[SYCL][E2E] Remove WA (device selector usage) for allowlist test (#16623)

Signed-off-by: Tikhomirova, Kseniya <[email protected]>

Author: KseniyaTikhomirova

sycl/test-e2e/Config/allowlist.cpp

@@ -1,16 +1,13 @@
-// REQUIRES: opencl && cpu
 // RUN: %{build} -o %t.out
 //
-// FIXME: Using ONEAPI_DEVICE_SELECTOR=\*:cpu results in seg. faults that I
-// cannot reproduce under gdb.
-// RUN: env PRINT_DEVICE_INFO=1 ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out > %t1.conf
-// RUN: env TEST_DEVICE_AVAILABLE=1 env SYCL_CONFIG_FILE_NAME=%t1.conf ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out
+// RUN: env PRINT_DEVICE_INFO=1 %{run-unfiltered-devices} %t.out > %t1.conf
+// RUN: env TEST_DEVICE_AVAILABLE=1 env SYCL_CONFIG_FILE_NAME=%t1.conf %{run-unfiltered-devices} %t.out
 //
-// RUN: env PRINT_PLATFORM_INFO=1 ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out > %t2.conf
-// RUN: env TEST_DEVICE_AVAILABLE=1 env SYCL_CONFIG_FILE_NAME=%t2.conf ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out
+// RUN: env PRINT_PLATFORM_INFO=1 %{run-unfiltered-devices} %t.out > %t2.conf
+// RUN: env TEST_PLATFORM_AVAILABLE=1 env SYCL_CONFIG_FILE_NAME=%t2.conf %{run-unfiltered-devices} %t.out
 //
-// RUN: env TEST_DEVICE_IS_NOT_AVAILABLE=1 env SYCL_DEVICE_ALLOWLIST="PlatformName:{{SUCH NAME DOESN'T EXIST}}" ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out
-// RUN: env TEST_INCORRECT_VALUE=1 env SYCL_DEVICE_ALLOWLIST="IncorrectKey:{{.*}}" ONEAPI_DEVICE_SELECTOR=opencl:cpu %{run-unfiltered-devices} %t.out
+// RUN: env TEST_DEVICE_IS_NOT_AVAILABLE=1 env SYCL_DEVICE_ALLOWLIST="PlatformName:{{SUCH NAME DOESN'T EXIST}}" %{run-unfiltered-devices} %t.out
+// RUN: env TEST_INCORRECT_VALUE=1 env SYCL_DEVICE_ALLOWLIST="IncorrectKey:{{.*}}" %{run-unfiltered-devices} %t.out
 
 #include "../helpers.hpp"
 #include <algorithm>
@@ -20,6 +17,16 @@
 #include <string>
 #include <sycl/detail/core.hpp>
 
+static bool isIdenticalDevices(const std::vector<sycl::device> &Devices) {
+  return std::all_of(
+      Devices.cbegin(), Devices.cend(), [&](const sycl::device &Dev) {
+        return (Dev.get_info<sycl::info::device::name>() ==
+                Devices.at(0).get_info<sycl::info::device::name>()) &&
+               (Dev.get_info<sycl::info::device::driver_version>() ==
+                Devices.at(0).get_info<sycl::info::device::driver_version>());
+      });
+}
+
 static void replaceSpecialCharacters(std::string &Str) {
   // Replace common special symbols with '.' which matches to any character
   std::replace_if(
@@ -48,7 +55,7 @@ int main() {
 
       return 0;
     }
-    throw std::runtime_error("No device is found");
+    throw std::runtime_error("No platform is found");
   }
 
   // Expected that the allowlist filter is not set
@@ -74,12 +81,15 @@ int main() {
   // Expected the allowlist to be set with the "PRINT_DEVICE_INFO" run result
   if (env::isDefined("TEST_DEVICE_AVAILABLE")) {
     for (const sycl::platform &Platform : sycl::platform::get_platforms()) {
-      if (Platform.get_devices().size() != 1)
+      auto Devices = Platform.get_devices();
+      if (Devices.empty())
+        throw std::runtime_error("No device is found");
+
+      if (!(Devices.size() == 1 || isIdenticalDevices(Devices)))
         throw std::runtime_error("Expected only one device.");
 
       return 0;
     }
-    throw std::runtime_error("No device is found");
   }
 
   // Expected the allowlist to be set but empty
@@ -89,26 +99,28 @@ int main() {
     return 0;
   }
 
+  // Expected the allowlist to be set with the "PRINT_PLATFORM_INFO" run result
+  if (env::isDefined("TEST_PLATFORM_AVAILABLE")) {
+    auto Platforms = sycl::platform::get_platforms();
+    if (Platforms.empty())
+      throw std::runtime_error("No platform is found");
+    else if (Platforms.size() != 1)
+      throw std::runtime_error("Expected only one platform.");
+
+    return 0;
+  }
+
   if (env::isDefined("TEST_INCORRECT_VALUE")) {
     try {
       sycl::platform::get_platforms();
     } 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,
-      // and transformation of std::vector<std::string> to std::string
-      const std::vector<std::string> ExpectedMsgs{
-          "Unrecognized key in device allowlist",
+      const std::string ExpectedMsg{
           "Unrecognized key in SYCL_DEVICE_ALLOWLIST"};
       const std::string GotMessage(E.what());
-      bool CorrectMsg = false;
-      for (const auto &ExpectedMsg : ExpectedMsgs) {
-        if (GotMessage.find(ExpectedMsg) != std::string::npos) {
-          CorrectMsg = true;
-          break;
-        }
+      if (GotMessage.find(ExpectedMsg) != std::string::npos) {
+        return 0;
       }
-      return CorrectMsg ? 0 : 1;
+      return 1;
     }
   }