From d6dd38f5210fedfd96ff088ef9b8a2424c79c4f0 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 11 Apr 2023 23:28:58 +0800 Subject: Implement FileCheck tests for several test commands (#2747) * Add missing expected.txt for test * Diagnostics -> StdWriters in render test * Allow specifying several test prefixes to run `slang-test -- tests/foo tests/bar` * Squash warnings in some tests * Enable gfx debug layer in gfx test util Makes this issue present consistently: https://github.com/shader-slang/slang/issues/2766 * Allow DebugDevice to return interfaces instantiated by the debugged object * Check that we actaully have a shader cache for shader cache tests * Implement FileCheck tests for several test commands - SIMPLE, SIMPLE_EX - SIMPLE_LINE - REFLECTION, CPU_REFLECTION - CROSS_COMPILE It does not currently support the render tests or the COMPARE_COMPUTE commands It is invoked by adding `(filecheck=MY_FILECHECK_PREFIX)` to the test command, for example TEST:CROSS_COMPILE(filecheck=SPIRV): -target spirv-assembly * Move LLVM FileCheck interface to slang-llvm * Neaten slang-test tests * Refine handling of expected output in slang-test * Add example FileCheck buffer test * Add cuda-kernel-export tests Which were waiting on FileCheck * Bump vs project files * Make createLLVMFileCheck_V1 return a void* rather than specifically an IFileCheck * Remove use of CharSlice from filecheck interface * Bump slang-llvm version --------- Co-authored-by: jsmall-nvidia --- tests/bugs/gh-449.slang | 7 +++++++ tests/bugs/gh-449.slang.expected | 4 ++-- tests/bugs/gh-841.slang | 14 ++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) (limited to 'tests/bugs') diff --git a/tests/bugs/gh-449.slang b/tests/bugs/gh-449.slang index 9ce678b53..1b7a9f07d 100644 --- a/tests/bugs/gh-449.slang +++ b/tests/bugs/gh-449.slang @@ -1,5 +1,6 @@ // gh-449.slang //TEST:SIMPLE: +//TEST:SIMPLE(filecheck=CHECK): // Issue when dealing with binary operations that // mix scalars with vectors that have a different @@ -16,10 +17,16 @@ void main() float2 a = float2(1, 2); uint b = 3; foo(a + b); + // CHECK: tests/bugs/gh-449.slang([[#@LINE-1]]): error 30019: expected an expression of type 'S', got 'vector' + // CHECK-NEXT: foo(a + b); + // CHECK-NEXT: ^ // This used to get confused, with the `f` getting converted // to a `uint` before the addition. uint2 u = uint2(1, 2); float f = 3.0; foo(u + f); + // CHECK: tests/bugs/gh-449.slang([[#@LINE-1]]): error 30019: expected an expression of type 'S', got 'vector' + // CHECK-NEXT: foo(u + f); + // CHECK-NEXT: ^ } diff --git a/tests/bugs/gh-449.slang.expected b/tests/bugs/gh-449.slang.expected index 8ca87a406..4d01e7fe3 100644 --- a/tests/bugs/gh-449.slang.expected +++ b/tests/bugs/gh-449.slang.expected @@ -1,9 +1,9 @@ result code = -1 standard error = { -tests/bugs/gh-449.slang(18): error 30019: expected an expression of type 'S', got 'vector' +tests/bugs/gh-449.slang(19): error 30019: expected an expression of type 'S', got 'vector' foo(a + b); ^ -tests/bugs/gh-449.slang(24): error 30019: expected an expression of type 'S', got 'vector' +tests/bugs/gh-449.slang(28): error 30019: expected an expression of type 'S', got 'vector' foo(u + f); ^ } diff --git a/tests/bugs/gh-841.slang b/tests/bugs/gh-841.slang index 44d8348e5..8dc687e77 100644 --- a/tests/bugs/gh-841.slang +++ b/tests/bugs/gh-841.slang @@ -1,12 +1,26 @@ // gh-841.slang //TEST:CROSS_COMPILE: -profile ps_5_0 -entry main -target spirv-assembly +//TEST:CROSS_COMPILE(filecheck=SPV): -profile ps_5_0 -entry main -target spirv-assembly +//TEST:CROSS_COMPILE(filecheck=GLSL): -profile ps_5_0 -entry main -target glsl // GitHub issue #841: failing to emit `flat` modifier in output GLSL when required struct RasterVertex { + // location 0 float4 c : COLOR; + + // Make sure that the input value in location 1 is decorated as Flat + // SPV-DAG: [[#VAL:]]{{.*}}:{{.*}} Variable Input + // SPV-DAG: Decorate [[#VAL]]{{.*}} Location 1 + // SPV-DAG: Decorate [[#VAL]]{{.*}} Flat + // + // Likewise for GLSL + // GLSL: flat layout(location = 1) + // GLSL-NEXT: in uint {{[[:alnum:]_]+}}; + // + // location 1 uint u : FLAGS; }; -- cgit v1.2.3