Re-enable tests disabled in 4d8954d (#2853)

GPUOpen-Drivers · Nov 30, 2023 · 60e7a44 · 60e7a44
1 parent 1742c99
commit 60e7a44
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lgc/test/UberFetchShader.lgc b/lgc/test/UberFetchShader.lgc
@@ -1,13 +1,16 @@
 ; RUN: lgc -mcpu=gfx1030 -o - -passes=lgc-vertex-fetch %s | FileCheck --check-prefixes=CHECK %s
-; REQUIRES: do-not-run-me
 
 ; CHECK-LABEL: define dllexport spir_func void @lgc.shader.VS.main()
 ; Get the descriptor of Uber Fetch Shader buffer
 ; CHECK: [[Desc:%[0-9]*]] = call i64 @lgc.load.user.data.i64(i32 4)
 
 ; CHECK: [[DESCPTR:%[0-9]*]] = inttoptr i64 [[Desc]] to ptr addrspace(4)
-; CHECK: [[UBERINFOPTR:%[0-9]*]] = getelementptr <4 x i32>, ptr addrspace(4) [[DESCPTR]], i32 0
-; CHECK: [[UBERINFO:%[0-9]*]] = load <4 x i32>, ptr addrspace(4) [[UBERINFOPTR]], align 16
+; location mask
+; CHECK: load i64, ptr addrspace(4) [[DESCPTR]], align 8
+
+; CHECK: [[UBERINFOPTR:%[0-9]*]] = getelementptr i64, ptr addrspace(4) [[DESCPTR]], i32 1
+; CHECK: [[CURUBERINFOPTR:%[0-9]*]] = getelementptr <4 x i32>, ptr addrspace(4) [[UBERINFOPTR]], i32 0
+; CHECK: [[UBERINFO:%[0-9]*]] = load <4 x i32>, ptr addrspace(4) [[CURUBERINFOPTR]], align 16
 
 ; Read the first dword: vertex attribute
 ; CHECK: [[attr:%[0-9]*]] = extractelement <4 x i32> [[UBERINFO]], i64 0

diff --git a/llpc/test/shaderdb/general/PipelineVsFs_TestUberShader.pipe b/llpc/test/shaderdb/general/PipelineVsFs_TestUberShader.pipe
@@ -2,15 +2,15 @@
 
 ; BEGIN_SHADERTEST
 ; RUN: amdllpc -v -gfxip=10.3 %s | FileCheck -check-prefix=SHADERTEST %s
-; REQUIRES: do-not-run-me
 ; SHADERTEST-LABEL: {{^// LLPC}} pipeline patching results
 ; Load input descriptor
 
 ; SHADERTEST: [[PTR0:%[.a-z0-9]+]] = insertelement <2 x i32> poison, i32 %userdata2, i64 0
 ; SHADERTEST: [[PTR1:%[.a-z0-9]+]] = insertelement <2 x i32> [[PTR0]], i32 %userdata3, i64 1
 ; SHADERTEST: [[PTR2:%[.a-z0-9]+]] = bitcast <2 x i32> [[PTR1]] to i64
 ; SHADERTEST: [[INTDESCPTR:%[0-9]+]] = inttoptr i64 [[PTR2]] to ptr addrspace(4)
-; SHADERTEST: [[UBERINFO:%[0-9]*]] = load <4 x i32>, ptr addrspace(4) [[INTDESCPTR]], align 16
+; SHADERTEST: [[CURDESCPTR:%[0-9]+]] = getelementptr i64, ptr addrspace(4) [[INTDESCPTR]], i64 1
+; SHADERTEST: [[UBERINFO:%[0-9]*]] = load <4 x i32>, ptr addrspace(4) [[CURDESCPTR]], align 16
 
 ; Load vertex
 ; SHADERTEST-COUNT-3: call i32 @llvm.amdgcn.struct.buffer.load.format.i32