Skip to content

Commit 43dc6e1

Browse files
piotrgkureksys_zuul
authored and
sys_zuul
committed
No functional change for FOSS.
Change-Id: I9e3c9c68a940f988de155b9f1e41924100c9ab29
1 parent b1153b2 commit 43dc6e1

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

IGC/Compiler/Optimizer/OpenCLPasses/StatelessToStatefull/StatelessToStatefull.cpp

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,10 @@ void StatelessToStatefull::visitCallInst(CallInst& I)
412412
{
413413
if (auto Inst = dyn_cast<GenIntrinsicInst>(&I))
414414
{
415-
if (Inst->getIntrinsicID() == GenISAIntrinsic::GenISA_simdBlockRead ||
416-
Inst->getIntrinsicID() == GenISAIntrinsic::GenISA_simdBlockWrite)
415+
GenISAIntrinsic::ID const intrinID = Inst->getIntrinsicID();
416+
417+
if (intrinID == GenISAIntrinsic::GenISA_simdBlockRead ||
418+
intrinID == GenISAIntrinsic::GenISA_simdBlockWrite)
417419
{
418420
Module* M = Inst->getParent()->getParent()->getParent();
419421
Function* F = Inst->getParent()->getParent();
@@ -428,7 +430,7 @@ void StatelessToStatefull::visitCallInst(CallInst& I)
428430
}
429431

430432
Value* offset = nullptr;
431-
unsigned int baseArgNumber = 0;
433+
unsigned int baseArgNumber = 0;
432434
if (pointerIsPositiveOffsetFromKernelArgument(F, ptr, offset, baseArgNumber))
433435
{
434436
ModuleMetaData* modMD = getAnalysis<MetaDataUtilsWrapper>().getModuleMetaData();
@@ -441,13 +443,13 @@ void StatelessToStatefull::visitCallInst(CallInst& I)
441443
unsigned addrSpace = EncodeAS4GFXResource(*resourceNumber, BufferType::UAV, 0);
442444
setPointerSizeTo32bit(addrSpace, I.getParent()->getParent()->getParent());
443445

444-
if (Inst->getIntrinsicID() == GenISAIntrinsic::GenISA_simdBlockRead)
446+
if (intrinID == GenISAIntrinsic::GenISA_simdBlockRead)
445447
{
446448
PointerType* pTy = PointerType::get(Inst->getType(), addrSpace);
447449
Instruction* pPtrToInt = IntToPtrInst::Create(Instruction::IntToPtr, offset, pTy, "", Inst);
448450
Function* simdMediaBlockReadFunc = GenISAIntrinsic::getDeclaration(
449451
M,
450-
GenISAIntrinsic::GenISA_simdBlockRead,
452+
intrinID,
451453
{ Inst->getType(),pTy });
452454
Instruction* simdMediaBlockRead = CallInst::Create(simdMediaBlockReadFunc, { pPtrToInt }, "", Inst);
453455
simdMediaBlockRead->setDebugLoc(DL);
@@ -461,13 +463,13 @@ void StatelessToStatefull::visitCallInst(CallInst& I)
461463
SmallVector<Value*, 2> args;
462464
args.push_back(pPtrToInt);
463465
args.push_back(Inst->getOperand(1));
464-
Function* simdMediaBlockWriteFunc = GenISAIntrinsic::getDeclaration(
466+
Function* pFunc = GenISAIntrinsic::getDeclaration(
465467
M,
466-
GenISAIntrinsic::GenISA_simdBlockWrite,
468+
intrinID,
467469
{ pTy,Inst->getOperand(1)->getType() });
468-
Instruction* simdMediaBlockWrite = CallInst::Create(simdMediaBlockWriteFunc, args, "", Inst);
469-
simdMediaBlockWrite->setDebugLoc(DL);
470-
Inst->replaceAllUsesWith(simdMediaBlockWrite);
470+
Instruction* pIntrinInst = CallInst::Create(pFunc, args, "", Inst);
471+
pIntrinInst->setDebugLoc(DL);
472+
Inst->replaceAllUsesWith(pIntrinInst);
471473
Inst->eraseFromParent();
472474
}
473475

0 commit comments

Comments
 (0)