From 2bba62cf770281a96976830b68e155596097e0f0 Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Mon, 12 May 2025 19:33:57 -0700 Subject: [PATCH] Enable most of the cbuffer tests for clang These have been working for some time but we never enabled the tests. --- test/Feature/CBuffer/arrays-16bit.test | 4 ++-- test/Feature/CBuffer/lit.local.cfg | 2 +- test/Feature/CBuffer/structs.test | 4 ++++ test/Feature/CBuffer/vectors-64bit.test | 4 ++++ test/Feature/CBuffer/vectors.test | 4 ++++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/test/Feature/CBuffer/arrays-16bit.test b/test/Feature/CBuffer/arrays-16bit.test index 56128961..3b0ff7e0 100644 --- a/test/Feature/CBuffer/arrays-16bit.test +++ b/test/Feature/CBuffer/arrays-16bit.test @@ -59,8 +59,8 @@ DescriptorSets: # DXC's vulkan support does not layout cbuffers compatibly with DXIL # UNSUPPORTED: Vulkan -# https://github.com/llvm/llvm-project/issues/110722 -# XFAIL: Clang +# https://github.com/llvm/llvm-project/issues/138996 +# UNSUPPORTED: Clang # 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/Feature/CBuffer/lit.local.cfg b/test/Feature/CBuffer/lit.local.cfg index 581c118e..1d8227d6 100644 --- a/test/Feature/CBuffer/lit.local.cfg +++ b/test/Feature/CBuffer/lit.local.cfg @@ -1,4 +1,4 @@ -if 'Clang' in config.available_features: +if 'Clang-Vulkan' in config.available_features: config.unsupported = True # CBuffer bindings seem to be broken under metal diff --git a/test/Feature/CBuffer/structs.test b/test/Feature/CBuffer/structs.test index 09c47c0e..b800653f 100644 --- a/test/Feature/CBuffer/structs.test +++ b/test/Feature/CBuffer/structs.test @@ -97,6 +97,10 @@ DescriptorSets: # DXC's vulkan support does not layout cbuffers compatibly with DXIL # UNSUPPORTED: Vulkan ++# Clang trips on 2-element vectors in structs: ++# https://github.com/llvm/llvm-project/issues/123968 ++# UNSUPPORTED: 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 | FileCheck %s diff --git a/test/Feature/CBuffer/vectors-64bit.test b/test/Feature/CBuffer/vectors-64bit.test index b074fefd..87ce086e 100644 --- a/test/Feature/CBuffer/vectors-64bit.test +++ b/test/Feature/CBuffer/vectors-64bit.test @@ -63,6 +63,10 @@ DescriptorSets: # DXC's vulkan support does not layout cbuffers compatibly with DXIL # UNSUPPORTED: Vulkan +# Clang trips on 3-element vectors in structs: +# https://github.com/llvm/llvm-project/issues/123968 +# UNSUPPORTED: 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 | FileCheck %s diff --git a/test/Feature/CBuffer/vectors.test b/test/Feature/CBuffer/vectors.test index a67d9e2c..754a1cd7 100644 --- a/test/Feature/CBuffer/vectors.test +++ b/test/Feature/CBuffer/vectors.test @@ -63,6 +63,10 @@ DescriptorSets: # DXC's vulkan support does not layout cbuffers compatibly with DXIL # UNSUPPORTED: Vulkan +# Clang trips on 3-element vectors in structs: +# https://github.com/llvm/llvm-project/issues/123968 +# UNSUPPORTED: 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 | FileCheck %s