Skip to content

Commit ed2cc0e

Browse files
matborzyszkowskiigcbot
authored andcommitted
Adjust LIT/ocloc tests for LLVM16 + opaque and typed pointers
Adjust LIT/ocloc tests for LLVM16 + opaque and typed pointers
1 parent 3fb0247 commit ed2cc0e

File tree

4 files changed

+9
-38
lines changed

4 files changed

+9
-38
lines changed

IGC/Compiler/tests/PrivateMemoryResolution/SOA_promotion/soa-mismatch-detection.ll

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
; REQUIRES: regkeys,llvm-16-plus
1010
;
11-
; RUN: igc_opt --ocl --igc-private-mem-resolution --regkey "EnablePrivMemNewSOATranspose=1,EnableOpaquePointersBackend=1" -S %s | FileCheck %s
11+
; RUN: igc_opt --ocl --igc-private-mem-resolution --regkey EnablePrivMemNewSOATranspose=1 --regkey EnableOpaquePointersBackend=1 -S %s | FileCheck %s
1212
;
1313
; This test is testing "MismatchDetected" algorithm in LowerGEPForPrivMem.cpp
1414
; The purpose of this test is to validate whether various combinations of allocas/geps/load/stores
@@ -42,15 +42,15 @@ exit:
4242
%l = load <2 x float>, ptr %arr2
4343

4444
; This case is not valid because i32 and i8 have different sizes
45-
; CHECK: %load2 = load i8, ptr %arr3
45+
; CHECK: %load2 = load i8, ptr {{.*}}
4646
%arr3 = alloca [512 x i32]
4747
%load2 = load i8, ptr %arr3
4848

4949
; Case Alloca->Store->Gep->Store: This case is not valid due to different sizes
5050

51-
; CHECK: store <4 x i32> zeroinitializer, ptr %offset.i.i.i.i.privateBufferPTR
52-
; CHECK: %offset_gep = getelementptr i8, ptr %offset.i.i.i.i.privateBufferPTR, i32 16
53-
; CHECK: store i32 0, ptr %offset_gep, align 4
51+
; CHECK: store <4 x i32> zeroinitializer, ptr {{.*}}
52+
; CHECK: [[OFFSET_GEP:%.*]] = getelementptr i8, ptr {{.*}}, i32 16
53+
; CHECK: store i32 0, ptr [[OFFSET_GEP]], align 4
5454

5555
%offset.i.i.i.i = alloca [8 x %"struct.ispc::vec_t"], align 4
5656
store <4 x i32> zeroinitializer, ptr %offset.i.i.i.i, align 4
@@ -63,7 +63,7 @@ exit:
6363
%load3 = load <2 x float>, ptr %st
6464

6565
; This case is not valid because i32 and i8 have different sizes
66-
; CHECK: %load4 = load <2 x i8>, ptr %st2
66+
; CHECK: %load4 = load <2 x i8>, ptr {{.*}}
6767
%st2 = alloca %g
6868
%load4 = load <2 x i8>, ptr %st2
6969

IGC/ocloc_tests/SPIRV-Asm/OpConvertUToPtr_widening-typed-pointers.spvasm

Lines changed: 0 additions & 29 deletions
This file was deleted.

IGC/ocloc_tests/SPIRV-Asm/OpConvertUToPtr_widening.spvasm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; REQUIRES: regkeys, spirv-as, dg2-supported, llvm-16-plus
1+
; REQUIRES: regkeys, spirv-as, dg2-supported, llvm-14-plus
22

33
; RUN: spirv-as --target-env spv1.0 -o %t.spv %s
44

@@ -28,4 +28,4 @@
2828
OpReturn
2929
OpFunctionEnd
3030

31-
; CHECK: inttoptr i16 %a to ptr addrspace(1)
31+
; CHECK: inttoptr i16 %a to {{i32|ptr}} addrspace(1){{.*}}

external/llvm/llvm_preferred_version.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
#
77
#============================ end_copyright_notice =============================
88

9-
set(DEFAULT_IGC_LLVM_VERSION "15.0.7")
9+
set(DEFAULT_IGC_LLVM_VERSION "16.0.6")
1010

0 commit comments

Comments
 (0)