-
Notifications
You must be signed in to change notification settings - Fork 791
[SYCL] Separate OpenCL specific constructs from lit tests. #2147
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
44a77a1
[SYCL] Separate OpenCL specific constructs from lit tests.
rbegam 0966142
removes redundant opencl requirement and comments.
rbegam 1cb78c1
adds a new file.
rbegam adfb330
clang formatted.
rbegam 9cc541f
corrects RUN commands.
rbegam 2a079d9
handles cuda fail.
rbegam 1bc78a5
[SYCL] update test.
rbegam File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
// REQUIRES: opencl | ||
// REQUIRES: opencl || level0 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. up for review #2235 |
||
|
||
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL | ||
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out | ||
// RUN: %CPU_RUN_PLACEHOLDER %t.out | ||
// RUN: %GPU_RUN_PLACEHOLDER %t.out | ||
|
||
//==--------------- event.cpp - SYCL event test ----------------------------==// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
// REQUIRES: opencl | ||
|
||
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -L %opencl_libs_dir -lOpenCL | ||
// RUN: %ACC_RUN_PLACEHOLDER %t.out | ||
// RUN: %CPU_RUN_PLACEHOLDER %t.out | ||
// RUN: %GPU_RUN_PLACEHOLDER %t.out | ||
//==-------- ordered_buffs.cpp - SYCL buffers in ordered queues test--------==// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
#include <CL/sycl.hpp> | ||
#include <iostream> | ||
|
||
using namespace cl::sycl; | ||
|
||
const int dataSize = 32; | ||
|
||
bool isQueueInOrder(cl_command_queue cq) { | ||
cl_command_queue_properties reportedProps; | ||
cl_int iRet = clGetCommandQueueInfo( | ||
cq, CL_QUEUE_PROPERTIES, sizeof(reportedProps), &reportedProps, nullptr); | ||
assert(CL_SUCCESS == iRet && "Failed to obtain queue info from ocl device"); | ||
return (!(reportedProps & CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE)); | ||
} | ||
|
||
int main() { | ||
int dataA[dataSize] = {0}; | ||
int dataB[dataSize] = {0}; | ||
|
||
{ | ||
queue Queue{property::queue::in_order()}; | ||
|
||
bool result = true; | ||
cl_command_queue cq = Queue.get(); | ||
device dev = Queue.get_device(); | ||
bool expected_result = dev.is_host() ? true : isQueueInOrder(cq); | ||
|
||
if (expected_result != result) { | ||
std::cout << "Resulting queue order is OOO but expected order is inorder" | ||
<< std::endl; | ||
|
||
return -1; | ||
} | ||
} | ||
|
||
return 0; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
// REQUIRES: opencl | ||
|
||
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t1.out -L %opencl_libs_dir -lOpenCL | ||
// RUN: %CPU_RUN_PLACEHOLDER %t1.out | ||
// RUN: %GPU_RUN_PLACEHOLDER %t1.out | ||
//==----------- ordered_dmemll.cpp - Device Memory Linked List test --------==// | ||
// It uses an ordered queue where explicit waiting is not necessary between | ||
// kernels | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
#include <CL/sycl.hpp> | ||
|
||
using namespace cl::sycl; | ||
|
||
constexpr int numNodes = 4; | ||
|
||
bool getQueueOrder(cl_command_queue cq) { | ||
cl_command_queue_properties reportedProps; | ||
cl_int iRet = clGetCommandQueueInfo( | ||
cq, CL_QUEUE_PROPERTIES, sizeof(reportedProps), &reportedProps, nullptr); | ||
assert(CL_SUCCESS == iRet && "Failed to obtain queue info from ocl device"); | ||
return (reportedProps & CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE) ? false | ||
: true; | ||
} | ||
|
||
int main() { | ||
queue q{property::queue::in_order()}; | ||
auto dev = q.get_device(); | ||
|
||
bool result = true; | ||
cl_command_queue cq = q.get(); | ||
bool expected_result = dev.is_host() ? true : getQueueOrder(cq); | ||
if (expected_result != result) { | ||
std::cout << "Resulting queue order is OOO but expected order is inorder" | ||
<< std::endl; | ||
|
||
return -1; | ||
} | ||
|
||
return 0; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder how clCreateUserEvent call below will be processed if only Level0 RT is available
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
clCreateUserEvent is not called for host and the test sets SYCL_DEVICE_TYPE=HOST. Do you suggest separating this test too?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not quite understand the logic of the test:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that is true. I am modifying this.