summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Kwak <82421531+jkwak-work@users.noreply.github.com>2025-01-10 11:01:32 -0800
committerGitHub <noreply@github.com>2025-01-10 11:01:32 -0800
commit6437f2d37b08972db5e4515bd124639c2903dda1 (patch)
tree7ac5ab926ff6861af56e264ab62a6a323fe8ee69
parent54845333858579f66bfa7c42bbf0b8e1317206ce (diff)
Fix potential test failures due to SPIRV validation failure (#6047)
There are a few tests that are currently passing but could fail when conditions change little bit. When slang-test runs with `test-server`, the spirv validation fails and the test gets reported as failed even though they are actually passing. To avoid the potential problem, this commit adds an empty entry point. Co-authored-by: Yong He <yonghe@outlook.com>
-rw-r--r--tests/diagnostics/uninitialized-fields-delegated.slang10
-rw-r--r--tests/diagnostics/uninitialized-fields.slang9
-rw-r--r--tests/diagnostics/uninitialized-globals.slang9
-rw-r--r--tests/diagnostics/uninitialized-local-variables.slang9
-rw-r--r--tests/diagnostics/uninitialized-out-parameters.slang9
-rw-r--r--tests/diagnostics/uninitialized-struct-from-constructor.slang11
-rw-r--r--tests/diagnostics/uninitialized-use-functions.slang9
7 files changed, 58 insertions, 8 deletions
diff --git a/tests/diagnostics/uninitialized-fields-delegated.slang b/tests/diagnostics/uninitialized-fields-delegated.slang
index e3777f477..75a76eac6 100644
--- a/tests/diagnostics/uninitialized-fields-delegated.slang
+++ b/tests/diagnostics/uninitialized-fields-delegated.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE(filecheck=CHK): -target spirv
+//TEST:SIMPLE(filecheck=CHK): -target spirv -entry computeMain
// Delegated constructors
struct Impl
@@ -44,3 +44,11 @@ struct HitInfo
//CHK-NOT: warning 41020
//CHK-NOT: warning 41021
+
+
+[Shader("compute")]
+[NumThreads(4, 1, 1)]
+void computeMain(int3 dispatchThreadID : SV_DispatchThreadID)
+{
+}
+
diff --git a/tests/diagnostics/uninitialized-fields.slang b/tests/diagnostics/uninitialized-fields.slang
index c5fa37aad..f3c7b1a36 100644
--- a/tests/diagnostics/uninitialized-fields.slang
+++ b/tests/diagnostics/uninitialized-fields.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE(filecheck=CHK): -target spirv
+//TEST:SIMPLE(filecheck=CHK): -target spirv -entry computeMain
extern static const int flag;
@@ -88,3 +88,10 @@ struct Pass
//CHK-NOT: warning 41020
//CHK-NOT: warning 41021
+
+[Shader("compute")]
+[NumThreads(4, 1, 1)]
+void computeMain(int3 dispatchThreadID : SV_DispatchThreadID)
+{
+}
+
diff --git a/tests/diagnostics/uninitialized-globals.slang b/tests/diagnostics/uninitialized-globals.slang
index 730b0343f..5108d7fc5 100644
--- a/tests/diagnostics/uninitialized-globals.slang
+++ b/tests/diagnostics/uninitialized-globals.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE(filecheck=CHK): -allow-glsl -target spirv
+//TEST:SIMPLE(filecheck=CHK): -allow-glsl -target spirv -entry computeMain
// Using groupshared variables
groupshared float4 gsUninitialized;
@@ -70,3 +70,10 @@ vec4 glsl_layout_out_ok()
}
//CHK-NOT: warning 41017
+
+[Shader("compute")]
+[NumThreads(4, 1, 1)]
+void computeMain(int3 dispatchThreadID : SV_DispatchThreadID)
+{
+}
+
diff --git a/tests/diagnostics/uninitialized-local-variables.slang b/tests/diagnostics/uninitialized-local-variables.slang
index d8cea8a65..f7a8ff2c7 100644
--- a/tests/diagnostics/uninitialized-local-variables.slang
+++ b/tests/diagnostics/uninitialized-local-variables.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE(filecheck=CHK): -target spirv
+//TEST:SIMPLE(filecheck=CHK): -target spirv -entry computeMain
float f(float) { return 1; }
@@ -175,3 +175,10 @@ float nested_scopes(int x, inout float p)
}
//CHK-NOT: warning 41016
+
+[Shader("compute")]
+[NumThreads(4, 1, 1)]
+void computeMain(int3 dispatchThreadID : SV_DispatchThreadID)
+{
+}
+
diff --git a/tests/diagnostics/uninitialized-out-parameters.slang b/tests/diagnostics/uninitialized-out-parameters.slang
index 37cfbb3d4..6dd3c58e8 100644
--- a/tests/diagnostics/uninitialized-out-parameters.slang
+++ b/tests/diagnostics/uninitialized-out-parameters.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE(filecheck=CHK): -target spirv
+//TEST:SIMPLE(filecheck=CHK): -target spirv -entry computeMain
// Using before assigning
float regular_undefined_use(out float3 v)
@@ -92,3 +92,10 @@ void target_switching_blocks(uint x, out half v)
//CHK-NOT: warning 41015
//CHK-NOT: warning 41018
+
+[Shader("compute")]
+[NumThreads(4, 1, 1)]
+void computeMain(int3 dispatchThreadID : SV_DispatchThreadID)
+{
+}
+
diff --git a/tests/diagnostics/uninitialized-struct-from-constructor.slang b/tests/diagnostics/uninitialized-struct-from-constructor.slang
index e3c44dca1..a422ac765 100644
--- a/tests/diagnostics/uninitialized-struct-from-constructor.slang
+++ b/tests/diagnostics/uninitialized-struct-from-constructor.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE(filecheck=CHK): -target spirv
+//TEST:SIMPLE(filecheck=CHK): -target spirv -entry computeMain
struct TangentSpace
{
@@ -21,4 +21,11 @@ struct TangentSpace
}
//CHK-NOT: warning 41020
-//CHK-NOT: warning 41021 \ No newline at end of file
+//CHK-NOT: warning 41021
+
+[Shader("compute")]
+[NumThreads(4, 1, 1)]
+void computeMain(int3 dispatchThreadID : SV_DispatchThreadID)
+{
+}
+
diff --git a/tests/diagnostics/uninitialized-use-functions.slang b/tests/diagnostics/uninitialized-use-functions.slang
index 82e7a04a8..5a1c8ad84 100644
--- a/tests/diagnostics/uninitialized-use-functions.slang
+++ b/tests/diagnostics/uninitialized-use-functions.slang
@@ -1,4 +1,4 @@
-//TEST:SIMPLE(filecheck=CHK): -target spirv
+//TEST:SIMPLE(filecheck=CHK): -target spirv -entry computeMain
// Both out and inout parameters
// should have this treated as writes
@@ -111,3 +111,10 @@ void f()
}
//CHK-NOT: warning 41016
+
+[Shader("compute")]
+[NumThreads(4, 1, 1)]
+void computeMain(int3 dispatchThreadID : SV_DispatchThreadID)
+{
+}
+