Merge branch 'main' into reconvergence-workflow

Author: luciechoi

.github/workflows/build-and-test-callable.yaml

@@ -58,7 +58,7 @@ on:
         required: false
         default: ''
         type: string
-      TestReconvergenceTarget:
+      TestTargetReconvergence:
         required: false
         default: 'check-hlsl-reconvergence'
         type: string
@@ -104,7 +104,7 @@ on:
         required: false
         default: ''
         type: string
-      TestReconvergenceTarget:
+      TestTargetReconvergence:
         required: false
         default: 'check-hlsl-reconvergence'
         type: string
@@ -191,7 +191,7 @@ jobs:
         run: |
             cd llvm-project
             cd build
-            ninja ${{ inputs.TestReconvergenceTarget }}
+            ninja ${{ inputs.TestTargetReconvergence }}
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action/macos@34d7c956a59aed1bfebf31df77b8de55db9bbaaf # v2.21.0
         if: always() && inputs.OS == 'macOS'

.github/workflows/windows-amd-clang-warp-preview-d3d12.yaml

@@ -21,4 +21,4 @@ jobs:
       TestTarget: check-hlsl-clang-warp-d3d12
       TestTargetReconvergence: check-hlsl-clang-reconvergence-warp-d3d12
       OffloadTest-branch: ${{ github.ref }}
-      LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On -DWARP_VERSION=1.0.15-preview
+      LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DOFFLOADTEST_USE_CLANG_TIDY=On -DWARP_VERSION=1.0.17

.github/workflows/windows-amd-dxc-warp-preview-d3d12.yaml

@@ -22,4 +22,4 @@ jobs:
       TestTarget: check-hlsl-warp-d3d12
       TestTargetReconvergence: check-hlsl-reconvergence-warp-d3d12
       OffloadTest-branch: ${{ github.ref }}
-      LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DWARP_VERSION=1.0.15-preview
+      LLVM-ExtraCMakeArgs: -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl -DWARP_VERSION=1.0.17

cmake/modules/Warp.cmake

@@ -24,7 +24,7 @@ function(setup_warp version)
   guess_nuget_arch(NUGET_ARCH)
 
   if (version STREQUAL "LKG")
-    set(version "1.0.15")
+    set(version "1.0.17")
     set(version_description "Latest Known Good for ${NUGET_ARCH} (${version})")
   else ()
     set(version_description "Custom (${version})")

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;
@@ -51,6 +52,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);

lib/API/MTL/MTLDevice.cpp

@@ -290,6 +290,7 @@ class MTLDevice : public offloadtest::Device {
                                                            Height, false);
         break;
       case ResourceKind::Sampler:
+      case ResourceKind::SamplerComparison:
         llvm_unreachable("Not implemented yet.");
       case ResourceKind::StructuredBuffer:
       case ResourceKind::RWStructuredBuffer:

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;

test/Basic/Matrix/matrix_construct_by_sub_mat.test

@@ -0,0 +1,67 @@
+#--- source.hlsl
+
+RWBuffer<int> In : register(u0);
+RWBuffer<int> Out : register(u1);
+
+[numthreads(16,1,1)]
+void main(uint GI : SV_GroupIndex) {
+  int2x2 A = int2x2(In[0], In[1],
+                    In[2], In[3]);
+  int2x2 B = int2x2(In[4], In[5],
+                    In[6], In[7]);
+  int2x2 C = int2x2(In[8], In[9],
+                    In[10], In[11]);
+  int3x1 D = int3x1(In[12], In[13], In[14]);
+
+  int4x4 Mat = {A, B, C, D, In[15]};
+  const uint COLS = 4;          
+  uint row = GI / COLS;
+  uint col = GI % COLS;
+
+  Out[GI] = Mat[row][col];
+}
+
+//--- pipeline.yaml
+
+---
+Shaders:
+  - Stage: Compute
+    Entry: main
+    DispatchSize: [1, 1, 1]
+Buffers:
+  - Name: In
+    Format: Int32
+    Data: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+  - Name: Out
+    Format: Int32
+    FillSize: 64
+  - Name: ExpectedOut
+    Format: Int32
+    Data: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+Results:
+  - Result: Out
+    Rule: BufferExact
+    Actual: Out
+    Expected: ExpectedOut
+DescriptorSets:
+  - Resources:
+    - Name: In
+      Kind: RWBuffer
+      DirectXBinding:
+        Register: 0
+        Space: 0
+      VulkanBinding:
+        Binding: 0
+    - Name: Out
+      Kind: RWBuffer
+      DirectXBinding:
+        Register: 1
+        Space: 0
+      VulkanBinding:
+        Binding: 1
+...
+#--- end
+
+# 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/Bugs/Adjacent-Partial-Writes.yaml

@@ -69,9 +69,6 @@ DescriptorSets:
 # https://github.com/llvm/llvm-project/issues/142677
 # UNSUPPORTED: Vulkan
 
-# Bug https://github.com/llvm/offload-test-suite/issues/330
-# XFAIL: AMD && DirectX
-
 # 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

test/Feature/ByteAddressBuffer/ByteAddressBuffers-16bit.test

@@ -88,8 +88,8 @@ DescriptorSets:
 ...
 #--- end
 
-# Unimplemented https://github.com/llvm/llvm-project/issues/108058
-# XFAIL: Clang
+# Unimplemented https://github.com/llvm/llvm-project/issues/179560
+# XFAIL: Clang && Vulkan
 
 # REQUIRES: Int16
 # RUN: split-file %s %t