Merge branch 'main' into isnan

danbrown-amd · web-flow · commit 398f319aeac8 · 2025-12-10T15:43:04.000-07:00
diff --git a/lib/API/DX/Device.cpp b/lib/API/DX/Device.cpp
@@ -1022,7 +1022,7 @@ class DXDevice : public offloadtest::Device {
             HR::toError(IS.CmdList->Close(), "Failed to close command list."))
       return Err;
 
-    ID3D12CommandList *CmdLists[] = {IS.CmdList.Get()};
+    ID3D12CommandList *const CmdLists[] = {IS.CmdList.Get()};
     IS.Queue->ExecuteCommandLists(1, CmdLists);
 
     return waitForSignal(IS);
@@ -1213,13 +1213,13 @@ class DXDevice : public offloadtest::Device {
         static_cast<uint32_t>(B.getElementSize() * B.OutputProps.Width);
     const uint32_t Height = static_cast<uint32_t>(B.OutputProps.Height);
 
-    uint8_t *SrcBase = reinterpret_cast<uint8_t *>(Mapped);
+    const uint8_t *SrcBase = reinterpret_cast<uint8_t *>(Mapped);
     uint8_t *DstBase =
         reinterpret_cast<uint8_t *>(P.Bindings.RTargetBufferPtr->Data[0].get());
 
     // Copy rows in reverse order.
     for (uint32_t Y = 0; Y < Height; ++Y) {
-      uint8_t *SrcRow = SrcBase + static_cast<size_t>(Y) * RowPitch;
+      const uint8_t *SrcRow = SrcBase + static_cast<size_t>(Y) * RowPitch;
       uint8_t *DstRow =
           DstBase + static_cast<size_t>(Height - 1 - Y) * RowBytes;
       memcpy(DstRow, SrcRow, RowBytes);
diff --git a/test/Basic/Matrix/matrix_elementwise_vector_cast.test b/test/Basic/Matrix/matrix_elementwise_vector_cast.test
@@ -73,8 +73,8 @@ DescriptorSets:
 ...
 #--- end
 
-# Unimplemented: https://github.com/llvm/llvm-project/issues/170538
-# XFAIL: Vulkan && Clang
+# Bug https://github.com/llvm/offload-test-suite/issues/599
+# XFAIL: Intel && Vulkan && 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
@@ -56,8 +56,8 @@ DescriptorSets:
 ...
 #--- end
 
-# Unimplemented: https://github.com/llvm/llvm-project/issues/170538
-# XFAIL: Vulkan && Clang
+# Bug https://github.com/llvm/offload-test-suite/issues/599
+# XFAIL: Intel && Vulkan && Clang
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl
diff --git a/test/Bugs/Adjacent-Partial-Writes.yaml b/test/Bugs/Adjacent-Partial-Writes.yaml
@@ -69,6 +69,9 @@ 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
diff --git a/test/Feature/HLSLLib/asdouble.32.test b/test/Feature/HLSLLib/asdouble.32.test
@@ -82,9 +82,6 @@ DescriptorSets:
         Binding: 2
 #--- end
 
-# Bug https://github.com/llvm/llvm-project/issues/153513
-# XFAIL: Clang && Vulkan
-
 # Bug https://github.com/microsoft/DirectXShaderCompiler/issues/7699
 # XFAIL: DXC && Vulkan
 
diff --git a/test/Feature/HLSLLib/asin.32.test b/test/Feature/HLSLLib/asin.32.test
@@ -61,6 +61,8 @@ DescriptorSets:
 ...
 #--- end
 
+# Bug https://github.com/llvm/offload-test-suite/issues/578
+# XFAIL: AMD && Vulkan
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/HLSLLib/countbits.64.test b/test/Feature/HLSLLib/countbits.64.test
@@ -97,6 +97,9 @@ DescriptorSets:
 # https://github.com/llvm/llvm-project/issues/142677
 # UNSUPPORTED: Vulkan
 
+# Bug https://github.com/llvm/offload-test-suite/issues/331
+# 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
diff --git a/test/Feature/HLSLLib/dot2add.test b/test/Feature/HLSLLib/dot2add.test
@@ -89,8 +89,8 @@ DescriptorSets:
 # Bug https://github.com/llvm/offload-test-suite/issues/341
 # XFAIL: Metal
 
-# Bug https://github.com/llvm/llvm-project/issues/149561
-# XFAIL: Clang && Vulkan && !VK_KHR_shader_float_controls2
+# Bug https://github.com/llvm/llvm-project/issues/149561 and https://github.com/llvm/offload-test-suite/issues/568
+# XFAIL: Clang && Vulkan
 
 # REQUIRES: Half
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/firstbithigh.16.test b/test/Feature/HLSLLib/firstbithigh.16.test
@@ -82,10 +82,8 @@ DescriptorSets:
 
 # REQUIRES: Int16
 
-# Bug: No bit set terminal is returned as 4294901776 instead of 4294967295
-# XFAIL: DXC && Metal
-# Bug: Fails with 'gpu-exec: error: Failed to materializeAll.:'
-# XFAIL: Clang && Metal
+# Bug https://github.com/llvm/offload-test-suite/issues/602
+# XFAIL: Metal
 
 # 16/64 bit firstbithigh doesn't have a DXC-Vulkan lowering
 # Unsupported https://github.com/microsoft/DirectXShaderCompiler/blob/main/tools/clang/test/CodeGenSPIRV/intrinsics.firstbitlow.64bit.hlsl
diff --git a/test/Feature/HLSLLib/firstbithigh.64.test b/test/Feature/HLSLLib/firstbithigh.64.test
@@ -82,7 +82,7 @@ DescriptorSets:
 
 # REQUIRES: Int64
 
-# Bug: Fails with 'gpu-exec: error: Failed to materializeAll.:'
+# Bug https://github.com/llvm/offload-test-suite/issues/605
 # XFAIL: Metal
 
 # 16/64 bit firstbithigh doesn't have a DXC-Vulkan lowering
@@ -92,6 +92,9 @@ DescriptorSets:
 # Bug https://github.com/llvm/llvm-project/issues/143171
 # XFAIL: Clang && Vulkan
 
+# Bug https://github.com/llvm/offload-test-suite/issues/324
+# XFAIL: NV && 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
diff --git a/test/Feature/HLSLLib/firstbitlow.16.test b/test/Feature/HLSLLib/firstbitlow.16.test
@@ -76,7 +76,7 @@ DescriptorSets:
 
 # REQUIRES: Int16
 
-# Fails with 'gpu-exec: error: Failed to materializeAll.:'
+# Bug https://github.com/llvm/offload-test-suite/issues/605
 # XFAIL: Metal
 
 # 16/64 bit firstbitlow doesn't have a DXC-Vulkan lowering
diff --git a/test/Feature/HLSLLib/firstbitlow.64.test b/test/Feature/HLSLLib/firstbitlow.64.test
@@ -76,7 +76,7 @@ DescriptorSets:
 
 # REQUIRES: Int64
 
-# Fails with 'gpu-exec: error: Failed to materializeAll.:'
+# Bug https://github.com/llvm/offload-test-suite/issues/605
 # XFAIL: Metal
 
 # 16/64 bit firstbitlow doesn't have a DXC-Vulkan lowering
@@ -86,6 +86,9 @@ DescriptorSets:
 # Bug https://github.com/llvm/llvm-project/issues/143003
 # XFAIL: Clang && Vulkan
 
+# Bug https://github.com/llvm/offload-test-suite/issues/324
+# XFAIL: NV && 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
diff --git a/test/Feature/HLSLLib/mad.int64.test b/test/Feature/HLSLLib/mad.int64.test
@@ -144,6 +144,9 @@ DescriptorSets:
 # https://github.com/llvm/llvm-project/issues/140095
 # UNSUPPORTED: Clang && Vulkan
 
+# Bug https://github.com/llvm/offload-test-suite/issues/412
+# XFAIL: AMD && DirectX
+
 # REQUIRES: Int64
 # RUN: split-file %s %t
 # RUN: %dxc_target -HV 202x -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/HLSLLib/select.32.test b/test/Feature/HLSLLib/select.32.test
@@ -350,8 +350,8 @@ DescriptorSets:
         Binding: 15
 #--- end
 
-# Bug https://github.com/llvm/llvm-project/issues/166642
-# XFAIL: Clang && Vulkan
+# Bug https://github.com/llvm/offload-test-suite/issues/615
+# XFAIL: Clang && Vulkan && Intel
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -HV 202x -T cs_6_5 -Fo %t.o %t/source.hlsl
diff --git a/test/Feature/HLSLLib/select.fp16.test b/test/Feature/HLSLLib/select.fp16.test
@@ -131,8 +131,8 @@ DescriptorSets:
         Binding: 4
 #--- end
 
-# Bug https://github.com/llvm/llvm-project/issues/166642
-# XFAIL: Clang && Vulkan
+# Bug https://github.com/llvm/offload-test-suite/issues/615
+# XFAIL: Clang && Vulkan && Intel
 
 # REQUIRES: Half
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/select.fp64.test b/test/Feature/HLSLLib/select.fp64.test
@@ -124,8 +124,8 @@ DescriptorSets:
         Binding: 4
 #--- end
 
-# Bug https://github.com/llvm/llvm-project/issues/166642
-# XFAIL: Clang && Vulkan
+# Bug https://github.com/llvm/offload-test-suite/issues/615
+# XFAIL: Clang && Vulkan && Intel
 
 # REQUIRES: Double
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/select.int16.test b/test/Feature/HLSLLib/select.int16.test
@@ -204,8 +204,8 @@ DescriptorSets:
         Binding: 8
 #--- end
 
-# Bug https://github.com/llvm/llvm-project/issues/166642
-# XFAIL: Clang && Vulkan
+# Bug https://github.com/llvm/offload-test-suite/issues/615
+# XFAIL: Clang && Vulkan && Intel
 
 # REQUIRES: Int16
 # RUN: split-file %s %t
diff --git a/test/Feature/HLSLLib/select.int64.test b/test/Feature/HLSLLib/select.int64.test
@@ -203,8 +203,8 @@ DescriptorSets:
         Binding: 8
 #--- end
 
-# Bug https://github.com/llvm/llvm-project/issues/166642
-# XFAIL: Clang && Vulkan
+# Bug https://github.com/llvm/offload-test-suite/issues/615
+# XFAIL: Clang && Vulkan && Intel
 
 # REQUIRES: Int64
 # RUN: split-file %s %t
diff --git a/test/Feature/TypedBuffer/GetDimensions.test b/test/Feature/TypedBuffer/GetDimensions.test
@@ -81,7 +81,9 @@ DescriptorSets:
 #--- end
 
 # Bug https://github.com/llvm/offload-test-suite/issues/469
-# XFAIL: DXC && Vulkan
+# 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
 
 # Unimplemented https://github.com/llvm/llvm-project/issues/164008
 # XFAIL: Clang && Vulkan
diff --git a/test/Feature/WaveOps/WaveIsFirstLane.test b/test/Feature/WaveOps/WaveIsFirstLane.test
@@ -65,9 +65,6 @@ DescriptorSets:
 ...
 #--- end
 
-# Bug https://github.com/llvm/offload-test-suite/issues/320
-# XFAIL: NV-Reconvergence-Issue-320
-
 # 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/lit.cfg.py b/test/lit.cfg.py
@@ -74,10 +74,6 @@ def setDeviceFeatures(config, device, compiler):
             config.available_features.add("Intel-Memory-Coherence-Issue-226")
     if "NVIDIA" in device["Description"]:
         config.available_features.add("NV")
-        NV50SeriesRegex = re.compile("NVIDIA GeForce [A-Z]+ 50[0-9]+")
-        NV50SeriesMatch = NV50SeriesRegex.match(device["Description"])
-        if NV50SeriesMatch and API == "DirectX":
-            config.available_features.add("NV-Reconvergence-Issue-320")
     if "AMD" in device["Description"]:
         config.available_features.add("AMD")
     if "Qualcomm" in device["Description"]:
