[SYCL] Implement basic sub-buffers support #64
There are no files selected for viewing
This file contains 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 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 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,89 @@ | ||
| // RUN: %clang -std=c++11 -fsycl %s -o %t.out -lstdc++ -lOpenCL | ||
| // RUN: env SYCL_DEVICE_TYPE=HOST %t.out | ||
| // RUN: %CPU_RUN_PLACEHOLDER %t.out | ||
| // RUN: %GPU_RUN_PLACEHOLDER %t.out | ||
| // RUN: %ACC_RUN_PLACEHOLDER %t.out | ||
| //==---------- subbuffer.cpp --- sub-buffer basic 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> | ||
|
|
||
| using namespace cl::sycl; | ||
|
|
||
| int main() { | ||
|
|
||
| bool Failed = false; | ||
| // Basic test case | ||
| { | ||
| const int M = 6; | ||
|
There was a problem hiding this comment. I think you can replace all the |
||
| const int N = 7; | ||
| int Result[M][N] = {0}; | ||
| { | ||
| auto OrigRange = range<2>(M, N); | ||
|
There was a problem hiding this comment. What about using modern C++ |
||
| buffer<int, 2> Buffer(OrigRange); | ||
| Buffer.set_final_data((int *)Result); | ||
|
There was a problem hiding this comment. Old C cast in modern C++ code... |
||
| auto Offset = id<2>(1, 1); | ||
| auto SubRange = range<2>(M - 2, N - 2); | ||
| queue MyQueue; | ||
| buffer<int, 2> SubBuffer(Buffer, Offset, SubRange); | ||
| MyQueue.submit([&](handler &cgh) { | ||
| auto B = SubBuffer.get_access<access::mode::read_write>(cgh); | ||
| cgh.parallel_for<class Subbuf_test>(SubRange, | ||
| [=](id<2> Index) { B[Index] = 1; }); | ||
| }); | ||
| } | ||
|
|
||
| // Check that we filled correct subset of buffer: | ||
| // 0000000 0000000 | ||
| // 0000000 0111110 | ||
| // 0000000 --> 0111110 | ||
| // 0000000 0111110 | ||
| // 0000000 0111110 | ||
| // 0000000 0000000 | ||
|
|
||
| for (size_t i = 0; i < M; ++i) { | ||
| for (size_t j = 0; j < N; ++j) { | ||
| size_t Expected = | ||
| ((i == 0) || (i == M - 1) || (j == 0) || (j == N - 1)) ? 0 : 1; | ||
|
There was a problem hiding this comment. Not clear why a Replacing |
||
| if (Result[i][j] != Expected) { | ||
| std::cout << "line: " << __LINE__ << " Result[" << i << "][" << j | ||
| << "] is " << Result[i][j] << " expected " << Expected | ||
| << std::endl; | ||
| Failed = true; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| // Try to create subbuffer from subbuffer | ||
| { | ||
| const int M = 10; | ||
| int Data[M] = {0}; | ||
| auto OrigRange = range<1>(M); | ||
|
There was a problem hiding this comment. Shorter: |
||
| buffer<int, 1> Buffer(Data, OrigRange); | ||
| auto Offset = id<1>(1); | ||
|
|
||
| auto SubRange = range<1>(M - 2); | ||
| auto SubSubRange = range<1>(M - 4); | ||
| queue MyQueue; | ||
| buffer<int, 1> SubBuffer(Buffer, Offset, SubRange); | ||
| buffer<int, 1> SubSubBuffer(SubBuffer, Offset, SubSubRange); | ||
| MyQueue.submit([&](handler &cgh) { | ||
| auto B = SubSubBuffer.get_access<access::mode::read_write>(cgh); | ||
| cgh.parallel_for<class Subsubbuf_test>(SubSubRange, | ||
| [=](id<1> Index) { B[Index] = 1; }); | ||
| }); | ||
| auto Acc = Buffer.get_access<cl::sycl::access::mode::read>(); | ||
| for (size_t i = 0; i < M; ++i) { | ||
| size_t Expected = (i > 1 && i < M - 2) ? 1 : 0; | ||
|
There was a problem hiding this comment. |
||
| if (Acc[i] != Expected) { | ||
| std::cout << "line: " << __LINE__ << " Data[" << i << "] is " << Acc[i] | ||
| << " expected " << Expected << std::endl; | ||
| Failed = true; | ||
| } | ||
| } | ||
| } | ||
| return Failed; | ||
| } | ||
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.
What about writing modern C++ with some
{ }instead of()for most of the instance constructions?