updating the now deprecated SYCL 1.2.1 device_selectors to the newer SYCL 2020 ones

Signed-off-by: Chris Perkins <[email protected]>

Author: cperkinsintel

SYCL/BFloat16/bfloat16_type.hpp

@@ -169,7 +169,7 @@ void verify_logic(queue &q, buffer<float, 1> &a, buffer<float, 1> &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)

SYCL/Basic/barrier_order.cpp

@@ -9,7 +9,7 @@
 #include <sycl/sycl.hpp>
 
 int main() {
-  sycl::device dev{sycl::default_selector{}};
+  sycl::device dev{sycl::default_selector_v};
   sycl::queue q{dev};
 
   int *x = sycl::malloc_shared<int>(1, q);

SYCL/Basic/buffer/buffer_dev_to_dev.cpp

@@ -24,8 +24,7 @@ int main() {
     buffer<int, 1> 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);

SYCL/Basic/buffer/buffer_migrate.cpp

@@ -19,7 +19,7 @@ int main() {
   buffer<int, 1> 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);
 

SYCL/Basic/build_log.cpp

@@ -7,7 +7,7 @@
 #include <sycl/sycl.hpp>
 
 int main() {
-  sycl::queue Q{sycl::default_selector()};
+  sycl::queue Q{sycl::default_selector_v};
 
   auto *I = sycl::malloc_device<int>(1, Q);
   Q.single_task([=]() { I[0] = 42; });

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<class kernel1>([]() {}); });
@@ -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<class kernel5>([]() {}); });

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);

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();
       }

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) {

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;

SYCL/Basic/handler/interop_task.cpp

@@ -27,7 +27,7 @@ int main() {
   sycl::buffer<int, 1> DstBuf(sycl::range<1>{BufSize});
   sycl::buffer<int, 1> 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<sycl::access::mode::write>(CGH);

SYCL/Basic/handler/run_on_host_intel.cpp

@@ -27,7 +27,7 @@ int main() {
   sycl::buffer<int, 1> SrcBuf(data1, sycl::range<1>{BufSize});
   sycl::buffer<int, 1> 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<sycl::access::mode::read>(CGH);
     auto DstAcc = DstBuf.get_access<sycl::access::mode::write>(CGH);

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<sycl::float4, SYCLRead>(CGH);
       auto Img2Acc = Img2.get_access<sycl::float4, SYCLWrite>(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<sycl::float4, SYCLRead>(CGH);
       CGH.single_task<class EmptyKernel>([=]() { 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<sycl::float4, SYCLRead>(CGH);
       CGH.single_task<class ConstTestPitch>([=] { ImgAcc.get_range(); });

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;

SYCL/Basic/image/image_array.cpp

@@ -48,7 +48,7 @@ int main() {
 
     sycl::buffer<int, 1> 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;

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;
 

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))

SYCL/Basic/image/image_sample.cpp

@@ -43,16 +43,14 @@ 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});
 
     s::buffer<dataT, 1> 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<dataT, s::access::mode::read>(cgh);
       s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,
@@ -80,16 +78,14 @@ 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});
 
     s::buffer<dataT, 1> 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<dataT, s::access::mode::read>(cgh);
       s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,
@@ -117,16 +113,14 @@ 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});
 
     s::buffer<dataT, 1> 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<dataT, s::access::mode::read>(cgh);
       s::accessor<dataT, 1, s::access::mode::write> resultDataAcc(resultDataBuf,

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;
 

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});

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))

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<BE>(Dev);
 
   sycl::device NewDev = sycl::make_device<BE>(NativeDev);

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};
 

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};

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 =

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

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<int> host_mem(1024, 1);
   buffer<int, 1> buf(&host_mem[0], host_mem.size());

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(

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);

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);

SYCL/DeprecatedFeatures/SpecConsts1.2.1/multiple-usages-of-composite.cpp

@@ -42,7 +42,7 @@ template <typename T> class kernel_t {
 template <typename T> 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);
 

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);

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);

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);

SYCL/DeprecatedFeatures/SpecConsts1.2.1/unpacked-composite-type.cpp

@@ -50,7 +50,7 @@ template <typename T> class kernel_t {
 template <typename T> 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);