[SPIRV] Add a means of turning off/on tests for specific spirv drivers (#678)

farzonl · web-flow · commit 2fcc0c944dfe · 2026-01-31T18:50:30.000-05:00
In the testing of KosmicKrisp Many tests for MoltenVK were XFAIL
resulting in unexpected passes. This change makes those tests XFAIL for
just MoltenVK.

## Results
```
OFFLOADTEST_GPU_NAME=KosmicKrisp ninja -C ../builds/llvm_relwithdebinfo_offload check-hlsl-clang-vk

Total Discovered Tests: 329
  Unsupported      :  72 (21.88%)
  Passed           : 186 (56.54%)
  Expectedly Failed:  71 (21.58%)

OFFLOADTEST_GPU_NAME=KosmicKrisp ninja -C ../builds/llvm_relwithdebinfo_offload check-hlsl-vk 

Total Discovered Tests: 329
  Unsupported      :  59 (17.93%)
  Passed           : 251 (76.29%)
  Expectedly Failed:  19 (5.78%)

OFFLOADTEST_GPU_NAME=MoltenVK ninja -C ../builds/llvm_relwithdebinfo_offload check-hlsl-vk

Total Discovered Tests: 329
  Unsupported      : 117 (35.56%)
  Passed           : 189 (57.45%)
  Expectedly Failed:  23 (6.99%)

OFFLOADTEST_GPU_NAME=MoltenVK ninja -C ../builds/llvm_relwithdebinfo_offload check-hlsl-clang-vk

Total Discovered Tests: 329
  Unsupported      : 128 (38.91%)
  Passed           : 134 (40.73%)
  Expectedly Failed:  67 (20.36%)

```
diff --git a/include/API/Device.h b/include/API/Device.h
@@ -38,6 +38,7 @@ struct DeviceConfig {
 class Device {
 protected:
   std::string Description;
+  std::string DriverName;
 
 public:
   virtual const Capabilities &getCapabilities() = 0;
@@ -49,6 +50,7 @@ class Device {
   virtual ~Device() = 0;
 
   llvm::StringRef getDescription() const { return Description; }
+  llvm::StringRef getDriverName() const { return DriverName; }
 
   static void registerDevice(std::shared_ptr<Device> D);
   static llvm::Error initialize(const DeviceConfig Config);
diff --git a/lib/API/VK/Device.cpp b/lib/API/VK/Device.cpp
@@ -382,16 +382,19 @@ class VKDevice : public offloadtest::Device {
     const uint64_t DeviceNameSz =
         strnlen(Props.deviceName, VK_MAX_PHYSICAL_DEVICE_NAME_SIZE);
     Description = std::string(Props.deviceName, DeviceNameSz);
-#if defined(__APPLE__) && defined(__aarch64__)
     DriverProps.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES;
     DriverProps.pNext = nullptr;
     Props2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
     Props2.pNext = &DriverProps;
     vkGetPhysicalDeviceProperties2(Device, &Props2);
     const uint64_t DriverNameSz =
         strnlen(DriverProps.driverName, VK_MAX_DRIVER_NAME_SIZE);
-    Description +=
-        " (" + std::string(DriverProps.driverName, DriverNameSz) + ")";
+    DriverName = std::string(DriverProps.driverName, DriverNameSz);
+#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
+    // adapter-regex matching.
+    Description += " (" + DriverName + ")";
 #endif
   }
   VKDevice(const VKDevice &) = default;
diff --git a/test/Feature/CBuffer/array-dynamic-index.test b/test/Feature/CBuffer/array-dynamic-index.test
@@ -78,6 +78,9 @@ DescriptorSets:
 ...
 #--- end
 
+# Bug https://github.com/llvm/llvm-project/issues/177806
+# XFAIL: Vulkan && MoltenVK && Clang
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -fvk-use-dx-layout -T cs_6_5 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/CBuffer/structs.test b/test/Feature/CBuffer/structs.test
@@ -102,6 +102,9 @@ DescriptorSets:
 # Bug https://github.com/llvm/llvm-project/issues/123968
 # XFAIL: Clang
 
+# Bug https://github.com/KhronosGroup/SPIRV-Cross/issues/2595
+# XFAIL: Vulkan && MoltenVK
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -fvk-use-dx-layout -T cs_6_5 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o | FileCheck %s
diff --git a/test/Feature/HLSLLib/cos.32.test b/test/Feature/HLSLLib/cos.32.test
@@ -62,7 +62,7 @@ DescriptorSets:
 #--- end
 
 # Bug https://github.com/KhronosGroup/SPIRV-Cross/issues/2525
-# XFAIL: Vulkan && Darwin
+# XFAIL: Vulkan && MoltenVK
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/HLSLLib/cosh.16.test b/test/Feature/HLSLLib/cosh.16.test
@@ -62,7 +62,7 @@ DescriptorSets:
 #--- end
 
 # Bug https://github.com/KhronosGroup/SPIRV-Cross/issues/2507
-# XFAIL: Vulkan && Darwin
+# XFAIL: Vulkan && MoltenVK
 
 # REQUIRES: Half
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/frac.32.test b/test/Feature/HLSLLib/frac.32.test
@@ -61,6 +61,11 @@ DescriptorSets:
 ...
 #--- end
 
+# Bug: https://github.com/llvm/offload-test-suite/issues/682
+# XFAIL: Vulkan && KosmicKrisp
+# Expected: [ nan, nan, 0, 0, 0, 0.5, nan, 0, 0.71828, 0.599976, 0.611, nan ]
+# Result:   [ nan,   0, 0, 0, 0, 0.5,   0, 0, 0.71828, 0.599976, 0.611, nan ]
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/HLSLLib/reflect.16.test b/test/Feature/HLSLLib/reflect.16.test
@@ -187,7 +187,7 @@ DescriptorSets:
 # REQUIRES: Half
 
 # Bug https://github.com/KhronosGroup/SPIRV-Cross/issues/2524
-# XFAIL: Vulkan && Darwin
+# XFAIL: Vulkan && MoltenVK
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -enable-16bit-types -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/HLSLLib/refract.16.test b/test/Feature/HLSLLib/refract.16.test
@@ -188,7 +188,7 @@ DescriptorSets:
 # REQUIRES: Half
 
 # Bug https://github.com/KhronosGroup/SPIRV-Cross/issues/2524
-# XFAIL: Vulkan && Darwin
+# XFAIL: Vulkan && MoltenVK
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -enable-16bit-types -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/HLSLLib/sin.32.test b/test/Feature/HLSLLib/sin.32.test
@@ -62,7 +62,7 @@ DescriptorSets:
 #--- end
 
 # Bug https://github.com/KhronosGroup/SPIRV-Cross/issues/2525
-# XFAIL: Vulkan && Darwin
+# XFAIL: Vulkan && MoltenVK
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/HLSLLib/sinh.16.test b/test/Feature/HLSLLib/sinh.16.test
@@ -62,7 +62,7 @@ DescriptorSets:
 #--- end
 
 # Bug https://github.com/KhronosGroup/SPIRV-Cross/issues/2507
-# XFAIL: Vulkan && Darwin
+# XFAIL: Vulkan && MoltenVK
 
 # REQUIRES: Half
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/tanh.16.test b/test/Feature/HLSLLib/tanh.16.test
@@ -62,7 +62,7 @@ DescriptorSets:
 #--- end
 
 # Bug https://github.com/KhronosGroup/SPIRV-Cross/issues/2507
-# XFAIL: Vulkan && Darwin
+# XFAIL: Vulkan && MoltenVK
 
 # REQUIRES: Half
 # RUN: split-file %s %t
diff --git a/test/Feature/MaximalReconvergence/loop_peeling.test b/test/Feature/MaximalReconvergence/loop_peeling.test
@@ -41,6 +41,7 @@ DescriptorSets:
 
 # BUG: https://github.com/llvm/llvm-project/issues/165288
 # XFAIL: !WARP && Clang && (DirectX || Metal)
+# XFAIL: Vulkan && Darwin
 
 # BUG: https://github.com/llvm/offload-test-suite/issues/520
 # XFAIL: QC
diff --git a/test/Feature/ResourceArrays/unbounded-array.test b/test/Feature/ResourceArrays/unbounded-array.test
@@ -56,6 +56,7 @@ DescriptorSets:
 
 # Unimplemented https://github.com/llvm/offload-test-suite/issues/305
 # XFAIL: Metal
+# XFAIL: DXC && Vulkan && KosmicKrisp
 
 # Bug https://github.com/llvm/offload-test-suite/issues/556
 # XFAIL: Vulkan && QC && Clang
diff --git a/test/Feature/Textures/Texture2D.Sample.test.yaml b/test/Feature/Textures/Texture2D.Sample.test.yaml
@@ -152,7 +152,7 @@ Results:
 #--- end
 
 # Unimplemented: https://github.com/llvm/offload-test-suite/issues/664
-# XFAIL: DirectX || Metal
+# XFAIL: DirectX || Metal || Vulkan && Darwin
 
 # Unimplemented: https://github.com/llvm/llvm-project/issues/175630
 # XFAIL: Clang
diff --git a/test/Feature/Textures/Texture2D.SampleBias.test.yaml b/test/Feature/Textures/Texture2D.SampleBias.test.yaml
@@ -143,7 +143,7 @@ Results:
 #--- end
 
 # Unimplemented: https://github.com/llvm/offload-test-suite/issues/664
-# XFAIL: DirectX || Metal
+# XFAIL: DirectX || Metal || Vulkan && Darwin
 
 # Unimplemented: https://github.com/llvm/llvm-project/issues/175630
 # XFAIL: Clang
diff --git a/test/Feature/Textures/Texture2D.SampleCmp.test.yaml b/test/Feature/Textures/Texture2D.SampleCmp.test.yaml
@@ -175,7 +175,7 @@ Results:
 #--- end
 
 # Unimplemented: https://github.com/llvm/offload-test-suite/issues/664
-# XFAIL: DirectX || Metal
+# XFAIL: DirectX || Metal || Vulkan && Darwin
 
 # Unimplemented: https://github.com/llvm/llvm-project/issues/175630
 # XFAIL: Clang
diff --git a/test/Feature/TypedBuffer/GetDimensions.test b/test/Feature/TypedBuffer/GetDimensions.test
@@ -83,7 +83,7 @@ DescriptorSets:
 # Bug https://github.com/llvm/offload-test-suite/issues/469
 # GetDimensions on Vulkan (DXC) returns [ 16, 16 ] instead of [ 8, 5 ]
 # except on AMD https://github.com/llvm/offload-test-suite/issues/523
-# XFAIL: DXC && Vulkan && !AMD
+# XFAIL: DXC && Vulkan && !Darwin && !AMD
 
 # Unimplemented https://github.com/llvm/llvm-project/issues/164008
 # XFAIL: Clang && Vulkan
diff --git a/test/Feature/WaveOps/WaveActiveAnyTrue.test b/test/Feature/WaveOps/WaveActiveAnyTrue.test
@@ -62,6 +62,9 @@ DescriptorSets:
 ...
 #--- end
 
+# Bug https://github.com/KhronosGroup/SPIRV-Cross/issues/2593
+# XFAIL: Vulkan && MoltenVK && Clang
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/WaveOps/WaveActiveCountBits.test b/test/Feature/WaveOps/WaveActiveCountBits.test
@@ -67,6 +67,14 @@ DescriptorSets:
 # Bug https://github.com/llvm/offload-test-suite/issues/549
 # XFAIL: QC && Vulkan && Clang
 
+# Bug https://github.com/KhronosGroup/SPIRV-Cross/issues/2594
+# XFAIL: Vulkan && MoltenVK && Clang
+
+# Bug https://github.com/llvm/offload-test-suite/issues/680
+# Expects: [ 3, 3, 3, 3, 2, 2, 0 ] 
+# Retsult: [ 3, 3, 3, 3, 4, 4, 0 ]
+# XFAIL: Vulkan && KosmicKrisp && Clang
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/Feature/WaveOps/WaveIsFirstLane.test b/test/Feature/WaveOps/WaveIsFirstLane.test
@@ -65,6 +65,11 @@ DescriptorSets:
 ...
 #--- end
 
+# Bug https://github.com/llvm/offload-test-suite/issues/681
+# Expected: [ 1, 0, 1, 1, 1, 0, 0, 0 ]
+# Result:   [ 1, 0, 0, 0, 1, 0, 0, 0 ]
+# XFAIL: Vulkan && KosmicKrisp
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/UseCase/particle-life.test b/test/UseCase/particle-life.test
@@ -359,7 +359,7 @@ DescriptorSets:
 # XFAIL: Metal
 
 # No idea what is going on here, but the results are _way_ off.
-# XFAIL: Vulkan && Darwin
+# XFAIL: Clang && Vulkan && MoltenVK
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 %if Vulkan %{ -fvk-use-dx-layout %} -Fo %t.o %t/particle-life.hlsl
diff --git a/test/WaveOps/GroupMemoryBarrierWithGroupSync.test b/test/WaveOps/GroupMemoryBarrierWithGroupSync.test
@@ -76,6 +76,9 @@ DescriptorSets:
 ...
 #--- end
 
+# Bug: https://github.com/llvm/offload-test-suite/issues/683
+# XFAIL: Vulkan && KosmicKrisp && Clang
+
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
 # RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/WaveOps/WaveActiveMax.int64.test b/test/WaveOps/WaveActiveMax.int64.test
@@ -310,7 +310,7 @@ DescriptorSets:
 # XFAIL: Clang && Vulkan
 
 # Bug https://github.com/llvm/offload-test-suite/issues/393
-# XFAIL: Metal
+# XFAIL: Metal || (Vulkan && MoltenVK)
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/WaveOps/WaveActiveSum.int16.test b/test/WaveOps/WaveActiveSum.int16.test
@@ -332,7 +332,7 @@ DescriptorSets:
 # XFAIL: NV && Clang && DirectX
 
 # Bug https://github.com/llvm/offload-test-suite/issues/393
-# XFAIL: Metal
+# XFAIL: Metal || (Vulkan && MoltenVK)
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -enable-16bit-types -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/WaveOps/WaveActiveSum.int64.test b/test/WaveOps/WaveActiveSum.int64.test
@@ -332,7 +332,7 @@ DescriptorSets:
 # XFAIL: NV && Clang && DirectX
 
 # Bug https://github.com/llvm/offload-test-suite/issues/355
-# XFAIL: Metal
+# XFAIL: Metal || (Vulkan && MoltenVK)
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/WaveOps/WaveReadLaneAt.Int.64.test b/test/WaveOps/WaveReadLaneAt.Int.64.test
@@ -100,6 +100,9 @@ DescriptorSets:
 # Tracked by https://github.com/llvm/offload-test-suite/issues/355
 # UNSUPPORTED: Metal
 
+# Bug Tracked by https://github.com/llvm/offload-test-suite/issues/672
+# XFAIL: Vulkan && MoltenVK
+
 # Bug https://github.com/llvm/offload-test-suite/issues/533
 # XFAIL: DirectX && AMD
 
diff --git a/test/WaveOps/WaveReadLaneFirst.int64.test b/test/WaveOps/WaveReadLaneFirst.int64.test
@@ -310,7 +310,7 @@ DescriptorSets:
 # XFAIL: Clang
 
 # Bug https://github.com/llvm/offload-test-suite/issues/393
-# XFAIL: Metal
+# XFAIL: Metal || (Vulkan && MoltenVK)
 
 # Bug https://github.com/llvm/offload-test-suite/issues/433
 # UNSUPPORTED: WARP
diff --git a/test/lit.cfg.py b/test/lit.cfg.py
@@ -82,6 +82,10 @@ def setDeviceFeatures(config, device, compiler):
     config.available_features.add(API)
     config.available_features.add(compiler)
     config.available_features.add(config.offloadtest_os)
+    # Note: For now just Darwin. In the future just check
+    # not Windows.
+    if device["Driver"] and "Darwin" == config.offloadtest_os:
+        config.available_features.add(device["Driver"])
     if "Microsoft Basic Render Driver" in device["Description"]:
         config.available_features.add("WARP")
         config.available_features.add(config.warp_arch)
diff --git a/tools/api-query/api-query.cpp b/tools/api-query/api-query.cpp
@@ -34,6 +34,7 @@ int main(int ArgC, char **ArgV) {
   for (const auto &D : Device::devices()) {
     outs() << "- API: " << D->getAPIName() << "\n";
     outs() << "  Description: " << D->getDescription() << "\n";
+    outs() << "  Driver: " << D->getDriverName() << "\n";
     outs() << "  Features: \n";
     for (const auto &C : D->getCapabilities()) {
       outs() << "    ";
