[SYCL] Add a check that the preferred/chosen GPU RT is Level-Zero (#2677)

Signed-off-by: Sergey V Maslov <[email protected]>

Author: smaslov-intel

sycl/test/plugins/sycl-ls-gpu-default.cpp

@@ -1,10 +1,10 @@
-// REQUIRES: gpu, level_zero
+// REQUIRES: gpu
 
-// RUN: sycl-ls --verbose >%t.default.out
+// RUN: env --unset=SYCL_BE sycl-ls --verbose >%t.default.out
 // RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
 
-// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : 1.0
-// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : 1.0
+// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}Level-Zero
+// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}Level-Zero
 
 //==-- sycl-ls-gpu-default.cpp - SYCL test for default selected gpu device -==//
 //

sycl/test/plugins/sycl-ls-gpu-level-zero.cpp

@@ -0,0 +1,15 @@
+// REQUIRES: gpu, level_zero
+
+// RUN: sycl-ls --verbose >%t.default.out
+// RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.default.out
+
+// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}Level-Zero
+// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}Level-Zero
+
+//==-- sycl-ls-gpu-level-zero.cpp - Test Level-Zero selected gpu device ----==//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//

sycl/test/plugins/sycl-ls-gpu-opencl.cpp

@@ -3,10 +3,10 @@
 // RUN: env SYCL_BE=PI_OPENCL sycl-ls --verbose >%t.opencl.out
 // RUN: FileCheck %s --check-prefixes=CHECK-GPU-BUILTIN,CHECK-GPU-CUSTOM --input-file %t.opencl.out
 
-// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{[0-9]\.[0-9]}}
-// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{[0-9]\.[0-9]}}
+// CHECK-GPU-BUILTIN: gpu_selector(){{.*}}GPU : {{.*}}OpenCL
+// CHECK-GPU-CUSTOM: custom_selector(gpu){{.*}}GPU : {{.*}}OpenCL
 
-//==-- sycl-ls-gpu-opencl.cpp - SYCL test for discovered/selected devices -===//
+//==-- sycl-ls-gpu-opencl.cpp - SYCL test for selected OpenCL GPU device --===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/tools/sycl-ls/sycl-ls.cpp

@@ -71,8 +71,11 @@ static void printDeviceInfo(const device &Device, const std::string &Prepend) {
     std::cout << Prepend << "Vendor     : " << DeviceVendor << std::endl;
     std::cout << Prepend << "Driver     : " << DeviceDriverVersion << std::endl;
   } else {
-    std::cout << Prepend << DeviceTypeName << ": " << DeviceVersion << "[ "
-              << DeviceDriverVersion << " ]" << std::endl;
+    auto DevicePlatform = Device.get_info<info::device::platform>();
+    auto DevicePlatformName = DevicePlatform.get_info<info::platform::name>();
+    std::cout << Prepend << DeviceTypeName << ": " << DevicePlatformName << " "
+              << DeviceVersion << " [" << DeviceDriverVersion << "]"
+              << std::endl;
   }
 }