diff options
| author | ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> | 2025-07-15 17:48:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-16 00:48:30 +0000 |
| commit | 439e025c1d3c58cc261c36f1e8d804a403b2856a (patch) | |
| tree | 7256b0982f4ff5a0587d2bc5a782438ff76b5b7b | |
| parent | 223ccd40599ffcd74b409c7321f2264b93aec4bd (diff) | |
Document why failing VVL coop-vec tests cannot be enabled & minor cleanup/bug-fix (#7754)
* Changes
Fix a coop-vec bug, fix incorrect test synax, clean up test, comment why some coop-vec tests are stil disabled
* Changes
Fix a coop-vec bug, fix incorrect test synax, clean up test, comment why some coop-vec tests are stil disabled
* disable failing tests
* push changes
* add to failing GLSL test list
47 files changed, 135 insertions, 81 deletions
diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang index 1443843a9..216dfc04a 100644 --- a/source/slang/hlsl.meta.slang +++ b/source/slang/hlsl.meta.slang @@ -26742,7 +26742,6 @@ CoopVec<T, M> coopVecMatMulAddPacked<T : __BuiltinArithmeticType, let M : int, l if (__isSignedInt<U>()) { operands |= 0x02; // MatrixBSignedComponentsKHR - operands |= 0x04; // MatrixCSignedComponentsKHR } if (__isSignedInt<T>()) { @@ -27193,7 +27192,6 @@ CoopVec<T, M> coopVecMatMulAddPacked<T : __BuiltinArithmeticType, let M : int, l if (__isSignedInt<U>()) { operands |= 0x02; // MatrixBSignedComponentsKHR - operands |= 0x04; // MatrixCSignedComponentsKHR } if (__isSignedInt<T>()) { @@ -27370,6 +27368,10 @@ CoopVec<T, M> coopVecMatMulPacked( int operands = 0; // NoneKHR let zero = 0; let cvtMatPtr = (Ptr<T[]>)matrixPtr; + if (__isSignedInt<U>()) + { + operands |= 0x02; // MatrixBSignedComponentsKHR + } if (__isSignedInt<T>()) { operands |= 0x08; // MatrixResultSignedComponentsKHR @@ -27439,9 +27441,18 @@ CoopVec<T, M> coopVecMatMulAddPacked<T : __BuiltinArithmeticType, let M : int, l let zero : int32_t = 0; let cvtMatPtr = (Ptr<T[]>)matrixPtr; let cvtBiasPtr = (Ptr<T[]>)biasPtr; + int operands = 0; // NoneKHR + if (__isSignedInt<U>()) + { + operands |= 0x02; // MatrixBSignedComponentsKHR + } + if (__isSignedInt<T>()) + { + operands |= 0x08; // MatrixResultSignedComponentsKHR + } return spirv_asm { - result:$$CoopVec<T, M> = OpCooperativeVectorMatrixMulAddNV $input $inputInterpretationSpirv $cvtMatPtr $zero $matrixInterpretationSpirv $cvtBiasPtr $zero $biasInterpretationSpirv $m $k $memoryLayoutSpirv $transpose $matrixStride; + result:$$CoopVec<T, M> = OpCooperativeVectorMatrixMulAddNV $input $inputInterpretationSpirv $cvtMatPtr $zero $matrixInterpretationSpirv $cvtBiasPtr $zero $biasInterpretationSpirv $m $k $memoryLayoutSpirv $transpose $matrixStride !operands; }; } } diff --git a/tests/cooperative-vector/atan.slang b/tests/cooperative-vector/atan.slang index ed425e926..ac716532a 100644 --- a/tests/cooperative-vector/atan.slang +++ b/tests/cooperative-vector/atan.slang @@ -22,5 +22,5 @@ void computeMain() CoopVec<float, 4> result = atan(vec); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/clamp.slang b/tests/cooperative-vector/clamp.slang index e8573f10f..4f5c57a98 100644 --- a/tests/cooperative-vector/clamp.slang +++ b/tests/cooperative-vector/clamp.slang @@ -24,5 +24,5 @@ void computeMain() CoopVec<float, 4> result = clamp(vec, minVal, maxVal); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/copyFrom.slang b/tests/cooperative-vector/copyFrom.slang index efa3fb1cb..aa64fe559 100644 --- a/tests/cooperative-vector/copyFrom.slang +++ b/tests/cooperative-vector/copyFrom.slang @@ -18,5 +18,5 @@ void computeMain() var result : CoopVec<int32_t, 4>; result.copyFrom(v); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/div.slang b/tests/cooperative-vector/div.slang index cf2413c8a..80c17eb36 100644 --- a/tests/cooperative-vector/div.slang +++ b/tests/cooperative-vector/div.slang @@ -26,5 +26,5 @@ void computeMain() CoopVec<int, 4> result = vec1 / vec2; for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/exp.slang b/tests/cooperative-vector/exp.slang index ac7e3579a..5b33beb1c 100644 --- a/tests/cooperative-vector/exp.slang +++ b/tests/cooperative-vector/exp.slang @@ -23,5 +23,5 @@ void computeMain() CoopVec<float, 4> result = exp(vec); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/fill.slang b/tests/cooperative-vector/fill.slang index eb91e6341..b968683d3 100644 --- a/tests/cooperative-vector/fill.slang +++ b/tests/cooperative-vector/fill.slang @@ -17,5 +17,5 @@ void computeMain() var result : CoopVec<int32_t, 4>; result.fill(10); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/fma.slang b/tests/cooperative-vector/fma.slang index e6a8d0102..ef0d8c7fc 100644 --- a/tests/cooperative-vector/fma.slang +++ b/tests/cooperative-vector/fma.slang @@ -30,5 +30,5 @@ void computeMain() CoopVec<float, 4> result = fma(vec1, vec2, vec3); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/load-store-arbitrary-array-vec.slang b/tests/cooperative-vector/load-store-arbitrary-array-vec.slang index 39ab45618..87522acab 100644 --- a/tests/cooperative-vector/load-store-arbitrary-array-vec.slang +++ b/tests/cooperative-vector/load-store-arbitrary-array-vec.slang @@ -31,5 +31,5 @@ void computeMain() vec.storeAny(temp); let result = CoopVec<uint32_t, 15>.loadAny(temp); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/load-store-groupshared.slang b/tests/cooperative-vector/load-store-groupshared.slang index 8b08d3e12..73b0aa350 100644 --- a/tests/cooperative-vector/load-store-groupshared.slang +++ b/tests/cooperative-vector/load-store-groupshared.slang @@ -23,5 +23,5 @@ void computeMain() vec.store(temp); let result = coopVecLoadGroupshared<5>(temp); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/log.slang b/tests/cooperative-vector/log.slang index d961aebf3..263fa7469 100644 --- a/tests/cooperative-vector/log.slang +++ b/tests/cooperative-vector/log.slang @@ -22,5 +22,5 @@ void computeMain() CoopVec<float, 4> result = log(vec); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-bias-mut.slang b/tests/cooperative-vector/matrix-mul-bias-mut.slang index dde7b533a..0d04b37f2 100644 --- a/tests/cooperative-vector/matrix-mul-bias-mut.slang +++ b/tests/cooperative-vector/matrix-mul-bias-mut.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // Disabled because HLSL doesn't support int8 @@ -45,5 +45,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-bias-packed-mut.slang b/tests/cooperative-vector/matrix-mul-bias-packed-mut.slang index 756defe63..f5d65eaf4 100644 --- a/tests/cooperative-vector/matrix-mul-bias-packed-mut.slang +++ b/tests/cooperative-vector/matrix-mul-bias-packed-mut.slang @@ -1,3 +1,4 @@ +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type -emit-spirv-directly //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -render-feature cooperative-vector -dx12-experimental -use-dxil -output-using-type -profile cs_6_9 -Xslang... -Xdxc -Vd -X. //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type @@ -43,5 +44,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-bias-packed.slang b/tests/cooperative-vector/matrix-mul-bias-packed.slang index 310dd0483..ae60f85a1 100644 --- a/tests/cooperative-vector/matrix-mul-bias-packed.slang +++ b/tests/cooperative-vector/matrix-mul-bias-packed.slang @@ -1,3 +1,4 @@ +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type -emit-spirv-directly //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -render-feature cooperative-vector -dx12-experimental -use-dxil -output-using-type -profile cs_6_9 -Xslang... -Xdxc -Vd -X. //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type @@ -42,5 +43,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-bias-rw-packed.slang b/tests/cooperative-vector/matrix-mul-bias-rw-packed.slang index c02bf6c6a..57732934f 100644 --- a/tests/cooperative-vector/matrix-mul-bias-rw-packed.slang +++ b/tests/cooperative-vector/matrix-mul-bias-rw-packed.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // Disabled because HLSL can't multiply from *RW*ByteAddressBuffers @@ -45,5 +45,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-bias-rw.slang b/tests/cooperative-vector/matrix-mul-bias-rw.slang index 7c5025b7b..a8ffb0c60 100644 --- a/tests/cooperative-vector/matrix-mul-bias-rw.slang +++ b/tests/cooperative-vector/matrix-mul-bias-rw.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // Disabled because HLSL doesn't support int8 @@ -44,5 +44,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-bias-rwbyteaddress-packed.slang b/tests/cooperative-vector/matrix-mul-bias-rwbyteaddress-packed.slang index ffa6812c4..9b9fd0d7d 100644 --- a/tests/cooperative-vector/matrix-mul-bias-rwbyteaddress-packed.slang +++ b/tests/cooperative-vector/matrix-mul-bias-rwbyteaddress-packed.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // Disabled because HLSL can't multiply from *RW*ByteAddressBuffers @@ -45,6 +45,6 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-bias-structuredbuffer-packed.slang b/tests/cooperative-vector/matrix-mul-bias-structuredbuffer-packed.slang index 8d39b00f7..b756ffb42 100644 --- a/tests/cooperative-vector/matrix-mul-bias-structuredbuffer-packed.slang +++ b/tests/cooperative-vector/matrix-mul-bias-structuredbuffer-packed.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type // These platforms don't support these operations from structured buffers //DISABLE_TESTTEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type diff --git a/tests/cooperative-vector/matrix-mul-bias.slang b/tests/cooperative-vector/matrix-mul-bias.slang index 6d10a4511..e830af0c6 100644 --- a/tests/cooperative-vector/matrix-mul-bias.slang +++ b/tests/cooperative-vector/matrix-mul-bias.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // Disabled because HLSL doesn't support int8 @@ -44,5 +44,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-byteaddress.slang b/tests/cooperative-vector/matrix-mul-byteaddress.slang index 69f75a3d0..333b1c8dc 100644 --- a/tests/cooperative-vector/matrix-mul-byteaddress.slang +++ b/tests/cooperative-vector/matrix-mul-byteaddress.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // Disabled because HLSL doesn't support int8 @@ -37,5 +37,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-mut.slang b/tests/cooperative-vector/matrix-mul-mut.slang index fb31529bb..f9861b4d1 100644 --- a/tests/cooperative-vector/matrix-mul-mut.slang +++ b/tests/cooperative-vector/matrix-mul-mut.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // Disabled because HLSL doesn't support int8 @@ -38,5 +38,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-packed-mut.slang b/tests/cooperative-vector/matrix-mul-packed-mut.slang index 98d73ee0c..83124741e 100644 --- a/tests/cooperative-vector/matrix-mul-packed-mut.slang +++ b/tests/cooperative-vector/matrix-mul-packed-mut.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type //Test(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -render-feature cooperative-vector -dx12-experimental -use-dxil -output-using-type -profile cs_6_9 -Xslang... -Xdxc -Vd -X. @@ -37,5 +37,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-packed.slang b/tests/cooperative-vector/matrix-mul-packed.slang index d4d740a5d..3051aefff 100644 --- a/tests/cooperative-vector/matrix-mul-packed.slang +++ b/tests/cooperative-vector/matrix-mul-packed.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type //Test(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -render-feature cooperative-vector -dx12-experimental -use-dxil -output-using-type -profile cs_6_9 -Xslang... -Xdxc -Vd -X. @@ -36,5 +36,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-rw-packed.slang b/tests/cooperative-vector/matrix-mul-rw-packed.slang index b4f6481a7..e1252ee3a 100644 --- a/tests/cooperative-vector/matrix-mul-rw-packed.slang +++ b/tests/cooperative-vector/matrix-mul-rw-packed.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // Disabled because HLSL can't multiply from *RW*ByteAddressBuffers @@ -38,5 +38,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-rw.slang b/tests/cooperative-vector/matrix-mul-rw.slang index 2f8b15c28..ff06d3af8 100644 --- a/tests/cooperative-vector/matrix-mul-rw.slang +++ b/tests/cooperative-vector/matrix-mul-rw.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // Disabled because HLSL doesn't support int8 @@ -37,5 +37,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-rwbyteaddress-packed.slang b/tests/cooperative-vector/matrix-mul-rwbyteaddress-packed.slang index b4f6481a7..e1252ee3a 100644 --- a/tests/cooperative-vector/matrix-mul-rwbyteaddress-packed.slang +++ b/tests/cooperative-vector/matrix-mul-rwbyteaddress-packed.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // Disabled because HLSL can't multiply from *RW*ByteAddressBuffers @@ -38,5 +38,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul-structuredbuffer-packed.slang b/tests/cooperative-vector/matrix-mul-structuredbuffer-packed.slang index b83b4e1e7..b3f076731 100644 --- a/tests/cooperative-vector/matrix-mul-structuredbuffer-packed.slang +++ b/tests/cooperative-vector/matrix-mul-structuredbuffer-packed.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type // These platforms don't support these operations from structured buffers //DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type @@ -39,5 +39,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/matrix-mul.slang b/tests/cooperative-vector/matrix-mul.slang index db96afbb3..6e26ec6da 100644 --- a/tests/cooperative-vector/matrix-mul.slang +++ b/tests/cooperative-vector/matrix-mul.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // Disabled because HLSL doesn't support int8 @@ -37,5 +37,5 @@ void computeMain() ); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/max.slang b/tests/cooperative-vector/max.slang index 3832ccee0..b814dadee 100644 --- a/tests/cooperative-vector/max.slang +++ b/tests/cooperative-vector/max.slang @@ -26,5 +26,5 @@ void computeMain() CoopVec<float, 4> result = max(vec1, vec2); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/min.slang b/tests/cooperative-vector/min.slang index df93b62e6..a447e4e63 100644 --- a/tests/cooperative-vector/min.slang +++ b/tests/cooperative-vector/min.slang @@ -26,5 +26,5 @@ void computeMain() CoopVec<float, 4> result = min(vec1, vec2); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/mul.slang b/tests/cooperative-vector/mul.slang index 7817946a9..68dd45df0 100644 --- a/tests/cooperative-vector/mul.slang +++ b/tests/cooperative-vector/mul.slang @@ -26,5 +26,5 @@ void computeMain() CoopVec<int, 4> result = vec1 * vec2; for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/outer-product-structuredbuffer.slang b/tests/cooperative-vector/outer-product-structuredbuffer.slang index 6de446f89..a0d3ad257 100644 --- a/tests/cooperative-vector/outer-product-structuredbuffer.slang +++ b/tests/cooperative-vector/outer-product-structuredbuffer.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type // These platforms don't support these operations into structured buffers //DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -render-feature cooperative-vector -dx12-experimental -use-dxil -output-using-type -profile cs_6_9 -Xslang... -Xdxc -Vd -X. diff --git a/tests/cooperative-vector/outer-product.slang b/tests/cooperative-vector/outer-product.slang index 3ad0f52eb..da78c6576 100644 --- a/tests/cooperative-vector/outer-product.slang +++ b/tests/cooperative-vector/outer-product.slang @@ -1,5 +1,5 @@ -// Disabled because of Vulkan validation error -//DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type +// Fails because VVL 1.4.313.0 has a bug that sees int32_t as uint32_t in validation layers, issue #7715 +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type // HLSL doesn't support the training operations //DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -render-feature cooperative-vector -dx12-experimental -use-dxil -output-using-type -profile cs_6_9 -Xslang... -Xdxc -Vd -X. diff --git a/tests/cooperative-vector/reduce-sum-accumulate-structuredbuffer.slang b/tests/cooperative-vector/reduce-sum-accumulate-structuredbuffer.slang index 3999ee141..8903d35de 100644 --- a/tests/cooperative-vector/reduce-sum-accumulate-structuredbuffer.slang +++ b/tests/cooperative-vector/reduce-sum-accumulate-structuredbuffer.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type -///TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // HLSL doesn't support the training operations //DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -render-feature cooperative-vector -dx12-experimental -use-dxil -output-using-type -profile cs_6_9 -Xslang... -Xdxc -Vd -X. diff --git a/tests/cooperative-vector/reduce-sum-accumulate.slang b/tests/cooperative-vector/reduce-sum-accumulate.slang index 3999ee141..8903d35de 100644 --- a/tests/cooperative-vector/reduce-sum-accumulate.slang +++ b/tests/cooperative-vector/reduce-sum-accumulate.slang @@ -1,5 +1,5 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -render-feature cooperative-vector -output-using-type -///TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu -output-using-type // HLSL doesn't support the training operations //DISABLE_TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -render-feature cooperative-vector -dx12-experimental -use-dxil -output-using-type -profile cs_6_9 -Xslang... -Xdxc -Vd -X. diff --git a/tests/cooperative-vector/scalar-mul.slang b/tests/cooperative-vector/scalar-mul.slang index 7af540785..1bffab6ef 100644 --- a/tests/cooperative-vector/scalar-mul.slang +++ b/tests/cooperative-vector/scalar-mul.slang @@ -21,5 +21,5 @@ void computeMain() CoopVec<float, 4> result = vec * 2.0; for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/simple.slang b/tests/cooperative-vector/simple.slang index 9a6b08b6c..df36b0870 100644 --- a/tests/cooperative-vector/simple.slang +++ b/tests/cooperative-vector/simple.slang @@ -20,5 +20,5 @@ void computeMain() var result = coopVecLoad<4, int32_t>(inputBuffer); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/step.slang b/tests/cooperative-vector/step.slang index e0362516c..3664a4279 100644 --- a/tests/cooperative-vector/step.slang +++ b/tests/cooperative-vector/step.slang @@ -26,5 +26,5 @@ void computeMain() CoopVec<float, 4> result = step(edge, x); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/sub.slang b/tests/cooperative-vector/sub.slang index 71c123b4a..32cec094d 100644 --- a/tests/cooperative-vector/sub.slang +++ b/tests/cooperative-vector/sub.slang @@ -26,5 +26,5 @@ void computeMain() CoopVec<int, 4> result = vec1 - vec2; for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/subscript.slang b/tests/cooperative-vector/subscript.slang index 384d03b24..7d0ef8bff 100644 --- a/tests/cooperative-vector/subscript.slang +++ b/tests/cooperative-vector/subscript.slang @@ -21,5 +21,5 @@ void computeMain() vec[3] = vec[2]+2; for(int i = 0; i < vec.getCount(); ++i) - outputBuffer[i] = vec[i];; + outputBuffer[i] = vec[i]; } diff --git a/tests/cooperative-vector/tanh.slang b/tests/cooperative-vector/tanh.slang index 1a0c2da44..4d69c7dbb 100644 --- a/tests/cooperative-vector/tanh.slang +++ b/tests/cooperative-vector/tanh.slang @@ -24,5 +24,5 @@ void computeMain() CoopVec<float, 4> result = tanh(vec); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/unary.slang b/tests/cooperative-vector/unary.slang index 581084881..669b0119d 100644 --- a/tests/cooperative-vector/unary.slang +++ b/tests/cooperative-vector/unary.slang @@ -21,5 +21,5 @@ void computeMain() CoopVec<int32_t, 4> negVec = -vec1; for(int i = 0; i < negVec.getCount(); ++i) - outputBuffer[i] = negVec[i];; + outputBuffer[i] = negVec[i]; } diff --git a/tests/cooperative-vector/variadic-init-bad-length.slang b/tests/cooperative-vector/variadic-init-bad-length.slang index 1f4c92d29..d6019497e 100644 --- a/tests/cooperative-vector/variadic-init-bad-length.slang +++ b/tests/cooperative-vector/variadic-init-bad-length.slang @@ -10,5 +10,5 @@ void computeMain() // CHECK: error 41400: static assertion failed, number of arguments to CoopVec constructor must match number of elements for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/variadic-init-cast.slang b/tests/cooperative-vector/variadic-init-cast.slang index ddcf534e7..8401babf8 100644 --- a/tests/cooperative-vector/variadic-init-cast.slang +++ b/tests/cooperative-vector/variadic-init-cast.slang @@ -16,5 +16,5 @@ void computeMain() { let result = CoopVec<float, 4>(int(1),half(2),uint(3),double(4)); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/cooperative-vector/variadic-init.slang b/tests/cooperative-vector/variadic-init.slang index 983d5f78b..019a46d75 100644 --- a/tests/cooperative-vector/variadic-init.slang +++ b/tests/cooperative-vector/variadic-init.slang @@ -16,5 +16,5 @@ void computeMain() { let result = CoopVec<int32_t, 4>(1,2,3,4); for(int i = 0; i < result.getCount(); ++i) - outputBuffer[i] = result[i];; + outputBuffer[i] = result[i]; } diff --git a/tests/expected-failure-github.txt b/tests/expected-failure-github.txt index 9d1af7a4d..fdf324d1b 100644 --- a/tests/expected-failure-github.txt +++ b/tests/expected-failure-github.txt @@ -1,3 +1,27 @@ + +tests/cooperative-vector/matrix-mul-bias-mut.slang (vk) +tests/cooperative-vector/matrix-mul-bias-packed-mut.slang (vk) +tests/cooperative-vector/matrix-mul-bias-packed.slang (vk) +tests/cooperative-vector/matrix-mul-bias-rw-packed.slang (vk) +tests/cooperative-vector/matrix-mul-bias-rw.slang (vk) +tests/cooperative-vector/matrix-mul-bias-rwbyteaddress-packed.slang (vk) +tests/cooperative-vector/matrix-mul-bias-structuredbuffer-packed.slang (vk) +tests/cooperative-vector/matrix-mul-bias.slang (vk) +tests/cooperative-vector/matrix-mul-byteaddress.slang (vk) +tests/cooperative-vector/matrix-mul-mut.slang (vk) +tests/cooperative-vector/matrix-mul-packed-mut.slang (vk) +tests/cooperative-vector/matrix-mul-packed.slang (vk) +tests/cooperative-vector/matrix-mul-rw-packed.slang (vk) +tests/cooperative-vector/matrix-mul-rw.slang (vk) +tests/cooperative-vector/matrix-mul-rwbyteaddress-packed.slang (vk) +tests/cooperative-vector/matrix-mul-structuredbuffer-packed.slang (vk) +tests/cooperative-vector/matrix-mul.slang (vk) +tests/cooperative-vector/outer-product-structuredbuffer.slang (vk) +tests/cooperative-vector/outer-product.slang (vk) +tests/cooperative-vector/reduce-sum-accumulate-structuredbuffer.slang.1 (cpu) +tests/cooperative-vector/reduce-sum-accumulate.slang.1 (cpu) +tests/cooperative-vector/reduce-sum-accumulate-structuredbuffer.slang.3 syn (cuda) +tests/cooperative-vector/reduce-sum-accumulate.slang.3 syn (cuda) tests/language-feature/saturated-cooperation/simple.slang (vk) tests/language-feature/saturated-cooperation/fuse3.slang (vk) tests/language-feature/saturated-cooperation/fuse-product.slang (vk) @@ -12,6 +36,4 @@ tests/compute/interface-shader-param-in-struct.slang.4 syn (wgpu) tests/compute/interface-shader-param.slang.5 syn (wgpu) tests/language-feature/shader-params/interface-shader-param-ordinary.slang.4 syn (wgpu) tests/glsl-intrinsic/shader-subgroup/shader-subgroup-builtin-variables.slang.8 (mtl) -tests/glsl-intrinsic/shader-subgroup/shader-subgroup-builtin-variables-2.slang.3 (mtl) -tests/cooperative-vector/matrix-mul-bias-packed.slang (vk) -tests/cooperative-vector/matrix-mul-bias-packed-mut.slang (vk) +tests/glsl-intrinsic/shader-subgroup/shader-subgroup-builtin-variables-2.slang.3 (mtl)
\ No newline at end of file diff --git a/tests/expected-failure-via-glsl.txt b/tests/expected-failure-via-glsl.txt index ac0e25910..7179faa54 100644 --- a/tests/expected-failure-via-glsl.txt +++ b/tests/expected-failure-via-glsl.txt @@ -6,7 +6,26 @@ tests/cooperative-vector/load-store-arbitrary-array.slang (vk) tests/cooperative-vector/load-store-groupshared.slang (vk) tests/cooperative-vector/load-store-rwbyteaddressbuffer.slang (vk) tests/cooperative-vector/load-store-rwstructuredbuffer.slang (vk) +tests/cooperative-vector/matrix-mul-bias-mut.slang (vk) +tests/cooperative-vector/matrix-mul-bias-packed-mut.slang (vk) +tests/cooperative-vector/matrix-mul-bias-packed.slang (vk) +tests/cooperative-vector/matrix-mul-bias-rw-packed.slang (vk) +tests/cooperative-vector/matrix-mul-bias-rw.slang (vk) +tests/cooperative-vector/matrix-mul-bias-rwbyteaddress-packed.slang (vk) +tests/cooperative-vector/matrix-mul-bias-structuredbuffer-packed.slang (vk) +tests/cooperative-vector/matrix-mul-bias.slang (vk) +tests/cooperative-vector/matrix-mul-byteaddress.slang (vk) +tests/cooperative-vector/matrix-mul-mut.slang (vk) +tests/cooperative-vector/matrix-mul-packed-mut.slang (vk) +tests/cooperative-vector/matrix-mul-packed.slang (vk) +tests/cooperative-vector/matrix-mul-rw-packed.slang (vk) +tests/cooperative-vector/matrix-mul-rw.slang (vk) +tests/cooperative-vector/matrix-mul-rwbyteaddress-packed.slang (vk) +tests/cooperative-vector/matrix-mul-structuredbuffer-packed.slang (vk) +tests/cooperative-vector/matrix-mul.slang (vk) tests/cooperative-vector/out.slang (vk) +tests/cooperative-vector/outer-product-structuredbuffer.slang (vk) +tests/cooperative-vector/outer-product.slang (vk) tests/cooperative-vector/parameter.slang (vk) tests/cooperative-vector/reduce-sum-accumulate-structuredbuffer.slang (vk) tests/cooperative-vector/reduce-sum-accumulate.slang (vk) |
