Fixed blur/blucpp OpenCL 2.0 check

samples/core/blur/blur.cpp

@@ -494,16 +494,19 @@ std::tuple<bool, bool, bool> BlurCppExample::query_capabilities()
         (device.getInfo<CL_DEVICE_LOCAL_MEM_TYPE>() == CL_LOCAL);
 
     // 4) query if device allow subgroup shuffle operations
+    bool use_subgroups =
+        cl::util::supports_extension(device, "cl_khr_subgroups");
     bool use_subgroup_exchange =
         cl::util::supports_extension(device, "cl_khr_subgroup_shuffle");
     bool use_subgroup_exchange_relative = cl::util::supports_extension(
         device, "cl_khr_subgroup_shuffle_relative");
 
-    return std::make_tuple(use_local_mem, use_subgroup_exchange,
-                           use_subgroup_exchange_relative);
+    return std::make_tuple(use_local_mem,
+                           use_subgroups && use_subgroup_exchange,
+                           use_subgroups && use_subgroup_exchange_relative);
 }
 
-bool BlurCppExample::query_opencl_2_0_support()
+bool BlurCppExample::query_opencl_c_2_0_support()
 {
     return cl::util::opencl_c_version_contains(device, "2.0");
 }

samples/core/blur/blur.hpp

@@ -42,7 +42,7 @@ class BlurCppExample {
     std::tuple<bool, bool, bool> query_capabilities();
 
     // Query device support for OpenCL 2.0
-    bool query_opencl_2_0_support();
+    bool query_opencl_c_2_0_support();
 
     void create_image_buffers();
 

samples/core/blur/main.c

@@ -1049,13 +1049,13 @@ int main(int argc, char *argv[])
     }
 
     // 5) query if OpenCL driver version is 2.0
-    bool opencl_version_2_0 = false;
+    bool opencl_c_version_2_0 = false;
     {
         char *driver_version = NULL;
         OCLERROR_PAR(
             driver_version = cl_util_get_device_info(s.device, CL_DRIVER_VERSION, &error),
             error, clean);
-        opencl_version_2_0 = strcmp("2.0", driver_version) ? 0 : 1;
+        opencl_c_version_2_0 = strcmp("2.0", driver_version) ? 0 : 1;
     clean:
         free(driver_version);
     }
@@ -1125,24 +1125,22 @@ int main(int argc, char *argv[])
                          error, prg);
 
         /// Subgroup exchange in dual-pass blur
-        if (use_subgroup_exchange_relative && opencl_version_2_0)
+        if (use_subgroup_exchange_relative && opencl_c_version_2_0)
         {
             printf("Dual-pass subgroup relative exchange blur\n");
 
             kernel_op[0] = '\0';
-            // cl_khr_subgroup_shuffle_relative requires OpenCL 2.0
             strcat(kernel_op, " -cl-std=CL2.0 ");
             strcat(kernel_op, "-D USE_SUBGROUP_EXCHANGE_RELATIVE ");
             OCLERROR_RET(dual_pass_subgroup_exchange_box_blur(
                              &s, (cl_int)blur_opts.size),
                          error, prg);
         }
-        if (use_subgroup_exchange && opencl_version_2_0)
+        if (use_subgroup_exchange && opencl_c_version_2_0)
         {
             printf("Dual-pass subgroup exchange blur\n");
 
             kernel_op[0] = '\0';
-            // cl_khr_subgroup_shuffle requires OpenCL 2.0
             strcat(kernel_op, " -cl-std=CL2.0 ");
             strcat(kernel_op, "-D USE_SUBGROUP_EXCHANGE ");
 
@@ -1182,25 +1180,23 @@ int main(int argc, char *argv[])
         }
 
         /// Subgroup exchange in dual-pass Gaussian blur
-        if (use_subgroup_exchange_relative && opencl_version_2_0)
+        if (use_subgroup_exchange_relative && opencl_c_version_2_0)
         {
             printf("Dual-pass subgroup relative exchange Gaussian blur\n");
 
             kernel_op[0] = '\0';
-            // cl_khr_subgroup_shuffle_relative requires OpenCL 2.0
             strcat(kernel_op, " -cl-std=CL2.0 ");
             strcat(kernel_op, "-D USE_SUBGROUP_EXCHANGE_RELATIVE ");
 
             OCLERROR_RET(dual_pass_subgroup_exchange_kernel_blur(&s, gauss_size,
                                                                  gauss_kern),
                          error, gkrn);
         }
-        if (use_subgroup_exchange && opencl_version_2_0)
+        if (use_subgroup_exchange && opencl_c_version_2_0)
         {
             printf("Dual-pass subgroup exchange Gaussian blur\n");
 
             kernel_op[0] = '\0';
-            // cl_khr_subgroup_shuffle requires OpenCL 2.0
             strcat(kernel_op, " -cl-std=CL2.0 ");
             strcat(kernel_op, "-D USE_SUBGROUP_EXCHANGE ");
 

samples/core/blur/main.cpp

@@ -49,7 +49,7 @@ int main(int argc, char* argv[])
         std::tie(use_local_mem, use_subgroup_exchange,
                  use_subgroup_exchange_relative) = blur.query_capabilities();
 
-        bool opencl_version_2_0 = blur.query_opencl_2_0_support();
+        bool opencl_c_version_2_0 = blur.query_opencl_c_2_0_support();
 
         // Create image buffers used for operation. In this example input,
         // output and temporary image buffers are used. Temporary buffer is used
@@ -87,22 +87,20 @@ int main(int argc, char* argv[])
             // file you can find 'USE_SUBGROUP_EXCHANGE_RELATIVE' C-like
             // definition switch for blur_box_horizontal_subgroup_exchange
             // function. In this case, 2 blur kernel functors are used.
-            if (use_subgroup_exchange_relative && opencl_version_2_0)
+            if (use_subgroup_exchange_relative && opencl_c_version_2_0)
             {
                 std::cout << "Dual-pass subgroup relative exchange blur"
                           << std::endl;
-                // cl_khr_subgroup_shuffle_relative requires OpenCL 2.0
                 blur.build_program(
                     "-D USE_SUBGROUP_EXCHANGE_RELATIVE -cl-std=CL2.0 ");
                 blur.dual_pass_subgroup_exchange_box_blur();
             }
 
             // Same as the previous one, but with a different build switch. See
             // the blur.cl file for more info about the switch.
-            if (use_subgroup_exchange && opencl_version_2_0)
+            if (use_subgroup_exchange && opencl_c_version_2_0)
             {
                 std::cout << "Dual-pass subgroup exchange blur" << std::endl;
-                // cl_khr_subgroup_shuffle requires OpenCL 2.0
                 blur.build_program("-D USE_SUBGROUP_EXCHANGE -cl-std=CL2.0 ");
                 blur.dual_pass_subgroup_exchange_box_blur();
             }
@@ -135,24 +133,22 @@ int main(int argc, char* argv[])
 
             // Similar to dual_pass_subgroup_exchange_box_blur but with a gauss
             // kernel.
-            if (use_subgroup_exchange_relative && opencl_version_2_0)
+            if (use_subgroup_exchange_relative && opencl_c_version_2_0)
             {
                 std::cout
                     << "Dual-pass subgroup relative exchange Gaussian blur"
                     << std::endl;
-                // cl_khr_subgroup_shuffle_relative requires OpenCL 2.0
                 blur.build_program(
                     "-D USE_SUBGROUP_EXCHANGE_RELATIVE -cl-std=CL2.0 ");
                 blur.dual_pass_subgroup_exchange_kernel_blur();
             }
 
             // Same as the previous one, but with a different build switch. See
             // the blur.cl file for more info about the switch.
-            if (use_subgroup_exchange && opencl_version_2_0)
+            if (use_subgroup_exchange && opencl_c_version_2_0)
             {
                 std::cout << "Dual-pass subgroup exchange Gaussian blur"
                           << std::endl;
-                // cl_khr_subgroup_shuffle requires OpenCL 2.0
                 blur.build_program("-D USE_SUBGROUP_EXCHANGE -cl-std=CL2.0 ");
                 blur.dual_pass_subgroup_exchange_kernel_blur();
             }