From d8b68432ef8aef3340d762b6ff25586ed85500d0 Mon Sep 17 00:00:00 2001 From: Mirko Brkusanin Date: Wed, 8 Nov 2023 13:30:15 +0100 Subject: [PATCH] Update llpc to handle new version of llvm Handle upstream llvm changes for https://github.com/llvm/llvm-project/commit/7b9d73c2f90c0ed8497339a16fc39785349d9610 [NFC] Remove Type::getInt8PtrTy (#71029) --- .../test_inputs/PipelineVsFs_ConstantData_Vs2Fs1.pipe | 6 +++--- shared/continuations/lib/LowerAwait.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/llpc/test/shaderdb/multiple_inputs/test_inputs/PipelineVsFs_ConstantData_Vs2Fs1.pipe b/llpc/test/shaderdb/multiple_inputs/test_inputs/PipelineVsFs_ConstantData_Vs2Fs1.pipe index 9220ee6d7b..761938f814 100644 --- a/llpc/test/shaderdb/multiple_inputs/test_inputs/PipelineVsFs_ConstantData_Vs2Fs1.pipe +++ b/llpc/test/shaderdb/multiple_inputs/test_inputs/PipelineVsFs_ConstantData_Vs2Fs1.pipe @@ -28,7 +28,7 @@ colorBuffer[0].blendEnable = 0 ; SHADERTEST-NEXT: [[TMP1:%.*]] = trunc i32 [[TMP0]] to i8 ; SHADERTEST-NEXT: [[DOTLHS_TRUNC:%.*]] = and i8 [[TMP1]], 15 ; SHADERTEST-NEXT: [[TMP2:%.*]] = urem i8 [[DOTLHS_TRUNC]], 3 -; SHADERTEST-NEXT: [[TMP3:%.*]] = zext i8 [[TMP2]] to i64 +; SHADERTEST-NEXT: [[TMP3:%.*]] = zext nneg i8 [[TMP2]] to i64 ; SHADERTEST-NEXT: [[TMP4:%.*]] = getelementptr [3 x <4 x float>], ptr addrspace(4) @__llpc_global_proxy_colors, i64 0, i64 [[TMP3]] ; SHADERTEST-NEXT: [[TMP5:%.*]] = load <4 x float>, ptr addrspace(4) [[TMP4]], align 16 ; SHADERTEST-NEXT: [[TMP6:%.*]] = insertvalue { <4 x float> } poison, <4 x float> [[TMP5]], 0 @@ -41,7 +41,7 @@ colorBuffer[0].blendEnable = 0 ; SHADERTEST2_PP0-NEXT: [[TMP1:%.*]] = trunc i32 [[TMP0]] to i8 ; SHADERTEST2_PP0-NEXT: [[DOTLHS_TRUNC:%.*]] = and i8 [[TMP1]], 15 ; SHADERTEST2_PP0-NEXT: [[TMP2:%.*]] = urem i8 [[DOTLHS_TRUNC]], 3 -; SHADERTEST2_PP0-NEXT: [[TMP3:%.*]] = zext i8 [[TMP2]] to i64 +; SHADERTEST2_PP0-NEXT: [[TMP3:%.*]] = zext nneg i8 [[TMP2]] to i64 ; SHADERTEST2_PP0-NEXT: [[TMP4:%.*]] = getelementptr [3 x <4 x float>], ptr addrspace(4) @__llpc_global_proxy_colors, i64 0, i64 [[TMP3]] ; SHADERTEST2_PP0-NEXT: [[TMP5:%.*]] = load <4 x float>, ptr addrspace(4) [[TMP4]], align 16 ; SHADERTEST2_PP0-NEXT: [[DOTI3:%.*]] = extractelement <4 x float> [[TMP5]], i64 3 @@ -58,7 +58,7 @@ colorBuffer[0].blendEnable = 0 ; SHADERTEST2_PP1-NEXT: [[TMP1:%.*]] = trunc i32 [[TMP0]] to i8 ; SHADERTEST2_PP1-NEXT: [[DOTLHS_TRUNC:%.*]] = and i8 [[TMP1]], 15 ; SHADERTEST2_PP1-NEXT: [[TMP2:%.*]] = urem i8 [[DOTLHS_TRUNC]], 3 -; SHADERTEST2_PP1-NEXT: [[TMP3:%.*]] = zext i8 [[TMP2]] to i64 +; SHADERTEST2_PP1-NEXT: [[TMP3:%.*]] = zext nneg i8 [[TMP2]] to i64 ; SHADERTEST2_PP1-NEXT: [[TMP4:%.*]] = getelementptr [3 x <4 x float>], ptr addrspace(4) @__llpc_global_proxy_colors, i64 0, i64 [[TMP3]] ; SHADERTEST2_PP1-NEXT: [[TMP5:%.*]] = load <4 x float>, ptr addrspace(4) [[TMP4]], align 16 ; SHADERTEST2_PP1-NEXT: [[DOTI3:%.*]] = extractelement <4 x float> [[TMP5]], i64 3 diff --git a/shared/continuations/lib/LowerAwait.cpp b/shared/continuations/lib/LowerAwait.cpp index 57f5e01427..48105aa129 100644 --- a/shared/continuations/lib/LowerAwait.cpp +++ b/shared/continuations/lib/LowerAwait.cpp @@ -171,7 +171,7 @@ static void processContinuations( // co.flag = llvm.coro.suspend.retcon // unreachable auto &Context = M.getContext(); - auto *I8Ptr = Type::getInt8PtrTy(Context); + auto *I8Ptr = PointerType::getUnqual(Context); auto *I32 = Type::getInt32Ty(Context); auto *I64 = Type::getInt64Ty(Context);