Update tests for new OpenCL version definition

See discussions on: intel/llvm-test-suite#1019

Author: npmiller

sycl/test-e2e/Basic/info_ocl_version.cpp

@@ -11,11 +11,10 @@ bool isSupportedDevice(device D) {
 
   if (PlatformName.find("OpenCL") != std::string::npos) {
     std::string Version = D.get_info<info::device::version>();
-    size_t Offset = Version.find("OpenCL");
-    if (Offset == std::string::npos)
-      return false;
-    Version = Version.substr(Offset + 7, 3);
-    if (Version >= std::string("2.0"))
+
+    // Group collectives are mandatory in OpenCL 2.0 but optional in 3.0.
+    Version = Version.substr(7, 3);
+    if (Version >= "2.0" && Version < "3.0")
       return true;
   }
 

sycl/test-e2e/GroupAlgorithm/SYCL2020/support.h

@@ -15,11 +15,10 @@ bool isSupportedDevice(device D) {
 
   if (PlatformName.find("OpenCL") != std::string::npos) {
     std::string Version = D.get_info<sycl::info::device::version>();
-    size_t Offset = Version.find("OpenCL");
-    if (Offset == std::string::npos)
-      return false;
-    Version = Version.substr(Offset + 7, 3);
-    if (Version >= std::string("2.0"))
+
+    // Group collectives are mandatory in OpenCL 2.0 but optional in 3.0.
+    Version = Version.substr(7, 3);
+    if (Version >= "2.0" && Version < "3.0")
       return true;
   }
 

sycl/test-e2e/GroupAlgorithm/support.h

@@ -169,5 +169,16 @@ bool core_sg_supported(const device &Device) {
   auto Vec = Device.get_info<info::device::extensions>();
   if (std::find(Vec.begin(), Vec.end(), "cl_khr_subgroups") != std::end(Vec))
     return true;
-  return Device.get_info<info::device::version>() >= "2.1";
+
+  if (Device.get_backend() == sycl::backend::opencl) {
+    // Extract the numerical version from the version string, OpenCL version
+    // string have the format "OpenCL <major>.<minor> <vendor specific data>".
+    std::string ver = Device.get_info<info::device::version>().substr(7, 3);
+
+    // cl_khr_subgroups was core in OpenCL 2.1 and 2.2, but went back to
+    // optional in 3.0
+    return ver >= "2.1" && ver < "3.0";
+  }
+
+  return false;
 }