summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJay Kwak <82421531+jkwak-work@users.noreply.github.com>2025-09-24 21:49:26 -0700
committerGitHub <noreply@github.com>2025-09-25 04:49:26 +0000
commitdb44c1b732891102199f0ec9d219a33d2ab2d6a1 (patch)
tree2efd3c0cec727dbbdd378721d398b25cb2edf3d0 /tests
parent55a7d2a73ef051f6027129f90e73a88b5176ec3b (diff)
Prepare VulkanSDK release Oct 2025 (#8525)
Related to - https://github.com/shader-slang/slang/issues/8519
Diffstat (limited to 'tests')
-rw-r--r--tests/expected-failure-github.txt3
-rw-r--r--tests/glsl-intrinsic/compute-derivative/derivative-mode-many-entry-points1.slang5
-rw-r--r--tests/glsl-intrinsic/compute-derivative/derivative-mode-many-entry-points2.slang3
-rw-r--r--tests/glsl-intrinsic/compute-derivative/derivative-mode-undefined-mode3.slang1
-rw-r--r--tests/glsl-intrinsic/raytracing/ray-query-cluster-intrinsics.slang14
-rw-r--r--tests/hlsl-intrinsic/texture/partial-resident-texture-combined.slang6
-rw-r--r--tests/hlsl-intrinsic/texture/partial-resident-texture.slang2
-rw-r--r--tests/language-feature/descriptor-handle/desc-handle-default.slang7
-rw-r--r--tests/language-feature/descriptor-handle/desc-handle-vk-mutable-descriptor.slang4
-rw-r--r--tests/spirv/debug-variable-scope.slang3
-rw-r--r--tests/spirv/tessellation.slang4
11 files changed, 29 insertions, 23 deletions
diff --git a/tests/expected-failure-github.txt b/tests/expected-failure-github.txt
index fdf7f447f..7e8a25cae 100644
--- a/tests/expected-failure-github.txt
+++ b/tests/expected-failure-github.txt
@@ -34,6 +34,3 @@ 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)
-
-# GitHub issue #8289; VVL prints an error incorrectly; it will be resolved with a next VulkanSDK
-gfx-unit-test-tool/samplerArrayVulkan.internal
diff --git a/tests/glsl-intrinsic/compute-derivative/derivative-mode-many-entry-points1.slang b/tests/glsl-intrinsic/compute-derivative/derivative-mode-many-entry-points1.slang
index 28a86d154..da799e021 100644
--- a/tests/glsl-intrinsic/compute-derivative/derivative-mode-many-entry-points1.slang
+++ b/tests/glsl-intrinsic/compute-derivative/derivative-mode-many-entry-points1.slang
@@ -14,7 +14,9 @@ buffer MyBlockName
int result;
} outputBuffer;
+#if !defined(GLSL_SYNTAX)
[DerivativeGroupQuad]
+#endif
[shader("compute")]
[numthreads(2,2,1)]
void main1(uint3 dispatchThreadID : SV_DispatchThreadID)
@@ -22,9 +24,12 @@ void main1(uint3 dispatchThreadID : SV_DispatchThreadID)
outputBuffer.result = asint(ddx(1));
}
+#if !defined(GLSL_SYNTAX)
[DerivativeGroupLinear]
[shader("compute")]
+[numthreads(4,1,1)]
void main2(uint3 dispatchThreadID : SV_DispatchThreadID)
{
outputBuffer.result = asint(ddx(1));
}
+#endif
diff --git a/tests/glsl-intrinsic/compute-derivative/derivative-mode-many-entry-points2.slang b/tests/glsl-intrinsic/compute-derivative/derivative-mode-many-entry-points2.slang
index 2749c3fae..96d4530a8 100644
--- a/tests/glsl-intrinsic/compute-derivative/derivative-mode-many-entry-points2.slang
+++ b/tests/glsl-intrinsic/compute-derivative/derivative-mode-many-entry-points2.slang
@@ -12,14 +12,15 @@ buffer MyBlockName
} outputBuffer;
[DerivativeGroupQuad]
-[shader("compute")]
[numthreads(2,2,1)]
+[shader("compute")]
void main1(uint3 dispatchThreadID : SV_DispatchThreadID)
{
outputBuffer.result = asint(ddx(1)) + asint(ddx(1)) ;
}
[DerivativeGroupLinear]
+[numthreads(4,1,1)]
[shader("compute")]
void main2(uint3 dispatchThreadID : SV_DispatchThreadID)
{
diff --git a/tests/glsl-intrinsic/compute-derivative/derivative-mode-undefined-mode3.slang b/tests/glsl-intrinsic/compute-derivative/derivative-mode-undefined-mode3.slang
index e2f1f8064..f071de48f 100644
--- a/tests/glsl-intrinsic/compute-derivative/derivative-mode-undefined-mode3.slang
+++ b/tests/glsl-intrinsic/compute-derivative/derivative-mode-undefined-mode3.slang
@@ -14,6 +14,7 @@ int someFunc()
return asint(ddx(1));
}
+[numthreads(2,2,1)]
void main(uint3 dispatchThreadID : SV_DispatchThreadID)
{
outputBuffer.result = someFunc();
diff --git a/tests/glsl-intrinsic/raytracing/ray-query-cluster-intrinsics.slang b/tests/glsl-intrinsic/raytracing/ray-query-cluster-intrinsics.slang
index b2c7d25b0..e052a56f1 100644
--- a/tests/glsl-intrinsic/raytracing/ray-query-cluster-intrinsics.slang
+++ b/tests/glsl-intrinsic/raytracing/ray-query-cluster-intrinsics.slang
@@ -1,8 +1,8 @@
-//TEST:SIMPLE(filecheck=CHECK_GLSL): -entry computeMain -target glsl -profile cs_6_5
-//TEST:SIMPLE(filecheck=CHECK_SPV): -entry computeMain -target spirv-assembly -profile cs_6_5
+//TEST:SIMPLE(filecheck=CHECK_GLSL): -entry computeMain -target glsl -profile cs_6_5
+//TEST:SIMPLE(filecheck=CHECK_SPV): -entry computeMain -target spirv-assembly -profile cs_6_5
-//CHECK_GLSL:rayQueryGetIntersectionClusterIdNV
-//CHECK_SPV:OpRayQueryGetClusterIdNV
+//CHECK_GLSL:rayQueryGetIntersectionClusterIdNV
+//CHECK_SPV:OpRayQueryGetIntersectionClusterIdNV
uniform RaytracingAccelerationStructure accelStruct;
@@ -41,15 +41,15 @@ float GetRayT<let RAY_QUERY_FLAGS: uint>(uint rayInlineFlags)
return 0.0f;
}
}
- else
+ else
{
if( rq.CommittedStatus() == COMMITTED_TRIANGLE_HIT )
- {
+ {
rq.Abort();
return rq.CommittedRayT();
}
}
-
+
int committedClusterId = rq.CommittedClusterID();
ray.TMin = 0.01f + committedClusterId;
return 0.0f;
diff --git a/tests/hlsl-intrinsic/texture/partial-resident-texture-combined.slang b/tests/hlsl-intrinsic/texture/partial-resident-texture-combined.slang
index 28cbdc04a..dd5790ee2 100644
--- a/tests/hlsl-intrinsic/texture/partial-resident-texture-combined.slang
+++ b/tests/hlsl-intrinsic/texture/partial-resident-texture-combined.slang
@@ -188,18 +188,18 @@ bool TEST_sparse<T>(
typealias TN = T;
constexpr const int2 offset = int2(0, 0);
uint status;
-
+
int sampleIndex = 0;
int2 iuv = int2(1, 1);
int3 iuvs = int3(iuv, sampleIndex);
-
+
return true
&& (status = getNotMapped(), all(TN(T(1)) == s2D.Load(iuvs, offset, status))) && CheckAccessFullyMapped(status)
&& (status = getNotMapped(), all(TN(T(1)) == s2DMS.Load(iuv, sampleIndex, offset, status))) && CheckAccessFullyMapped(status)
;
}
-[numthreads(4, 1, 1)]
+[numthreads(2, 2, 1)]
void computeMain(int3 dispatchThreadID: SV_DispatchThreadID)
{
bool result = true
diff --git a/tests/hlsl-intrinsic/texture/partial-resident-texture.slang b/tests/hlsl-intrinsic/texture/partial-resident-texture.slang
index 74155043a..8ba1ca587 100644
--- a/tests/hlsl-intrinsic/texture/partial-resident-texture.slang
+++ b/tests/hlsl-intrinsic/texture/partial-resident-texture.slang
@@ -249,7 +249,7 @@ bool TEST_load<T>(
;
}
-[numthreads(4, 1, 1)]
+[numthreads(2, 2, 1)]
void computeMain(int3 dispatchThreadID: SV_DispatchThreadID)
{
bool result = true
diff --git a/tests/language-feature/descriptor-handle/desc-handle-default.slang b/tests/language-feature/descriptor-handle/desc-handle-default.slang
index 016b04bfb..9a4d444d7 100644
--- a/tests/language-feature/descriptor-handle/desc-handle-default.slang
+++ b/tests/language-feature/descriptor-handle/desc-handle-default.slang
@@ -109,12 +109,13 @@ uniform RWStructuredBuffer<float>.Handle rwBuffer;
uniform RaytracingAccelerationStructure.Handle rayAcceleration;
#endif
+[numthreads(2,2,1)]
[shader("compute")]
void computeMain()
{
t1[0] = t2[0] + t2[0] + t4[0];
-
+
#ifdef SAMPLER
t1[2] = t4.Sample(sampler, 0);
#endif
@@ -148,7 +149,7 @@ void computeMain()
#ifdef STORAGE_BUFFER
t1[0] += rwBuffer[0];
#endif
-
+
#ifdef ACCELERATION_STRUCTURE
RayDesc ray;
ray.Origin = float3(0.1f, 0.1f, 0.0f);
@@ -162,4 +163,4 @@ void computeMain()
rq.Abort();
t1[13] = (float)rq.RayFlags();
#endif
-} \ No newline at end of file
+}
diff --git a/tests/language-feature/descriptor-handle/desc-handle-vk-mutable-descriptor.slang b/tests/language-feature/descriptor-handle/desc-handle-vk-mutable-descriptor.slang
index 2bf57d0ef..93981cd27 100644
--- a/tests/language-feature/descriptor-handle/desc-handle-vk-mutable-descriptor.slang
+++ b/tests/language-feature/descriptor-handle/desc-handle-vk-mutable-descriptor.slang
@@ -51,7 +51,7 @@ uniform StructuredBuffer<float>.Handle buffer2;
uniform RWStructuredBuffer<float>.Handle rwBuffer;
uniform RaytracingAccelerationStructure.Handle rayAcceleration;
-
+[numthreads(2,2,1)]
[shader("compute")]
void computeMain()
{
@@ -80,4 +80,4 @@ void computeMain()
rq.Abort();
t1[13] = (float)rq.RayFlags();
-} \ No newline at end of file
+}
diff --git a/tests/spirv/debug-variable-scope.slang b/tests/spirv/debug-variable-scope.slang
index 03871f1f0..5ef078789 100644
--- a/tests/spirv/debug-variable-scope.slang
+++ b/tests/spirv/debug-variable-scope.slang
@@ -1,4 +1,5 @@
-//TEST:SIMPLE(filecheck=CHECK):-target spirv-asm -entry main -stage fragment -g2 -emit-spirv-directly
+// Regressed with SPIRV update. Tracking on github issue #8522
+//DISABLE_TEST:SIMPLE(filecheck=CHECK):-target spirv-asm -entry main -stage fragment -g2 -O0 -emit-spirv-directly
Texture2D testTex : register(t0);
SamplerState testSampler : register(s0);
diff --git a/tests/spirv/tessellation.slang b/tests/spirv/tessellation.slang
index 67cbca07f..0794dd089 100644
--- a/tests/spirv/tessellation.slang
+++ b/tests/spirv/tessellation.slang
@@ -1,7 +1,7 @@
//TEST:SIMPLE(filecheck=HULL): -target spirv -stage hull -entry hullMain
//TEST:SIMPLE(filecheck=DOMAIN): -target spirv -stage domain -entry domainMain
-//TEST:SIMPLE(filecheck=DEBUGINFO): -target spirv -g2 -stage hull -entry hullMain
-//TEST:SIMPLE(filecheck=DEBUGINFO): -target spirv -g2 -stage domain -entry domainMain
+//TEST:SIMPLE(filecheck=DEBUGINFO): -target spirv -g2 -O0 -stage hull -entry hullMain
+//TEST:SIMPLE(filecheck=DEBUGINFO): -target spirv -g2 -O0 -stage domain -entry domainMain
// HULL-DAG: OpExecutionMode %hullMain SpacingEqual
// HULL-DAG: OpExecutionMode %hullMain OutputVertices 4