Skip to content
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.

Sign up for GitHub

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

[SYCL] Fix the test/basic_tests/buffer/subbuffer.cpp #1277

Merged
merged 6 commits into from
Mar 11, 2020
Merged

[SYCL] Fix the test/basic_tests/buffer/subbuffer.cpp #1277

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbf9462
[SYCL] fix the test/basic_tests/buffer/subbuffer.cpp
rbegam Mar 9, 2020
f5f58c4
[SYCL] Clang formatted.
rbegam Mar 9, 2020
6264606
Update sycl/test/basic_tests/buffer/subbuffer.cpp
rbegam Mar 10, 2020
246e8c0
Update sycl/test/basic_tests/buffer/subbuffer.cpp
rbegam Mar 10, 2020
53738c4
Update sycl/test/basic_tests/buffer/subbuffer.cpp
rbegam Mar 10, 2020
e08606e
clang Formatted.
rbegam Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions sycl/test/basic_tests/buffer/subbuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
Expand All @@ -19,16 +19,19 @@
// 2) Exceptions if we trying to create sub buffer not according to spec

#include <CL/sycl.hpp>

#include <algorithm>
#include <iostream>
#include <numeric>
#include <vector>

void checkHostAccessor(cl::sycl::queue &q) {
std::size_t size =
q.get_device().get_info<cl::sycl::info::device::mem_base_addr_align>() /
8;
std::size_t subbuf_align =
q.get_device().get_info<cl::sycl::info::device::mem_base_addr_align>() / 8;
std::size_t size = std::max(subbuf_align, 10 * 2 * sizeof(int)); // hold at least 20 elements
size /= sizeof(int);
size *= 2;

std::vector<int> data(size);
std::iota(data.begin(), data.end(), 0);
{
Expand Down Expand Up @@ -59,9 +62,9 @@ void checkHostAccessor(cl::sycl::queue &q) {
}

void check1DSubBuffer(cl::sycl::queue &q) {
std::size_t size =
q.get_device().get_info<cl::sycl::info::device::mem_base_addr_align>() /
8;
std::size_t subbuf_align =
q.get_device().get_info<cl::sycl::info::device::mem_base_addr_align>() / 8;
std::size_t size = std::max(subbuf_align, 32 * sizeof(int)); // hold at least 32 elements
size /= sizeof(int);
size *= 2;

Expand Down Expand Up @@ -201,7 +204,7 @@ void copyBlock() {
using typename cl::sycl::access::mode;
using buffer = cl::sycl::buffer<int, 1>;

auto CopyF = [](buffer& Buffer, buffer& Block, size_t Idx, size_t BlockSize) {
auto CopyF = [](buffer &Buffer, buffer &Block, size_t Idx, size_t BlockSize) {
auto Subbuf = buffer(Buffer, Idx * BlockSize, BlockSize);
auto *Src = Subbuf.get_access<mode::read>().get_pointer();
auto *Dst = Block.get_access<mode::write>().get_pointer();
Expand Down Expand Up @@ -244,8 +247,7 @@ void copyBlock() {
"Invalid data in block buffer");
}
}
}
catch (cl::sycl::exception& ex) {
} catch (cl::sycl::exception &ex) {
assert(false && "Unexpected exception captured!");
}
}
Expand Down