From 3cbfdf7aac1c77e0ca631edcd8168e2ce5a365ec Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Wed, 17 Aug 2022 22:21:50 -0700 Subject: [PATCH 1/9] updating the now deprecated SYCL 1.2.1 device_selectors to the newer SYCL 2020 ones Signed-off-by: Chris Perkins --- SYCL/BFloat16/bfloat16_type.hpp | 2 +- SYCL/Basic/barrier_order.cpp | 2 +- SYCL/Basic/buffer/buffer_dev_to_dev.cpp | 3 +-- SYCL/Basic/buffer/buffer_migrate.cpp | 2 +- SYCL/Basic/build_log.cpp | 2 +- SYCL/Basic/enqueue_barrier.cpp | 6 ++--- SYCL/Basic/fpga_tests/Inputs/fpga_host.cpp | 2 +- SYCL/Basic/get_backend.cpp | 3 +-- SYCL/Basic/group_local_id.cpp | 2 +- SYCL/Basic/half_type.cpp | 2 +- SYCL/Basic/handler/interop_task.cpp | 2 +- SYCL/Basic/handler/run_on_host_intel.cpp | 2 +- SYCL/Basic/image/image.cpp | 6 ++--- .../image/image_accessor_readwrite_half.cpp | 2 +- SYCL/Basic/image/image_array.cpp | 2 +- SYCL/Basic/image/image_read.cpp | 3 +-- SYCL/Basic/image/image_read_fp16.cpp | 3 +-- SYCL/Basic/image/image_sample.cpp | 12 +++------ SYCL/Basic/image/image_write.cpp | 3 +-- SYCL/Basic/image/image_write.h | 2 -- SYCL/Basic/image/image_write_fp16.cpp | 3 +-- SYCL/Basic/interop/construction_ocl.cpp | 2 +- SYCL/Basic/interop/construction_ze.cpp | 2 +- .../Basic/kernel_bundle/kernel_bundle_api.cpp | 4 +-- SYCL/Basic/partition_supported.cpp | 2 +- SYCL/Basic/stream/stream.cpp | 3 +-- SYCL/Basic/subdevice_pi.cpp | 3 +-- SYCL/Basic/submit_barrier.cpp | 2 +- .../SpecConsts1.2.1/composite-in-functor.cpp | 2 +- .../SpecConsts1.2.1/composite-type.cpp | 2 +- .../multiple-usages-of-composite.cpp | 2 +- .../SpecConsts1.2.1/spec_const_hw.cpp | 2 +- .../SpecConsts1.2.1/spec_const_neg.cpp | 2 +- .../SpecConsts1.2.1/spec_const_redefine.cpp | 2 +- .../unpacked-composite-type.cpp | 2 +- .../cuda_program_interop.cpp | 2 +- SYCL/DeprecatedFeatures/deprecated.cpp | 4 +-- .../device_platform_interop.cpp | 9 +++---- SYCL/DeprecatedFeatures/get_backend.cpp | 3 +-- SYCL/DeprecatedFeatures/program_link.cpp | 3 +-- SYCL/DeprecatedFeatures/spec_const_aot.cpp | 2 +- SYCL/DeprecatedFeatures/spec_consts.hpp | 2 +- SYCL/DeviceLib/built-ins/printf.cpp | 5 ++-- SYCL/DeviceLib/imf_simd_emulate_test.cpp | 3 +-- SYCL/ESIMD/dpas/dpas_test3.cpp | 2 +- SYCL/ESIMD/lsc/Inputs/lsc_block_load.hpp | 3 +-- SYCL/ESIMD/lsc/Inputs/lsc_slm_load.hpp | 2 +- SYCL/ESIMD/lsc/Inputs/lsc_slm_store.hpp | 2 +- SYCL/ESIMD/lsc/Inputs/lsc_surf_load.hpp | 3 +-- SYCL/ESIMD/lsc/Inputs/lsc_surf_store.hpp | 3 +-- SYCL/ESIMD/lsc/Inputs/lsc_usm_load.hpp | 3 +-- SYCL/ESIMD/lsc/Inputs/lsc_usm_store.hpp | 3 +-- .../regression/Inputs/complex-lib-test.cpp | 2 +- SYCL/ESIMD/regression/dgetrf_8x8.cpp | 2 +- SYCL/ESIMD/sycl_esimd_mix.cpp | 2 +- SYCL/GroupAlgorithm/SYCL2020/sort.cpp | 2 +- SYCL/InlineAsm/include/asmhelper.h | 2 +- SYCL/InorderQueue/prop.cpp | 2 +- SYCL/Plugin/enqueue-arg-order-buffer.cpp | 2 +- SYCL/Plugin/enqueue-arg-order-image.cpp | 4 +-- SYCL/Plugin/interop-buffer-cuda.cpp | 2 +- SYCL/Plugin/interop-cuda-experimental.cpp | 6 ++--- .../interop-level-zero-buffer-multi-dim.cpp | 2 +- .../interop-level-zero-buffer-ownership.cpp | 2 +- SYCL/Plugin/interop-level-zero-buffer.cpp | 4 +-- .../interop-level-zero-get-native-mem.cpp | 2 +- .../interop-level-zero-keep-ownership.cpp | 2 +- SYCL/Plugin/level-zero-usm-capabilities.cpp | 2 +- SYCL/Plugin/level_zero_batch_event_status.cpp | 3 +-- SYCL/Plugin/level_zero_batch_test.cpp | 2 +- ...evel_zero_batch_test_copy_with_compute.cpp | 2 +- .../Plugin/level_zero_device_scope_events.cpp | 3 +-- SYCL/Plugin/level_zero_dynamic_batch_test.cpp | 2 +- SYCL/Plugin/level_zero_queue_profiling.cpp | 3 +-- SYCL/Plugin/max_malloc.cpp | 2 +- SYCL/Plugin/retain_events.cpp | 2 +- SYCL/Plugin/sycl-targets-order.cpp | 2 +- SYCL/Reduction/regression_after_pr_6343.cpp | 2 +- SYCL/Regression/cache_test.cpp | 2 +- .../context_is_destroyed_after_exception.cpp | 2 +- SYCL/Regression/event_destruction.cpp | 3 +-- .../kernel_bundle_ignore_sycl_external.cpp | 2 +- SYCL/Regression/usm_malloc_shared.cpp | 2 +- SYCL/Scheduler/DataMovement.cpp | 4 +-- SYCL/Scheduler/ReleaseResourcesTest.cpp | 4 +-- SYCL/USM/multictxt.cpp | 12 ++++----- SYCL/XPTI/basic_event_collection.inc | 2 +- SYCL/XPTI/mem_alloc_events.inc | 2 +- SYCL/helpers.hpp | 27 +++++++++---------- 89 files changed, 122 insertions(+), 155 deletions(-) diff --git a/SYCL/BFloat16/bfloat16_type.hpp b/SYCL/BFloat16/bfloat16_type.hpp index 17742fb5dc..97e1ccb7fc 100644 --- a/SYCL/BFloat16/bfloat16_type.hpp +++ b/SYCL/BFloat16/bfloat16_type.hpp @@ -169,7 +169,7 @@ void verify_logic(queue &q, buffer &a, buffer &b, } int run_tests() { - device dev{default_selector()}; + device dev{default_selector_v}; // TODO: replace is_gpu check with extension check when the appropriate part // of implementation ready (aspect) diff --git a/SYCL/Basic/barrier_order.cpp b/SYCL/Basic/barrier_order.cpp index 207685adbc..45c02e43fe 100644 --- a/SYCL/Basic/barrier_order.cpp +++ b/SYCL/Basic/barrier_order.cpp @@ -9,7 +9,7 @@ #include int main() { - sycl::device dev{sycl::default_selector{}}; + sycl::device dev{sycl::default_selector_v}; sycl::queue q{dev}; int *x = sycl::malloc_shared(1, q); diff --git a/SYCL/Basic/buffer/buffer_dev_to_dev.cpp b/SYCL/Basic/buffer/buffer_dev_to_dev.cpp index 5d143a7447..ec7b650aad 100644 --- a/SYCL/Basic/buffer/buffer_dev_to_dev.cpp +++ b/SYCL/Basic/buffer/buffer_dev_to_dev.cpp @@ -24,8 +24,7 @@ int main() { buffer Buffer(Data, range<1>(10), {property::buffer::use_host_ptr()}); - default_selector Selector; - device Device(Selector); + device Device(default_selector_v); context FirstContext(Device); context SecondContext(Device); diff --git a/SYCL/Basic/buffer/buffer_migrate.cpp b/SYCL/Basic/buffer/buffer_migrate.cpp index 5016c802bd..08b5353234 100644 --- a/SYCL/Basic/buffer/buffer_migrate.cpp +++ b/SYCL/Basic/buffer/buffer_migrate.cpp @@ -19,7 +19,7 @@ int main() { buffer Buffer(&Data, range<1>(1)); const auto &Devices = - platform(gpu_selector{}).get_devices(info::device_type::gpu); + platform(gpu_selector_v).get_devices(info::device_type::gpu); std::cout << Devices.size() << " devices found" << std::endl; context C(Devices); diff --git a/SYCL/Basic/build_log.cpp b/SYCL/Basic/build_log.cpp index ebfc651d22..60d245f2f0 100644 --- a/SYCL/Basic/build_log.cpp +++ b/SYCL/Basic/build_log.cpp @@ -7,7 +7,7 @@ #include int main() { - sycl::queue Q{sycl::default_selector()}; + sycl::queue Q{sycl::default_selector_v}; auto *I = sycl::malloc_device(1, Q); Q.single_task([=]() { I[0] = 42; }); diff --git a/SYCL/Basic/enqueue_barrier.cpp b/SYCL/Basic/enqueue_barrier.cpp index 225dda44e6..fc911ad230 100644 --- a/SYCL/Basic/enqueue_barrier.cpp +++ b/SYCL/Basic/enqueue_barrier.cpp @@ -12,7 +12,7 @@ int main() { sycl::context Context; - sycl::queue Q1(Context, sycl::default_selector{}); + sycl::queue Q1(Context, sycl::default_selector_v); Q1.submit( [&](sycl::handler &cgh) { cgh.single_task([]() {}); }); @@ -30,8 +30,8 @@ int main() { // call queue::ext_oneapi_submit_barrier() Q1.ext_oneapi_submit_barrier(); - sycl::queue Q2(Context, sycl::default_selector{}); - sycl::queue Q3(Context, sycl::default_selector{}); + sycl::queue Q2(Context, sycl::default_selector_v); + sycl::queue Q3(Context, sycl::default_selector_v); auto Event1 = Q1.submit( [&](sycl::handler &cgh) { cgh.single_task([]() {}); }); diff --git a/SYCL/Basic/fpga_tests/Inputs/fpga_host.cpp b/SYCL/Basic/fpga_tests/Inputs/fpga_host.cpp index 727edf6beb..cd143d5256 100644 --- a/SYCL/Basic/fpga_tests/Inputs/fpga_host.cpp +++ b/SYCL/Basic/fpga_tests/Inputs/fpga_host.cpp @@ -14,7 +14,7 @@ using namespace sycl; void foo(double &, queue q, int x); int main(void) { - queue q(accelerator_selector{}); + queue q(accelerator_selector_v); double result; foo(result, q, 3); diff --git a/SYCL/Basic/get_backend.cpp b/SYCL/Basic/get_backend.cpp index 7da435a4e9..f269f87355 100644 --- a/SYCL/Basic/get_backend.cpp +++ b/SYCL/Basic/get_backend.cpp @@ -45,8 +45,7 @@ int main() { return_fail(); } - default_selector sel; - queue q(c, sel); + queue q(c, default_selector_v); if (q.get_backend() != plt.get_backend()) { return_fail(); } diff --git a/SYCL/Basic/group_local_id.cpp b/SYCL/Basic/group_local_id.cpp index db70924295..47849f93ca 100644 --- a/SYCL/Basic/group_local_id.cpp +++ b/SYCL/Basic/group_local_id.cpp @@ -8,7 +8,7 @@ using namespace sycl; int main() { - queue q(cpu_selector{}); + queue q(cpu_selector_v); const int sz = 16; q.submit([&](handler &h) { diff --git a/SYCL/Basic/half_type.cpp b/SYCL/Basic/half_type.cpp index 1387948b95..92f7cfca9b 100644 --- a/SYCL/Basic/half_type.cpp +++ b/SYCL/Basic/half_type.cpp @@ -238,7 +238,7 @@ int main() { constexpr_verify_mul(); constexpr_verify_div(); - device dev{default_selector()}; + device dev{default_selector_v}; if (!dev.is_host() && !dev.has(sycl::aspect::fp16)) { std::cout << "This device doesn't support the extension cl_khr_fp16" << std::endl; diff --git a/SYCL/Basic/handler/interop_task.cpp b/SYCL/Basic/handler/interop_task.cpp index cf56b8126c..2cde2698d6 100644 --- a/SYCL/Basic/handler/interop_task.cpp +++ b/SYCL/Basic/handler/interop_task.cpp @@ -27,7 +27,7 @@ int main() { sycl::buffer DstBuf(sycl::range<1>{BufSize}); sycl::buffer DstBuf2(sycl::range<1>{BufSize}); - TestQueue Queue{sycl::default_selector{}}; + TestQueue Queue{sycl::default_selector_v}; Queue.submit([&](sycl::handler &CGH) { auto DstAcc = DstBuf.get_access(CGH); diff --git a/SYCL/Basic/handler/run_on_host_intel.cpp b/SYCL/Basic/handler/run_on_host_intel.cpp index 34f1b86a04..b86dcf6fdb 100644 --- a/SYCL/Basic/handler/run_on_host_intel.cpp +++ b/SYCL/Basic/handler/run_on_host_intel.cpp @@ -27,7 +27,7 @@ int main() { sycl::buffer SrcBuf(data1, sycl::range<1>{BufSize}); sycl::buffer DstBuf(sycl::range<1>{BufSize}); - TestQueue Queue{sycl::default_selector{}}; + TestQueue Queue{sycl::default_selector_v}; Queue.submit([&](sycl::handler &CGH) { auto SrcAcc = SrcBuf.get_access(CGH); auto DstAcc = DstBuf.get_access(CGH); diff --git a/SYCL/Basic/image/image.cpp b/SYCL/Basic/image/image.cpp index e9aaa8ddb6..91f628d8b4 100644 --- a/SYCL/Basic/image/image.cpp +++ b/SYCL/Basic/image/image.cpp @@ -35,7 +35,7 @@ int main() { { sycl::image<2> Img1(Img1HostData.data(), ChanOrder, ChanType, Img1Size); sycl::image<2> Img2(Img2HostData.data(), ChanOrder, ChanType, Img2Size); - TestQueue Q{sycl::default_selector()}; + TestQueue Q{sycl::default_selector_v}; Q.submit([&](sycl::handler &CGH) { auto Img1Acc = Img1.get_access(CGH); auto Img2Acc = Img2.get_access(CGH); @@ -64,7 +64,7 @@ int main() { { const sycl::range<1> ImgPitch(4 * 4 * 4 * 2); sycl::image<2> Img(ChanOrder, ChanType, Img1Size, ImgPitch); - TestQueue Q{sycl::default_selector()}; + TestQueue Q{sycl::default_selector_v}; Q.submit([&](sycl::handler &CGH) { auto ImgAcc = Img.get_access(CGH); CGH.single_task([=]() { ImgAcc.get_range(); }); @@ -75,7 +75,7 @@ int main() { const sycl::range<1> ImgPitch(4 * 4 * 4 * 2); sycl::image<2> Img(Img1HostData.data(), ChanOrder, ChanType, Img1Size, ImgPitch); - TestQueue Q{sycl::default_selector()}; + TestQueue Q{sycl::default_selector_v}; Q.submit([&](sycl::handler &CGH) { auto ImgAcc = Img.get_access(CGH); CGH.single_task([=] { ImgAcc.get_range(); }); diff --git a/SYCL/Basic/image/image_accessor_readwrite_half.cpp b/SYCL/Basic/image/image_accessor_readwrite_half.cpp index fe0499c735..59d8ad1c50 100644 --- a/SYCL/Basic/image/image_accessor_readwrite_half.cpp +++ b/SYCL/Basic/image/image_accessor_readwrite_half.cpp @@ -147,7 +147,7 @@ void check_half4(char *HostPtr) { int main() { // Checking if default selected device supports half datatype. // Same device will be selected in the write/read functions. - s::device Dev{s::default_selector()}; + s::device Dev{s::default_selector_v}; if (!Dev.is_host() && !Dev.has(sycl::aspect::fp16)) { std::cout << "This device doesn't support the extension cl_khr_fp16" << std::endl; diff --git a/SYCL/Basic/image/image_array.cpp b/SYCL/Basic/image/image_array.cpp index dc6c541d70..5007032c45 100644 --- a/SYCL/Basic/image/image_array.cpp +++ b/SYCL/Basic/image/image_array.cpp @@ -48,7 +48,7 @@ int main() { sycl::buffer ResBuf(ResBufData.data(), {ResBufSize}); - TestQueue Q{sycl::default_selector()}; + TestQueue Q{sycl::default_selector_v}; constexpr auto SYCLRead = sycl::access::mode::read; constexpr auto SYCLWrite = sycl::access::mode::write; diff --git a/SYCL/Basic/image/image_read.cpp b/SYCL/Basic/image/image_read.cpp index f76b891297..96bdca5761 100644 --- a/SYCL/Basic/image/image_read.cpp +++ b/SYCL/Basic/image/image_read.cpp @@ -8,8 +8,7 @@ int main() { - s::default_selector selector; - s::queue myQueue(selector); + s::queue myQueue(s::default_selector_v); bool passed = true; diff --git a/SYCL/Basic/image/image_read_fp16.cpp b/SYCL/Basic/image/image_read_fp16.cpp index 2d415d2c6d..7e61317b25 100644 --- a/SYCL/Basic/image/image_read_fp16.cpp +++ b/SYCL/Basic/image/image_read_fp16.cpp @@ -7,8 +7,7 @@ #include "image_read.h" int main() { - s::default_selector selector; - s::queue myQueue(selector); + s::queue myQueue(s::default_selector_v); // Device doesn't support cl_khr_fp16 extension - skip. if (!myQueue.get_device().has(sycl::aspect::fp16)) diff --git a/SYCL/Basic/image/image_sample.cpp b/SYCL/Basic/image/image_sample.cpp index 6409d7b999..28073070f3 100644 --- a/SYCL/Basic/image/image_sample.cpp +++ b/SYCL/Basic/image/image_sample.cpp @@ -43,8 +43,6 @@ bool test1d_coord(dataT *hostPtr, coordT coord, dataT expectedColour) { s::sampler testSampler(s::coordinate_normalization_mode::unnormalized, s::addressing_mode::clamp, s::filtering_mode::linear); - s::default_selector selector; - { // Scope everything to force destruction s::image<1> image(hostPtr, s::image_channel_order::rgba, channelType, s::range<1>{3}); @@ -52,7 +50,7 @@ bool test1d_coord(dataT *hostPtr, coordT coord, dataT expectedColour) { s::buffer resultDataBuf(&resultData, s::range<1>(1)); // Do the test by reading a single pixel from the image - s::queue myQueue(selector); + s::queue myQueue(s::default_selector_v); myQueue.submit([&](s::handler &cgh) { auto imageAcc = image.get_access(cgh); s::accessor resultDataAcc(resultDataBuf, @@ -80,8 +78,6 @@ bool test2d_coord(dataT *hostPtr, coordT coord, dataT expectedColour) { s::sampler testSampler(s::coordinate_normalization_mode::unnormalized, s::addressing_mode::clamp, s::filtering_mode::linear); - s::default_selector selector; - { // Scope everything to force destruction s::image<2> image(hostPtr, s::image_channel_order::rgba, channelType, s::range<2>{3, 3}); @@ -89,7 +85,7 @@ bool test2d_coord(dataT *hostPtr, coordT coord, dataT expectedColour) { s::buffer resultDataBuf(&resultData, s::range<1>(1)); // Do the test by reading a single pixel from the image - s::queue myQueue(selector); + s::queue myQueue(s::default_selector_v); myQueue.submit([&](s::handler &cgh) { auto imageAcc = image.get_access(cgh); s::accessor resultDataAcc(resultDataBuf, @@ -117,8 +113,6 @@ bool test3d_coord(dataT *hostPtr, coordT coord, dataT expectedColour) { s::sampler testSampler(s::coordinate_normalization_mode::unnormalized, s::addressing_mode::clamp, s::filtering_mode::linear); - s::default_selector selector; - { // Scope everything to force destruction s::image<3> image(hostPtr, s::image_channel_order::rgba, channelType, s::range<3>{3, 3, 3}); @@ -126,7 +120,7 @@ bool test3d_coord(dataT *hostPtr, coordT coord, dataT expectedColour) { s::buffer resultDataBuf(&resultData, s::range<1>(1)); // Do the test by reading a single pixel from the image - s::queue myQueue(selector); + s::queue myQueue(s::default_selector_v); myQueue.submit([&](s::handler &cgh) { auto imageAcc = image.get_access(cgh); s::accessor resultDataAcc(resultDataBuf, diff --git a/SYCL/Basic/image/image_write.cpp b/SYCL/Basic/image/image_write.cpp index 3f4aa66d7f..7fb03ecbf4 100644 --- a/SYCL/Basic/image/image_write.cpp +++ b/SYCL/Basic/image/image_write.cpp @@ -12,8 +12,7 @@ int main() { - s::default_selector selector; - s::queue myQueue(selector); + s::queue myQueue(s::default_selector_v); bool passed = true; diff --git a/SYCL/Basic/image/image_write.h b/SYCL/Basic/image/image_write.h index 0ebadcf599..6a87a63925 100644 --- a/SYCL/Basic/image/image_write.h +++ b/SYCL/Basic/image/image_write.h @@ -119,8 +119,6 @@ bool test3d_coord(s::queue myQueue, dataT *hostPtr, coordT coord, dataT colour) { dataT resultData; - s::default_selector selector; - { // Scope everything to force destruction s::image<3> image(hostPtr, s::image_channel_order::rgba, channelType, s::range<3>{3, 3, 3}); diff --git a/SYCL/Basic/image/image_write_fp16.cpp b/SYCL/Basic/image/image_write_fp16.cpp index 6b9458cfdf..93dc7a4b1d 100644 --- a/SYCL/Basic/image/image_write_fp16.cpp +++ b/SYCL/Basic/image/image_write_fp16.cpp @@ -7,8 +7,7 @@ #include "image_write.h" int main() { - s::default_selector selector; - s::queue myQueue(selector); + s::queue myQueue(s::default_selector_v); // Device doesn't support cl_khr_fp16 extension - skip. if (!myQueue.get_device().has(sycl::aspect::fp16)) diff --git a/SYCL/Basic/interop/construction_ocl.cpp b/SYCL/Basic/interop/construction_ocl.cpp index 91912ace44..95313a839b 100644 --- a/SYCL/Basic/interop/construction_ocl.cpp +++ b/SYCL/Basic/interop/construction_ocl.cpp @@ -10,7 +10,7 @@ constexpr auto BE = sycl::backend::opencl; int main() { - sycl::device Dev{sycl::default_selector{}}; + sycl::device Dev{sycl::default_selector_v}; auto NativeDev = sycl::get_native(Dev); sycl::device NewDev = sycl::make_device(NativeDev); diff --git a/SYCL/Basic/interop/construction_ze.cpp b/SYCL/Basic/interop/construction_ze.cpp index 345499338f..6c6ee2f3fa 100644 --- a/SYCL/Basic/interop/construction_ze.cpp +++ b/SYCL/Basic/interop/construction_ze.cpp @@ -10,7 +10,7 @@ constexpr auto BE = sycl::backend::ext_oneapi_level_zero; int main() { - sycl::device Dev{sycl::default_selector{}}; + sycl::device Dev{sycl::default_selector_v}; sycl::queue Q{Dev}; diff --git a/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp b/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp index 3c58aa9111..c33aaa28f6 100644 --- a/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp +++ b/SYCL/Basic/kernel_bundle/kernel_bundle_api.cpp @@ -34,8 +34,8 @@ void checkException(TryBodyT TryBody, const std::string &ExpectedErrMsg) { } int main() { - const sycl::device Dev{sycl::default_selector{}}; - const sycl::device Dev2{sycl::default_selector{}}; + const sycl::device Dev{sycl::default_selector_v}; + const sycl::device Dev2{sycl::default_selector_v}; const sycl::context Ctx{Dev}; const sycl::context Ctx2{Dev2}; diff --git a/SYCL/Basic/partition_supported.cpp b/SYCL/Basic/partition_supported.cpp index a8e0a4d678..0786a0ac3c 100644 --- a/SYCL/Basic/partition_supported.cpp +++ b/SYCL/Basic/partition_supported.cpp @@ -53,7 +53,7 @@ supports_partition_property(const sycl::device &dev, int main() { - auto dev = sycl::device(sycl::default_selector()); + auto dev = sycl::device(sycl::default_selector_v); // 1 - check exceed max_compute_units sycl::info::partition_property partitionEqually = diff --git a/SYCL/Basic/stream/stream.cpp b/SYCL/Basic/stream/stream.cpp index dcc2fba469..1c2e74ef38 100644 --- a/SYCL/Basic/stream/stream.cpp +++ b/SYCL/Basic/stream/stream.cpp @@ -22,8 +22,7 @@ using namespace sycl; int main() { { - default_selector Selector; - queue Queue(Selector); + queue Queue(default_selector_v); context Context = Queue.get_context(); // Check constructor and getters diff --git a/SYCL/Basic/subdevice_pi.cpp b/SYCL/Basic/subdevice_pi.cpp index 5a2adbeb13..5544d06170 100644 --- a/SYCL/Basic/subdevice_pi.cpp +++ b/SYCL/Basic/subdevice_pi.cpp @@ -194,8 +194,7 @@ int main(int argc, const char **argv) { std::string test(argv[1]); std::string partition_type(argv[2]); - default_selector selector; - device dev(selector); + device dev(default_selector_v); std::vector host_mem(1024, 1); buffer buf(&host_mem[0], host_mem.size()); diff --git a/SYCL/Basic/submit_barrier.cpp b/SYCL/Basic/submit_barrier.cpp index 071072bfa3..c6461625fe 100755 --- a/SYCL/Basic/submit_barrier.cpp +++ b/SYCL/Basic/submit_barrier.cpp @@ -9,7 +9,7 @@ int main() { - sycl::device dev{sycl::default_selector{}}; + sycl::device dev{sycl::default_selector_v}; sycl::queue q{dev}; q.submit( diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-in-functor.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-in-functor.cpp index 9ef1e05e50..cbdb74e6f5 100644 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-in-functor.cpp +++ b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-in-functor.cpp @@ -49,7 +49,7 @@ class my_kernel_t { }; int main() { - sycl::queue q(default_selector{}, [](exception_list l) { + sycl::queue q(sycl::default_selector_v, [](exception_list l) { for (auto ep : l) { try { std::rethrow_exception(ep); diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-type.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-type.cpp index 61ed328be8..77e3dec688 100644 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-type.cpp +++ b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-type.cpp @@ -35,7 +35,7 @@ int global_val = 10; int get_value() { return global_val; } int main(int argc, char **argv) { - sycl::queue q(default_selector{}, [](exception_list l) { + sycl::queue q(default_selector_v, [](exception_list l) { for (auto ep : l) { try { std::rethrow_exception(ep); diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/multiple-usages-of-composite.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/multiple-usages-of-composite.cpp index 3259291f3e..64823240e8 100644 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/multiple-usages-of-composite.cpp +++ b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/multiple-usages-of-composite.cpp @@ -42,7 +42,7 @@ template class kernel_t { template class kernel_driver_t { public: void execute(const pod_t &pod) { - device dev = sycl::device(default_selector{}); + device dev = sycl::device(default_selector_v); context ctx = context(dev); queue q(dev); diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_hw.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_hw.cpp index 332879dda8..9f1bc48dca 100644 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_hw.cpp +++ b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_hw.cpp @@ -67,7 +67,7 @@ struct MyKernel { int main(int argc, char **argv) { global_val = argc + 16; - sycl::queue q(default_selector{}, [](exception_list l) { + sycl::queue q(default_selector_v, [](exception_list l) { for (auto ep : l) { try { std::rethrow_exception(ep); diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_neg.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_neg.cpp index db018b03ba..c8966e84ef 100644 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_neg.cpp +++ b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_neg.cpp @@ -27,7 +27,7 @@ using namespace sycl; class KernelAAAi; int main(int argc, char **argv) { - sycl::queue q(default_selector{}, [](exception_list l) { + sycl::queue q(default_selector_v, [](exception_list l) { for (auto ep : l) { try { std::rethrow_exception(ep); diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_redefine.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_redefine.cpp index 59ac0dcdc9..29c1231cae 100644 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_redefine.cpp +++ b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_redefine.cpp @@ -39,7 +39,7 @@ int get_value() { return val; } int main(int argc, char **argv) { val = argc; - sycl::queue q(default_selector{}, [](exception_list l) { + sycl::queue q(default_selector_v, [](exception_list l) { for (auto ep : l) { try { std::rethrow_exception(ep); diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/unpacked-composite-type.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/unpacked-composite-type.cpp index 2bdf1c4463..f09ff7ea7c 100644 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/unpacked-composite-type.cpp +++ b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/unpacked-composite-type.cpp @@ -50,7 +50,7 @@ template class kernel_t { template class kernel_driver_t { public: void execute(const pod_t &pod) { - device dev = sycl::device(default_selector{}); + device dev = sycl::device(default_selector_v); context ctx = context(dev); queue q(dev); diff --git a/SYCL/DeprecatedFeatures/cuda_program_interop.cpp b/SYCL/DeprecatedFeatures/cuda_program_interop.cpp index ba7b3b1bcc..123fa1789f 100644 --- a/SYCL/DeprecatedFeatures/cuda_program_interop.cpp +++ b/SYCL/DeprecatedFeatures/cuda_program_interop.cpp @@ -5,7 +5,7 @@ #include int main() { - sycl::queue Queue{sycl::default_selector{}}; + sycl::queue Queue{sycl::default_selector_v}; Queue.submit( [](sycl::handler &CGH) { CGH.single_task([] {}); }); diff --git a/SYCL/DeprecatedFeatures/deprecated.cpp b/SYCL/DeprecatedFeatures/deprecated.cpp index 582dc50d25..a92de72bce 100644 --- a/SYCL/DeprecatedFeatures/deprecated.cpp +++ b/SYCL/DeprecatedFeatures/deprecated.cpp @@ -17,8 +17,8 @@ using namespace sycl; int main() { - device Device{default_selector()}; - platform Platform{default_selector()}; + device Device{default_selector_v}; + platform Platform{default_selector_v}; bool b = Device.has_extension("cl_intel_subgroups"); b = Platform.has_extension("some_extension"); diff --git a/SYCL/DeprecatedFeatures/device_platform_interop.cpp b/SYCL/DeprecatedFeatures/device_platform_interop.cpp index ad72e159e7..8938af2d28 100644 --- a/SYCL/DeprecatedFeatures/device_platform_interop.cpp +++ b/SYCL/DeprecatedFeatures/device_platform_interop.cpp @@ -22,21 +22,20 @@ using namespace sycl; int main() { - default_selector device_selector; - device D1(device_selector); + device D1(default_selector_v); cl_device_id cl_device; { - device D2(device_selector); + device D2(default_selector_v); cl_device = get_native(D2); } device D3(cl_device); assert(D1 == D3 && "Device impls are different"); - platform P1(device_selector); + platform P1(default_selector_v); cl_platform_id cl_platform; { - platform P2(device_selector); + platform P2(default_selector_v); cl_platform = get_native(P2); } platform P3(cl_platform); diff --git a/SYCL/DeprecatedFeatures/get_backend.cpp b/SYCL/DeprecatedFeatures/get_backend.cpp index 4ca91d044f..2faabfa57d 100644 --- a/SYCL/DeprecatedFeatures/get_backend.cpp +++ b/SYCL/DeprecatedFeatures/get_backend.cpp @@ -50,8 +50,7 @@ int main() { return_fail(); } - default_selector sel; - queue q(c, sel); + queue q(c, default_selector_v); if (q.get_backend() != plt.get_backend()) { return_fail(); } diff --git a/SYCL/DeprecatedFeatures/program_link.cpp b/SYCL/DeprecatedFeatures/program_link.cpp index 06b7f8edae..5e48a2f7bc 100644 --- a/SYCL/DeprecatedFeatures/program_link.cpp +++ b/SYCL/DeprecatedFeatures/program_link.cpp @@ -23,8 +23,7 @@ class DUMMY { }; int main(void) { - default_selector s; - platform p(s); + platform p(default_selector_v); if (p.is_host()) { return 0; } diff --git a/SYCL/DeprecatedFeatures/spec_const_aot.cpp b/SYCL/DeprecatedFeatures/spec_const_aot.cpp index a372681044..d04f0ebf2c 100644 --- a/SYCL/DeprecatedFeatures/spec_const_aot.cpp +++ b/SYCL/DeprecatedFeatures/spec_const_aot.cpp @@ -18,7 +18,7 @@ using namespace sycl; class Kernel; int main(int argc, char **argv) { - sycl::queue q(default_selector{}, [](exception_list l) { + sycl::queue q(sycl::default_selector_v, [](exception_list l) { for (auto ep : l) { try { std::rethrow_exception(ep); diff --git a/SYCL/DeprecatedFeatures/spec_consts.hpp b/SYCL/DeprecatedFeatures/spec_consts.hpp index 9e66e897a1..2ff38c9487 100644 --- a/SYCL/DeprecatedFeatures/spec_consts.hpp +++ b/SYCL/DeprecatedFeatures/spec_consts.hpp @@ -49,7 +49,7 @@ struct MyKernel { int main(int argc, char **argv) { global_val = argc + 16; - sycl::queue q(default_selector{}, [](exception_list l) { + sycl::queue q(sycl::default_selector_v, [](exception_list l) { for (auto ep : l) { try { std::rethrow_exception(ep); diff --git a/SYCL/DeviceLib/built-ins/printf.cpp b/SYCL/DeviceLib/built-ins/printf.cpp index 6bd2e080dd..18df597162 100644 --- a/SYCL/DeviceLib/built-ins/printf.cpp +++ b/SYCL/DeviceLib/built-ins/printf.cpp @@ -35,9 +35,8 @@ static const CONSTANT char format_vec[] = "%d,%d,%d,%d\n"; const CONSTANT char format_hello_world_2[] = "%lu: Hello, World!\n"; int main() { - default_selector Selector; { - queue Queue(Selector); + queue Queue(default_selector_v); Queue.submit([&](handler &CGH) { CGH.single_task([=]() { @@ -110,7 +109,7 @@ int main() { } { - queue Queue(Selector); + queue Queue(default_selector_v); // printf in parallel_for Queue.submit([&](handler &CGH) { CGH.parallel_for(range<1>(10), [=](id<1> i) { diff --git a/SYCL/DeviceLib/imf_simd_emulate_test.cpp b/SYCL/DeviceLib/imf_simd_emulate_test.cpp index 63e18a7e29..bfa345aad5 100644 --- a/SYCL/DeviceLib/imf_simd_emulate_test.cpp +++ b/SYCL/DeviceLib/imf_simd_emulate_test.cpp @@ -1812,8 +1812,7 @@ void run_vgtle_2_4_test(s::queue &queue) { } int main(int, char **) { - s::default_selector device_selector; - s::queue device_queue(device_selector); + s::queue device_queue(s::default_selector_v); std::cout << "Running on " << device_queue.get_device().get_info() << "\n"; diff --git a/SYCL/ESIMD/dpas/dpas_test3.cpp b/SYCL/ESIMD/dpas/dpas_test3.cpp index 4c10ba08c2..68aa171cbe 100644 --- a/SYCL/ESIMD/dpas/dpas_test3.cpp +++ b/SYCL/ESIMD/dpas/dpas_test3.cpp @@ -94,7 +94,7 @@ void dpas_ker(nd_item<1> &idx, BF16 *matA, BF16 *matB, float *matC) { int main() { // A [8][16] * B[16][16]= C[8][16] - queue q(gpu_selector{}); + queue q(gpu_selector_v); nd_range<1> Range(range<1>{1}, range<1>{1}); constexpr int MB = 8; constexpr int NB = 16; // KB = NB = 16 in pvc diff --git a/SYCL/ESIMD/lsc/Inputs/lsc_block_load.hpp b/SYCL/ESIMD/lsc/Inputs/lsc_block_load.hpp index 53495bf111..d3f1942c1f 100644 --- a/SYCL/ESIMD/lsc/Inputs/lsc_block_load.hpp +++ b/SYCL/ESIMD/lsc/Inputs/lsc_block_load.hpp @@ -99,8 +99,7 @@ bool test(unsigned SurfaceWidth, unsigned SurfaceHeight, unsigned SurfacePitch, T old_val = get_rand(); - auto GPUSelector = gpu_selector{}; - auto q = queue{GPUSelector}; + auto q = queue{gpu_selector_v}; auto dev = q.get_device(); std::cout << "Running case #" << case_num << " on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/lsc/Inputs/lsc_slm_load.hpp b/SYCL/ESIMD/lsc/Inputs/lsc_slm_load.hpp index ac1e6d838d..74ec5ebb14 100644 --- a/SYCL/ESIMD/lsc/Inputs/lsc_slm_load.hpp +++ b/SYCL/ESIMD/lsc/Inputs/lsc_slm_load.hpp @@ -43,7 +43,7 @@ bool test(uint32_t PMask = ~0) { else if constexpr (DS == lsc_data_size::u16u32h) VMask = static_cast(0xffff0000); - queue Q(gpu_selector{}); + queue Q(gpu_selector_v); auto D = Q.get_device(); std::cout << "Running case #" << CaseNum << " on " << D.get_info() << std::endl; diff --git a/SYCL/ESIMD/lsc/Inputs/lsc_slm_store.hpp b/SYCL/ESIMD/lsc/Inputs/lsc_slm_store.hpp index b38804dceb..5c9d669bad 100644 --- a/SYCL/ESIMD/lsc/Inputs/lsc_slm_store.hpp +++ b/SYCL/ESIMD/lsc/Inputs/lsc_slm_store.hpp @@ -36,7 +36,7 @@ bool test(uint32_t PMask = ~0) { else if constexpr (DS == lsc_data_size::u16u32h) VMask = static_cast(0xffff0000); - queue Q(gpu_selector{}); + queue Q(gpu_selector_v); auto D = Q.get_device(); std::cout << "Running case #" << CaseNum << " on " << D.get_info() << std::endl; diff --git a/SYCL/ESIMD/lsc/Inputs/lsc_surf_load.hpp b/SYCL/ESIMD/lsc/Inputs/lsc_surf_load.hpp index d2d2eb6414..fd6bb75d6d 100644 --- a/SYCL/ESIMD/lsc/Inputs/lsc_surf_load.hpp +++ b/SYCL/ESIMD/lsc/Inputs/lsc_surf_load.hpp @@ -51,8 +51,7 @@ bool test(uint32_t pmask = 0xffffffff) { T old_val = get_rand(); - auto GPUSelector = gpu_selector{}; - auto q = queue{GPUSelector}; + auto q = queue{gpu_selector_v}; auto dev = q.get_device(); std::cout << "Running case #" << case_num << " on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/lsc/Inputs/lsc_surf_store.hpp b/SYCL/ESIMD/lsc/Inputs/lsc_surf_store.hpp index f261f079fc..feb18ffe21 100644 --- a/SYCL/ESIMD/lsc/Inputs/lsc_surf_store.hpp +++ b/SYCL/ESIMD/lsc/Inputs/lsc_surf_store.hpp @@ -51,8 +51,7 @@ bool test(uint32_t pmask = 0xffffffff) { T old_val = get_rand(); T new_val = get_rand(); - auto GPUSelector = gpu_selector{}; - auto q = queue{GPUSelector}; + auto q = queue{gpu_selector_v}; auto dev = q.get_device(); std::cout << "Running case #" << case_num << " on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/lsc/Inputs/lsc_usm_load.hpp b/SYCL/ESIMD/lsc/Inputs/lsc_usm_load.hpp index ca7e1ba0b6..bbb36cd195 100644 --- a/SYCL/ESIMD/lsc/Inputs/lsc_usm_load.hpp +++ b/SYCL/ESIMD/lsc/Inputs/lsc_usm_load.hpp @@ -52,8 +52,7 @@ bool test(uint32_t pmask = 0xffffffff) { T old_val = get_rand(); T zero_val = (T)0; - auto GPUSelector = gpu_selector{}; - auto q = queue{GPUSelector}; + auto q = queue{gpu_selector_v}; auto dev = q.get_device(); std::cout << "Running case #" << case_num << " on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/lsc/Inputs/lsc_usm_store.hpp b/SYCL/ESIMD/lsc/Inputs/lsc_usm_store.hpp index 94907eb414..227380b6f1 100644 --- a/SYCL/ESIMD/lsc/Inputs/lsc_usm_store.hpp +++ b/SYCL/ESIMD/lsc/Inputs/lsc_usm_store.hpp @@ -51,8 +51,7 @@ bool test(uint32_t pmask = 0xffffffff) { T old_val = get_rand(); T new_val = get_rand(); - auto GPUSelector = gpu_selector{}; - auto q = queue{GPUSelector}; + auto q = queue{gpu_selector_v}; auto dev = q.get_device(); std::cout << "Running case #" << case_num << " on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/regression/Inputs/complex-lib-test.cpp b/SYCL/ESIMD/regression/Inputs/complex-lib-test.cpp index 9ad66fd437..532deeab29 100644 --- a/SYCL/ESIMD/regression/Inputs/complex-lib-test.cpp +++ b/SYCL/ESIMD/regression/Inputs/complex-lib-test.cpp @@ -10,7 +10,7 @@ int main(int argc, char *argv[]) { try { size_t i; size_t N = 1024; - sycl::device D(sycl::default_selector{}); + sycl::device D(sycl::default_selector_v); sycl::context Ctx(D); sycl::queue Q(Ctx, D); diff --git a/SYCL/ESIMD/regression/dgetrf_8x8.cpp b/SYCL/ESIMD/regression/dgetrf_8x8.cpp index 521be63073..b39aa26a02 100644 --- a/SYCL/ESIMD/regression/dgetrf_8x8.cpp +++ b/SYCL/ESIMD/regression/dgetrf_8x8.cpp @@ -129,7 +129,7 @@ void dgetrfnp_batch_strided_c(int64_t m, int64_t n, double *a, int64_t lda, int64_t stride_a, int64_t *ipiv, int64_t stride_ipiv, int64_t batch, int64_t *info) { - queue queue((gpu_selector())); + queue queue(gpu_selector_v); auto device = queue.get_device(); auto context = queue.get_context(); int status; diff --git a/SYCL/ESIMD/sycl_esimd_mix.cpp b/SYCL/ESIMD/sycl_esimd_mix.cpp index d5d724fc6e..02eb06cf32 100644 --- a/SYCL/ESIMD/sycl_esimd_mix.cpp +++ b/SYCL/ESIMD/sycl_esimd_mix.cpp @@ -63,7 +63,7 @@ int main(void) { // We need that many threads in each group sycl::range<1> LocalRange{1}; - queue q(gpu_selector{}, esimd_test::createExceptionHandler()); + queue q(gpu_selector_v, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/GroupAlgorithm/SYCL2020/sort.cpp b/SYCL/GroupAlgorithm/SYCL2020/sort.cpp index 85f31e78b0..15d249c84a 100644 --- a/SYCL/GroupAlgorithm/SYCL2020/sort.cpp +++ b/SYCL/GroupAlgorithm/SYCL2020/sort.cpp @@ -347,7 +347,7 @@ void test_sort_by_type(sycl::queue &q, std::size_t dataSize) { } int main(int argc, char *argv[]) { - sycl::queue q(sycl::default_selector{}, async_handler_); + sycl::queue q(sycl::default_selector_v, async_handler_); if (!isSupportedDevice(q.get_device())) { std::cout << "Skipping test\n"; return 0; diff --git a/SYCL/InlineAsm/include/asmhelper.h b/SYCL/InlineAsm/include/asmhelper.h index 35c8c68b5f..4cf9b4362d 100644 --- a/SYCL/InlineAsm/include/asmhelper.h +++ b/SYCL/InlineAsm/include/asmhelper.h @@ -92,7 +92,7 @@ auto exception_handler = [](sycl::exception_list exceptions) { template bool launchInlineASMTestImpl(F &f, bool requires_particular_sg_size = true) { - sycl::queue deviceQueue(sycl::gpu_selector{}, exception_handler); + sycl::queue deviceQueue(sycl::gpu_selector_v, exception_handler); sycl::device device = deviceQueue.get_device(); if (!isInlineASMSupported(device)) { diff --git a/SYCL/InorderQueue/prop.cpp b/SYCL/InorderQueue/prop.cpp index dc737c4a59..f6daac2041 100644 --- a/SYCL/InorderQueue/prop.cpp +++ b/SYCL/InorderQueue/prop.cpp @@ -51,7 +51,7 @@ int main() { if (res != 0) return res; - device dev{sycl::default_selector{}}; + device dev{sycl::default_selector_v}; context ctx{dev}; auto exception_handler = [](sycl::exception_list exceptions) {}; diff --git a/SYCL/Plugin/enqueue-arg-order-buffer.cpp b/SYCL/Plugin/enqueue-arg-order-buffer.cpp index aa3660be64..bca144a582 100644 --- a/SYCL/Plugin/enqueue-arg-order-buffer.cpp +++ b/SYCL/Plugin/enqueue-arg-order-buffer.cpp @@ -237,7 +237,7 @@ void testcopyH2DBuffer() { buffer buffer_from_1D(data_from_1D.data(), range<1>(width)); buffer buffer_to_1D(data_to_1D.data(), range<1>(width)); - device Dev{default_selector{}}; + device Dev{default_selector_v}; context myCtx{Dev}; context otherCtx{Dev}; diff --git a/SYCL/Plugin/enqueue-arg-order-image.cpp b/SYCL/Plugin/enqueue-arg-order-image.cpp index fec4b94ce7..8329792b2e 100644 --- a/SYCL/Plugin/enqueue-arg-order-image.cpp +++ b/SYCL/Plugin/enqueue-arg-order-image.cpp @@ -206,7 +206,7 @@ void testcopyH2DImage() { ImgSize_2D); sycl::image<2> image_to_2D(data_to_2D.data(), ChanOrder, ChanType, ImgSize_2D); - device Dev{default_selector{}}; + device Dev{default_selector_v}; context Ctx{Dev}; context otherCtx{Dev}; @@ -245,7 +245,7 @@ void testcopyH2DImage() { ImgSize_3D); sycl::image<3> image_to_3D(data_to_3D.data(), ChanOrder, ChanType, ImgSize_3D); - device Dev{default_selector{}}; + device Dev{default_selector_v}; context Ctx{Dev}; context otherCtx{Dev}; diff --git a/SYCL/Plugin/interop-buffer-cuda.cpp b/SYCL/Plugin/interop-buffer-cuda.cpp index 7b72bbd034..11e063ae0d 100644 --- a/SYCL/Plugin/interop-buffer-cuda.cpp +++ b/SYCL/Plugin/interop-buffer-cuda.cpp @@ -17,7 +17,7 @@ int main() { int Data[1] = {0}; sycl::buffer Buffer(&Data[0], sycl::range<1>(1)); { - sycl::queue Queue{sycl::gpu_selector()}; + sycl::queue Queue{sycl::gpu_selector_v}; Queue.submit([&](sycl::handler &cgh) { auto Acc = Buffer.get_access(cgh); cgh.single_task([=]() { (void)Acc; }); diff --git a/SYCL/Plugin/interop-cuda-experimental.cpp b/SYCL/Plugin/interop-cuda-experimental.cpp index 13b1c97be1..f5c1fac18c 100644 --- a/SYCL/Plugin/interop-cuda-experimental.cpp +++ b/SYCL/Plugin/interop-cuda-experimental.cpp @@ -55,7 +55,7 @@ int main() { // Create sycl queue with queue construct from Q's native types and submit // some work { - sycl::queue new_Q(Q_sycl_ctx, sycl::default_selector()); + sycl::queue new_Q(Q_sycl_ctx, sycl::default_selector_v); assert(check_queue(new_Q)); } @@ -92,7 +92,7 @@ int main() { // Create sycl queue with new queue and submit some work { - sycl::queue new_Q(sycl_ctx, sycl::default_selector()); + sycl::queue new_Q(sycl_ctx, sycl::default_selector_v); assert(check_queue(new_Q)); } @@ -112,7 +112,7 @@ int main() { // Check sycl queue with sycl_ctx still works { - sycl::queue new_Q(sycl_ctx, sycl::default_selector()); + sycl::queue new_Q(sycl_ctx, sycl::default_selector_v); assert(check_queue(new_Q)); } diff --git a/SYCL/Plugin/interop-level-zero-buffer-multi-dim.cpp b/SYCL/Plugin/interop-level-zero-buffer-multi-dim.cpp index 442ef5c6c7..87cf6cc339 100644 --- a/SYCL/Plugin/interop-level-zero-buffer-multi-dim.cpp +++ b/SYCL/Plugin/interop-level-zero-buffer-multi-dim.cpp @@ -16,7 +16,7 @@ using namespace sycl; int main() { #ifdef SYCL_EXT_ONEAPI_BACKEND_LEVEL_ZERO try { - platform Plt{gpu_selector{}}; + platform Plt{gpu_selector_v}; auto Devices = Plt.get_devices(); diff --git a/SYCL/Plugin/interop-level-zero-buffer-ownership.cpp b/SYCL/Plugin/interop-level-zero-buffer-ownership.cpp index 852e605237..742554c879 100644 --- a/SYCL/Plugin/interop-level-zero-buffer-ownership.cpp +++ b/SYCL/Plugin/interop-level-zero-buffer-ownership.cpp @@ -108,7 +108,7 @@ void test_copyback_and_free( int main() { #ifdef SYCL_EXT_ONEAPI_BACKEND_LEVEL_ZERO try { - platform Plt{gpu_selector{}}; + platform Plt{gpu_selector_v}; auto Devices = Plt.get_devices(); diff --git a/SYCL/Plugin/interop-level-zero-buffer.cpp b/SYCL/Plugin/interop-level-zero-buffer.cpp index 60ac2187cf..1bf2d3538f 100644 --- a/SYCL/Plugin/interop-level-zero-buffer.cpp +++ b/SYCL/Plugin/interop-level-zero-buffer.cpp @@ -139,7 +139,7 @@ int main() { // Test case #3 // Use buffer in two different contexts context Context1; - queue Queue1(Context1, default_selector{}); + queue Queue1(Context1, default_selector_v); Queue1.submit([&](sycl::handler &CGH) { auto Acc = HostBufferInterop2.get_access(CGH); @@ -151,7 +151,7 @@ int main() { }); context Context2; - queue Queue2(Context2, default_selector{}); + queue Queue2(Context2, default_selector_v); Queue2.submit([&](sycl::handler &CGH) { auto Acc = HostBufferInterop2.get_access(CGH); diff --git a/SYCL/Plugin/interop-level-zero-get-native-mem.cpp b/SYCL/Plugin/interop-level-zero-get-native-mem.cpp index 513f99e668..41381d1ec0 100644 --- a/SYCL/Plugin/interop-level-zero-get-native-mem.cpp +++ b/SYCL/Plugin/interop-level-zero-get-native-mem.cpp @@ -22,7 +22,7 @@ constexpr size_t SIZE = 16; int main() { #ifdef SYCL_EXT_ONEAPI_BACKEND_LEVEL_ZERO try { - platform Plt{gpu_selector{}}; + platform Plt{gpu_selector_v}; auto Devices = Plt.get_devices(); diff --git a/SYCL/Plugin/interop-level-zero-keep-ownership.cpp b/SYCL/Plugin/interop-level-zero-keep-ownership.cpp index 6fd5307a1e..eeeb60cb32 100644 --- a/SYCL/Plugin/interop-level-zero-keep-ownership.cpp +++ b/SYCL/Plugin/interop-level-zero-keep-ownership.cpp @@ -16,7 +16,7 @@ using namespace sycl; int main() { // Creat SYCL platform/device - device Device(gpu_selector{}); + device Device(gpu_selector_v); platform Platform = Device.get_info(); // Create native Level-Zero context diff --git a/SYCL/Plugin/level-zero-usm-capabilities.cpp b/SYCL/Plugin/level-zero-usm-capabilities.cpp index 1170f6e033..fa25287fb8 100644 --- a/SYCL/Plugin/level-zero-usm-capabilities.cpp +++ b/SYCL/Plugin/level-zero-usm-capabilities.cpp @@ -18,7 +18,7 @@ using namespace sycl; int main() { - auto D = device(gpu_selector()); + auto D = device(gpu_selector_v); std::cout << "name = " << D.get_info() << std::endl; std::cout << " usm_host_allocations: " << D.has(aspect::usm_host_allocations) diff --git a/SYCL/Plugin/level_zero_batch_event_status.cpp b/SYCL/Plugin/level_zero_batch_event_status.cpp index a87d63eccc..073b099ee0 100644 --- a/SYCL/Plugin/level_zero_batch_event_status.cpp +++ b/SYCL/Plugin/level_zero_batch_event_status.cpp @@ -48,8 +48,7 @@ #include int main(void) { - sycl::default_selector ds{}; - sycl::queue q{ds}; + sycl::queue q{sycl::default_selector_v}; std::vector events(10); sycl::event ev1 = q.submit([&](sycl::handler &cgh) { diff --git a/SYCL/Plugin/level_zero_batch_test.cpp b/SYCL/Plugin/level_zero_batch_test.cpp index b6ea3a1228..7d7a190150 100644 --- a/SYCL/Plugin/level_zero_batch_test.cpp +++ b/SYCL/Plugin/level_zero_batch_test.cpp @@ -241,7 +241,7 @@ int main(int argc, char *argv[]) { size_t N = 512 / 4; size_t AL = M * N * sizeof(uint32_t); - sycl::queue q(sycl::default_selector{}); + sycl::queue q(sycl::default_selector_v); auto ctx = q.get_context(); auto dev = q.get_device(); diff --git a/SYCL/Plugin/level_zero_batch_test_copy_with_compute.cpp b/SYCL/Plugin/level_zero_batch_test_copy_with_compute.cpp index 3afbc83a01..46dbd6f137 100644 --- a/SYCL/Plugin/level_zero_batch_test_copy_with_compute.cpp +++ b/SYCL/Plugin/level_zero_batch_test_copy_with_compute.cpp @@ -248,7 +248,7 @@ int main(int argc, char *argv[]) { size_t N = 4; size_t AL = M * N * sizeof(uint32_t); - sycl::queue q(sycl::default_selector{}); + sycl::queue q(sycl::default_selector_v); auto ctx = q.get_context(); auto dev = q.get_device(); diff --git a/SYCL/Plugin/level_zero_device_scope_events.cpp b/SYCL/Plugin/level_zero_device_scope_events.cpp index d4b7904072..2cc6445169 100644 --- a/SYCL/Plugin/level_zero_device_scope_events.cpp +++ b/SYCL/Plugin/level_zero_device_scope_events.cpp @@ -34,8 +34,7 @@ #include int main(int argc, char **argv) { - sycl::gpu_selector device_selector; - sycl::queue queue(device_selector); + sycl::queue queue(sycl::gpu_selector_v); int N = (argc >= 2 ? std::atoi(argv[1]) : 100); std::cout << N << " kernels" << std::endl; diff --git a/SYCL/Plugin/level_zero_dynamic_batch_test.cpp b/SYCL/Plugin/level_zero_dynamic_batch_test.cpp index 630d110b6d..153263034c 100644 --- a/SYCL/Plugin/level_zero_dynamic_batch_test.cpp +++ b/SYCL/Plugin/level_zero_dynamic_batch_test.cpp @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) { size_t N = 512 / 4; size_t AL = M * N * sizeof(uint32_t); - sycl::queue q(sycl::default_selector{}); + sycl::queue q(sycl::default_selector_v); auto ctx = q.get_context(); auto dev = q.get_device(); diff --git a/SYCL/Plugin/level_zero_queue_profiling.cpp b/SYCL/Plugin/level_zero_queue_profiling.cpp index dbb1816fbe..5efac0d353 100644 --- a/SYCL/Plugin/level_zero_queue_profiling.cpp +++ b/SYCL/Plugin/level_zero_queue_profiling.cpp @@ -56,12 +56,11 @@ int main(int argc, char **argv) { bool profiling = argc > 1; { - gpu_selector dev_sel; property_list propList{}; if (profiling) propList = sycl::property::queue::enable_profiling(); - queue q(dev_sel, propList); + queue q(gpu_selector_v, propList); // Perform the computation foo(q, 2); } // SYCL scope diff --git a/SYCL/Plugin/max_malloc.cpp b/SYCL/Plugin/max_malloc.cpp index a402fec64b..8bcdc9022f 100644 --- a/SYCL/Plugin/max_malloc.cpp +++ b/SYCL/Plugin/max_malloc.cpp @@ -13,7 +13,7 @@ using namespace sycl; const double Gb = 1024 * 1024 * 1024; int main() { - auto D = device(gpu_selector()); + auto D = device(gpu_selector_v); std::cout << "name = " << D.get_info() << std::endl; diff --git a/SYCL/Plugin/retain_events.cpp b/SYCL/Plugin/retain_events.cpp index d48854affa..da1b1f25b3 100644 --- a/SYCL/Plugin/retain_events.cpp +++ b/SYCL/Plugin/retain_events.cpp @@ -67,7 +67,7 @@ int test(sycl::device &D) { int main() { try { - sycl::device D1{sycl::gpu_selector{}}; + sycl::device D1{sycl::gpu_selector_v}; print_device_properties(D1); for (int i = 0; i < 10; ++i) { test(D1); diff --git a/SYCL/Plugin/sycl-targets-order.cpp b/SYCL/Plugin/sycl-targets-order.cpp index 04b8221eb1..eb0f45ad68 100644 --- a/SYCL/Plugin/sycl-targets-order.cpp +++ b/SYCL/Plugin/sycl-targets-order.cpp @@ -21,7 +21,7 @@ int main(int argc, char **argv) { // select the default SYCL device - sycl::device device{sycl::default_selector{}}; + sycl::device device{sycl::default_selector_v}; std::cout << "Running on SYCL device " << device.get_info() << ", driver version " diff --git a/SYCL/Reduction/regression_after_pr_6343.cpp b/SYCL/Reduction/regression_after_pr_6343.cpp index c9422cee03..cb3f478452 100644 --- a/SYCL/Reduction/regression_after_pr_6343.cpp +++ b/SYCL/Reduction/regression_after_pr_6343.cpp @@ -8,7 +8,7 @@ using namespace sycl; int main() { - device d(default_selector{}); + device d(default_selector_v); context ctx{d}; queue q{ctx, d}; diff --git a/SYCL/Regression/cache_test.cpp b/SYCL/Regression/cache_test.cpp index 393d6ab63a..af2d925f02 100644 --- a/SYCL/Regression/cache_test.cpp +++ b/SYCL/Regression/cache_test.cpp @@ -36,7 +36,7 @@ using namespace sycl::ext::oneapi; int queryFromQueue(std::vector *platform_list, std::vector *device_list) { int failures = 0; - sycl::queue Q{sycl::default_selector{}}; + sycl::queue Q{sycl::default_selector_v}; sycl::device dev = Q.get_info(); auto plt = dev.get_platform(); diff --git a/SYCL/Regression/context_is_destroyed_after_exception.cpp b/SYCL/Regression/context_is_destroyed_after_exception.cpp index 15fe32ab27..11ef3cc1ed 100644 --- a/SYCL/Regression/context_is_destroyed_after_exception.cpp +++ b/SYCL/Regression/context_is_destroyed_after_exception.cpp @@ -11,7 +11,7 @@ int main() { const auto GlobalRange = 1; const auto LocalRange = 2; - sycl::queue myQueue{sycl::gpu_selector{}, [](sycl::exception_list elist) { + sycl::queue myQueue{sycl::gpu_selector_v, [](sycl::exception_list elist) { for (auto e : elist) std::rethrow_exception(e); }}; diff --git a/SYCL/Regression/event_destruction.cpp b/SYCL/Regression/event_destruction.cpp index 071f4d7d79..e0becff0ff 100644 --- a/SYCL/Regression/event_destruction.cpp +++ b/SYCL/Regression/event_destruction.cpp @@ -21,8 +21,7 @@ const size_t ITERS = 100000; // The test checks that that event destruction does not lead to stack overflow int main() { - sycl::default_selector S; - sycl::queue Q(S); + sycl::queue Q(sycl::default_selector_v); sycl::buffer Buf(3000); for (size_t Idx = 0; Idx < ITERS; ++Idx) { auto Event = Q.submit([&](sycl::handler &cgh) { diff --git a/SYCL/Regression/kernel_bundle_ignore_sycl_external.cpp b/SYCL/Regression/kernel_bundle_ignore_sycl_external.cpp index 6e5a22981f..207a24a95d 100644 --- a/SYCL/Regression/kernel_bundle_ignore_sycl_external.cpp +++ b/SYCL/Regression/kernel_bundle_ignore_sycl_external.cpp @@ -13,7 +13,7 @@ SYCL_EXTERNAL int f(int a) { return a + 1; } int main() { - const sycl::device Dev{sycl::default_selector{}}; + const sycl::device Dev{sycl::default_selector_v}; const sycl::context Ctx{Dev}; sycl::queue Q{Ctx, Dev}; diff --git a/SYCL/Regression/usm_malloc_shared.cpp b/SYCL/Regression/usm_malloc_shared.cpp index 6a8463a924..f65ca372d7 100644 --- a/SYCL/Regression/usm_malloc_shared.cpp +++ b/SYCL/Regression/usm_malloc_shared.cpp @@ -24,7 +24,7 @@ int main(int argc, char *argv[]) { } }; - queue myQueue(default_selector{}, exception_handler); + queue myQueue(default_selector_v, exception_handler); std::cout << "Device: " << myQueue.get_device().get_info() << std::endl; diff --git a/SYCL/Scheduler/DataMovement.cpp b/SYCL/Scheduler/DataMovement.cpp index 353da4a742..000d03c3f7 100644 --- a/SYCL/Scheduler/DataMovement.cpp +++ b/SYCL/Scheduler/DataMovement.cpp @@ -56,8 +56,8 @@ template class CustomAllocator { }; int main() { - TestQueue Queue1(sycl::default_selector{}); - TestQueue Queue2(sycl::default_selector{}); + TestQueue Queue1(sycl::default_selector_v); + TestQueue Queue2(sycl::default_selector_v); TestQueue Queue3(sycl::host_selector{}); std::vector Data(1); diff --git a/SYCL/Scheduler/ReleaseResourcesTest.cpp b/SYCL/Scheduler/ReleaseResourcesTest.cpp index 80487317d2..f7b19819d6 100644 --- a/SYCL/Scheduler/ReleaseResourcesTest.cpp +++ b/SYCL/Scheduler/ReleaseResourcesTest.cpp @@ -25,12 +25,10 @@ int main() { // Checks creating of the second host accessor while first one is alive. try { - sycl::default_selector device_selector; - sycl::range<1> BufSize{1}; sycl::buffer Buf(BufSize); - TestQueue Queue(device_selector); + TestQueue Queue(sycl::default_selector_v); Queue.submit([&](sycl::handler &CGH) { auto BufAcc = Buf.get_access(CGH); diff --git a/SYCL/USM/multictxt.cpp b/SYCL/USM/multictxt.cpp index ec7e54cefd..1bb2f46b1b 100644 --- a/SYCL/USM/multictxt.cpp +++ b/SYCL/USM/multictxt.cpp @@ -20,8 +20,8 @@ using namespace sycl; // only needs to exist for this test to do its job. void GpuCpuCpu() { - queue gpu_q(gpu_selector{}); - queue cpu_q(cpu_selector{}); + queue gpu_q(gpu_selector_v); + queue cpu_q(cpu_selector_v); device dev = cpu_q.get_device(); context ctx = cpu_q.get_context(); if (dev.get_info()) { @@ -32,8 +32,8 @@ void GpuCpuCpu() { } void CpuGpuGpu() { - queue cpu_q(cpu_selector{}); - queue gpu_q(gpu_selector{}); + queue cpu_q(cpu_selector_v); + queue gpu_q(gpu_selector_v); device dev = gpu_q.get_device(); context ctx = gpu_q.get_context(); @@ -45,8 +45,8 @@ void CpuGpuGpu() { } void GpuCpuGpu() { - queue gpu_q(gpu_selector{}); - queue cpu_q(cpu_selector{}); + queue gpu_q(gpu_selector_v); + queue cpu_q(cpu_selector_v); device dev = gpu_q.get_device(); context ctx = gpu_q.get_context(); diff --git a/SYCL/XPTI/basic_event_collection.inc b/SYCL/XPTI/basic_event_collection.inc index 8eeae71c89..b23f1474e1 100644 --- a/SYCL/XPTI/basic_event_collection.inc +++ b/SYCL/XPTI/basic_event_collection.inc @@ -7,7 +7,7 @@ #include int main() { - sycl::queue Q{sycl::default_selector{}}; + sycl::queue Q{sycl::default_selector_v}; auto Ptr = sycl::malloc_device(1, Q); diff --git a/SYCL/XPTI/mem_alloc_events.inc b/SYCL/XPTI/mem_alloc_events.inc index cc23d031f5..4add70c850 100644 --- a/SYCL/XPTI/mem_alloc_events.inc +++ b/SYCL/XPTI/mem_alloc_events.inc @@ -9,7 +9,7 @@ #include int main() { - sycl::queue Q{sycl::default_selector{}}; + sycl::queue Q{sycl::default_selector_v}; sycl::buffer Buf{sycl::range{100}}; std::vector Vec; diff --git a/SYCL/helpers.hpp b/SYCL/helpers.hpp index bf27cd34d6..a51c64bd24 100644 --- a/SYCL/helpers.hpp +++ b/SYCL/helpers.hpp @@ -52,23 +52,22 @@ std::ostream &operator<<(std::ostream &Out, return Out; } +void exceptionHandlerHelper(sycl::exception_list ExceptionList) { + for (std::exception_ptr ExceptionPtr : ExceptionList) { + try { + std::rethrow_exception(ExceptionPtr); + } catch (sycl::exception &E) { + std::cerr << E.what() << std::endl; + } + } + abort(); +} + class TestQueue : public sycl::queue { public: - TestQueue(const sycl::device_selector &DevSelector, + TestQueue(const sycl::detail::DSelectorInvocableType &DevSelector, const sycl::property_list &PropList = {}) - : sycl::queue( - DevSelector, - [](sycl::exception_list ExceptionList) { - for (std::exception_ptr ExceptionPtr : ExceptionList) { - try { - std::rethrow_exception(ExceptionPtr); - } catch (sycl::exception &E) { - std::cerr << E.what() << std::endl; - } - } - abort(); - }, - PropList) {} + : sycl::queue(DevSelector, exceptionHandlerHelper, PropList) {} ~TestQueue() { wait_and_throw(); } }; From 1972aee92e6508b4d6ace76597007268065e11e0 Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Thu, 18 Aug 2022 09:12:13 -0700 Subject: [PATCH 2/9] updating overlooked test --- SYCL/DeprecatedFeatures/program_link.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SYCL/DeprecatedFeatures/program_link.cpp b/SYCL/DeprecatedFeatures/program_link.cpp index 5e48a2f7bc..dd6c8c6d3c 100644 --- a/SYCL/DeprecatedFeatures/program_link.cpp +++ b/SYCL/DeprecatedFeatures/program_link.cpp @@ -28,7 +28,7 @@ int main(void) { return 0; } context c(p); - queue Q(c, s); + queue Q(c, default_selector_v); program prog1(c); prog1.compile_with_kernel_type(); prog1.link("-cl-finite-math-only"); From 332738abd314e5cceaacd9752160cc04ce8a3a54 Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Wed, 7 Sep 2022 13:30:17 -0700 Subject: [PATCH 3/9] automerge seems to have incorrectly restored these files --- .../SpecConsts1.2.1/composite-in-functor.cpp | 87 -------- .../SpecConsts1.2.1/composite-type.cpp | 97 --------- .../multiple-usages-of-composite.cpp | 77 ------- .../SpecConsts1.2.1/spec_const_hw.cpp | 188 ------------------ .../SpecConsts1.2.1/spec_const_neg.cpp | 77 ------- .../SpecConsts1.2.1/spec_const_redefine.cpp | 113 ----------- .../unpacked-composite-type.cpp | 80 -------- 7 files changed, 719 deletions(-) delete mode 100644 SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-in-functor.cpp delete mode 100644 SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-type.cpp delete mode 100644 SYCL/DeprecatedFeatures/SpecConsts1.2.1/multiple-usages-of-composite.cpp delete mode 100644 SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_hw.cpp delete mode 100644 SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_neg.cpp delete mode 100644 SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_redefine.cpp delete mode 100644 SYCL/DeprecatedFeatures/SpecConsts1.2.1/unpacked-composite-type.cpp diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-in-functor.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-in-functor.cpp deleted file mode 100644 index cbdb74e6f5..0000000000 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-in-functor.cpp +++ /dev/null @@ -1,87 +0,0 @@ -// UNSUPPORTED: cuda || hip -// -// RUN: %clangxx -fsycl %s -D__SYCL_INTERNAL_API -o %t.out -// RUN: %HOST_RUN_PLACEHOLDER %t.out %HOST_CHECK_PLACEHOLDER -// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER -// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER -// -// The test checks that the specialization constant feature works correctly with -// composite types: toolchain processes them correctly and runtime can correctly -// execute the program. -// -// CHECK: 1 : 2 -// CHECK-NEXT: 3 -// CHECK-NEXT: 4 : 5 - -#include -#include - -using namespace sycl; - -struct A { - float x; - float y[2]; -}; - -struct pod_t { - int f1[2]; - A f2; -}; - -class my_kernel_t { -public: - using sc_t = - sycl::ext::oneapi::experimental::spec_constant; - - my_kernel_t(const sc_t &sc, const sycl::stream &strm) - : sc_(sc), strm_(strm) {} - - void operator()(sycl::id<1> i) const { - auto p = sc_.get(); - strm_ << p.f1[0] << " : " << p.f1[1] << "\n"; - strm_ << p.f2.x << "\n"; - strm_ << p.f2.y[0] << " : " << p.f2.y[1] << "\n"; - strm_ << sycl::endl; - } - - sc_t sc_; - sycl::stream strm_; -}; - -int main() { - sycl::queue q(sycl::default_selector_v, [](exception_list l) { - for (auto ep : l) { - try { - std::rethrow_exception(ep); - } catch (sycl::exception &e0) { - std::cout << e0.what(); - } catch (std::exception &e1) { - std::cout << e1.what(); - } catch (...) { - std::cout << "*** catch (...)\n"; - } - } - }); - - pod_t pod; - pod.f1[0] = 1; - pod.f1[1] = 2; - pod.f2.x = 3; - pod.f2.y[0] = 4; - pod.f2.y[1] = 5; - - sycl::program p(q.get_context()); - auto sc = p.set_spec_constant(pod); - p.build_with_kernel_type(); - - q.submit([&](sycl::handler &cgh) { - sycl::stream strm(1024, 256, cgh); - my_kernel_t func(sc, strm); - - auto sycl_kernel = p.get_kernel(); - cgh.parallel_for(sycl_kernel, sycl::range<1>(1), func); - }); - q.wait(); - - return 0; -} diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-type.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-type.cpp deleted file mode 100644 index 77e3dec688..0000000000 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/composite-type.cpp +++ /dev/null @@ -1,97 +0,0 @@ -// UNSUPPORTED: cuda || hip -// -// RUN: %clangxx -fsycl -D__SYCL_INTERNAL_API %s -o %t.out -// RUN: %HOST_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// -// The test checks that the specialization constant feature works correctly with -// composite types: toolchain processes them correctly and runtime can correctly -// execute the program. - -#include - -#include -#include - -using namespace sycl; -class Test; - -struct A { - int a; - float b; -}; - -struct POD { - A a[2]; - int b; -}; - -using MyPODConst = POD; - -int global_val = 10; - -// Fetch a value at runtime. -int get_value() { return global_val; } - -int main(int argc, char **argv) { - sycl::queue q(default_selector_v, [](exception_list l) { - for (auto ep : l) { - try { - std::rethrow_exception(ep); - } catch (sycl::exception &e0) { - std::cout << e0.what(); - } catch (std::exception &e1) { - std::cout << e1.what(); - } catch (...) { - std::cout << "*** catch (...)\n"; - } - } - }); - - std::cout << "Running on " << q.get_device().get_info() - << "\n"; - std::cout << "global_val = " << global_val << "\n"; - sycl::program program(q.get_context()); - - int goldi = (int)get_value(); - float goldf = (float)get_value(); - - POD gold = {{{goldi, goldf}, {goldi, goldf}}, goldi}; - - sycl::ext::oneapi::experimental::spec_constant pod = - program.set_spec_constant(gold); - - program.build_with_kernel_type(); - - POD result; - try { - sycl::buffer bufi(&result, 1); - - q.submit([&](sycl::handler &cgh) { - auto acci = bufi.get_access(cgh); - cgh.single_task(program.get_kernel(), - [=]() { acci[0] = pod.get(); }); - }); - } catch (sycl::exception &e) { - std::cout << "*** Exception caught: " << e.what() << "\n"; - return 1; - } - - bool passed = false; - - std::cout << result.a[0].a << " " << result.a[0].b << "\n"; - std::cout << result.a[1].a << " " << result.a[1].b << "\n"; - std::cout << result.b << "\n\n"; - - std::cout << gold.a[0].a << " " << gold.a[0].b << "\n"; - std::cout << gold.a[1].a << " " << gold.a[1].b << "\n"; - std::cout << gold.b << "\n\n"; - - if (0 == std::memcmp(&result, &gold, sizeof(POD))) { - passed = true; - } - - std::cout << (passed ? "passed\n" : "FAILED\n"); - return passed ? 0 : 1; -} diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/multiple-usages-of-composite.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/multiple-usages-of-composite.cpp deleted file mode 100644 index 64823240e8..0000000000 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/multiple-usages-of-composite.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// UNSUPPORTED: cuda || hip -// -// RUN: %clangxx -fsycl -D__SYCL_INTERNAL_API %s -o %t.out -v -// RUN: %HOST_RUN_PLACEHOLDER %t.out %HOST_CHECK_PLACEHOLDER -// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER -// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER -// -// The test checks that multiple usages of the same specialization constant -// works correctly: toolchain processes them correctly and runtime can -// correctly execute the program. -// -// CHECK: --------> 1 - -#include - -using namespace sycl; - -class sc_kernel_t; - -namespace test { - -struct pod_t { - float x; - float y; -}; - -template class kernel_t { -public: - using sc_t = - sycl::ext::oneapi::experimental::spec_constant; - - kernel_t(const sc_t &sc, sycl::stream &strm) : sc_(sc), strm_(strm) {} - - void operator()(sycl::id<1> i) const { - strm_ << "--------> " << sc_.get().x << sycl::endl; - } - - sc_t sc_; - sycl::stream strm_; -}; - -template class kernel_driver_t { -public: - void execute(const pod_t &pod) { - device dev = sycl::device(default_selector_v); - context ctx = context(dev); - queue q(dev); - - sycl::program p(q.get_context()); - auto sc = p.set_spec_constant(pod); - p.build_with_kernel_type>(); - - q.submit([&](sycl::handler &cgh) { - sycl::stream strm(1024, 256, cgh); - kernel_t func(sc, strm); - - auto sycl_kernel = p.get_kernel>(); - cgh.parallel_for(sycl_kernel, sycl::range<1>(1), func); - }); - q.wait(); - } -}; - -template class kernel_driver_t; - -// The line below instantiates the second use of the spec constant named -// `sc_kernel_t`, which used to corrupt the spec constant content -template class kernel_driver_t; -} // namespace test - -int main() { - test::pod_t pod = {1, 2}; - test::kernel_driver_t kd_float; - kd_float.execute(pod); - - return 0; -} diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_hw.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_hw.cpp deleted file mode 100644 index 9f1bc48dca..0000000000 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_hw.cpp +++ /dev/null @@ -1,188 +0,0 @@ -// UNSUPPORTED: cuda || hip -// -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -D__SYCL_INTERNAL_API %s -o %t.out -// RUN: %HOST_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// -//==----------- spec_const_hw.cpp ------------------------------------------==// -// -// 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 -// -//===----------------------------------------------------------------------===// -// The test checks that the specialization constant feature works correctly - -// tool chain processes them correctly and runtime can correctly execute the -// program. - -#include - -#include -#include - -class MyInt32Const; -class MyFloatConst; -class MyConst; - -using namespace sycl; - -class KernelAAAi; -class KernelBBBf; - -int global_val = 10; - -// Fetch a value at runtime. -int get_value() { return global_val; } - -float foo( - const sycl::ext::oneapi::experimental::spec_constant - &f32) { - return f32; -} - -struct SCWrapper { - SCWrapper(sycl::program &p) - : SC1(p.set_spec_constant(4)), - SC2(p.set_spec_constant(2)) {} - - sycl::ext::oneapi::experimental::spec_constant SC1; - sycl::ext::oneapi::experimental::spec_constant SC2; -}; - -// MyKernel is used to test default constructor -using AccT = sycl::accessor; -using ScT = sycl::ext::oneapi::experimental::spec_constant; - -struct MyKernel { - MyKernel(AccT &Acc) : Acc(Acc) {} - - void setConst(ScT Sc) { this->Sc = Sc; } - - void operator()() const { Acc[0] = Sc.get(); } - AccT Acc; - ScT Sc; -}; - -int main(int argc, char **argv) { - global_val = argc + 16; - - sycl::queue q(default_selector_v, [](exception_list l) { - for (auto ep : l) { - try { - std::rethrow_exception(ep); - } catch (sycl::exception &e0) { - std::cout << e0.what(); - } catch (std::exception &e1) { - std::cout << e1.what(); - } catch (...) { - std::cout << "*** catch (...)\n"; - } - } - }); - - std::cout << "Running on " << q.get_device().get_info() - << "\n"; - std::cout << "global_val = " << global_val << "\n"; - sycl::program program1(q.get_context()); - sycl::program program2(q.get_context()); - sycl::program program3(q.get_context()); - sycl::program program4(q.get_context()); - - int goldi = (int)get_value(); - // TODO make this floating point once supported by the compiler - float goldf = (float)get_value(); - - sycl::ext::oneapi::experimental::spec_constant i32 = - program1.set_spec_constant(goldi); - - sycl::ext::oneapi::experimental::spec_constant f32 = - program2.set_spec_constant(goldf); - - sycl::ext::oneapi::experimental::spec_constant sc = - program4.set_spec_constant(goldi); - - program1.build_with_kernel_type(); - // Use an option (does not matter which exactly) to test different internal - // SYCL RT execution path - program2.build_with_kernel_type("-cl-fast-relaxed-math"); - - SCWrapper W(program3); - program3.build_with_kernel_type(); - - program4.build_with_kernel_type(); - - int goldw = 6; - - std::vector veci(1); - std::vector vecf(1); - std::vector vecw(1); - std::vector vec(1); - try { - sycl::buffer bufi(veci.data(), veci.size()); - sycl::buffer buff(vecf.data(), vecf.size()); - sycl::buffer bufw(vecw.data(), vecw.size()); - sycl::buffer buf(vec.data(), vec.size()); - - q.submit([&](sycl::handler &cgh) { - auto acci = bufi.get_access(cgh); - cgh.single_task(program1.get_kernel(), - [=]() { acci[0] = i32.get(); }); - }); - q.submit([&](sycl::handler &cgh) { - auto accf = buff.get_access(cgh); - cgh.single_task(program2.get_kernel(), - [=]() { accf[0] = foo(f32); }); - }); - - q.submit([&](sycl::handler &cgh) { - auto accw = bufw.get_access(cgh); - cgh.single_task( - program3.get_kernel(), - [=]() { accw[0] = W.SC1.get() + W.SC2.get(); }); - }); - // Check spec_constant default construction with subsequent initialization - q.submit([&](sycl::handler &cgh) { - auto acc = buf.get_access(cgh); - // Specialization constants specification says: - // sycl::experimental::spec_constant is default constructible, - // although the object is not considered initialized until the result of - // the call to sycl::program::set_spec_constant is assigned to it. - MyKernel Kernel(acc); // default construct inside MyKernel instance - Kernel.setConst(sc); // initialize to sc, returned by set_spec_constant - - cgh.single_task(program4.get_kernel(), Kernel); - }); - - } catch (sycl::exception &e) { - std::cout << "*** Exception caught: " << e.what() << "\n"; - return 1; - } - bool passed = true; - int vali = veci[0]; - - if (vali != goldi) { - std::cout << "*** ERROR: " << vali << " != " << goldi << "(gold)\n"; - passed = false; - } - int valf = vecf[0]; - - if (valf != goldf) { - std::cout << "*** ERROR: " << valf << " != " << goldf << "(gold)\n"; - passed = false; - } - int valw = vecw[0]; - - if (valw != goldw) { - std::cout << "*** ERROR: " << valw << " != " << goldw << "(gold)\n"; - passed = false; - } - int val = vec[0]; - - if (val != goldi) { - std::cout << "*** ERROR: " << val << " != " << goldi << "(gold)\n"; - passed = false; - } - std::cout << (passed ? "passed\n" : "FAILED\n"); - return passed ? 0 : 1; -} diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_neg.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_neg.cpp deleted file mode 100644 index c8966e84ef..0000000000 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_neg.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// RUN: %clangxx -fsycl -D__SYCL_INTERNAL_API %s -o %t.out -// RUN: %HOST_RUN_PLACEHOLDER %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// Specialization constants are not supported on FPGA h/w and emulator. -// UNSUPPORTED: cuda || hip -// -//==----------- spec_const_hw.cpp ------------------------------------------==// -// -// 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 -// -//===----------------------------------------------------------------------===// -// The test that specialization constant implementation throws exceptions when -// expected. - -#include - -#include -#include - -class MyInt32Const; - -using namespace sycl; - -class KernelAAAi; - -int main(int argc, char **argv) { - sycl::queue q(default_selector_v, [](exception_list l) { - for (auto ep : l) { - try { - std::rethrow_exception(ep); - } catch (sycl::exception &e0) { - std::cout << e0.what(); - } catch (std::exception &e1) { - std::cout << e1.what(); - } catch (...) { - std::cout << "*** catch (...)\n"; - } - } - }); - - std::cout << "Running on " << q.get_device().get_info() - << "\n"; - sycl::program program1(q.get_context()); - - sycl::ext::oneapi::experimental::spec_constant i32 = - program1.set_spec_constant(10); - - std::vector veci(1); - bool passed = false; - - program1.build_with_kernel_type(); - - try { - // This is an attempt to set a spec constant after the program has been - // built - spec_const_error should be thrown - sycl::ext::oneapi::experimental::spec_constant i32 = - program1.set_spec_constant(10); - - sycl::buffer bufi(veci.data(), veci.size()); - - q.submit([&](sycl::handler &cgh) { - auto acci = bufi.get_access(cgh); - cgh.single_task(program1.get_kernel(), - [=]() { acci[0] = i32.get(); }); - }); - } catch (sycl::ext::oneapi::experimental::spec_const_error &sc_err) { - passed = true; - } catch (sycl::exception &e) { - std::cout << "*** Exception caught: " << e.what() << "\n"; - return 1; - } - std::cout << (passed ? "passed\n" : "FAILED\n"); - return passed ? 0 : 1; -} diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_redefine.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_redefine.cpp deleted file mode 100644 index 29c1231cae..0000000000 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/spec_const_redefine.cpp +++ /dev/null @@ -1,113 +0,0 @@ -// UNSUPPORTED: cuda || hip -// -// FIXME Disable fallback assert so that it doesn't interferes with number of -// program builds at run-time -// RUN: %clangxx -DSYCL_DISABLE_FALLBACK_ASSERT -D__SYCL_INTERNAL_API -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %HOST_RUN_PLACEHOLDER %t.out -// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER -// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER -// -//==----------- spec_const_redefine.cpp ------------------------------------==// -// -// 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 -// -//===----------------------------------------------------------------------===// -// The test checks that: -// - a specialization constant can be redifined and correct new value is used -// after redefinition. -// - the program is JITted only once per a unique set of specialization -// constants values. - -#include - -#include -#include - -class SC0; -class SC1; -class KernelAAA; - -using namespace sycl; - -int val = 0; - -// Fetch a value at runtime. -int get_value() { return val; } - -int main(int argc, char **argv) { - val = argc; - - sycl::queue q(default_selector_v, [](exception_list l) { - for (auto ep : l) { - try { - std::rethrow_exception(ep); - } catch (sycl::exception &e0) { - std::cout << e0.what(); - } catch (std::exception &e1) { - std::cout << e1.what(); - } catch (...) { - std::cout << "*** catch (...)\n"; - } - } - }); - - std::cout << "Running on " << q.get_device().get_info() - << "\n"; - bool passed = true; - int x = get_value(); - - const int sc_vals[][2] = { - {1 + x, 2 + x}, - {2 + x, 3 + x}, - {1 + x, 2 + x}, // same as first - program in cache must be used - {2 + x, 3 + x} // same as second - program in cache must be used - }; - constexpr int n_sc_sets = sizeof(sc_vals) / sizeof(sc_vals[0]); - std::vector vec(n_sc_sets); - - for (int i = 0; i < n_sc_sets; i++) { - sycl::program program(q.get_context()); - const int *sc_set = &sc_vals[i][0]; - sycl::ext::oneapi::experimental::spec_constant sc0 = - program.set_spec_constant(sc_set[0]); - sycl::ext::oneapi::experimental::spec_constant sc1 = - program.set_spec_constant(sc_set[1]); - - program.build_with_kernel_type(); - - try { - sycl::buffer buf(vec.data(), vec.size()); - - q.submit([&](sycl::handler &cgh) { - auto acc = buf.get_access(cgh); - cgh.single_task(program.get_kernel(), - [=]() { acc[i] = sc0.get() + sc1.get(); }); - }); - } catch (sycl::exception &e) { - std::cout << "*** Exception caught: " << e.what() << "\n"; - return 1; - } - int val = vec[i]; - int gold = sc_set[0] + sc_set[1]; - - std::cout << "val = " << val << " gold = " << gold << "\n"; - - if (val != gold) { - std::cout << "*** ERROR[" << i << "]: " << val << " != " << gold - << "(gold)\n"; - passed = false; - } - } - std::cout << (passed ? "passed\n" : "FAILED\n"); - return passed ? 0 : 1; -} - -// --- Check that only two JIT compilation happened: -// CHECK-NOT: ---> piProgramBuild -// CHECK: ---> piProgramBuild -// CHECK: ---> piProgramBuild -// CHECK-NOT: ---> piProgramBuild -// --- Check that the test completed with expected results: -// CHECK: passed diff --git a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/unpacked-composite-type.cpp b/SYCL/DeprecatedFeatures/SpecConsts1.2.1/unpacked-composite-type.cpp deleted file mode 100644 index f09ff7ea7c..0000000000 --- a/SYCL/DeprecatedFeatures/SpecConsts1.2.1/unpacked-composite-type.cpp +++ /dev/null @@ -1,80 +0,0 @@ -// UNSUPPORTED: cuda || hip -// -// RUN: %clangxx -fsycl -D__SYCL_INTERNAL_API %s -o %t.out -// RUN: %HOST_RUN_PLACEHOLDER %t.out %HOST_CHECK_PLACEHOLDER -// RUN: %CPU_RUN_PLACEHOLDER %t.out %CPU_CHECK_PLACEHOLDER -// RUN: %GPU_RUN_PLACEHOLDER %t.out %GPU_CHECK_PLACEHOLDER -// -// This test is intended to check that unpacked composites with elemements of -// various sizes are handled correctly -// -// CHECK: --------> 1 -// CHECK: --------> 2 -// CHECK: --------> 3 -// CHECK: --------> 4 -#include - -#include - -using namespace sycl; - -class sc_kernel_t; - -namespace test { - -struct pod_t { - int a; - int8_t b; - int c; - int64_t d; -}; - -template class kernel_t { -public: - using sc_t = - sycl::ext::oneapi::experimental::spec_constant; - - kernel_t(const sc_t &sc, sycl::stream &strm) : sc_(sc), strm_(strm) {} - - void operator()(sycl::id<1> i) const { - strm_ << "--------> " << sc_.get().a << sycl::endl; - strm_ << "--------> " << sc_.get().b << sycl::endl; - strm_ << "--------> " << sc_.get().c << sycl::endl; - strm_ << "--------> " << sc_.get().d << sycl::endl; - } - - sc_t sc_; - sycl::stream strm_; -}; - -template class kernel_driver_t { -public: - void execute(const pod_t &pod) { - device dev = sycl::device(default_selector_v); - context ctx = context(dev); - queue q(dev); - - sycl::program p(q.get_context()); - auto sc = p.set_spec_constant(pod); - p.build_with_kernel_type>(); - - q.submit([&](sycl::handler &cgh) { - sycl::stream strm(1024, 256, cgh); - kernel_t func(sc, strm); - - auto sycl_kernel = p.get_kernel>(); - cgh.parallel_for(sycl_kernel, sycl::range<1>(1), func); - }); - q.wait(); - } -}; - -} // namespace test - -int main() { - test::pod_t pod = {1, 2, 3, 4}; - test::kernel_driver_t kd_float; - kd_float.execute(pod); - - return 0; -} From 4d1fe9ec56ce892d85045f59c14fb991c6430580 Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Wed, 7 Sep 2022 15:01:57 -0700 Subject: [PATCH 4/9] accidentally re-added by automerge --- .../cuda_program_interop.cpp | 22 --- SYCL/DeprecatedFeatures/get_backend.cpp | 73 -------- SYCL/DeprecatedFeatures/program_link.cpp | 57 ------ SYCL/DeprecatedFeatures/spec_const_aot.cpp | 64 ------- SYCL/DeprecatedFeatures/spec_consts.hpp | 169 ------------------ 5 files changed, 385 deletions(-) delete mode 100644 SYCL/DeprecatedFeatures/cuda_program_interop.cpp delete mode 100644 SYCL/DeprecatedFeatures/get_backend.cpp delete mode 100644 SYCL/DeprecatedFeatures/program_link.cpp delete mode 100644 SYCL/DeprecatedFeatures/spec_const_aot.cpp delete mode 100644 SYCL/DeprecatedFeatures/spec_consts.hpp diff --git a/SYCL/DeprecatedFeatures/cuda_program_interop.cpp b/SYCL/DeprecatedFeatures/cuda_program_interop.cpp deleted file mode 100644 index 123fa1789f..0000000000 --- a/SYCL/DeprecatedFeatures/cuda_program_interop.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -D__SYCL_INTERNAL_API %s -o %t.out -// RUN: %GPU_RUN_PLACEHOLDER %t.out -// REQUIRES: cuda - -#include - -int main() { - sycl::queue Queue{sycl::default_selector_v}; - Queue.submit( - [](sycl::handler &CGH) { CGH.single_task([] {}); }); - - sycl::program Prog{Queue.get_context()}; - Prog.build_with_kernel_type(); - - auto NativeProgram = sycl::get_native(Prog); - - assert(NativeProgram != 0); - - // TODO check program interop constructor, once it is available. - - return 0; -} diff --git a/SYCL/DeprecatedFeatures/get_backend.cpp b/SYCL/DeprecatedFeatures/get_backend.cpp deleted file mode 100644 index 2faabfa57d..0000000000 --- a/SYCL/DeprecatedFeatures/get_backend.cpp +++ /dev/null @@ -1,73 +0,0 @@ -// REQUIRES: TEMPORARY_DISABLED -// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -D__SYCL_INTERNAL_API %s -o %t.out -// RUN: env SYCL_DEVICE_FILTER=%sycl_be %t.out -// -//==----------------- get_backend.cpp ------------------------==// -// This is a test of get_backend(). -// Do not set SYCL_DEVICE_FILTER. We do not want the preferred -// backend. -//==----------------------------------------------------------==// - -#include -#include -#include - -using namespace sycl; - -bool check(backend be) { - switch (be) { - case backend::opencl: - case backend::ext_oneapi_level_zero: - case backend::ext_oneapi_cuda: - case backend::ext_oneapi_hip: - case backend::host: - return true; - default: - return false; - } - return false; -} - -inline void return_fail() { - std::cout << "Failed" << std::endl; - exit(1); -} - -int main() { - for (const auto &plt : platform::get_platforms()) { - if (!plt.is_host()) { - if (check(plt.get_backend()) == false) { - return_fail(); - } - - context c(plt); - if (c.get_backend() != plt.get_backend()) { - return_fail(); - } - - program prog(c); - if (prog.get_backend() != plt.get_backend()) { - return_fail(); - } - - queue q(c, default_selector_v); - if (q.get_backend() != plt.get_backend()) { - return_fail(); - } - - auto device = q.get_device(); - if (device.get_backend() != plt.get_backend()) { - return_fail(); - } - - unsigned char *HostAlloc = (unsigned char *)malloc_host(1, c); - auto e = q.memset(HostAlloc, 42, 1); - free(HostAlloc, c); - if (e.get_backend() != plt.get_backend()) { - return_fail(); - } - } - } - std::cout << "Passed" << std::endl; - return 0; -} diff --git a/SYCL/DeprecatedFeatures/program_link.cpp b/SYCL/DeprecatedFeatures/program_link.cpp deleted file mode 100644 index dd6c8c6d3c..0000000000 --- a/SYCL/DeprecatedFeatures/program_link.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// RUN: %clangxx -D__SYCL_INTERNAL_API -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER SYCL_PI_TRACE=-1 SYCL_PROGRAM_LINK_OPTIONS="-cl-fast-relaxed-math" %t.out %CPU_CHECK_PLACEHOLDER --check-prefix=CHECK-IS-RELAXED-MATH -// RUN: %GPU_RUN_PLACEHOLDER SYCL_PI_TRACE=-1 SYCL_PROGRAM_LINK_OPTIONS="-cl-fast-relaxed-math" %t.out %GPU_CHECK_PLACEHOLDER --check-prefix=CHECK-IS-RELAXED-MATH -// RUN: %ACC_RUN_PLACEHOLDER SYCL_PI_TRACE=-1 SYCL_PROGRAM_LINK_OPTIONS="-cl-fast-relaxed-math" %t.out %ACC_CHECK_PLACEHOLDER --check-prefix=CHECK-IS-RELAXED-MATH - -// RUN: %CPU_RUN_PLACEHOLDER SYCL_PI_TRACE=-1 SYCL_PROGRAM_COMPILE_OPTIONS="-cl-opt-disable" %t.out %CPU_CHECK_PLACEHOLDER --check-prefix=CHECK-IS-OPT-DISABLE -// RUN: %GPU_RUN_PLACEHOLDER SYCL_PI_TRACE=-1 SYCL_PROGRAM_COMPILE_OPTIONS="-cl-opt-disable" %t.out %GPU_CHECK_PLACEHOLDER --check-prefix=CHECK-IS-OPT-DISABLE -// RUN: %ACC_RUN_PLACEHOLDER SYCL_PI_TRACE=-1 SYCL_PROGRAM_COMPILE_OPTIONS="-cl-opt-disable" %t.out %ACCPU_CHECK_PLACEHOLDER --check-prefix=CHECK-IS-OPT-DISABLE -// -// Hits an assertion on AMD with multiple GPUs available, fails trace on Nvidia. -// XFAIL: hip_amd || hip_nvidia -// -// Unsupported on Level Zero because the test passes OpenCL specific compiler -// and linker switches. -// UNSUPPORTED: level_zero - -#include -#include -using namespace sycl; -class DUMMY { -public: - void operator()(item<1>) const {}; -}; - -int main(void) { - platform p(default_selector_v); - if (p.is_host()) { - return 0; - } - context c(p); - queue Q(c, default_selector_v); - program prog1(c); - prog1.compile_with_kernel_type(); - prog1.link("-cl-finite-math-only"); - assert(prog1.get_state() == sycl::program_state::linked && - "fail to link program"); - // CHECK-IS-RELAXED-MATH: -cl-fast-relaxed-math - // CHECK-IS-RELAXED-MATH-NOT: -cl-finite-math-only - assert(prog1.get_link_options() == "-cl-finite-math-only" && - "program::get_link_options() output is wrong"); - - program prog2(c); - prog2.compile_with_kernel_type("-cl-mad-enable"); - assert(prog2.get_state() == sycl::program_state::compiled && - "fail to compile program"); - // CHECK-IS-OPT-DISABLE: -cl-opt-disable - // CHECK-IS-OPT-DISABLE-NOT: -cl-mad-enable - assert(prog2.get_compile_options() == "-cl-mad-enable" && - "program::get_compile_options() output is wrong"); - - // enforce SYCL toolchain to emit device image but no enqueue in run-time - if (false) { - Q.submit([&](handler &CGH) { CGH.parallel_for(range<1>{2}, DUMMY{}); }); - } - - return 0; -} diff --git a/SYCL/DeprecatedFeatures/spec_const_aot.cpp b/SYCL/DeprecatedFeatures/spec_const_aot.cpp deleted file mode 100644 index d04f0ebf2c..0000000000 --- a/SYCL/DeprecatedFeatures/spec_const_aot.cpp +++ /dev/null @@ -1,64 +0,0 @@ -// REQUIRES: opencl-aot, cpu -// -// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 -D__SYCL_INTERNAL_API %s -o %t.out -// RUN: %CPU_RUN_PLACEHOLDER %t.out -// -// The test checks that the specialization constant feature works with ahead -// of time compilation. - -#include - -#include -#include - -class MyInt32Const; - -using namespace sycl; - -class Kernel; - -int main(int argc, char **argv) { - sycl::queue q(sycl::default_selector_v, [](exception_list l) { - for (auto ep : l) { - try { - std::rethrow_exception(ep); - } catch (sycl::exception &e0) { - std::cout << e0.what(); - } catch (std::exception &e1) { - std::cout << e1.what(); - } catch (...) { - std::cout << "*** catch (...)\n"; - } - } - }); - - std::cout << "Running on " << q.get_device().get_info() - << "\n"; - sycl::program prog(q.get_context()); - - sycl::ext::oneapi::experimental::spec_constant i32 = - prog.set_spec_constant(10); - - prog.build_with_kernel_type(); - - std::vector vec(1); - { - sycl::buffer buf(vec.data(), vec.size()); - - q.submit([&](sycl::handler &cgh) { - auto acc = buf.get_access(cgh); - cgh.single_task(prog.get_kernel(), - [=]() { acc[0] = i32.get(); }); - }); - } - bool passed = true; - int val = vec[0]; - int gold = 0; // with AOT, spec constant is set to C++ default for the type - - if (val != gold) { - std::cout << "*** ERROR: " << val << " != " << gold << "(gold)\n"; - passed = false; - } - std::cout << (passed ? "passed\n" : "FAILED\n"); - return passed ? 0 : 1; -} diff --git a/SYCL/DeprecatedFeatures/spec_consts.hpp b/SYCL/DeprecatedFeatures/spec_consts.hpp deleted file mode 100644 index 2ff38c9487..0000000000 --- a/SYCL/DeprecatedFeatures/spec_consts.hpp +++ /dev/null @@ -1,169 +0,0 @@ -#include - -#include -#include - -class MyInt32Const; -class MyFloatConst; -class MyConst; - -using namespace sycl; - -class KernelAAAi; -class KernelBBBf; - -int global_val = 10; - -// Fetch a value at runtime. -int get_value() { return global_val; } - -float foo( - const sycl::ext::oneapi::experimental::spec_constant - &f32) { - return f32; -} - -struct SCWrapper { - SCWrapper(sycl::program &p) - : SC1(p.set_spec_constant(4)), - SC2(p.set_spec_constant(2)) {} - - sycl::ext::oneapi::experimental::spec_constant SC1; - sycl::ext::oneapi::experimental::spec_constant SC2; -}; - -// MyKernel is used to test default constructor -using AccT = sycl::accessor; -using ScT = sycl::ext::oneapi::experimental::spec_constant; - -struct MyKernel { - MyKernel(AccT &Acc) : Acc(Acc) {} - - void setConst(ScT Sc) { this->Sc = Sc; } - - void operator()() const { Acc[0] = Sc.get(); } - AccT Acc; - ScT Sc; -}; - -int main(int argc, char **argv) { - global_val = argc + 16; - - sycl::queue q(sycl::default_selector_v, [](exception_list l) { - for (auto ep : l) { - try { - std::rethrow_exception(ep); - } catch (sycl::exception &e0) { - std::cout << e0.what(); - } catch (std::exception &e1) { - std::cout << e1.what(); - } catch (...) { - std::cout << "*** catch (...)\n"; - } - } - }); - - std::cout << "Running on " << q.get_device().get_info() - << "\n"; - std::cout << "global_val = " << global_val << "\n"; - sycl::program program1(q.get_context()); - sycl::program program2(q.get_context()); - sycl::program program3(q.get_context()); - sycl::program program4(q.get_context()); - - const int goldi = get_value(); - // TODO make this floating point once supported by the compiler - const float goldf = get_value(); - - sycl::ext::oneapi::experimental::spec_constant i32 = - program1.set_spec_constant(goldi); - - sycl::ext::oneapi::experimental::spec_constant f32 = - program2.set_spec_constant(goldf); - - sycl::ext::oneapi::experimental::spec_constant sc = - program4.set_spec_constant(goldi); - - program1.build_with_kernel_type(); - // Use an option (does not matter which exactly) to test different internal - // SYCL RT execution path - program2.build_with_kernel_type("-cl-fast-relaxed-math"); - - SCWrapper W(program3); - program3.build_with_kernel_type(); - - program4.build_with_kernel_type(); - - int goldw = 6; - - std::vector veci(1); - std::vector vecf(1); - std::vector vecw(1); - std::vector vec(1); - try { - sycl::buffer bufi(veci.data(), veci.size()); - sycl::buffer buff(vecf.data(), vecf.size()); - sycl::buffer bufw(vecw.data(), vecw.size()); - sycl::buffer buf(vec.data(), vec.size()); - - q.submit([&](sycl::handler &cgh) { - auto acci = bufi.get_access(cgh); - cgh.single_task(program1.get_kernel(), - [=]() { acci[0] = i32.get(); }); - }); - q.submit([&](sycl::handler &cgh) { - auto accf = buff.get_access(cgh); - cgh.single_task(program2.get_kernel(), - [=]() { accf[0] = foo(f32); }); - }); - - q.submit([&](sycl::handler &cgh) { - auto accw = bufw.get_access(cgh); - cgh.single_task( - program3.get_kernel(), - [=]() { accw[0] = W.SC1.get() + W.SC2.get(); }); - }); - // Check spec_constant default construction with subsequent initialization - q.submit([&](sycl::handler &cgh) { - auto acc = buf.get_access(cgh); - // Specialization constants specification says: - // sycl::experimental::spec_constant is default constructible, - // although the object is not considered initialized until the result of - // the call to sycl::program::set_spec_constant is assigned to it. - MyKernel Kernel(acc); // default construct inside MyKernel instance - Kernel.setConst(sc); // initialize to sc, returned by set_spec_constant - - cgh.single_task(program4.get_kernel(), Kernel); - }); - - } catch (sycl::exception &e) { - std::cout << "*** Exception caught: " << e.what() << "\n"; - return 1; - } - bool passed = true; - int vali = veci[0]; - - if (vali != goldi) { - std::cout << "*** ERROR: " << vali << " != " << goldi << "(gold)\n"; - passed = false; - } - - if (std::fabs(vecf[0] - goldf) > std::numeric_limits::epsilon()) { - std::cout << "*** ERROR: " << vecf[0] << " != " << goldf << "(gold)\n"; - passed = false; - } - int valw = vecw[0]; - - if (valw != goldw) { - std::cout << "*** ERROR: " << valw << " != " << goldw << "(gold)\n"; - passed = false; - } - int val = vec[0]; - - if (val != goldi) { - std::cout << "*** ERROR: " << val << " != " << goldi << "(gold)\n"; - passed = false; - } - std::cout << (passed ? "passed\n" : "FAILED\n"); - return passed ? 0 : 1; -} From 434c962e2cb91c94a60d2a45dfc3fbf45a46cd74 Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Wed, 7 Sep 2022 18:20:43 -0700 Subject: [PATCH 5/9] ESIMD using older style device_selector classes. Updated as well. --- SYCL/ESIMD/BitonicSortK.cpp | 2 +- SYCL/ESIMD/BitonicSortKv2.cpp | 2 +- SYCL/ESIMD/PrefixSum.cpp | 2 +- SYCL/ESIMD/Prefix_Local_sum1.cpp | 2 +- SYCL/ESIMD/Prefix_Local_sum2.cpp | 2 +- SYCL/ESIMD/Prefix_Local_sum3.cpp | 2 +- SYCL/ESIMD/Stencil.cpp | 2 +- SYCL/ESIMD/acc_gather_scatter_rgba.hpp | 2 +- SYCL/ESIMD/accessor.hpp | 2 +- SYCL/ESIMD/accessor_gather_scatter.hpp | 2 +- SYCL/ESIMD/accessor_load_store.hpp | 2 +- SYCL/ESIMD/aot_mixed.cpp | 2 +- SYCL/ESIMD/api/ballot.cpp | 2 +- SYCL/ESIMD/api/bin_and_cmp_ops_heavy.cpp | 2 +- SYCL/ESIMD/api/esimd_bit_ops.cpp | 2 +- SYCL/ESIMD/api/esimd_merge.cpp | 2 +- SYCL/ESIMD/api/esimd_pack_unpack_mask.cpp | 2 +- SYCL/ESIMD/api/esimd_rgba_smoke.cpp | 2 +- .../api/functional/ctors/ctor_array_core.cpp | 2 +- .../functional/ctors/ctor_array_fp_extra.cpp | 2 +- .../functional/ctors/ctor_broadcast_core.cpp | 2 +- .../ctors/ctor_broadcast_fp_extra.cpp | 2 +- .../functional/ctors/ctor_converting_core.cpp | 2 +- .../ctors/ctor_converting_fp_extra.cpp | 2 +- .../api/functional/ctors/ctor_copy_core.cpp | 2 +- .../functional/ctors/ctor_copy_fp_extra.cpp | 2 +- .../functional/ctors/ctor_default_core.cpp | 2 +- .../ctors/ctor_default_fp_extra.cpp | 2 +- .../ctors/ctor_fill_accuracy_fp.cpp | 2 +- .../ctors/ctor_fill_accuracy_fp_extra.cpp | 2 +- .../api/functional/ctors/ctor_fill_core.cpp | 2 +- .../functional/ctors/ctor_fill_fp_extra.cpp | 2 +- .../functional/ctors/ctor_load_acc_core.cpp | 2 +- .../ctors/ctor_load_acc_fp_extra.cpp | 2 +- .../functional/ctors/ctor_load_usm_core.cpp | 2 +- .../ctors/ctor_load_usm_fp_extra.cpp | 2 +- .../api/functional/ctors/ctor_move_core.cpp | 2 +- .../functional/ctors/ctor_move_fp_extra.cpp | 2 +- .../api/functional/ctors/ctor_vector_core.cpp | 2 +- .../functional/ctors/ctor_vector_fp_extra.cpp | 2 +- .../functions/functions_select_2d_core.cpp | 2 +- .../functions_select_2d_fp_extra.cpp | 2 +- .../functions_select_lvalue_core.cpp | 2 +- .../functions_select_lvalue_fp_extra.cpp | 2 +- .../functions_select_rvalue_core.cpp | 2 +- .../functions_select_rvalue_fp_extra.cpp | 2 +- .../functions_select_simd_view_rval_core.cpp | 2 +- ...nctions_select_simd_view_rval_fp_extra.cpp | 2 +- ...operator_assignment_move_and_copy_core.cpp | 2 +- .../operators/operator_bitwise_not_sint.cpp | 2 +- .../operators/operator_bitwise_not_uint.cpp | 2 +- ..._decrement_and_increment_accuracy_core.cpp | 2 +- ...rement_and_increment_accuracy_fp_extra.cpp | 2 +- .../operator_decrement_and_increment_core.cpp | 2 +- ...rator_decrement_and_increment_fp_extra.cpp | 2 +- .../operators/operator_logical_not.cpp | 2 +- SYCL/ESIMD/api/replicate_smoke.cpp | 2 +- SYCL/ESIMD/api/saturation_smoke.cpp | 2 +- SYCL/ESIMD/api/simd_any_all.cpp | 2 +- .../api/simd_binop_integer_promotion.cpp | 2 +- SYCL/ESIMD/api/simd_copy_to_from.cpp | 2 +- SYCL/ESIMD/api/simd_mask.cpp | 2 +- SYCL/ESIMD/api/simd_memory_access.cpp | 2 +- SYCL/ESIMD/api/simd_negation_operator.cpp | 2 +- SYCL/ESIMD/api/simd_subscript_operator.cpp | 2 +- SYCL/ESIMD/api/simd_view_copy_move_assign.cpp | 2 +- .../ESIMD/api/simd_view_negation_operator.cpp | 2 +- SYCL/ESIMD/api/simd_view_select_2d_fp.cpp | 2 +- SYCL/ESIMD/api/simd_view_select_2d_int.cpp | 2 +- .../api/simd_view_subscript_operator.cpp | 2 +- SYCL/ESIMD/api/slm_gather_scatter.cpp | 2 +- SYCL/ESIMD/api/slm_gather_scatter_heavy.cpp | 2 +- SYCL/ESIMD/api/slm_gather_scatter_rgba.cpp | 2 +- SYCL/ESIMD/api/svm_gather_scatter.cpp | 2 +- SYCL/ESIMD/api/unary_ops_heavy.cpp | 2 +- SYCL/ESIMD/dp4a.cpp | 2 +- SYCL/ESIMD/dpas/dpas_test1.cpp | 2 +- SYCL/ESIMD/dpas/dpas_test2.cpp | 2 +- SYCL/ESIMD/dpas/dpas_tf32.cpp | 2 +- SYCL/ESIMD/dpas/dpasw_test.cpp | 2 +- SYCL/ESIMD/esimd_check_vc_codegen.cpp | 2 +- SYCL/ESIMD/esimd_test_utils.hpp | 41 ++++++++----------- SYCL/ESIMD/ext_math.cpp | 2 +- .../Inputs/fp_args_size_common.hpp | 2 +- SYCL/ESIMD/fp_call_from_func.cpp | 2 +- SYCL/ESIMD/fp_call_recursive.cpp | 2 +- SYCL/ESIMD/fp_in_phi.cpp | 2 +- SYCL/ESIMD/fp_in_select.cpp | 2 +- SYCL/ESIMD/histogram.cpp | 2 +- SYCL/ESIMD/histogram_256_slm.cpp | 2 +- SYCL/ESIMD/histogram_256_slm_spec_2020.cpp | 2 +- SYCL/ESIMD/histogram_2d.cpp | 2 +- SYCL/ESIMD/histogram_raw_send.cpp | 2 +- SYCL/ESIMD/kmeans/kmeans.cpp | 2 +- SYCL/ESIMD/linear/linear.cpp | 2 +- SYCL/ESIMD/lsc/Inputs/lsc_surf.hpp | 2 +- SYCL/ESIMD/lsc/atomic_smoke.cpp | 2 +- SYCL/ESIMD/lsc/lsc_slm.cpp | 2 +- SYCL/ESIMD/lsc/lsc_usm.cpp | 2 +- SYCL/ESIMD/lsc/lsc_usm_2d.cpp | 2 +- SYCL/ESIMD/lsc/lsc_usm_atomic_cachehint.cpp | 2 +- SYCL/ESIMD/mandelbrot/mandelbrot.cpp | 2 +- SYCL/ESIMD/mandelbrot/mandelbrot_spec.cpp | 2 +- SYCL/ESIMD/matrix_transpose.cpp | 2 +- SYCL/ESIMD/matrix_transpose2.cpp | 2 +- SYCL/ESIMD/matrix_transpose_glb.cpp | 2 +- SYCL/ESIMD/matrix_transpose_usm.cpp | 2 +- .../Inputs/noinline_args_size_common.hpp | 2 +- SYCL/ESIMD/noinline_call_from_func.cpp | 2 +- SYCL/ESIMD/noinline_call_recursive.cpp | 2 +- SYCL/ESIMD/printf.cpp | 4 +- .../ESIMD/private_memory/Inputs/pm_common.cpp | 2 +- SYCL/ESIMD/reduction.cpp | 2 +- .../regression/big_const_initializer.cpp | 2 +- .../regression/noinline_bypointers_vadd.cpp | 2 +- SYCL/ESIMD/regression/operator_decrement.cpp | 2 +- SYCL/ESIMD/regression/replicate_bug.cpp | 2 +- SYCL/ESIMD/regression/store_zero_const.cpp | 2 +- .../regression/usm_gather_scatter_32.cpp | 2 +- .../ESIMD/regression/variable_gather_mask.cpp | 2 +- SYCL/ESIMD/slm_barrier.cpp | 2 +- SYCL/ESIMD/slm_split_barrier.cpp | 2 +- .../Inputs/spec-const-2020-common.hpp | 2 +- SYCL/ESIMD/stencil2.cpp | 2 +- SYCL/ESIMD/sycl_esimd_mix.cpp | 2 +- SYCL/ESIMD/test_id_3d.cpp | 2 +- SYCL/ESIMD/usm_gather_scatter_rgba.cpp | 2 +- SYCL/ESIMD/vadd_1d.cpp | 2 +- SYCL/ESIMD/vadd_2d.cpp | 2 +- SYCL/ESIMD/vadd_2d_acc.cpp | 2 +- SYCL/ESIMD/vadd_half.cpp | 2 +- SYCL/ESIMD/vadd_raw_send.cpp | 2 +- SYCL/ESIMD/vadd_usm.cpp | 2 +- 133 files changed, 151 insertions(+), 156 deletions(-) diff --git a/SYCL/ESIMD/BitonicSortK.cpp b/SYCL/ESIMD/BitonicSortK.cpp index d63a068ba3..d47db53661 100644 --- a/SYCL/ESIMD/BitonicSortK.cpp +++ b/SYCL/ESIMD/BitonicSortK.cpp @@ -700,7 +700,7 @@ int main(int argc, char *argv[]) { int size = 1 << LOG2_ELEMENTS; cout << "BitonicSort (" << size << ") Start..." << std::endl; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); BitonicSort bitonicSort; diff --git a/SYCL/ESIMD/BitonicSortKv2.cpp b/SYCL/ESIMD/BitonicSortKv2.cpp index f0e12f3c37..6f9347ee90 100644 --- a/SYCL/ESIMD/BitonicSortKv2.cpp +++ b/SYCL/ESIMD/BitonicSortKv2.cpp @@ -620,7 +620,7 @@ int main(int argc, char *argv[]) { sycl::property_list props{sycl::property::queue::enable_profiling{}, sycl::property::queue::in_order()}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), props); BitonicSort bitonicSort; diff --git a/SYCL/ESIMD/PrefixSum.cpp b/SYCL/ESIMD/PrefixSum.cpp index 1460c1efc6..ee6a90db52 100644 --- a/SYCL/ESIMD/PrefixSum.cpp +++ b/SYCL/ESIMD/PrefixSum.cpp @@ -391,7 +391,7 @@ int main(int argc, char *argv[]) { sycl::range<2> LocalRange{1, 1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::in_order()); auto dev = q.get_device(); diff --git a/SYCL/ESIMD/Prefix_Local_sum1.cpp b/SYCL/ESIMD/Prefix_Local_sum1.cpp index 93f00303f4..f0f02f2f7f 100644 --- a/SYCL/ESIMD/Prefix_Local_sum1.cpp +++ b/SYCL/ESIMD/Prefix_Local_sum1.cpp @@ -125,7 +125,7 @@ int main(int argc, char *argv[]) { sycl::range<2> LocalRange{1, 1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); auto dev = q.get_device(); diff --git a/SYCL/ESIMD/Prefix_Local_sum2.cpp b/SYCL/ESIMD/Prefix_Local_sum2.cpp index 613e3682b1..752742006f 100644 --- a/SYCL/ESIMD/Prefix_Local_sum2.cpp +++ b/SYCL/ESIMD/Prefix_Local_sum2.cpp @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) { sycl::range<2> LocalRange{1, 1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); auto dev = q.get_device(); diff --git a/SYCL/ESIMD/Prefix_Local_sum3.cpp b/SYCL/ESIMD/Prefix_Local_sum3.cpp index 63ba03626a..e69a0b9317 100644 --- a/SYCL/ESIMD/Prefix_Local_sum3.cpp +++ b/SYCL/ESIMD/Prefix_Local_sum3.cpp @@ -324,7 +324,7 @@ int main(int argc, char *argv[]) { sycl::range<2> LocalRange{1, 1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); auto dev = q.get_device(); diff --git a/SYCL/ESIMD/Stencil.cpp b/SYCL/ESIMD/Stencil.cpp index 38b22dbcda..632c1935ad 100644 --- a/SYCL/ESIMD/Stencil.cpp +++ b/SYCL/ESIMD/Stencil.cpp @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) { << std::endl; sycl::range<2> LocalRange{1, 1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); auto dev = q.get_device(); diff --git a/SYCL/ESIMD/acc_gather_scatter_rgba.hpp b/SYCL/ESIMD/acc_gather_scatter_rgba.hpp index 8e52861892..96b537da1c 100644 --- a/SYCL/ESIMD/acc_gather_scatter_rgba.hpp +++ b/SYCL/ESIMD/acc_gather_scatter_rgba.hpp @@ -161,7 +161,7 @@ template bool test(queue q) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/accessor.hpp b/SYCL/ESIMD/accessor.hpp index 7075877b68..115697a86f 100644 --- a/SYCL/ESIMD/accessor.hpp +++ b/SYCL/ESIMD/accessor.hpp @@ -31,7 +31,7 @@ int main() { } try { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); buffer buf0(data0, range<1>(VL)); buffer buf1(data1, range<1>(VL)); diff --git a/SYCL/ESIMD/accessor_gather_scatter.hpp b/SYCL/ESIMD/accessor_gather_scatter.hpp index 4ea6a09817..a8a0254e96 100644 --- a/SYCL/ESIMD/accessor_gather_scatter.hpp +++ b/SYCL/ESIMD/accessor_gather_scatter.hpp @@ -108,7 +108,7 @@ template bool test(queue q) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/accessor_load_store.hpp b/SYCL/ESIMD/accessor_load_store.hpp index 4dde24df1a..7bd0ff83f6 100644 --- a/SYCL/ESIMD/accessor_load_store.hpp +++ b/SYCL/ESIMD/accessor_load_store.hpp @@ -98,7 +98,7 @@ int main(int argc, char **argv) { size = size == 0 ? 128 : size; } std::cout << "Using size=" << size << "\n"; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/aot_mixed.cpp b/SYCL/ESIMD/aot_mixed.cpp index 0f237a558a..8943f5ba79 100644 --- a/SYCL/ESIMD/aot_mixed.cpp +++ b/SYCL/ESIMD/aot_mixed.cpp @@ -152,7 +152,7 @@ bool test_sycl(queue q) { #endif int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/ballot.cpp b/SYCL/ESIMD/api/ballot.cpp index fe1cf0310c..d2bfaa487d 100755 --- a/SYCL/ESIMD/api/ballot.cpp +++ b/SYCL/ESIMD/api/ballot.cpp @@ -88,7 +88,7 @@ template bool test(queue &Q) { } int main(void) { - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto Dev = Q.get_device(); std::cout << "Running on " << Dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/bin_and_cmp_ops_heavy.cpp b/SYCL/ESIMD/api/bin_and_cmp_ops_heavy.cpp index da908391f8..52588348b0 100644 --- a/SYCL/ESIMD/api/bin_and_cmp_ops_heavy.cpp +++ b/SYCL/ESIMD/api/bin_and_cmp_ops_heavy.cpp @@ -255,7 +255,7 @@ template using IDf = init_default; template using ISf = init_for_shift; int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/esimd_bit_ops.cpp b/SYCL/ESIMD/api/esimd_bit_ops.cpp index d33984cd4d..657c95ee2e 100644 --- a/SYCL/ESIMD/api/esimd_bit_ops.cpp +++ b/SYCL/ESIMD/api/esimd_bit_ops.cpp @@ -120,7 +120,7 @@ template bool test(queue q) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/esimd_merge.cpp b/SYCL/ESIMD/api/esimd_merge.cpp index 38a15b8386..bc2007b565 100644 --- a/SYCL/ESIMD/api/esimd_merge.cpp +++ b/SYCL/ESIMD/api/esimd_merge.cpp @@ -38,7 +38,7 @@ int main(void) { constexpr unsigned SUB_VL = VL / FACTOR / FACTOR; constexpr unsigned Size = VL * NUM_THREADS; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/esimd_pack_unpack_mask.cpp b/SYCL/ESIMD/api/esimd_pack_unpack_mask.cpp index 91a6be6b55..4369a3d642 100644 --- a/SYCL/ESIMD/api/esimd_pack_unpack_mask.cpp +++ b/SYCL/ESIMD/api/esimd_pack_unpack_mask.cpp @@ -111,7 +111,7 @@ template bool test(queue q) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/esimd_rgba_smoke.cpp b/SYCL/ESIMD/api/esimd_rgba_smoke.cpp index 73c3c0ee03..f7671d515b 100644 --- a/SYCL/ESIMD/api/esimd_rgba_smoke.cpp +++ b/SYCL/ESIMD/api/esimd_rgba_smoke.cpp @@ -200,7 +200,7 @@ template bool test(queue q) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_array_core.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_array_core.cpp index 984969249d..feaed2f9c1 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_array_core.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_array_core.cpp @@ -27,7 +27,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_array_fp_extra.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_array_fp_extra.cpp index 27e9a3a568..1aa0b9f1c8 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_array_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_array_fp_extra.cpp @@ -27,7 +27,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_broadcast_core.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_broadcast_core.cpp index 02fd350d85..53a3e9aa69 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_broadcast_core.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_broadcast_core.cpp @@ -28,7 +28,7 @@ using namespace sycl::ext::intel::esimd; using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_broadcast_fp_extra.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_broadcast_fp_extra.cpp index 2f4b7c6b57..3770c48a1a 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_broadcast_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_broadcast_fp_extra.cpp @@ -31,7 +31,7 @@ using namespace sycl::ext::intel::esimd; using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_converting_core.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_converting_core.cpp index 69965f7580..9978df13a3 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_converting_core.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_converting_core.cpp @@ -28,7 +28,7 @@ using namespace sycl::ext::intel::experimental::esimd; using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_converting_fp_extra.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_converting_fp_extra.cpp index 39f9be9fcd..dc92626058 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_converting_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_converting_fp_extra.cpp @@ -28,7 +28,7 @@ using namespace sycl::ext::intel::experimental::esimd; using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_copy_core.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_copy_core.cpp index 6062f00138..564d9af4b8 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_copy_core.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_copy_core.cpp @@ -27,7 +27,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_copy_fp_extra.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_copy_fp_extra.cpp index 9815900eb6..253719c54d 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_copy_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_copy_fp_extra.cpp @@ -27,7 +27,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_default_core.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_default_core.cpp index fda84f942f..378cb64f6c 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_default_core.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_default_core.cpp @@ -27,7 +27,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_default_fp_extra.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_default_fp_extra.cpp index cdb47bfd15..36dfbb5718 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_default_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_default_fp_extra.cpp @@ -27,7 +27,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp.cpp index 27393d8ade..b81c5e1831 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp.cpp @@ -30,7 +30,7 @@ using namespace esimd_test::api::functional; using init_val = ctors::init_val; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp_extra.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp_extra.cpp index 014a1659ed..622c93aeb5 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_fill_accuracy_fp_extra.cpp @@ -29,7 +29,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_fill_core.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_fill_core.cpp index 96a285d392..920c09289d 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_fill_core.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_fill_core.cpp @@ -27,7 +27,7 @@ using namespace esimd_test::api::functional; using init_val = ctors::init_val; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_fill_fp_extra.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_fill_fp_extra.cpp index 740175f154..1d34715c86 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_fill_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_fill_fp_extra.cpp @@ -26,7 +26,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_load_acc_core.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_load_acc_core.cpp index ff2f4bb074..b7bfda4988 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_load_acc_core.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_load_acc_core.cpp @@ -27,7 +27,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_load_acc_fp_extra.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_load_acc_fp_extra.cpp index 797ff009c8..4349aef399 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_load_acc_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_load_acc_fp_extra.cpp @@ -27,7 +27,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_load_usm_core.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_load_usm_core.cpp index ce57ae120e..78cb139646 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_load_usm_core.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_load_usm_core.cpp @@ -26,7 +26,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_load_usm_fp_extra.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_load_usm_fp_extra.cpp index 4b960879c1..5d0d11b9f4 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_load_usm_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_load_usm_fp_extra.cpp @@ -26,7 +26,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_move_core.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_move_core.cpp index 7bfa6666df..3715e7917c 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_move_core.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_move_core.cpp @@ -42,7 +42,7 @@ int main(int, char **) { unnamed_type_pack::generate(); - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); // Run test for all combinations possible diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_move_fp_extra.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_move_fp_extra.cpp index 6fcd17c450..4538173ef6 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_move_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_move_fp_extra.cpp @@ -36,7 +36,7 @@ int main(int, char **) { unnamed_type_pack::generate(); - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); // Run test for all combinations possible diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_vector_core.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_vector_core.cpp index 0f8f12e275..e6d9b14c52 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_vector_core.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_vector_core.cpp @@ -27,7 +27,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); sycl::device device = queue.get_device(); diff --git a/SYCL/ESIMD/api/functional/ctors/ctor_vector_fp_extra.cpp b/SYCL/ESIMD/api/functional/ctors/ctor_vector_fp_extra.cpp index 30798ef5e2..9f469c2803 100644 --- a/SYCL/ESIMD/api/functional/ctors/ctor_vector_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/ctors/ctor_vector_fp_extra.cpp @@ -27,7 +27,7 @@ using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/functional/functions/functions_select_2d_core.cpp b/SYCL/ESIMD/api/functional/functions/functions_select_2d_core.cpp index 13bc7cf562..14442c17b9 100644 --- a/SYCL/ESIMD/api/functional/functions/functions_select_2d_core.cpp +++ b/SYCL/ESIMD/api/functional/functions/functions_select_2d_core.cpp @@ -27,7 +27,7 @@ using namespace sycl::ext::intel::experimental::esimd; using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = functions::run_test_for_types(queue); diff --git a/SYCL/ESIMD/api/functional/functions/functions_select_2d_fp_extra.cpp b/SYCL/ESIMD/api/functional/functions/functions_select_2d_fp_extra.cpp index bdd68484f2..1619ddea47 100644 --- a/SYCL/ESIMD/api/functional/functions/functions_select_2d_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/functions/functions_select_2d_fp_extra.cpp @@ -30,7 +30,7 @@ using namespace sycl::ext::intel::experimental::esimd; using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = functions::run_test_for_types(queue); diff --git a/SYCL/ESIMD/api/functional/functions/functions_select_lvalue_core.cpp b/SYCL/ESIMD/api/functional/functions/functions_select_lvalue_core.cpp index 265b15a0b0..691519f9d4 100644 --- a/SYCL/ESIMD/api/functional/functions/functions_select_lvalue_core.cpp +++ b/SYCL/ESIMD/api/functional/functions/functions_select_lvalue_core.cpp @@ -30,7 +30,7 @@ using namespace sycl::ext::intel::experimental::esimd; using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = diff --git a/SYCL/ESIMD/api/functional/functions/functions_select_lvalue_fp_extra.cpp b/SYCL/ESIMD/api/functional/functions/functions_select_lvalue_fp_extra.cpp index ba71d3f0cf..4af233b879 100644 --- a/SYCL/ESIMD/api/functional/functions/functions_select_lvalue_fp_extra.cpp +++ b/SYCL/ESIMD/api/functional/functions/functions_select_lvalue_fp_extra.cpp @@ -27,7 +27,7 @@ using namespace sycl::ext::intel::experimental::esimd; using namespace esimd_test::api::functional; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = functions::run_test_for_types class run_test { }; int main(int, char **) { - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool passed = true; diff --git a/SYCL/ESIMD/api/replicate_smoke.cpp b/SYCL/ESIMD/api/replicate_smoke.cpp index c9985edc93..a48e0ed70c 100644 --- a/SYCL/ESIMD/api/replicate_smoke.cpp +++ b/SYCL/ESIMD/api/replicate_smoke.cpp @@ -173,7 +173,7 @@ template bool test(queue q) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; bool passed = true; diff --git a/SYCL/ESIMD/api/saturation_smoke.cpp b/SYCL/ESIMD/api/saturation_smoke.cpp index e6aa049160..50bc07dda8 100644 --- a/SYCL/ESIMD/api/saturation_smoke.cpp +++ b/SYCL/ESIMD/api/saturation_smoke.cpp @@ -180,7 +180,7 @@ template struct FpToFp : public DataMgr { // clang-format on int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/simd_any_all.cpp b/SYCL/ESIMD/api/simd_any_all.cpp index 3c826dd152..a9fb7d8029 100644 --- a/SYCL/ESIMD/api/simd_any_all.cpp +++ b/SYCL/ESIMD/api/simd_any_all.cpp @@ -139,7 +139,7 @@ template bool test(queue q) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/simd_binop_integer_promotion.cpp b/SYCL/ESIMD/api/simd_binop_integer_promotion.cpp index 7334aaa995..3f3c2917af 100644 --- a/SYCL/ESIMD/api/simd_binop_integer_promotion.cpp +++ b/SYCL/ESIMD/api/simd_binop_integer_promotion.cpp @@ -102,7 +102,7 @@ template bool test(queue q) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/simd_copy_to_from.cpp b/SYCL/ESIMD/api/simd_copy_to_from.cpp index 2113772cd8..94f007d6f5 100644 --- a/SYCL/ESIMD/api/simd_copy_to_from.cpp +++ b/SYCL/ESIMD/api/simd_copy_to_from.cpp @@ -226,7 +226,7 @@ template bool testAcc(queue &Q) { } int main(void) { - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto Dev = Q.get_device(); std::cout << "Running on " << Dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/simd_mask.cpp b/SYCL/ESIMD/api/simd_mask.cpp index 4eb441961d..4c6300ac29 100644 --- a/SYCL/ESIMD/api/simd_mask.cpp +++ b/SYCL/ESIMD/api/simd_mask.cpp @@ -328,7 +328,7 @@ template struct simd_mask_api_test { }; int main(int argc, char **argv) { - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto Dev = Q.get_device(); std::cout << "Running on " << Dev.get_info() << "\n"; bool Passed = true; diff --git a/SYCL/ESIMD/api/simd_memory_access.cpp b/SYCL/ESIMD/api/simd_memory_access.cpp index 4d42011169..224fc9b6e5 100644 --- a/SYCL/ESIMD/api/simd_memory_access.cpp +++ b/SYCL/ESIMD/api/simd_memory_access.cpp @@ -150,7 +150,7 @@ int main(int argc, char **argv) { return 2; } std::cout << "Using size=" << size << "\n"; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/simd_negation_operator.cpp b/SYCL/ESIMD/api/simd_negation_operator.cpp index b14d326e02..d0f6ab20b7 100644 --- a/SYCL/ESIMD/api/simd_negation_operator.cpp +++ b/SYCL/ESIMD/api/simd_negation_operator.cpp @@ -80,7 +80,7 @@ bool test(queue q, const std::array &input, } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/simd_subscript_operator.cpp b/SYCL/ESIMD/api/simd_subscript_operator.cpp index 481fab3b04..33e1ce5588 100644 --- a/SYCL/ESIMD/api/simd_subscript_operator.cpp +++ b/SYCL/ESIMD/api/simd_subscript_operator.cpp @@ -93,7 +93,7 @@ template bool test(queue &q) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/simd_view_copy_move_assign.cpp b/SYCL/ESIMD/api/simd_view_copy_move_assign.cpp index 5cd4f4eb5a..eff3eb3f3d 100644 --- a/SYCL/ESIMD/api/simd_view_copy_move_assign.cpp +++ b/SYCL/ESIMD/api/simd_view_copy_move_assign.cpp @@ -157,7 +157,7 @@ template bool testT(queue &q) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; bool passed = true; diff --git a/SYCL/ESIMD/api/simd_view_negation_operator.cpp b/SYCL/ESIMD/api/simd_view_negation_operator.cpp index 441337d6af..1026d71201 100644 --- a/SYCL/ESIMD/api/simd_view_negation_operator.cpp +++ b/SYCL/ESIMD/api/simd_view_negation_operator.cpp @@ -81,7 +81,7 @@ bool test(queue q, const std::array &input, } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/simd_view_select_2d_fp.cpp b/SYCL/ESIMD/api/simd_view_select_2d_fp.cpp index c397945845..865d5f2066 100644 --- a/SYCL/ESIMD/api/simd_view_select_2d_fp.cpp +++ b/SYCL/ESIMD/api/simd_view_select_2d_fp.cpp @@ -16,7 +16,7 @@ #include "simd_view_select_2d.hpp" int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/simd_view_select_2d_int.cpp b/SYCL/ESIMD/api/simd_view_select_2d_int.cpp index 3fa106b716..61f715b83f 100644 --- a/SYCL/ESIMD/api/simd_view_select_2d_int.cpp +++ b/SYCL/ESIMD/api/simd_view_select_2d_int.cpp @@ -16,7 +16,7 @@ #include "simd_view_select_2d.hpp" int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/simd_view_subscript_operator.cpp b/SYCL/ESIMD/api/simd_view_subscript_operator.cpp index b9923fa25b..4d80ea82a8 100644 --- a/SYCL/ESIMD/api/simd_view_subscript_operator.cpp +++ b/SYCL/ESIMD/api/simd_view_subscript_operator.cpp @@ -96,7 +96,7 @@ template bool test(queue &q) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/slm_gather_scatter.cpp b/SYCL/ESIMD/api/slm_gather_scatter.cpp index 8a5f3571cd..20db8e9bde 100644 --- a/SYCL/ESIMD/api/slm_gather_scatter.cpp +++ b/SYCL/ESIMD/api/slm_gather_scatter.cpp @@ -121,7 +121,7 @@ template bool test(queue q) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/slm_gather_scatter_heavy.cpp b/SYCL/ESIMD/api/slm_gather_scatter_heavy.cpp index 9a1bd93098..83f1d188a4 100644 --- a/SYCL/ESIMD/api/slm_gather_scatter_heavy.cpp +++ b/SYCL/ESIMD/api/slm_gather_scatter_heavy.cpp @@ -441,7 +441,7 @@ template bool test_vl1(queue q) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/slm_gather_scatter_rgba.cpp b/SYCL/ESIMD/api/slm_gather_scatter_rgba.cpp index bb4db5e5a8..859003557e 100644 --- a/SYCL/ESIMD/api/slm_gather_scatter_rgba.cpp +++ b/SYCL/ESIMD/api/slm_gather_scatter_rgba.cpp @@ -177,7 +177,7 @@ template bool test(queue q) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/svm_gather_scatter.cpp b/SYCL/ESIMD/api/svm_gather_scatter.cpp index 87f37fe094..17c62dc2a2 100644 --- a/SYCL/ESIMD/api/svm_gather_scatter.cpp +++ b/SYCL/ESIMD/api/svm_gather_scatter.cpp @@ -74,7 +74,7 @@ template bool test(queue &Q) { } int main(void) { - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto Dev = Q.get_device(); std::cout << "Running on " << Dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/api/unary_ops_heavy.cpp b/SYCL/ESIMD/api/unary_ops_heavy.cpp index bc86616e61..c40ce9d071 100644 --- a/SYCL/ESIMD/api/unary_ops_heavy.cpp +++ b/SYCL/ESIMD/api/unary_ops_heavy.cpp @@ -152,7 +152,7 @@ bool test(Ops ops, queue &q) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/dp4a.cpp b/SYCL/ESIMD/dp4a.cpp index aecd971ff1..730ad7a831 100644 --- a/SYCL/ESIMD/dp4a.cpp +++ b/SYCL/ESIMD/dp4a.cpp @@ -23,7 +23,7 @@ int main(void) { constexpr unsigned GROUPSIZE = 1; using DTYPE = unsigned int; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/dpas/dpas_test1.cpp b/SYCL/ESIMD/dpas/dpas_test1.cpp index ad4d6cb63a..865241f73f 100644 --- a/SYCL/ESIMD/dpas/dpas_test1.cpp +++ b/SYCL/ESIMD/dpas/dpas_test1.cpp @@ -23,7 +23,7 @@ int main(void) { constexpr unsigned VL = 16; constexpr unsigned GroupSize = 1; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/dpas/dpas_test2.cpp b/SYCL/ESIMD/dpas/dpas_test2.cpp index ab0653ccab..53539fdea1 100644 --- a/SYCL/ESIMD/dpas/dpas_test2.cpp +++ b/SYCL/ESIMD/dpas/dpas_test2.cpp @@ -23,7 +23,7 @@ int main(void) { constexpr unsigned VL = 16; constexpr unsigned GroupSize = 1; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/dpas/dpas_tf32.cpp b/SYCL/ESIMD/dpas/dpas_tf32.cpp index b9ee59a9d9..00da75d225 100644 --- a/SYCL/ESIMD/dpas/dpas_tf32.cpp +++ b/SYCL/ESIMD/dpas/dpas_tf32.cpp @@ -24,7 +24,7 @@ using namespace sycl::ext::intel::esimd; using namespace sycl::ext::intel::experimental::esimd; int main() { - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); constexpr int REPEAT_COUNT = 8; constexpr int SYSTOLIC_DEPTH = 8; diff --git a/SYCL/ESIMD/dpas/dpasw_test.cpp b/SYCL/ESIMD/dpas/dpasw_test.cpp index e1bfda68c0..1a8892ff6d 100644 --- a/SYCL/ESIMD/dpas/dpasw_test.cpp +++ b/SYCL/ESIMD/dpas/dpasw_test.cpp @@ -23,7 +23,7 @@ int main(void) { constexpr unsigned VL = 16; constexpr unsigned GroupSize = 2; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/esimd_check_vc_codegen.cpp b/SYCL/ESIMD/esimd_check_vc_codegen.cpp index 73c3473531..fbf60a2482 100644 --- a/SYCL/ESIMD/esimd_check_vc_codegen.cpp +++ b/SYCL/ESIMD/esimd_check_vc_codegen.cpp @@ -44,7 +44,7 @@ int main(void) { // We need that many threads in each group range<1> LocalRange{1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/esimd_test_utils.hpp b/SYCL/ESIMD/esimd_test_utils.hpp index 453cb83b9a..0dc80ed460 100644 --- a/SYCL/ESIMD/esimd_test_utils.hpp +++ b/SYCL/ESIMD/esimd_test_utils.hpp @@ -26,33 +26,28 @@ using namespace sycl; namespace esimd_test { -// This is the class provided to SYCL runtime by the application to decide +// This is function provided to SYCL runtime by the application to decide // on which device to run, or whether to run at all. // When selecting a device, SYCL runtime first takes (1) a selector provided by // the program or a default one and (2) the set of all available devices. Then -// it passes each device to the '()' operator of the selector. Device, for -// which '()' returned the highest number, is selected. If a negative number -// was returned for all devices, then the selection process will cause an -// exception. -class ESIMDSelector : public device_selector { - // Require GPU device unless HOST is requested in SYCL_DEVICE_FILTER env - virtual int operator()(const device &device) const { - if (const char *dev_filter = getenv("SYCL_DEVICE_FILTER")) { - std::string filter_string(dev_filter); - if (filter_string.find("gpu") != std::string::npos) - return device.is_gpu() ? 1000 : -1; - if (filter_string.find("host") != std::string::npos) - return device.is_host() ? 1000 : -1; - std::cerr - << "Supported 'SYCL_DEVICE_FILTER' env var values are 'gpu' and " - "'host', '" - << filter_string << "' does not contain such substrings.\n"; - return -1; - } - // If "SYCL_DEVICE_FILTER" not defined, only allow gpu device - return device.is_gpu() ? 1000 : -1; +// it passes each device to the selector. A device for which the highest number +// is returned is selected. If a negative number was returned for all devices, +// then the selection process will cause an exception. +inline int ESIMDSelector(const device &device) { + if (const char *dev_filter = getenv("SYCL_DEVICE_FILTER")) { + std::string filter_string(dev_filter); + if (filter_string.find("gpu") != std::string::npos) + return device.is_gpu() ? 1000 : -1; + if (filter_string.find("host") != std::string::npos) + return device.is_host() ? 1000 : -1; + std::cerr << "Supported 'SYCL_DEVICE_FILTER' env var values are 'gpu' and " + "'host', '" + << filter_string << "' does not contain such substrings.\n"; + return -1; } -}; + // If "SYCL_DEVICE_FILTER" not defined, only allow gpu device + return device.is_gpu() ? 1000 : -1; +} inline auto createExceptionHandler() { return [](exception_list l) { diff --git a/SYCL/ESIMD/ext_math.cpp b/SYCL/ESIMD/ext_math.cpp index c515cbd29a..521123259d 100644 --- a/SYCL/ESIMD/ext_math.cpp +++ b/SYCL/ESIMD/ext_math.cpp @@ -460,7 +460,7 @@ template bool testSYCL(queue &Q) { // --- The entry point int main(void) { - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto Dev = Q.get_device(); std::cout << "Running on " << Dev.get_info() << "\n"; bool Pass = true; diff --git a/SYCL/ESIMD/fp_args_size/Inputs/fp_args_size_common.hpp b/SYCL/ESIMD/fp_args_size/Inputs/fp_args_size_common.hpp index 17b759c1b5..242a44cfe9 100644 --- a/SYCL/ESIMD/fp_args_size/Inputs/fp_args_size_common.hpp +++ b/SYCL/ESIMD/fp_args_size/Inputs/fp_args_size_common.hpp @@ -36,7 +36,7 @@ ESIMD_NOINLINE TC add(TA A, TB B) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/fp_call_from_func.cpp b/SYCL/ESIMD/fp_call_from_func.cpp index 153c62c2d1..cfaadd17ec 100644 --- a/SYCL/ESIMD/fp_call_from_func.cpp +++ b/SYCL/ESIMD/fp_call_from_func.cpp @@ -39,7 +39,7 @@ template ESIMD_NOINLINE void test(AccTy acc, int A, int B) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/fp_call_recursive.cpp b/SYCL/ESIMD/fp_call_recursive.cpp index f772581b4e..fc3a62adf7 100644 --- a/SYCL/ESIMD/fp_call_recursive.cpp +++ b/SYCL/ESIMD/fp_call_recursive.cpp @@ -33,7 +33,7 @@ ESIMD_NOINLINE unsigned add(unsigned A, unsigned B, unsigned C) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/fp_in_phi.cpp b/SYCL/ESIMD/fp_in_phi.cpp index 4ffc857fa3..8089b460ad 100644 --- a/SYCL/ESIMD/fp_in_phi.cpp +++ b/SYCL/ESIMD/fp_in_phi.cpp @@ -83,7 +83,7 @@ bool test(queue q, bool flag) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/fp_in_select.cpp b/SYCL/ESIMD/fp_in_select.cpp index b050f0989c..e0f54db788 100644 --- a/SYCL/ESIMD/fp_in_select.cpp +++ b/SYCL/ESIMD/fp_in_select.cpp @@ -71,7 +71,7 @@ bool test(queue q, bool flag) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/histogram.cpp b/SYCL/ESIMD/histogram.cpp index ef3bdd2ac1..5a393c9a11 100644 --- a/SYCL/ESIMD/histogram.cpp +++ b/SYCL/ESIMD/histogram.cpp @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) { // Read in image luma plane // Allocate Input Buffer - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); auto dev = q.get_device(); diff --git a/SYCL/ESIMD/histogram_256_slm.cpp b/SYCL/ESIMD/histogram_256_slm.cpp index 85092d5671..27d1cd7ea5 100644 --- a/SYCL/ESIMD/histogram_256_slm.cpp +++ b/SYCL/ESIMD/histogram_256_slm.cpp @@ -104,7 +104,7 @@ int CheckHistogram(unsigned int *cpu_histogram, unsigned int *gpu_histogram) { } int main() { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), sycl::property::queue::enable_profiling{}); const char *input_file = nullptr; diff --git a/SYCL/ESIMD/histogram_256_slm_spec_2020.cpp b/SYCL/ESIMD/histogram_256_slm_spec_2020.cpp index 29db543127..4d3b673dba 100644 --- a/SYCL/ESIMD/histogram_256_slm_spec_2020.cpp +++ b/SYCL/ESIMD/histogram_256_slm_spec_2020.cpp @@ -104,7 +104,7 @@ class NumBlocksConst; class histogram_slm; int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), sycl::property::queue::enable_profiling{}); auto dev = q.get_device(); auto ctxt = q.get_context(); diff --git a/SYCL/ESIMD/histogram_2d.cpp b/SYCL/ESIMD/histogram_2d.cpp index 3d44cac9d8..7d0ff309d8 100644 --- a/SYCL/ESIMD/histogram_2d.cpp +++ b/SYCL/ESIMD/histogram_2d.cpp @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) { // Read in image luma plane // Allocate Input Buffer - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); auto dev = q.get_device(); diff --git a/SYCL/ESIMD/histogram_raw_send.cpp b/SYCL/ESIMD/histogram_raw_send.cpp index 0881a3d903..4f3202c1b7 100644 --- a/SYCL/ESIMD/histogram_raw_send.cpp +++ b/SYCL/ESIMD/histogram_raw_send.cpp @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) { // Read in image luma plane // Allocate Input Buffer - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), sycl::property::queue::enable_profiling{}); auto dev = q.get_device(); diff --git a/SYCL/ESIMD/kmeans/kmeans.cpp b/SYCL/ESIMD/kmeans/kmeans.cpp index 76e43c874b..ab80459742 100644 --- a/SYCL/ESIMD/kmeans/kmeans.cpp +++ b/SYCL/ESIMD/kmeans/kmeans.cpp @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) { sycl::property_list props{property::queue::enable_profiling{}, property::queue::in_order()}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), props); auto points4 = malloc_shared(NUM_POINTS / SIMD_SIZE, q); diff --git a/SYCL/ESIMD/linear/linear.cpp b/SYCL/ESIMD/linear/linear.cpp index 6cff4a1459..8892c0741b 100644 --- a/SYCL/ESIMD/linear/linear.cpp +++ b/SYCL/ESIMD/linear/linear.cpp @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) { // Number of workitems in a workgroup range<2> LocalRange{1, 1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); auto dev = q.get_device(); diff --git a/SYCL/ESIMD/lsc/Inputs/lsc_surf.hpp b/SYCL/ESIMD/lsc/Inputs/lsc_surf.hpp index 7e24874ca1..435c7845d4 100644 --- a/SYCL/ESIMD/lsc/Inputs/lsc_surf.hpp +++ b/SYCL/ESIMD/lsc/Inputs/lsc_surf.hpp @@ -22,7 +22,7 @@ int main() { auto constexpr SIMDSize = unsigned{4}; auto q = - queue{esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()}; + queue{esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()}; auto device = q.get_device(); std::cout << "Device name: " << device.get_info() << std::endl; diff --git a/SYCL/ESIMD/lsc/atomic_smoke.cpp b/SYCL/ESIMD/lsc/atomic_smoke.cpp index e48e2905fc..2c1753d0fa 100644 --- a/SYCL/ESIMD/lsc/atomic_smoke.cpp +++ b/SYCL/ESIMD/lsc/atomic_smoke.cpp @@ -482,7 +482,7 @@ bool test_int_types(queue q, const Config &cfg) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/lsc/lsc_slm.cpp b/SYCL/ESIMD/lsc/lsc_slm.cpp index ef8bdb5f6d..a3dd3c7e3c 100644 --- a/SYCL/ESIMD/lsc/lsc_slm.cpp +++ b/SYCL/ESIMD/lsc/lsc_slm.cpp @@ -27,7 +27,7 @@ int main() { auto constexpr SIMDSize = unsigned{4}; auto q = - queue{esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()}; + queue{esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()}; auto device = q.get_device(); std::cout << "Device name: " << device.get_info() << std::endl; diff --git a/SYCL/ESIMD/lsc/lsc_usm.cpp b/SYCL/ESIMD/lsc/lsc_usm.cpp index 5a790cfa66..a64389f348 100644 --- a/SYCL/ESIMD/lsc/lsc_usm.cpp +++ b/SYCL/ESIMD/lsc/lsc_usm.cpp @@ -27,7 +27,7 @@ int main() { auto constexpr SIMDSize = unsigned{4}; auto q = - queue{esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()}; + queue{esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()}; auto device = q.get_device(); std::cout << "Device name: " << device.get_info() << std::endl; diff --git a/SYCL/ESIMD/lsc/lsc_usm_2d.cpp b/SYCL/ESIMD/lsc/lsc_usm_2d.cpp index 5c13455785..7730567fa5 100644 --- a/SYCL/ESIMD/lsc/lsc_usm_2d.cpp +++ b/SYCL/ESIMD/lsc/lsc_usm_2d.cpp @@ -30,7 +30,7 @@ int main() { unsigned y = 0; unsigned size = data_height * data_pitch; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto device = q.get_device(); std::cout << "Device name: " << device.get_info() << std::endl; diff --git a/SYCL/ESIMD/lsc/lsc_usm_atomic_cachehint.cpp b/SYCL/ESIMD/lsc/lsc_usm_atomic_cachehint.cpp index 91374f693e..c46d8faf15 100644 --- a/SYCL/ESIMD/lsc/lsc_usm_atomic_cachehint.cpp +++ b/SYCL/ESIMD/lsc/lsc_usm_atomic_cachehint.cpp @@ -43,7 +43,7 @@ int main(void) { constexpr size_t LocalRange = 4; constexpr size_t GlobalRange = 64; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/mandelbrot/mandelbrot.cpp b/SYCL/ESIMD/mandelbrot/mandelbrot.cpp index dd8731668a..12d7189ed6 100644 --- a/SYCL/ESIMD/mandelbrot/mandelbrot.cpp +++ b/SYCL/ESIMD/mandelbrot/mandelbrot.cpp @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) { double kernel_times = 0; unsigned num_iters = 10; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); try { diff --git a/SYCL/ESIMD/mandelbrot/mandelbrot_spec.cpp b/SYCL/ESIMD/mandelbrot/mandelbrot_spec.cpp index 02d42f9f30..989dc7fd4e 100644 --- a/SYCL/ESIMD/mandelbrot/mandelbrot_spec.cpp +++ b/SYCL/ESIMD/mandelbrot/mandelbrot_spec.cpp @@ -119,7 +119,7 @@ int main(int argc, char *argv[]) { // Number of workitems in a workgroup sycl::range<2> LocalRange{1, 1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); auto dev = q.get_device(); diff --git a/SYCL/ESIMD/matrix_transpose.cpp b/SYCL/ESIMD/matrix_transpose.cpp index ebe14bc029..499183db31 100644 --- a/SYCL/ESIMD/matrix_transpose.cpp +++ b/SYCL/ESIMD/matrix_transpose.cpp @@ -274,7 +274,7 @@ ESIMD_INLINE void transpose16(AccessorTy buf, int MZ, int block_col, bool runTest(unsigned MZ, unsigned block_size, unsigned num_iters, double &kernel_times, double &total_times) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); int *M = new int[MZ * MZ]; diff --git a/SYCL/ESIMD/matrix_transpose2.cpp b/SYCL/ESIMD/matrix_transpose2.cpp index 6f0df0e28c..00dd924a9d 100644 --- a/SYCL/ESIMD/matrix_transpose2.cpp +++ b/SYCL/ESIMD/matrix_transpose2.cpp @@ -272,7 +272,7 @@ ESIMD_INLINE void transpose16(AccessorInTy in, AccessorOutTy out, int MZ, bool runTest(unsigned MZ, unsigned block_size, unsigned num_iters, double &kernel_times, double &total_times) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); int *M = new int[MZ * MZ]; diff --git a/SYCL/ESIMD/matrix_transpose_glb.cpp b/SYCL/ESIMD/matrix_transpose_glb.cpp index 23c0474686..e68f228d86 100644 --- a/SYCL/ESIMD/matrix_transpose_glb.cpp +++ b/SYCL/ESIMD/matrix_transpose_glb.cpp @@ -240,7 +240,7 @@ ESIMD_INLINE void transpose16(int *buf, int MZ, int block_col, int block_row) { bool runTest(unsigned MZ, unsigned block_size, unsigned num_iters, double &kernel_times, double &total_times) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); int *M = malloc_shared(MZ * MZ, q); diff --git a/SYCL/ESIMD/matrix_transpose_usm.cpp b/SYCL/ESIMD/matrix_transpose_usm.cpp index 48d45b9980..babf8fa97d 100644 --- a/SYCL/ESIMD/matrix_transpose_usm.cpp +++ b/SYCL/ESIMD/matrix_transpose_usm.cpp @@ -320,7 +320,7 @@ int main(int argc, char *argv[]) { MZ = (MZ < (1U << 12)) ? MZ : (1U << 12); } - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); unsigned num_iters = 10; diff --git a/SYCL/ESIMD/noinline_args_size/Inputs/noinline_args_size_common.hpp b/SYCL/ESIMD/noinline_args_size/Inputs/noinline_args_size_common.hpp index 781efe0320..bd6add9c8e 100644 --- a/SYCL/ESIMD/noinline_args_size/Inputs/noinline_args_size_common.hpp +++ b/SYCL/ESIMD/noinline_args_size/Inputs/noinline_args_size_common.hpp @@ -35,7 +35,7 @@ ESIMD_NOINLINE TC add(TA A, TB B) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/noinline_call_from_func.cpp b/SYCL/ESIMD/noinline_call_from_func.cpp index 0d187a2623..0e1f8f150d 100644 --- a/SYCL/ESIMD/noinline_call_from_func.cpp +++ b/SYCL/ESIMD/noinline_call_from_func.cpp @@ -37,7 +37,7 @@ template ESIMD_NOINLINE void test(AccTy acc, int A, int B) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/noinline_call_recursive.cpp b/SYCL/ESIMD/noinline_call_recursive.cpp index c736a47659..eaa583f1d3 100644 --- a/SYCL/ESIMD/noinline_call_recursive.cpp +++ b/SYCL/ESIMD/noinline_call_recursive.cpp @@ -32,7 +32,7 @@ ESIMD_NOINLINE unsigned add(unsigned A, unsigned B, unsigned C) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/printf.cpp b/SYCL/ESIMD/printf.cpp index c730b3a1f5..4a65166ec5 100644 --- a/SYCL/ESIMD/printf.cpp +++ b/SYCL/ESIMD/printf.cpp @@ -45,7 +45,7 @@ const CONSTANT char format_int[] = "%d\n"; int main() { { - queue Queue(esimd_test::ESIMDSelector{}, + queue Queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); Queue.submit([&](handler &CGH) { @@ -84,7 +84,7 @@ int main() { } { - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); // printf in parallel_for constexpr int SIMD_SIZE = 16; constexpr int WORK_SIZE = SIMD_SIZE; diff --git a/SYCL/ESIMD/private_memory/Inputs/pm_common.cpp b/SYCL/ESIMD/private_memory/Inputs/pm_common.cpp index 5857c77943..fbd46806bd 100644 --- a/SYCL/ESIMD/private_memory/Inputs/pm_common.cpp +++ b/SYCL/ESIMD/private_memory/Inputs/pm_common.cpp @@ -109,7 +109,7 @@ ESIMD_INLINE void work(int *o, int offx1, int offx2, int offy1, int offy2, template class KernelID; template int test() { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/reduction.cpp b/SYCL/ESIMD/reduction.cpp index 118c634c4e..5be1efe9d5 100644 --- a/SYCL/ESIMD/reduction.cpp +++ b/SYCL/ESIMD/reduction.cpp @@ -27,7 +27,7 @@ int main(void) { constexpr unsigned VL = 32; constexpr unsigned GroupSize = 1; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/regression/big_const_initializer.cpp b/SYCL/ESIMD/regression/big_const_initializer.cpp index ade56b4832..1ff20c2f0d 100644 --- a/SYCL/ESIMD/regression/big_const_initializer.cpp +++ b/SYCL/ESIMD/regression/big_const_initializer.cpp @@ -37,7 +37,7 @@ inline void foo(sycl::ext::intel::esimd::simd &k) { int main(int argc, char **argv) { size_t nsamples = N_SAMPLES; - sycl::queue queue(esimd_test::ESIMDSelector{}, + sycl::queue queue(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); std::cout << "Running on " diff --git a/SYCL/ESIMD/regression/noinline_bypointers_vadd.cpp b/SYCL/ESIMD/regression/noinline_bypointers_vadd.cpp index b5441ebd7b..8a294bf8d8 100644 --- a/SYCL/ESIMD/regression/noinline_bypointers_vadd.cpp +++ b/SYCL/ESIMD/regression/noinline_bypointers_vadd.cpp @@ -42,7 +42,7 @@ int main(void) { constexpr unsigned Size = 1024; constexpr unsigned GroupSize = 8; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/regression/operator_decrement.cpp b/SYCL/ESIMD/regression/operator_decrement.cpp index 1294d472fb..76d3972765 100644 --- a/SYCL/ESIMD/regression/operator_decrement.cpp +++ b/SYCL/ESIMD/regression/operator_decrement.cpp @@ -39,7 +39,7 @@ int main(void) { // We need that many threads in each group range<1> LocalRange{1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/regression/replicate_bug.cpp b/SYCL/ESIMD/regression/replicate_bug.cpp index 02e2e63752..e7e36283f3 100644 --- a/SYCL/ESIMD/regression/replicate_bug.cpp +++ b/SYCL/ESIMD/regression/replicate_bug.cpp @@ -74,7 +74,7 @@ template bool test(queue q, const std::vector &gold) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/regression/store_zero_const.cpp b/SYCL/ESIMD/regression/store_zero_const.cpp index c4080b0398..dcb5896137 100644 --- a/SYCL/ESIMD/regression/store_zero_const.cpp +++ b/SYCL/ESIMD/regression/store_zero_const.cpp @@ -78,7 +78,7 @@ template bool test(queue Q) { } int main(void) { - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto Dev = Q.get_device(); std::cout << "Running on " << Dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/regression/usm_gather_scatter_32.cpp b/SYCL/ESIMD/regression/usm_gather_scatter_32.cpp index 55c7ec168f..ae1a16e787 100644 --- a/SYCL/ESIMD/regression/usm_gather_scatter_32.cpp +++ b/SYCL/ESIMD/regression/usm_gather_scatter_32.cpp @@ -28,7 +28,7 @@ int main(void) { constexpr unsigned Size = 1024; constexpr unsigned VL = 32; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/regression/variable_gather_mask.cpp b/SYCL/ESIMD/regression/variable_gather_mask.cpp index 9abdec64ed..8380b43622 100644 --- a/SYCL/ESIMD/regression/variable_gather_mask.cpp +++ b/SYCL/ESIMD/regression/variable_gather_mask.cpp @@ -129,7 +129,7 @@ template bool test(const char *msg, queue q, Command cmd) { } int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/slm_barrier.cpp b/SYCL/ESIMD/slm_barrier.cpp index 1a8a4e4e01..96b2a2b942 100644 --- a/SYCL/ESIMD/slm_barrier.cpp +++ b/SYCL/ESIMD/slm_barrier.cpp @@ -75,7 +75,7 @@ int main(void) { constexpr unsigned VL = 16; constexpr unsigned Size = NUM_THREADS * VL; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/slm_split_barrier.cpp b/SYCL/ESIMD/slm_split_barrier.cpp index c437292186..e525de2072 100644 --- a/SYCL/ESIMD/slm_split_barrier.cpp +++ b/SYCL/ESIMD/slm_split_barrier.cpp @@ -79,7 +79,7 @@ int main(void) { constexpr unsigned VL = 16; constexpr unsigned Size = NUM_THREADS * VL; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/spec_const/Inputs/spec-const-2020-common.hpp b/SYCL/ESIMD/spec_const/Inputs/spec-const-2020-common.hpp index a505a6d31c..1bf7c796fc 100644 --- a/SYCL/ESIMD/spec_const/Inputs/spec-const-2020-common.hpp +++ b/SYCL/ESIMD/spec_const/Inputs/spec-const-2020-common.hpp @@ -36,7 +36,7 @@ class TestKernel; constexpr specialization_id ConstID(DEF_VAL); int main(int argc, char **argv) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/stencil2.cpp b/SYCL/ESIMD/stencil2.cpp index 94ee136272..ede181b9c7 100644 --- a/SYCL/ESIMD/stencil2.cpp +++ b/SYCL/ESIMD/stencil2.cpp @@ -90,7 +90,7 @@ int main(int argc, char *argv[]) { << std::endl; sycl::range<2> LocalRange{1, 1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::enable_profiling{}); auto dev = q.get_device(); diff --git a/SYCL/ESIMD/sycl_esimd_mix.cpp b/SYCL/ESIMD/sycl_esimd_mix.cpp index 02eb06cf32..5f08c1b07c 100644 --- a/SYCL/ESIMD/sycl_esimd_mix.cpp +++ b/SYCL/ESIMD/sycl_esimd_mix.cpp @@ -94,7 +94,7 @@ int main(void) { // We need that many threads in each group sycl::range<1> LocalRange{1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/test_id_3d.cpp b/SYCL/ESIMD/test_id_3d.cpp index 7935f3c71a..875530f3c8 100644 --- a/SYCL/ESIMD/test_id_3d.cpp +++ b/SYCL/ESIMD/test_id_3d.cpp @@ -31,7 +31,7 @@ int main(void) { size_t Y = GlobalRange[1]; size_t X = GlobalRange[2]; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/usm_gather_scatter_rgba.cpp b/SYCL/ESIMD/usm_gather_scatter_rgba.cpp index a6e998eae4..6e1c7f713b 100644 --- a/SYCL/ESIMD/usm_gather_scatter_rgba.cpp +++ b/SYCL/ESIMD/usm_gather_scatter_rgba.cpp @@ -162,7 +162,7 @@ template bool test(queue q) { } int main(void) { - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/vadd_1d.cpp b/SYCL/ESIMD/vadd_1d.cpp index c6b2c1db51..dfd898343a 100644 --- a/SYCL/ESIMD/vadd_1d.cpp +++ b/SYCL/ESIMD/vadd_1d.cpp @@ -42,7 +42,7 @@ int main(void) { // We need that many threads in each group range<1> LocalRange{1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/vadd_2d.cpp b/SYCL/ESIMD/vadd_2d.cpp index ce58008f61..cc40bec6bf 100644 --- a/SYCL/ESIMD/vadd_2d.cpp +++ b/SYCL/ESIMD/vadd_2d.cpp @@ -48,7 +48,7 @@ int main(void) { // Number of workitems in a workgroup range<1> LocalRange{GroupSize}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/vadd_2d_acc.cpp b/SYCL/ESIMD/vadd_2d_acc.cpp index d42239e8ad..78d6f32a0d 100644 --- a/SYCL/ESIMD/vadd_2d_acc.cpp +++ b/SYCL/ESIMD/vadd_2d_acc.cpp @@ -48,7 +48,7 @@ int main(void) { sycl::nd_range<2> Range(GlobalRange, LocalRange); - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); auto ctxt = q.get_context(); diff --git a/SYCL/ESIMD/vadd_half.cpp b/SYCL/ESIMD/vadd_half.cpp index 1ca24dabe4..1482aae505 100644 --- a/SYCL/ESIMD/vadd_half.cpp +++ b/SYCL/ESIMD/vadd_half.cpp @@ -54,7 +54,7 @@ int main(int argc, char **argv) { } std::cout << "Using start value = " << start_val << "\n"; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/vadd_raw_send.cpp b/SYCL/ESIMD/vadd_raw_send.cpp index df1df6da1a..66bb565d98 100644 --- a/SYCL/ESIMD/vadd_raw_send.cpp +++ b/SYCL/ESIMD/vadd_raw_send.cpp @@ -109,7 +109,7 @@ int main(void) { // We need that many threads in each group range<1> LocalRange{1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; diff --git a/SYCL/ESIMD/vadd_usm.cpp b/SYCL/ESIMD/vadd_usm.cpp index 61836fbe04..1246538b14 100644 --- a/SYCL/ESIMD/vadd_usm.cpp +++ b/SYCL/ESIMD/vadd_usm.cpp @@ -23,7 +23,7 @@ int main(void) { constexpr unsigned VL = 32; constexpr unsigned GroupSize = 8; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); auto dev = q.get_device(); std::cout << "Running on " << dev.get_info() << "\n"; From 23462530f4d730797fac4aa59b0fccc36b5c5964 Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Thu, 8 Sep 2022 13:05:38 -0700 Subject: [PATCH 6/9] gpu_selector warning Signed-off-by: Chris Perkins --- SYCL/ESIMD/regression/Inputs/dgetrf.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SYCL/ESIMD/regression/Inputs/dgetrf.hpp b/SYCL/ESIMD/regression/Inputs/dgetrf.hpp index 6b099b38b0..b044bd99d2 100644 --- a/SYCL/ESIMD/regression/Inputs/dgetrf.hpp +++ b/SYCL/ESIMD/regression/Inputs/dgetrf.hpp @@ -302,7 +302,7 @@ void dgetrfnp_batch_strided_c(int64_t m, int64_t n, double *a, int64_t lda, int64_t stride_a, int64_t *ipiv, int64_t stride_ipiv, int64_t batch, int64_t *info) { - queue queue((gpu_selector())); + queue queue(gpu_selector_v); auto device = queue.get_device(); auto context = queue.get_context(); int status; From f7293ab33071ce9df15c97db9271a068ede7f5b7 Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Thu, 29 Sep 2022 14:07:49 -0700 Subject: [PATCH 7/9] clang-format sings and I dance --- SYCL/ESIMD/esimd_test_utils.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SYCL/ESIMD/esimd_test_utils.hpp b/SYCL/ESIMD/esimd_test_utils.hpp index d4c4172ce4..99c7517f6f 100644 --- a/SYCL/ESIMD/esimd_test_utils.hpp +++ b/SYCL/ESIMD/esimd_test_utils.hpp @@ -38,10 +38,10 @@ inline int ESIMDSelector(const device &device) { std::string filter_string(dev_filter); if (filter_string.find("gpu") != std::string::npos) return device.is_gpu() ? 1000 : -1; - - std::cerr << "Supported 'SYCL_DEVICE_FILTER' env var values are 'gpu' and " - "'host', '" - << filter_string << "' does not contain such substrings.\n"; + + std::cerr + << "Supported 'SYCL_DEVICE_FILTER' env var device type is 'gpu' and " + << filter_string << "' does not contain that.\n"; return -1; } // If "SYCL_DEVICE_FILTER" not defined, only allow gpu device From 28d79d0bfbbe59103a085ec95b6e658024e6021c Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Thu, 29 Sep 2022 16:43:21 -0700 Subject: [PATCH 8/9] moar new files that need updating --- SYCL/Config/select_device.cpp | 40 +++++++++++----------- SYCL/ESIMD/dpas/dpas_bf16.cpp | 2 +- SYCL/ESIMD/dpas/dpas_fp16.cpp | 2 +- SYCL/ESIMD/dpas/dpas_int.cpp | 2 +- SYCL/ESIMD/lsc/Inputs/lsc_block_store.hpp | 2 +- SYCL/ESIMD/lsc/lsc_predicate.cpp | 2 +- SYCL/ESIMD/lsc/lsc_predicate_stateless.cpp | 2 +- SYCL/ESIMD/radix_sort.cpp | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/SYCL/Config/select_device.cpp b/SYCL/Config/select_device.cpp index 7364841e43..3c435d8446 100644 --- a/SYCL/Config/select_device.cpp +++ b/SYCL/Config/select_device.cpp @@ -226,7 +226,7 @@ int main() { std::vector components(getAllowListDesc(allowlist)); std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); for (const DevDescT &desc : components) { if ((std::regex_match(dev.get_info(), @@ -284,7 +284,7 @@ int main() { std::vector components(getAllowListDesc(allowlist)); std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); const auto &plt = dev.get_platform(); for (const DevDescT &desc : components) { @@ -345,12 +345,12 @@ int main() { std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; try { - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); const auto &plt = dev.get_platform(); - } catch (sycl::runtime_error &E) { + } catch (sycl::exception &E) { const std::string expectedMsg( - "No device of requested type available"); + "No device of requested type 'info::device_type::gpu' available"); const std::string gotMessage(E.what()); if (gotMessage.find(expectedMsg) != std::string::npos) { passed = true; @@ -417,12 +417,12 @@ int main() { std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; try { - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); const auto &plt = dev.get_platform(); - } catch (sycl::runtime_error &E) { + } catch (sycl::exception &E) { const std::string expectedMsg( - "No device of requested type available"); + "No device of requested type 'info::device_type::gpu' available"); const std::string gotMessage(E.what()); if (gotMessage.find(expectedMsg) != std::string::npos) { passed = true; @@ -491,7 +491,7 @@ int main() { std::vector components(getAllowListDesc(allowlist)); std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); for (const DevDescT &desc : components) { if ((std::regex_match(dev.get_info(), @@ -549,7 +549,7 @@ int main() { std::vector components(getAllowListDesc(allowlist)); std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); for (const DevDescT &desc : components) { if (std::regex_match(dev.get_info(), @@ -600,7 +600,7 @@ int main() { std::vector components(getAllowListDesc(allowlist)); std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); const auto &plt = dev.get_platform(); for (const DevDescT &desc : components) { @@ -663,7 +663,7 @@ int main() { std::vector components(getAllowListDesc(allowlist)); std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); for (const DevDescT &desc : components) { if ((std::regex_match(dev.get_info(), @@ -722,10 +722,10 @@ int main() { std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; try { - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); const auto &plt = dev.get_platform(); - } catch (sycl::runtime_error &E) { + } catch (sycl::exception &E) { // Workaround to make CI pass. // TODO: after the submission of PR intel/llvm:3826, create PR to // intel/llvm-test-suite with removal of 1st parameter of the vector, @@ -785,10 +785,10 @@ int main() { std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; try { - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); const auto &plt = dev.get_platform(); - } catch (sycl::runtime_error &E) { + } catch (sycl::exception &E) { // Workaround to make CI pass. // TODO: after the submission of PR intel/llvm:3826, create PR to // intel/llvm-test-suite with removal of 1st parameter of the vector, @@ -852,10 +852,10 @@ int main() { std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; try { - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); const auto &plt = dev.get_platform(); - } catch (sycl::runtime_error &E) { + } catch (sycl::exception &E) { // Workaround to make CI pass. // TODO: after the submission of PR intel/llvm:3826, create PR to // intel/llvm-test-suite with removal of 1st parameter of the vector, @@ -917,10 +917,10 @@ int main() { std::cout << "SYCL_DEVICE_ALLOWLIST=" << allowlist << std::endl; try { - sycl::queue deviceQueue(gpu_selector{}); + sycl::queue deviceQueue(gpu_selector_v); device dev = deviceQueue.get_device(); const auto &plt = dev.get_platform(); - } catch (sycl::runtime_error &E) { + } catch (sycl::exception &E) { // Workaround to make CI pass. // TODO: after the submission of PR intel/llvm:3826, create PR to // intel/llvm-test-suite with removal of 1st parameter of the vector, diff --git a/SYCL/ESIMD/dpas/dpas_bf16.cpp b/SYCL/ESIMD/dpas/dpas_bf16.cpp index 28e8f7d60b..0b73333210 100644 --- a/SYCL/ESIMD/dpas/dpas_bf16.cpp +++ b/SYCL/ESIMD/dpas/dpas_bf16.cpp @@ -15,7 +15,7 @@ #include "dpas_common.hpp" int main(int argc, const char *argv[]) { - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool Print = argc > 1 && std::string(argv[1]) == "-debug"; bool Passed = true; diff --git a/SYCL/ESIMD/dpas/dpas_fp16.cpp b/SYCL/ESIMD/dpas/dpas_fp16.cpp index e038d12e4a..41797f9877 100644 --- a/SYCL/ESIMD/dpas/dpas_fp16.cpp +++ b/SYCL/ESIMD/dpas/dpas_fp16.cpp @@ -15,7 +15,7 @@ #include "dpas_common.hpp" int main(int argc, const char *argv[]) { - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool Print = argc > 1 && std::string(argv[1]) == "-debug"; bool Passed = true; diff --git a/SYCL/ESIMD/dpas/dpas_int.cpp b/SYCL/ESIMD/dpas/dpas_int.cpp index ecf4937148..612ddd9f20 100644 --- a/SYCL/ESIMD/dpas/dpas_int.cpp +++ b/SYCL/ESIMD/dpas/dpas_int.cpp @@ -15,7 +15,7 @@ #include "dpas_common.hpp" int main(int argc, const char *argv[]) { - queue Q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()); + queue Q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()); bool Print = argc > 1 && std::string(argv[1]) == "-debug"; bool Passed = true; diff --git a/SYCL/ESIMD/lsc/Inputs/lsc_block_store.hpp b/SYCL/ESIMD/lsc/Inputs/lsc_block_store.hpp index 5cba736c93..262fe43199 100644 --- a/SYCL/ESIMD/lsc/Inputs/lsc_block_store.hpp +++ b/SYCL/ESIMD/lsc/Inputs/lsc_block_store.hpp @@ -36,7 +36,7 @@ bool test(unsigned SurfaceWidth, unsigned SurfaceHeight, unsigned SurfacePitch, T old_val = get_rand(); T new_val = get_rand(); - auto GPUSelector = gpu_selector{}; + auto GPUSelector = gpu_selector_v; auto q = queue{GPUSelector}; auto dev = q.get_device(); std::cout << "Running case #" << case_num << " on " diff --git a/SYCL/ESIMD/lsc/lsc_predicate.cpp b/SYCL/ESIMD/lsc/lsc_predicate.cpp index 5f0df4672a..764996d220 100644 --- a/SYCL/ESIMD/lsc/lsc_predicate.cpp +++ b/SYCL/ESIMD/lsc/lsc_predicate.cpp @@ -170,7 +170,7 @@ template int testUSM(queue q) { int main() { auto q = - queue{esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()}; + queue{esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()}; auto device = q.get_device(); std::cout << "Device name: " << device.get_info() << std::endl; diff --git a/SYCL/ESIMD/lsc/lsc_predicate_stateless.cpp b/SYCL/ESIMD/lsc/lsc_predicate_stateless.cpp index 23ab9d3e52..9d1e8692d0 100644 --- a/SYCL/ESIMD/lsc/lsc_predicate_stateless.cpp +++ b/SYCL/ESIMD/lsc/lsc_predicate_stateless.cpp @@ -104,7 +104,7 @@ template int testAccessor(queue q) { int main() { auto q = - queue{esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler()}; + queue{esimd_test::ESIMDSelector, esimd_test::createExceptionHandler()}; auto device = q.get_device(); std::cout << "Device name: " << device.get_info() << std::endl; diff --git a/SYCL/ESIMD/radix_sort.cpp b/SYCL/ESIMD/radix_sort.cpp index 04e703d185..ba1d05cf38 100644 --- a/SYCL/ESIMD/radix_sort.cpp +++ b/SYCL/ESIMD/radix_sort.cpp @@ -589,7 +589,7 @@ int main(int argc, char *argv[]) { cl::sycl::range<2> LocalRange{1, 1}; - queue q(esimd_test::ESIMDSelector{}, esimd_test::createExceptionHandler(), + queue q(esimd_test::ESIMDSelector, esimd_test::createExceptionHandler(), property::queue::in_order()); auto dev = q.get_device(); From 16f5a727608e44ba8d7a69f912984b2889c07e56 Mon Sep 17 00:00:00 2001 From: Chris Perkins Date: Fri, 30 Sep 2022 11:01:19 -0700 Subject: [PATCH 9/9] multiple devices on jenkins confusing test --- SYCL/Config/select_device.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/SYCL/Config/select_device.cpp b/SYCL/Config/select_device.cpp index 3c435d8446..d47701d163 100644 --- a/SYCL/Config/select_device.cpp +++ b/SYCL/Config/select_device.cpp @@ -180,6 +180,9 @@ int main() { fs.open("select_device_config.txt"); if (fs.is_open()) { for (const auto &plt : platform::get_platforms()) { + if (passed) { + break; + } // no need to write more than one match for (const auto &dev : plt.get_devices()) { if (dev.has(aspect::gpu)) { std::string name = dev.get_info(); @@ -310,6 +313,9 @@ int main() { fs.open("select_device_config.txt"); if (fs.is_open()) { for (const auto &plt : platform::get_platforms()) { + if (passed) { + break; + } // no need for additional entries for (const auto &dev : plt.get_devices()) { if (dev.has(aspect::gpu)) { std::string name = dev.get_info(); @@ -441,6 +447,9 @@ int main() { fs.open("select_device_config.txt"); if (fs.is_open()) { for (const auto &plt : platform::get_platforms()) { + if (passed) { + break; + } // no need for additional entries for (const auto &dev : plt.get_devices()) { if (dev.has(aspect::gpu)) { std::string name = dev.get_info(); @@ -517,6 +526,9 @@ int main() { fs.open("select_device_config.txt"); if (fs.is_open()) { for (const auto &plt : platform::get_platforms()) { + if (passed) { + break; + } // no need for additional entries for (const auto &dev : plt.get_devices()) { if (dev.has(aspect::gpu)) { std::string name = dev.get_info();