From dbf94621825ab7d44dc4725b3910f72172c6b587 Mon Sep 17 00:00:00 2001 From: rbegam Date: Mon, 9 Mar 2020 12:52:47 -0700 Subject: [PATCH 1/6] [SYCL] fix the test/basic_tests/buffer/subbuffer.cpp Signed-off-by: Rehana Begam --- sycl/test/basic_tests/buffer/subbuffer.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sycl/test/basic_tests/buffer/subbuffer.cpp b/sycl/test/basic_tests/buffer/subbuffer.cpp index abd821deb8ff3..e1095bda6686d 100644 --- a/sycl/test/basic_tests/buffer/subbuffer.cpp +++ b/sycl/test/basic_tests/buffer/subbuffer.cpp @@ -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 @@ -22,18 +22,22 @@ #include #include #include +#include void checkHostAccessor(cl::sycl::queue &q) { - std::size_t size = - q.get_device().get_info() / - 8; + std::size_t subbuf_align = + q.get_device(). + get_info() / 8; + std::size_t size = subbuf_align; + size = std::max(size, 10 * 2 * sizeof(int)); // hold at least 20 elements size /= sizeof(int); size *= 2; + std::vector data(size); std::iota(data.begin(), data.end(), 0); { cl::sycl::buffer buf(data.data(), size); - cl::sycl::buffer subbuf(buf, {size / 2}, {10}); + cl::sycl::buffer subbuf(buf, {size /2}, {10}); { auto host_acc = subbuf.get_access(); @@ -59,9 +63,11 @@ void checkHostAccessor(cl::sycl::queue &q) { } void check1DSubBuffer(cl::sycl::queue &q) { - std::size_t size = - q.get_device().get_info() / - 8; + std::size_t subbuf_align = + q.get_device(). + get_info() / 8; + std::size_t size = subbuf_align; + size = std::max(size, 32 * sizeof(int)); // hold at least 32 elements size /= sizeof(int); size *= 2; From f5f58c4aee9e2338ebd5e31901cf94e7f813753b Mon Sep 17 00:00:00 2001 From: rbegam Date: Mon, 9 Mar 2020 13:09:21 -0700 Subject: [PATCH 2/6] [SYCL] Clang formatted. Signed-off-by: Rehana Begam --- sycl/test/basic_tests/buffer/subbuffer.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sycl/test/basic_tests/buffer/subbuffer.cpp b/sycl/test/basic_tests/buffer/subbuffer.cpp index e1095bda6686d..47c47bdaa7362 100644 --- a/sycl/test/basic_tests/buffer/subbuffer.cpp +++ b/sycl/test/basic_tests/buffer/subbuffer.cpp @@ -19,15 +19,14 @@ // 2) Exceptions if we trying to create sub buffer not according to spec #include +#include #include #include #include -#include void checkHostAccessor(cl::sycl::queue &q) { std::size_t subbuf_align = - q.get_device(). - get_info() / 8; + q.get_device().get_info() / 8; std::size_t size = subbuf_align; size = std::max(size, 10 * 2 * sizeof(int)); // hold at least 20 elements size /= sizeof(int); @@ -37,7 +36,7 @@ void checkHostAccessor(cl::sycl::queue &q) { std::iota(data.begin(), data.end(), 0); { cl::sycl::buffer buf(data.data(), size); - cl::sycl::buffer subbuf(buf, {size /2}, {10}); + cl::sycl::buffer subbuf(buf, {size / 2}, {10}); { auto host_acc = subbuf.get_access(); @@ -64,8 +63,7 @@ void checkHostAccessor(cl::sycl::queue &q) { void check1DSubBuffer(cl::sycl::queue &q) { std::size_t subbuf_align = - q.get_device(). - get_info() / 8; + q.get_device().get_info() / 8; std::size_t size = subbuf_align; size = std::max(size, 32 * sizeof(int)); // hold at least 32 elements size /= sizeof(int); @@ -207,7 +205,7 @@ void copyBlock() { using typename cl::sycl::access::mode; using buffer = cl::sycl::buffer; - 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().get_pointer(); auto *Dst = Block.get_access().get_pointer(); @@ -250,8 +248,7 @@ void copyBlock() { "Invalid data in block buffer"); } } - } - catch (cl::sycl::exception& ex) { + } catch (cl::sycl::exception &ex) { assert(false && "Unexpected exception captured!"); } } From 626460663949c1bb4fb4aa563d9112ed63c9280d Mon Sep 17 00:00:00 2001 From: rbegam <60943159+rbegam@users.noreply.github.com> Date: Tue, 10 Mar 2020 10:14:47 -0700 Subject: [PATCH 3/6] Update sycl/test/basic_tests/buffer/subbuffer.cpp Signed-off-by: Rehana Begam Co-Authored-By: Romanov Vlad <17316488+romanovvlad@users.noreply.github.com> --- sycl/test/basic_tests/buffer/subbuffer.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sycl/test/basic_tests/buffer/subbuffer.cpp b/sycl/test/basic_tests/buffer/subbuffer.cpp index 47c47bdaa7362..2f012cbd72d21 100644 --- a/sycl/test/basic_tests/buffer/subbuffer.cpp +++ b/sycl/test/basic_tests/buffer/subbuffer.cpp @@ -27,8 +27,7 @@ void checkHostAccessor(cl::sycl::queue &q) { std::size_t subbuf_align = q.get_device().get_info() / 8; - std::size_t size = subbuf_align; - size = std::max(size, 10 * 2 * sizeof(int)); // hold at least 20 elements + std::size_t size = std::max(subbuf_align, 10 * 2 * sizeof(int)); // hold at least 20 elements size /= sizeof(int); size *= 2; From 246e8c0f3d9c031ea1e178c3c7ea6e31bab35b02 Mon Sep 17 00:00:00 2001 From: rbegam <60943159+rbegam@users.noreply.github.com> Date: Tue, 10 Mar 2020 10:15:02 -0700 Subject: [PATCH 4/6] Update sycl/test/basic_tests/buffer/subbuffer.cpp Signed-off-by: Rehana Begam Co-Authored-By: Romanov Vlad <17316488+romanovvlad@users.noreply.github.com> --- sycl/test/basic_tests/buffer/subbuffer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sycl/test/basic_tests/buffer/subbuffer.cpp b/sycl/test/basic_tests/buffer/subbuffer.cpp index 2f012cbd72d21..0639a45332fd1 100644 --- a/sycl/test/basic_tests/buffer/subbuffer.cpp +++ b/sycl/test/basic_tests/buffer/subbuffer.cpp @@ -19,6 +19,7 @@ // 2) Exceptions if we trying to create sub buffer not according to spec #include + #include #include #include From 53738c45eff8582b455933550791f6202673a3a7 Mon Sep 17 00:00:00 2001 From: rbegam <60943159+rbegam@users.noreply.github.com> Date: Tue, 10 Mar 2020 10:15:21 -0700 Subject: [PATCH 5/6] Update sycl/test/basic_tests/buffer/subbuffer.cpp Signed-off-by: Rehana Begam Co-Authored-By: Romanov Vlad <17316488+romanovvlad@users.noreply.github.com> --- sycl/test/basic_tests/buffer/subbuffer.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sycl/test/basic_tests/buffer/subbuffer.cpp b/sycl/test/basic_tests/buffer/subbuffer.cpp index 0639a45332fd1..9d961e87a7558 100644 --- a/sycl/test/basic_tests/buffer/subbuffer.cpp +++ b/sycl/test/basic_tests/buffer/subbuffer.cpp @@ -64,8 +64,7 @@ void checkHostAccessor(cl::sycl::queue &q) { void check1DSubBuffer(cl::sycl::queue &q) { std::size_t subbuf_align = q.get_device().get_info() / 8; - std::size_t size = subbuf_align; - size = std::max(size, 32 * sizeof(int)); // hold at least 32 elements + std::size_t size = std::max(subbuf_align, 32 * sizeof(int)); // hold at least 32 elements size /= sizeof(int); size *= 2; From e08606e914ad3b13b667170b0eddf790e34f44f5 Mon Sep 17 00:00:00 2001 From: rbegam <60943159+rbegam@users.noreply.github.com> Date: Tue, 10 Mar 2020 12:11:50 -0700 Subject: [PATCH 6/6] clang Formatted. Signed-off-by: Rehana Begam --- sycl/test/basic_tests/buffer/subbuffer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl/test/basic_tests/buffer/subbuffer.cpp b/sycl/test/basic_tests/buffer/subbuffer.cpp index 9d961e87a7558..6014fa716d400 100644 --- a/sycl/test/basic_tests/buffer/subbuffer.cpp +++ b/sycl/test/basic_tests/buffer/subbuffer.cpp @@ -64,7 +64,7 @@ void checkHostAccessor(cl::sycl::queue &q) { void check1DSubBuffer(cl::sycl::queue &q) { std::size_t subbuf_align = q.get_device().get_info() / 8; - std::size_t size = std::max(subbuf_align, 32 * sizeof(int)); // hold at least 32 elements + std::size_t size = std::max(subbuf_align, 32 * sizeof(int)); // hold at least 32 elements size /= sizeof(int); size *= 2;