summaryrefslogtreecommitdiff
path: root/tests/bugs
diff options
context:
space:
mode:
authorEllie Hermaszewska <ellieh@nvidia.com>2023-08-15 20:28:42 +0800
committerGitHub <noreply@github.com>2023-08-15 20:28:42 +0800
commit00bd481e001e8c0b8008eaff5a38fa37963e6f99 (patch)
treed068f0649167bff80b9cd3aa7d32d790540e9564 /tests/bugs
parent113a257aafe4403c3ab905098d0560635ca94286 (diff)
SPIR-V WIP (#3064)
* Add type layout for structured buffer * Default to generating spirv directly * vk test for compute simple * Add spirv-dis as a downstream compiler * Emit Array types in SPIR-V * makevector for spirv * Dump whole spirv module on validation failure * register array types todo, use emitTypeInst * Neater formatting for unhandled inst printing * break out emitCompositeConstruct * Correct array type generation * neaten * Allow getElement for vector * Remove unused * Allow predicating target intrinsics on types * Consider functions with intrinsics to have definitions We need to specialize these if they are predicated on types * Correct array type generation * makeArray for spir-v * replace getElement with getElementPtr for spirv * Correct translation of field access for spirv * Push layouts to types for spirv * Spirv intrinsics * operator now makes a pointer * Add structured buffer of struct test * Preserve type layout in spirv structured buffer legalization * neaten * makeVectorFromScalar for SPIRV * placeholder for layouts on param groups * More type safe spirv op construction * Know that constants and types only go in one section * Remove emitTypeInst * Add todo for spirv sampling * Add links to spirv documentation on emit functions * OpTypeImage support for SPIR-V * Add simpler texture test for spirv * s/spirv_direct/spirv/g * Allow several string literals in target_intrinsic * Handle global params without a var layour for SPIR-V For example groupshared vars * uint spirv asm type * Add todo for isDefinition It is currently too broad * Some atomic op spirv intrinsics * Strip ConstantBuffer wrappers for spirv * Add todo for matrix annotations * Do not associate decorations insts with spirv counterparts * Correct entry point parameter generation * Spelling * Assert that fieldAddress is returning a pointer * Add error for existential type layout getting to spir-v emit * Add IRTupleTypeLayout Unused so far * Allow getElementPtr to work with vectors * Correct target name in test * Hide default spirv direct behind a premake option --default-spirv-direct=true * Do not insert space at start of intrinsic def * Correct asm rendering in tests * remove redundant option * Emit directly from direct test * Add source language options for spirv-dis * Add comments to spirv dis * Add dead debug print for before spirv module * Correct asm rendering in tests * s/spirv_direct/spirv/g * Only specialize intrinsic functions with predicates * regenerate vs projects * squash warnings * squash warnings * remove duplication * Silence warnings from msvc * squash warnings * Overload for zero sized array * More msvc warnings * warnings * Add spirv-tools to path for tests * Do not be specific about dxc version for diag test * Normalize line endings from spirv-dis * Correct filecheck matches * Temporarily disable two spirv tests Failing on CI, undebuggable hang :/ * Do not emit storage class more than once for spirv snippet * Do not pass spir-v to spirv-dis by stdin * Do not get spirv-dis output via stream, use file * normalize file endings in spirv-dis output
Diffstat (limited to 'tests/bugs')
-rw-r--r--tests/bugs/gh-3085.slang4
-rw-r--r--tests/bugs/gh-841.slang6
-rw-r--r--tests/bugs/interlocked-add-uint-int.slang4
-rw-r--r--tests/bugs/texture-array-samplecmplevelzero.slang2
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/bugs/gh-3085.slang b/tests/bugs/gh-3085.slang
index 9250d501d..86992aec6 100644
--- a/tests/bugs/gh-3085.slang
+++ b/tests/bugs/gh-3085.slang
@@ -1,5 +1,5 @@
//TEST:SIMPLE(filecheck=CHECK): -entry MainCs -stage compute -profile glsl_450 -target spirv
-//CHECK: EntryPoint
+//CHECK: OpEntryPoint
RWTexture2D<float4> g_Test;
@@ -26,4 +26,4 @@ void MainCs(uint3 groupID: SV_GroupID, uint3 groupThreadID: SV_GroupThreadID)
// color+= LoadSourceColor ( pixelPos , int2 ( i%3 , i/3 ) , msaaSampleIndex ) . rgb ;
//}
g_Test[int2(pixelPos.x / 2, pixelPos.y + 0)] = float4(color, 1.0);
-} \ No newline at end of file
+}
diff --git a/tests/bugs/gh-841.slang b/tests/bugs/gh-841.slang
index 8dc687e77..0608023e5 100644
--- a/tests/bugs/gh-841.slang
+++ b/tests/bugs/gh-841.slang
@@ -12,9 +12,9 @@ struct RasterVertex
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
+ // SPV-DAG: [[VAL:%[_A-Za-z0-9]+]] = OpVariable {{.*}} Input
+ // SPV-DAG: OpDecorate [[VAL]] Location 1
+ // SPV-DAG: OpDecorate [[VAL]] Flat
//
// Likewise for GLSL
// GLSL: flat layout(location = 1)
diff --git a/tests/bugs/interlocked-add-uint-int.slang b/tests/bugs/interlocked-add-uint-int.slang
index 10baa7f17..4396a3dc5 100644
--- a/tests/bugs/interlocked-add-uint-int.slang
+++ b/tests/bugs/interlocked-add-uint-int.slang
@@ -1,5 +1,5 @@
//TEST:SIMPLE(filecheck=CHECK): -target spirv -profile glsl_450 -stage compute -entry MainCs -line-directive-mode none
-//CHECK: {{.*}} AtomicIAdd
+//CHECK: {{.*}} OpAtomicIAdd
RWBuffer<uint> g_InterlockTest;
[numthreads(1,1,1)]
@@ -16,4 +16,4 @@ void MainCs( uint2 dispatchThreadID : SV_DispatchThreadID, uint2 groupThreadID :
{
InterlockedAdd( g_InterlockTest[ 0 ], -int(nVertexCount) );
}
-} \ No newline at end of file
+}
diff --git a/tests/bugs/texture-array-samplecmplevelzero.slang b/tests/bugs/texture-array-samplecmplevelzero.slang
index 6176f74dc..c8afba603 100644
--- a/tests/bugs/texture-array-samplecmplevelzero.slang
+++ b/tests/bugs/texture-array-samplecmplevelzero.slang
@@ -1,5 +1,5 @@
//TEST_DISABLED:SIMPLE(filecheck=CHECK): -entry MainPs -stage fragment -profile glsl_450 -target spirv
-//CHECK: EntryPoint
+//CHECK: OpEntryPoint
SamplerComparisonState g_tSFMShadowDepthTexture_sampler;
Texture2DArray g_tSFMShadowDepthTexture;