[SYCL] Add ext::intel::info::device::device_id to sycl-ls output

sycl/test-e2e/Plugin/level_zero_ext_intel_cslice.cpp

@@ -1,7 +1,8 @@
 // REQUIRES: level_zero
 // REQUIRES: aspect-ext_intel_device_id
-// https://github.com/intel/llvm/issues/14826
-// XFAIL: arch-intel_gpu_pvc
+
+// XFAIL: gpu-intel-pvc-1T
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15699
 
 // RUN: %{build} -Wno-error=deprecated-declarations -o %t.out
 

sycl/test-e2e/Plugin/level_zero_ext_intel_queue_index.cpp

@@ -1,8 +1,9 @@
 // REQUIRES: aspect-ext_intel_device_id
 // REQUIRES: level_zero
 
-// https://github.com/intel/llvm/issues/14826
-// XFAIL: arch-intel_gpu_pvc
+// XFAIL: gpu-intel-pvc-1T
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15699
+
 // RUN: %{build} -o %t.out
 
 // TODO: at this time PVC 1T systems are not correctly supporting CSLICE

sycl/test-e2e/Plugin/level_zero_sub_sub_device.cpp

@@ -1,7 +1,7 @@
 // REQUIRES:  arch-intel_gpu_pvc, level_zero
 
-// https://github.com/intel/llvm/issues/14826
 // XFAIL: arch-intel_gpu_pvc
+// XFAIL-TRACKER: https://github.com/intel/llvm/issues/15602
 
 // RUN: %{build} %level_zero_options -o %t.out
 

sycl/test-e2e/lit.cfg.py

@@ -430,8 +430,6 @@ def open_check_file(file_name):
     )
     sp = subprocess.check_output(cmd, text=True, shell=True)
     for line in sp.splitlines():
-        if "Intel(R) Data Center GPU Max 1100" in line:
-            config.available_features.add("gpu-intel-pvc-1T")
         if "gfx90a" in line:
             config.available_features.add("gpu-amd-gfx90a")
         if not line.startswith("["):
@@ -720,6 +718,15 @@ def open_check_file(file_name):
             # str.removeprefix isn't universally available...
             sg_sizes_str = line.strip().replace("info::device::sub_group_sizes: ", "")
             dev_sg_sizes.append(sg_sizes_str.strip().split(" "))
+        if re.match(r" *DeviceID*", line):
+            gpu_intel_pvc_1T_device_id = "3034"
+            gpu_intel_pvc_2T_device_id = "3029"
+            _, device_id = line.strip().split(":", 1)
+            device_id = device_id.strip()
+            if device_id == gpu_intel_pvc_1T_device_id:             
+                config.available_features.add("gpu-intel-pvc-1T")
+            if device_id == gpu_intel_pvc_2T_device_id:
+                config.available_features.add("gpu-intel-pvc-2T")
         if re.match(r" *Architecture:", line):
             _, architecture = line.strip().split(":", 1)
             architectures.add(architecture.strip())

sycl/test-e2e/no-xfail-without-tracker.cpp

@@ -47,4 +47,4 @@
 // tests to match the required format and in that case you should just update
 // (i.e. reduce) the number below.
 //
-// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 178
+// NUMBER-OF-XFAIL-WITHOUT-TRACKER: 175

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

@@ -148,6 +148,15 @@ static void printDeviceInfo(const device &Device, bool Verbose,
       std::cout << std::endl;
     }
 
+    // Get and print device ID, if it is available.
+    if (Device.has(aspect::ext_intel_device_id)) {
+      auto DeviceID =
+          Device.get_info<sycl::ext::intel::info::device::device_id>();
+      std::cout << Prepend << "DeviceID          : " << DeviceID << std::endl;
+    } else {
+      std::cout << Prepend << "DeviceID          : " << "UNKNOWN" << std::endl;
+    }
+
     // Print sub and sub-sub devices.
     {
       auto DevCount = GetNumberOfSubAndSubSubDevices(Device);