add api-query fro family prefix. limit family prefix to intel for now. updte test cases for updated xfail

farzonl · farzonl · commit 881f4ab8f619 · 2026-06-06T01:39:16.000-04:00
diff --git a/include/API/Device.h b/include/API/Device.h
@@ -191,6 +191,7 @@ class Device {
   std::string DriverName;
   std::string DriverVersion;
   std::string GPUGeneration;
+  uint16_t FamilyPrefix = 0;
 
 public:
   virtual const Capabilities &getCapabilities() = 0;
@@ -232,6 +233,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
diff --git a/lib/API/DX/Device.cpp b/lib/API/DX/Device.cpp
@@ -1003,6 +1003,7 @@ class DXDevice : public offloadtest::Device {
                                        &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)
diff --git a/lib/API/VK/Device.cpp b/lib/API/VK/Device.cpp
@@ -1384,6 +1384,7 @@ class VulkanDevice : public offloadtest::Device {
 
     // 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)
diff --git a/test/Basic/Matrix/matrix_const_single_subscript.i2x3.test b/test/Basic/Matrix/matrix_const_single_subscript.i2x3.test
@@ -96,7 +96,7 @@ DescriptorSets:
 # XFAIL: Vulkan && Clang
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/696
-# XFAIL: Intel-Modern-GPU && DirectX && Clang
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Basic/Matrix/matrix_construct_by_sub_mat.test b/test/Basic/Matrix/matrix_construct_by_sub_mat.test
@@ -62,7 +62,7 @@ DescriptorSets:
 #--- end
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/696
-# XFAIL: Intel-Modern-GPU && DirectX && Clang
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Basic/Matrix/matrix_elementwise_cast.test b/test/Basic/Matrix/matrix_elementwise_cast.test
@@ -100,7 +100,7 @@ DescriptorSets:
 #--- end
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/696
-# XFAIL: Intel-Modern-GPU && DirectX && Clang
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Basic/Matrix/matrix_elementwise_vector_cast.test b/test/Basic/Matrix/matrix_elementwise_vector_cast.test
@@ -76,7 +76,7 @@ DescriptorSets:
 # XFAIL: Intel && Vulkan && Clang
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/696
-# XFAIL: Intel-Modern-GPU && DirectX && Clang
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Basic/Matrix/matrix_scalar_arithmetic.test b/test/Basic/Matrix/matrix_scalar_arithmetic.test
@@ -83,7 +83,7 @@ DescriptorSets:
 #--- end
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/696
-# XFAIL: Intel-Modern-GPU && DirectX && Clang
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Basic/Matrix/matrix_scalar_constructor.test b/test/Basic/Matrix/matrix_scalar_constructor.test
@@ -56,7 +56,7 @@ DescriptorSets:
 #--- end
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/696
-# XFAIL: Intel-Modern-GPU && DirectX && Clang
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Basic/Matrix/matrix_single_subscript_basic.i2x3.test b/test/Basic/Matrix/matrix_single_subscript_basic.i2x3.test
@@ -96,7 +96,7 @@ DescriptorSets:
 # XFAIL: Vulkan && Clang
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/696
-# XFAIL: Intel-Modern-GPU && DirectX && Clang
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Basic/Matrix/matrix_single_subscript_basic.i3x2.test b/test/Basic/Matrix/matrix_single_subscript_basic.i3x2.test
@@ -100,7 +100,7 @@ DescriptorSets:
 # XFAIL: Vulkan && Clang
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/696
-# XFAIL: Intel-Modern-GPU && DirectX && Clang
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Basic/Matrix/matrix_single_subscript_basic.test b/test/Basic/Matrix/matrix_single_subscript_basic.test
@@ -102,7 +102,7 @@ DescriptorSets:
 # XFAIL: Vulkan && Clang
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/696
-# XFAIL: Intel-Modern-GPU && DirectX && Clang
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Basic/Matrix/matrix_trunc_cast.test b/test/Basic/Matrix/matrix_trunc_cast.test
@@ -59,7 +59,7 @@ DescriptorSets:
 # XFAIL: Intel && Vulkan && Clang
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/696
-# XFAIL: Intel-Modern-GPU && DirectX && Clang
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer_threadgroup.f4x2.test b/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer_threadgroup.f4x2.test
@@ -97,7 +97,7 @@ DescriptorSets:
 # XFAIL: Vulkan && QC && DXC
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/696
-# XFAIL: Intel-Modern-GPU && DirectX && Clang
+# XFAIL:Intel-Gen-Current && DirectX && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/CBuffer/arrays-16bit.test b/test/Feature/CBuffer/arrays-16bit.test
@@ -82,7 +82,7 @@ DescriptorSets:
 # REQUIRES: Half, Int16
 
 # Bug: https://github.com/llvm/offload-test-suite/issues/933
-# XFAIL:  Intel-Legacy-GPU && DirectX
+# XFAIL:  Intel-Gen-10 && DirectX
 
 # Unimplemented https://github.com/llvm/llvm-project/issues/159602
 # XFAIL: Clang && Vulkan
diff --git a/test/Feature/CBuffer/scalars-16bit.test b/test/Feature/CBuffer/scalars-16bit.test
@@ -58,7 +58,7 @@ DescriptorSets:
 # XFAIL: QC && Vulkan
 
 # Bug https://github.com/llvm/offload-test-suite/issues/932
-# XFAIL:  Intel-Legacy-GPU && DirectX
+# XFAIL: Intel-Gen-10 && DirectX
 
 # REQUIRES: Half, Int16
 
diff --git a/test/Feature/HLSLLib/mul.fp16.test b/test/Feature/HLSLLib/mul.fp16.test
@@ -113,7 +113,7 @@ DescriptorSets:
 #--- end
 
 # Bug https://github.com/llvm/offload-test-suite/issues/777
-# XFAIL: Intel-Legacy-GPU && DirectX
+# XFAIL: Intel-Gen-10 && DirectX
 
 # REQUIRES: Half
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/mul.int16.test b/test/Feature/HLSLLib/mul.int16.test
@@ -110,7 +110,7 @@ DescriptorSets:
 #--- end
 
 # Bug https://github.com/llvm/offload-test-suite/issues/777
-# XFAIL: Intel-Legacy-GPU && DirectX
+# XFAIL: Intel-Gen-10 && DirectX
 
 # REQUIRES: Int16
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/transpose.fp16.test b/test/Feature/HLSLLib/transpose.fp16.test
@@ -105,7 +105,7 @@ DescriptorSets:
 #--- end
 
 # Bug https://github.com/llvm/offload-test-suite/issues/779
-# XFAIL: Intel-Legacy-GPU && DirectX
+# XFAIL: Intel-Gen-10 && DirectX
 
 # REQUIRES: Half
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/transpose.int16.test b/test/Feature/HLSLLib/transpose.int16.test
@@ -102,7 +102,7 @@ DescriptorSets:
 #--- end
 
 # Bug https://github.com/llvm/offload-test-suite/issues/779
-# XFAIL: Intel-Legacy-GPU && DirectX
+# XFAIL:  Intel-Gen-10 && DirectX
 
 # REQUIRES: Int16
 # RUN: split-file %s %t
diff --git a/test/lit.cfg.py b/test/lit.cfg.py
@@ -114,9 +114,9 @@ def setDeviceFeatures(config, device, compiler):
 
     if "Intel" in device["Description"]:
         if device["GPUGeneration"] == "Intel Gen11-14/Xe":
-            config.available_features.add("Intel-Modern-GPU")
+            config.available_features.add("Intel-Gen-Current")
         if device["GPUGeneration"] == "Intel Gen7-10":
-            config.available_features.add("Intel-Legacy-GPU")
+            config.available_features.add("Intel-Gen-10")
         config.available_features.add("Intel")
         if "UHD Graphics" in device["Description"] and API == "DirectX":
             # When Intel resolves the driver issue and tests XFAILing on the
diff --git a/tools/api-query/api-query.cpp b/tools/api-query/api-query.cpp
@@ -14,6 +14,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Error.h"
+#include "llvm/Support/Format.h"
 #include "llvm/Support/InitLLVM.h"
 
 using namespace llvm;
@@ -50,6 +51,8 @@ int main(int ArgC, char **ArgV) {
       outs() << C;
     }
     outs() << "\"\n";
+    outs() << "  GPUGeneration: " << D->getGPUGeneration() << "\n";
+    outs() << "  FamilyPrefix: " << format_hex(D->getFamilyPrefix(), 6) << "\n";
     outs() << "  Features: \n";
     for (const auto &C : D->getCapabilities()) {
       outs() << "    ";
