Update shaderdb tests

GPUOpen-Drivers · Apr 29, 2022 · 3a2fc92 · 3a2fc92
1 parent 286929a
commit 3a2fc92
Show file tree

Hide file tree

Showing 1,147 changed files with 1,211 additions and 1,385 deletions.
diff --git a/llpc/test/shaderdb/core/OOB_Check_Array_Load_With_Array_Load_Result_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Array_Load_With_Array_Load_Result_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca [5 x i32], align 4, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Dependent_Load_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Dependent_Load_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca [5 x i32], align 4, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Load_Array_Loop_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Load_Array_Loop_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[parent:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca [2048 x <4 x float>], align 16, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Load_Array_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Load_Array_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca [2048 x [2 x <4 x float>]], align 16, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Load_Array_with_Struct_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Load_Array_with_Struct_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca [5 x { <4 x float> }], align 16, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Load_Matrix_Vector_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Load_Matrix_Vector_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[mat:[a-z0-9]+]] = alloca [4 x <4 x float>], align 16, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Load_Matrix_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Load_Matrix_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca [4 x <4 x float>], align 16, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Load_Nested_Struct_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Load_Nested_Struct_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca [5 x { [10 x <4 x float>], [12 x { [4 x <4 x float>] }] }], align 16, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Load_Struct_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Load_Struct_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca [5 x { [10 x <4 x float>], [12 x <4 x float>] }], align 16, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Load_Vector_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Load_Vector_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca <4 x float>, align 16, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Multiple_Load_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Multiple_Load_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca <4 x float>, align 16, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Optimization_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Optimization_lit.frag
@@ -3,7 +3,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} final pipeline module info
 ; SHADERTEST: define dllexport amdgpu_ps { <4 x float> } @_amdgpu_ps_main
 ; SHADERTEST-NOT: phi

diff --git a/llpc/test/shaderdb/core/OOB_Check_Store_Array_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Store_Array_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca [2048 x [2 x <4 x float>]], align 16, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OOB_Check_Store_Struct_lit.frag b/llpc/test/shaderdb/core/OOB_Check_Store_Struct_lit.frag
@@ -4,7 +4,7 @@
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s -enable-scratch-bounds-checks | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: .[[entry:[a-z0-9]+]]:
 ; SHADERTEST: %[[arr:[a-z0-9]+]] = alloca [5 x { [10 x <4 x float>] }], align 16, addrspace(5)

diff --git a/llpc/test/shaderdb/core/OpAccessChain_TestBlockVectorExtract_lit.frag b/llpc/test/shaderdb/core/OpAccessChain_TestBlockVectorExtract_lit.frag
@@ -33,7 +33,7 @@ void main()
 }
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 

diff --git a/llpc/test/shaderdb/core/OpAccessChain_TestGeneralVarVectorExtract_lit.frag b/llpc/test/shaderdb/core/OpAccessChain_TestGeneralVarVectorExtract_lit.frag
@@ -23,7 +23,7 @@ void main()
 }
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results

diff --git a/llpc/test/shaderdb/core/OpAccessChain_TestInOutVectorExtract_lit.frag b/llpc/test/shaderdb/core/OpAccessChain_TestInOutVectorExtract_lit.frag
@@ -16,7 +16,7 @@ void main()
 }
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: add i32 %{{[0-9]*}}, 1

diff --git a/llpc/test/shaderdb/core/OpAccessChain_TestMultiLevelChain_lit.spvasm b/llpc/test/shaderdb/core/OpAccessChain_TestMultiLevelChain_lit.spvasm
@@ -1,6 +1,6 @@
 
 ; BEGIN_SHADERTEST
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: getelementptr{{.*}}<{ [8 x [4 x float]], i32 }>, <{ [8 x [4 x float]], i32 }> addrspace({{.*}})* @{{.*}}, i32 0,

diff --git a/llpc/test/shaderdb/core/OpAccessChain_TestOutBlockMemberLocUnspecified_lit.vert b/llpc/test/shaderdb/core/OpAccessChain_TestOutBlockMemberLocUnspecified_lit.vert
@@ -24,7 +24,7 @@ void main()
 }
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: icmp eq i32 %{{[0-9]*}}, 1

diff --git a/llpc/test/shaderdb/core/OpAccessChain_TestRowMajorBlockVectorExtract_lit.frag b/llpc/test/shaderdb/core/OpAccessChain_TestRowMajorBlockVectorExtract_lit.frag
@@ -40,7 +40,7 @@ void main()
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: insertelement <4 x [4 x %{{[a-z0-9.]*}}] addrspace(7)*> undef, [4 x %{{[a-z0-9.]*}}] addrspace(7)* %{{[0-9]*}}, i{{32|64}} 0

diff --git a/llpc/test/shaderdb/core/OpAccessChain_TestUniformVectorExtract_lit.frag b/llpc/test/shaderdb/core/OpAccessChain_TestUniformVectorExtract_lit.frag
@@ -16,7 +16,7 @@ void main()
 }
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: [[GEPVAR:%[^ ]+]] = getelementptr <{ [4 x double], i32 }>, <{ [4 x double], i32 }> addrspace(7)* {{%[^,]+}}, i64 0, i32 0, i64 %

diff --git a/llpc/test/shaderdb/core/OpAll_TestBoolConst_lit.frag b/llpc/test/shaderdb/core/OpAll_TestBoolConst_lit.frag
@@ -11,7 +11,7 @@ void main()
 }
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: store <4 x i32> <i32 1, i32 0, i32 1, i32 0>,

diff --git a/llpc/test/shaderdb/core/OpAll_TestBvec4_lit.frag b/llpc/test/shaderdb/core/OpAll_TestBvec4_lit.frag
@@ -20,7 +20,7 @@ void main()
 }
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-COUNT-3: = and i1

diff --git a/llpc/test/shaderdb/core/OpAny_TestBoolConst_lit.frag b/llpc/test/shaderdb/core/OpAny_TestBoolConst_lit.frag
@@ -11,7 +11,7 @@ void main()
 }
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST: store <4 x i32> <i32 1, i32 0, i32 1, i32 0>,

diff --git a/llpc/test/shaderdb/core/OpAny_TestBvec2_lit.frag b/llpc/test/shaderdb/core/OpAny_TestBvec2_lit.frag
@@ -20,7 +20,7 @@ void main()
 }
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-COUNT-3: = or i1

diff --git a/llpc/test/shaderdb/core/OpArrayLength_TestGeneral_lit.frag b/llpc/test/shaderdb/core/OpArrayLength_TestGeneral_lit.frag
@@ -23,7 +23,7 @@ void main()
 }
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i32 {{.*}}@lgc.create.get.buffer.desc.length.i32(

diff --git a/llpc/test/shaderdb/core/OpAtomicAnd_TestInt64ImageAtomicAnd.spvasm b/llpc/test/shaderdb/core/OpAtomicAnd_TestInt64ImageAtomicAnd.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 8

diff --git a/llpc/test/shaderdb/core/OpAtomicCompareExchange_TestInt64ImageAtomicCompSwap.spvasm b/llpc/test/shaderdb/core/OpAtomicCompareExchange_TestInt64ImageAtomicCompSwap.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.compare.swap.i64(i32 1

diff --git a/llpc/test/shaderdb/core/OpAtomicCompareExchange_TestStrongCompare.spvasm b/llpc/test/shaderdb/core/OpAtomicCompareExchange_TestStrongCompare.spvasm
@@ -1,5 +1,5 @@
 ; BEGIN_SHADERTEST
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} pipeline patching results
 ; SHADERTEST: %[[RESULT:[0-9]*]] = call i32 @llvm.amdgcn.raw.buffer.atomic.cmpswap.i32(i32 %{{[0-9]*}}, i32 %[[COMPARE:[0-9]*]]
 ; SHADERTEST: %[[IS_EQUAL:[0-9]*]] = icmp eq i32 %[[RESULT]], %[[COMPARE]]

diff --git a/llpc/test/shaderdb/core/OpAtomicExchange_TestInt64ImageAtomicExchange.spvasm b/llpc/test/shaderdb/core/OpAtomicExchange_TestInt64ImageAtomicExchange.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 0

diff --git a/llpc/test/shaderdb/core/OpAtomicIAdd_TestInt64ImageAtomicAdd.spvasm b/llpc/test/shaderdb/core/OpAtomicIAdd_TestInt64ImageAtomicAdd.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 2

diff --git a/llpc/test/shaderdb/core/OpAtomicIDecrement_TestInt64ImageAtomicDecrement.spvasm b/llpc/test/shaderdb/core/OpAtomicIDecrement_TestInt64ImageAtomicDecrement.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 3, {{.*}}, i64 1)

diff --git a/llpc/test/shaderdb/core/OpAtomicIDecrement_TestStorageBlock_lit.spvasm b/llpc/test/shaderdb/core/OpAtomicIDecrement_TestStorageBlock_lit.spvasm
@@ -1,5 +1,5 @@
 ; BEGIN_SHADERTEST
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST; call i32 @lgc.buffer.atomic.idecrement.i32(<4 x i32> %{{[0-9]*}}, i32 24, i32 0, i1 false)

diff --git a/llpc/test/shaderdb/core/OpAtomicIIncrement_TestInt64ImageAtomicIncrement.spvasm b/llpc/test/shaderdb/core/OpAtomicIIncrement_TestInt64ImageAtomicIncrement.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 2, {{.*}}, i64 1)

diff --git a/llpc/test/shaderdb/core/OpAtomicIIncrement_TestStorageBlock_lit.spvasm b/llpc/test/shaderdb/core/OpAtomicIIncrement_TestStorageBlock_lit.spvasm
@@ -1,5 +1,5 @@
 ; BEGIN_SHADERTEST
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST; store i32

diff --git a/llpc/test/shaderdb/core/OpAtomicIIncrement_TestVariablePointer_lit.spvasm b/llpc/test/shaderdb/core/OpAtomicIIncrement_TestVariablePointer_lit.spvasm
@@ -1,5 +1,5 @@
 ; BEGIN_SHADERTEST
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST; call i32 @lgc.buffer.atomic.iincrement.i32(<4 x i32> %{{[0-9]*}}, i32 0, i32 0, i1 false)
 

diff --git a/llpc/test/shaderdb/core/OpAtomicISub_TestInt64ImageAtomicSub.spvasm b/llpc/test/shaderdb/core/OpAtomicISub_TestInt64ImageAtomicSub.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 3

diff --git a/llpc/test/shaderdb/core/OpAtomicLoad_TestInt64ImageAtomicLoad.spvasm b/llpc/test/shaderdb/core/OpAtomicLoad_TestInt64ImageAtomicLoad.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 2, {{.*}}, i64 0)

diff --git a/llpc/test/shaderdb/core/OpAtomicLoad_TestStorageBlock_lit.spvasm b/llpc/test/shaderdb/core/OpAtomicLoad_TestStorageBlock_lit.spvasm
@@ -1,6 +1,6 @@
 
 ; BEGIN_SHADERTEST
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: %{{.*}} = load atomic i32, i32 addrspace({{.*}})* {{.*}} monotonic

diff --git a/llpc/test/shaderdb/core/OpAtomicOr_TestInt64ImageAtomicOr.spvasm b/llpc/test/shaderdb/core/OpAtomicOr_TestInt64ImageAtomicOr.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 9

diff --git a/llpc/test/shaderdb/core/OpAtomicSMax_TestInt64ImageAtomicMax.spvasm b/llpc/test/shaderdb/core/OpAtomicSMax_TestInt64ImageAtomicMax.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 6

diff --git a/llpc/test/shaderdb/core/OpAtomicSMin_TestInt64ImageAtomicMin.spvasm b/llpc/test/shaderdb/core/OpAtomicSMin_TestInt64ImageAtomicMin.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 4

diff --git a/llpc/test/shaderdb/core/OpAtomicStore_TestInt64ImageAtomicStore.spvasm b/llpc/test/shaderdb/core/OpAtomicStore_TestInt64ImageAtomicStore.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 0

diff --git a/llpc/test/shaderdb/core/OpAtomicStore_TestStorageBlock_lit.spvasm b/llpc/test/shaderdb/core/OpAtomicStore_TestStorageBlock_lit.spvasm
@@ -1,6 +1,6 @@
 
 ; BEGIN_SHADERTEST
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: store atomic i32 %{{.*}}, i32 addrspace({{.*}}7)* %{{.*}} monotonic

diff --git a/llpc/test/shaderdb/core/OpAtomicUMax_TestInt64ImageAtomicMax.spvasm b/llpc/test/shaderdb/core/OpAtomicUMax_TestInt64ImageAtomicMax.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 7

diff --git a/llpc/test/shaderdb/core/OpAtomicUMin_TestInt64ImageAtomicMin.spvasm b/llpc/test/shaderdb/core/OpAtomicUMin_TestInt64ImageAtomicMin.spvasm
@@ -1,4 +1,4 @@
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIRV-to-LLVM translation results
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i64 (...) @lgc.create.image.atomic.i64(i32 5

diff --git a/llpc/test/shaderdb/core/OpAtomicXXX_TestImageDimension_lit.comp b/llpc/test/shaderdb/core/OpAtomicXXX_TestImageDimension_lit.comp
@@ -121,7 +121,7 @@ void main()
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i32 (...) @lgc.create.image.atomic.i32(i32 2, i32 0, i32 0, i32 0, <8 x i32> %{{[-0-9A-Za0z_.]+}}, i32 7, i32 9)

diff --git a/llpc/test/shaderdb/core/OpAtomicXXX_TestImageMemoryQualifier_lit.comp b/llpc/test/shaderdb/core/OpAtomicXXX_TestImageMemoryQualifier_lit.comp
@@ -13,7 +13,7 @@ void main()
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i32 (...) @lgc.create.image.atomic.i32(i32 2, i32 1, i32 0, i32 0, <8 x i32> %{{[-0-9A-Za0z_.]+}}, <2 x i32> <i32 5, i32 5>, i32 9)

diff --git a/llpc/test/shaderdb/core/OpAtomicXXX_TestImage_lit.comp b/llpc/test/shaderdb/core/OpAtomicXXX_TestImage_lit.comp
@@ -43,7 +43,7 @@ void main()
 
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i32 (...) @lgc.create.image.atomic.i32(i32 2, i32 1, i32 0, i32 0, <8 x i32> %{{[-0-9A-Za0z_.]+}}, <2 x i32> <i32 7, i32 7>, i32 9)

diff --git a/llpc/test/shaderdb/core/OpAtomicXXX_TestImage_lit.frag b/llpc/test/shaderdb/core/OpAtomicXXX_TestImage_lit.frag
@@ -45,7 +45,7 @@ void main()
 }
 // BEGIN_SHADERTEST
 /*
-; RUN: amdllpc -spvgen-dir=%spvgendir% -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
+; RUN: amdllpc -v %gfxip %s | FileCheck -check-prefix=SHADERTEST %s
 
 ; SHADERTEST-LABEL: {{^// LLPC}} SPIR-V lowering results
 ; SHADERTEST: call i32 (...) @lgc.create.image.atomic.i32(i32 2, i32 0, i32 0, i32 0, <8 x i32>