From 98cc893f7f95d260e638861d1b203fa2f0a6c27c Mon Sep 17 00:00:00 2001 From: Helena Kotas Date: Thu, 29 May 2025 16:21:57 -0700 Subject: [PATCH 1/3] Enable implicit binding tests for Clang-DXC --- test/Feature/ImplicitBindings/all-implicit.test | 3 ++- test/Feature/ImplicitBindings/simple-resources.test | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/Feature/ImplicitBindings/all-implicit.test b/test/Feature/ImplicitBindings/all-implicit.test index 8bc95ca1d..dacced1ef 100644 --- a/test/Feature/ImplicitBindings/all-implicit.test +++ b/test/Feature/ImplicitBindings/all-implicit.test @@ -68,7 +68,8 @@ DescriptorSets: ... #--- end -# UNSUPPORTED: Clang +# Clang's Vulcan implicit binding is not yet implemented. +# UNSUPPORTED: Clang-Vulkan # CBuffer bindings seem to be broken under metal # https://github.com/llvm-beanz/offload-test-suite/issues/55 diff --git a/test/Feature/ImplicitBindings/simple-resources.test b/test/Feature/ImplicitBindings/simple-resources.test index f50b71f70..9f951115d 100644 --- a/test/Feature/ImplicitBindings/simple-resources.test +++ b/test/Feature/ImplicitBindings/simple-resources.test @@ -66,15 +66,15 @@ DescriptorSets: ... #--- end -# UNSUPPORTED: Clang +# Clang's Vulcan implicit binding is not yet implemented. +# UNSUPPORTED: Clang-Vulkan # DXC's vulkan backend doesn't drop unused bindings, so it isn't possible to # specify descriptor sets that are valid for both DirectX and Vulkan there. # UNSUPPORTED: DXC-Vulkan # RUN: split-file %s %t -# RUN: %if !Vulkan %{ %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl %} -# RUN: %if Vulkan %{ %dxc_target -T cs_6_0 -fspv-target-env=vulkan1.3 -fvk-use-scalar-layout -Fo %t.o %t/source.hlsl %} +# RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl # RUN: %offloader %t/pipeline.yaml %t.o | FileCheck %s # CHECK: Name: BufD From c07e007dc3742af288c4693bcc623e80830153f7 Mon Sep 17 00:00:00 2001 From: Helena Kotas Date: Thu, 29 May 2025 19:07:12 -0700 Subject: [PATCH 2/3] It's Vulkan! --- test/Feature/ImplicitBindings/all-implicit.test | 2 +- test/Feature/ImplicitBindings/simple-resources.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Feature/ImplicitBindings/all-implicit.test b/test/Feature/ImplicitBindings/all-implicit.test index dacced1ef..261087b1c 100644 --- a/test/Feature/ImplicitBindings/all-implicit.test +++ b/test/Feature/ImplicitBindings/all-implicit.test @@ -68,7 +68,7 @@ DescriptorSets: ... #--- end -# Clang's Vulcan implicit binding is not yet implemented. +# Clang's Vulkan implicit binding is not yet implemented. # UNSUPPORTED: Clang-Vulkan # CBuffer bindings seem to be broken under metal diff --git a/test/Feature/ImplicitBindings/simple-resources.test b/test/Feature/ImplicitBindings/simple-resources.test index 9f951115d..2f13ed757 100644 --- a/test/Feature/ImplicitBindings/simple-resources.test +++ b/test/Feature/ImplicitBindings/simple-resources.test @@ -66,7 +66,7 @@ DescriptorSets: ... #--- end -# Clang's Vulcan implicit binding is not yet implemented. +# Clang's Vulkan implicit binding is not yet implemented. # UNSUPPORTED: Clang-Vulkan # DXC's vulkan backend doesn't drop unused bindings, so it isn't possible to From 2ebe7f14b963155b3506731f5c78e79474986bd1 Mon Sep 17 00:00:00 2001 From: Helena Kotas Date: Fri, 30 May 2025 15:20:34 -0700 Subject: [PATCH 3/3] Disable simple-resources.test for Metal; update links --- test/Feature/ImplicitBindings/all-implicit.test | 2 +- test/Feature/ImplicitBindings/simple-resources.test | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/Feature/ImplicitBindings/all-implicit.test b/test/Feature/ImplicitBindings/all-implicit.test index 261087b1c..755e980b3 100644 --- a/test/Feature/ImplicitBindings/all-implicit.test +++ b/test/Feature/ImplicitBindings/all-implicit.test @@ -72,7 +72,7 @@ DescriptorSets: # UNSUPPORTED: Clang-Vulkan # CBuffer bindings seem to be broken under metal -# https://github.com/llvm-beanz/offload-test-suite/issues/55 +# https://github.com/llvm/offload-test-suite/issues/55 # UNSUPPORTED: Metal # RUN: split-file %s %t diff --git a/test/Feature/ImplicitBindings/simple-resources.test b/test/Feature/ImplicitBindings/simple-resources.test index 2f13ed757..0db49506a 100644 --- a/test/Feature/ImplicitBindings/simple-resources.test +++ b/test/Feature/ImplicitBindings/simple-resources.test @@ -73,6 +73,10 @@ DescriptorSets: # specify descriptor sets that are valid for both DirectX and Vulkan there. # UNSUPPORTED: DXC-Vulkan +# CBuffer bindings seem to be broken under metal +# https://github.com/llvm/offload-test-suite/issues/55 +# UNSUPPORTED: Metal + # 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