[Intel] Add a means to check which intel gpu generation for vulkan and directX (#1291)

This change fixes #709

Author: farzonl

include/API/Device.h

@@ -191,6 +191,8 @@ class Device {
   std::string Description;
   std::string DriverName;
   std::string DriverVersion;
+  std::string GPUGeneration;
+  uint16_t FamilyPrefix = 0;
 
 public:
   virtual const Capabilities &getCapabilities() = 0;
@@ -247,6 +249,8 @@ class Device {
   llvm::StringRef getDescription() const { return Description; }
   llvm::StringRef getDriverName() const { return DriverName; }
   llvm::StringRef getDriverVersion() const { return DriverVersion; }
+  llvm::StringRef getGPUGeneration() const { return GPUGeneration; }
+  uint16_t getFamilyPrefix() const { return FamilyPrefix; }
 };
 
 llvm::Error

lib/API/DX/Device.cpp

@@ -1014,6 +1014,26 @@ class DXDevice : public offloadtest::Device {
     Description = std::move(Desc);
     DriverVersion = std::move(DriverVer);
     DriverName = "DirectX";
+
+    DXCoreHardwareID HardwareID;
+    if (SUCCEEDED(Adapter->GetProperty(DXCoreAdapterProperty::HardwareID,
+                                       &HardwareID))) {
+      // 0x8086 is the Vendor ID for Intel
+      if (HardwareID.vendorID == 0x8086) {
+        FamilyPrefix = static_cast<uint16_t>(HardwareID.deviceID) & 0xFF00;
+        const IntelGpuEra Era =
+            getIntelGpuEra(static_cast<uint16_t>(HardwareID.deviceID));
+        if (Era == IntelGpuEra::Gen7_to_10)
+          GPUGeneration = "Intel Gen7-10";
+        else if (Era == IntelGpuEra::Gen11_to_14_and_Xe)
+          GPUGeneration = "Intel Gen11-14/Xe";
+        else
+          GPUGeneration = "Intel Unknown";
+      } else {
+        // We don't have a need yet to identify other GPU vendors.
+        GPUGeneration = "Unknown";
+      }
+    }
   }
   DXDevice(const DXDevice &) = delete;
   DXDevice &operator=(const DXDevice &) = delete;

lib/API/Util.cpp

@@ -47,3 +47,27 @@ llvm::Error offloadtest::findAndValidateRenderPassTextureSize(
 
   return llvm::Error::success();
 }
+
+offloadtest::IntelGpuEra offloadtest::getIntelGpuEra(uint16_t DeviceId) {
+  const uint16_t FamilyPrefix = DeviceId & 0xFF00;
+  switch (FamilyPrefix) {
+  case 0x5900: // Kaby Lake (7th Gen)
+  case 0x3E00: // Coffee Lake / Whiskey Lake (8th/9th Gen)
+  case 0x9B00: // Comet Lake (10th Gen)
+  case 0x8A00: // Ice Lake (10th Gen)
+    return IntelGpuEra::Gen7_to_10;
+  case 0x9A00: // Tiger Lake (11th Gen)
+  case 0x4C00: // Rocket Lake (11th Gen Desktop)
+  case 0x4600: // Alder Lake (12th Gen)
+  case 0xA700: // Raptor Lake (13th Gen)
+  case 0x7D00: // Meteor Lake (14th Gen Core Ultra)
+  case 0x5600: // Arc Alchemist (Discrete Xe-HPG)
+  case 0x4F00: // DG1 (Discrete Xe-LP)
+  case 0x0B00: // Ponte Vecchio (Xe-HPC / Data Center Max)
+  case 0xE200: // Battlemage Discrete
+  case 0x6400: // Lunar Lake Integrated
+    return IntelGpuEra::Gen11_to_14_and_Xe;
+  default:
+    return IntelGpuEra::UnknownOrLegacy;
+  }
+}

lib/API/Util.h

@@ -25,6 +25,9 @@ llvm::Error findAndValidateRenderPassTextureSize(const RenderPassBeginDesc &,
                                                  uint32_t *OutWidth,
                                                  uint32_t *OutHeight);
 
+enum class IntelGpuEra { UnknownOrLegacy, Gen7_to_10, Gen11_to_14_and_Xe };
+
+IntelGpuEra getIntelGpuEra(uint16_t deviceId);
 } // namespace offloadtest
 
-#endif // OFFLOADTEST_API_UTIL_H
+#endif // OFFLOADTEST_API_UTIL_H

lib/API/VK/Device.cpp

@@ -1522,6 +1522,22 @@ class VulkanDevice : public offloadtest::Device {
     const uint64_t DriverInfoSz =
         strnlen(DriverProps.driverInfo, VK_MAX_DRIVER_INFO_SIZE);
     DriverVersion = std::string(DriverProps.driverInfo, DriverInfoSz);
+
+    // 0x8086 is the Vendor ID for Intel
+    if (Props.vendorID == 0x8086) {
+      FamilyPrefix = static_cast<uint16_t>(Props.deviceID) & 0xFF00;
+      const IntelGpuEra Era =
+          getIntelGpuEra(static_cast<uint16_t>(Props.deviceID));
+      if (Era == IntelGpuEra::Gen7_to_10)
+        GPUGeneration = "Intel Gen7-10";
+      else if (Era == IntelGpuEra::Gen11_to_14_and_Xe)
+        GPUGeneration = "Intel Gen11-14/Xe";
+      else
+        GPUGeneration = "Intel Unknown";
+    } else {
+      // We don't have a need yet to identify other GPU vendors.
+      GPUGeneration = "Unknown";
+    }
 #if defined(__APPLE__) && defined(__aarch64__)
     // Apple silicon Macs may have multiple Vulkan drivers sharing one device
     // name. Include the driver name in the description to enable
@@ -4284,6 +4300,7 @@ llvm::Error offloadtest::initializeVulkanDevices(
     return Err;
 
   for (const auto &PDev : PhysicalDevices) {
+
     auto DeviceOrErr = VulkanDevice::create(VulkanInstanceShPtr, PDev,
                                             AvailableInstanceLayers);
     if (!DeviceOrErr) {

test/Basic/Matrix/matrix_const_single_subscript.i2x3.test

@@ -95,6 +95,9 @@ DescriptorSets:
 # Bug: https://github.com/llvm/offload-test-suite/issues/660
 # XFAIL: Vulkan && Clang
 
+# Bug: https://github.com/llvm/offload-test-suite/issues/696
+# XFAIL:Intel-Gen-Current && DirectX && Clang
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o

test/Basic/Matrix/matrix_construct_by_sub_mat.test

@@ -61,6 +61,9 @@ DescriptorSets:
 ...
 #--- end
 
+# Bug: https://github.com/llvm/offload-test-suite/issues/696
+# XFAIL:Intel-Gen-Current && DirectX && Clang
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o

test/Basic/Matrix/matrix_elementwise_cast.test

@@ -98,6 +98,10 @@ DescriptorSets:
         Binding: 3
 ...
 #--- end
+
+# Bug: https://github.com/llvm/offload-test-suite/issues/696
+# XFAIL:Intel-Gen-Current && DirectX && Clang
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o

test/Basic/Matrix/matrix_elementwise_vector_cast.test

@@ -73,7 +73,10 @@ DescriptorSets:
 #--- end
 
 # Bug https://github.com/llvm/offload-test-suite/issues/599
-# XFAIL: Intel && Vulkan && Clang
+# XFAIL: Intel-Gen-10 && Vulkan && Clang
+
+# Bug: https://github.com/llvm/offload-test-suite/issues/696
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl

test/Basic/Matrix/matrix_scalar_arithmetic.test

@@ -82,6 +82,9 @@ DescriptorSets:
 ...
 #--- end
 
+# Bug: https://github.com/llvm/offload-test-suite/issues/696
+# XFAIL:Intel-Gen-Current && DirectX && Clang
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o | FileCheck %s