Skip to content

Commit e24106e

Browse files
jurahuljurahul
committed
[IRBuilder] Add new overload for CreateIntrinsic
Add a new `CreateIntrinsic` overload with no `Types`, useful for creating calls to non-overloaded intrinsics that don't need additional mangling.
1 parent 7d7b58b commit e24106e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+147
-138
lines changed

‎clang/lib/CodeGen/CGBuiltin.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,23 @@ static Value *handleHlslClip(const CallExpr *E, CodeGenFunction *CGF) {
114114
CMP = CGF->Builder.CreateIntrinsic(
115115
CGF->Builder.getInt1Ty(), CGF->CGM.getHLSLRuntime().getAnyIntrinsic(),
116116
{FCompInst}, nullptr);
117-
} else
117+
} else {
118118
CMP = CGF->Builder.CreateFCmpOLT(Op0, FZeroConst);
119+
}
119120

120-
if (CGF->CGM.getTarget().getTriple().isDXIL())
121+
if (CGF->CGM.getTarget().getTriple().isDXIL()) {
121122
LastInstr = CGF->Builder.CreateIntrinsic(
122123
CGF->VoidTy, llvm::Intrinsic::dx_discard, {CMP}, nullptr);
123-
else if (CGF->CGM.getTarget().getTriple().isSPIRV()) {
124+
} else if (CGF->CGM.getTarget().getTriple().isSPIRV()) {
124125
BasicBlock *LT0 = CGF->createBasicBlock("lt0", CGF->CurFn);
125126
BasicBlock *End = CGF->createBasicBlock("end", CGF->CurFn);
126127

127128
CGF->Builder.CreateCondBr(CMP, LT0, End);
128129

129130
CGF->Builder.SetInsertPoint(LT0);
130131

131-
CGF->Builder.CreateIntrinsic(CGF->VoidTy, llvm::Intrinsic::spv_discard, {},
132-
nullptr);
132+
CGF->Builder.CreateIntrinsic(llvm::Intrinsic::spv_discard,
133+
ArrayRef<Value *>{}, nullptr);
133134

134135
LastInstr = CGF->Builder.CreateBr(End);
135136

‎clang/lib/CodeGen/CGHLSLRuntime.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,8 @@ void CGHLSLRuntime::emitEntryFunction(const FunctionDecl *FD,
386386
SmallVector<OperandBundleDef, 1> OB;
387387
if (CGM.shouldEmitConvergenceTokens()) {
388388
assert(EntryFn->isConvergent());
389-
llvm::Value *I = B.CreateIntrinsic(
390-
llvm::Intrinsic::experimental_convergence_entry, {}, {});
389+
llvm::Value *I =
390+
B.CreateIntrinsic(llvm::Intrinsic::experimental_convergence_entry, {});
391391
llvm::Value *bundleArgs[] = {I};
392392
OB.emplace_back("convergencectrl", bundleArgs);
393393
}

‎llvm/include/llvm/IR/IRBuilder.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,14 @@ class IRBuilderBase {
10041004
ArrayRef<Value *> Args, FMFSource FMFSource = {},
10051005
const Twine &Name = "");
10061006

1007+
/// Create a call to non-overloaded intrinsic \p ID with \p Args. If
1008+
/// \p FMFSource is provided, copy fast-math-flags from that instruction to
1009+
/// the intrinsic.
1010+
CallInst *CreateIntrinsic(Intrinsic::ID ID, ArrayRef<Value *> Args,
1011+
FMFSource FMFSource = {}, const Twine &Name = "") {
1012+
return CreateIntrinsic(ID, /*Types=*/{}, Args, FMFSource, Name);
1013+
}
1014+
10071015
/// Create call to the minnum intrinsic.
10081016
Value *CreateMinNum(Value *LHS, Value *RHS, FMFSource FMFSource = {},
10091017
const Twine &Name = "") {

‎llvm/lib/CodeGen/SafeStack.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ Value *SafeStack::getStackGuard(IRBuilder<> &IRB, Function &F) {
367367

368368
if (!StackGuardVar) {
369369
TL.insertSSPDeclarations(*M);
370-
return IRB.CreateIntrinsic(Intrinsic::stackguard, {}, {});
370+
return IRB.CreateIntrinsic(Intrinsic::stackguard, {});
371371
}
372372

373373
return IRB.CreateLoad(StackPtrTy, StackGuardVar, "StackGuard");

‎llvm/lib/CodeGen/StackProtector.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ static Value *getStackGuard(const TargetLoweringBase *TLI, Module *M,
542542
if (SupportsSelectionDAGSP)
543543
*SupportsSelectionDAGSP = true;
544544
TLI->insertSSPDeclarations(*M);
545-
return B.CreateIntrinsic(Intrinsic::stackguard, {}, {});
545+
return B.CreateIntrinsic(Intrinsic::stackguard, {});
546546
}
547547

548548
/// Insert code into the entry block that stores the stack guard
@@ -563,7 +563,7 @@ static bool CreatePrologue(Function *F, Module *M, Instruction *CheckLoc,
563563
AI = B.CreateAlloca(PtrTy, nullptr, "StackGuardSlot");
564564

565565
Value *GuardSlot = getStackGuard(TLI, M, B, &SupportsSelectionDAGSP);
566-
B.CreateIntrinsic(Intrinsic::stackprotector, {}, {GuardSlot, AI});
566+
B.CreateIntrinsic(Intrinsic::stackprotector, {GuardSlot, AI});
567567
return SupportsSelectionDAGSP;
568568
}
569569

‎llvm/lib/IR/AutoUpgrade.cpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1766,7 +1766,7 @@ static Value *upgradeX86VPERMT2Intrinsics(IRBuilder<> &Builder, CallBase &CI,
17661766
if (!IndexForm)
17671767
std::swap(Args[0], Args[1]);
17681768

1769-
Value *V = Builder.CreateIntrinsic(IID, {}, Args);
1769+
Value *V = Builder.CreateIntrinsic(IID, Args);
17701770
Value *PassThru = ZeroMask ? ConstantAggregateZero::get(Ty)
17711771
: Builder.CreateBitCast(CI.getArgOperand(1),
17721772
Ty);
@@ -2021,8 +2021,8 @@ static Value *upgradeMaskedCompare(IRBuilder<> &Builder, CallBase &CI,
20212021
// Replace a masked intrinsic with an older unmasked intrinsic.
20222022
static Value *upgradeX86MaskedShift(IRBuilder<> &Builder, CallBase &CI,
20232023
Intrinsic::ID IID) {
2024-
Value *Rep = Builder.CreateIntrinsic(
2025-
IID, {}, {CI.getArgOperand(0), CI.getArgOperand(1)});
2024+
Value *Rep =
2025+
Builder.CreateIntrinsic(IID, {CI.getArgOperand(0), CI.getArgOperand(1)});
20262026
return emitX86Select(Builder, CI.getArgOperand(3), Rep, CI.getArgOperand(2));
20272027
}
20282028

@@ -2279,7 +2279,7 @@ static bool upgradeAVX512MaskToSelect(StringRef Name, IRBuilder<> &Builder,
22792279
SmallVector<Value *, 4> Args(CI.args());
22802280
Args.pop_back();
22812281
Args.pop_back();
2282-
Rep = Builder.CreateIntrinsic(IID, {}, Args);
2282+
Rep = Builder.CreateIntrinsic(IID, Args);
22832283
unsigned NumArgs = CI.arg_size();
22842284
Rep = emitX86Select(Builder, CI.getArgOperand(NumArgs - 1), Rep,
22852285
CI.getArgOperand(NumArgs - 2));
@@ -2504,7 +2504,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
25042504
: Intrinsic::x86_avx512_sqrt_pd_512;
25052505

25062506
Value *Args[] = {CI->getArgOperand(0), CI->getArgOperand(3)};
2507-
Rep = Builder.CreateIntrinsic(IID, {}, Args);
2507+
Rep = Builder.CreateIntrinsic(IID, Args);
25082508
} else {
25092509
Rep = Builder.CreateIntrinsic(Intrinsic::sqrt, CI->getType(),
25102510
{CI->getArgOperand(0)});
@@ -2631,8 +2631,8 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
26312631
break;
26322632
}
26332633

2634-
Rep = Builder.CreateIntrinsic(IID, {},
2635-
{CI->getOperand(0), CI->getArgOperand(1)});
2634+
Rep =
2635+
Builder.CreateIntrinsic(IID, {CI->getOperand(0), CI->getArgOperand(1)});
26362636
Rep = applyX86MaskOn1BitsVec(Builder, Rep, CI->getArgOperand(2));
26372637
} else if (Name.starts_with("avx512.mask.fpclass.p")) {
26382638
Type *OpTy = CI->getArgOperand(0)->getType();
@@ -2654,8 +2654,8 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
26542654
else
26552655
llvm_unreachable("Unexpected intrinsic");
26562656

2657-
Rep = Builder.CreateIntrinsic(IID, {},
2658-
{CI->getOperand(0), CI->getArgOperand(1)});
2657+
Rep =
2658+
Builder.CreateIntrinsic(IID, {CI->getOperand(0), CI->getArgOperand(1)});
26592659
Rep = applyX86MaskOn1BitsVec(Builder, Rep, CI->getArgOperand(2));
26602660
} else if (Name.starts_with("avx512.cmp.p")) {
26612661
SmallVector<Value *, 4> Args(CI->args());
@@ -2683,7 +2683,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
26832683
std::swap(Mask, Args.back());
26842684
Args.push_back(Mask);
26852685

2686-
Rep = Builder.CreateIntrinsic(IID, {}, Args);
2686+
Rep = Builder.CreateIntrinsic(IID, Args);
26872687
} else if (Name.starts_with("avx512.mask.cmp.")) {
26882688
// Integer compare intrinsics.
26892689
unsigned Imm = cast<ConstantInt>(CI->getArgOperand(2))->getZExtValue();
@@ -2899,7 +2899,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
28992899
} else if (Name == "sse42.crc32.64.8") {
29002900
Value *Trunc0 =
29012901
Builder.CreateTrunc(CI->getArgOperand(0), Type::getInt32Ty(C));
2902-
Rep = Builder.CreateIntrinsic(Intrinsic::x86_sse42_crc32_32_8, {},
2902+
Rep = Builder.CreateIntrinsic(Intrinsic::x86_sse42_crc32_32_8,
29032903
{Trunc0, CI->getArgOperand(1)});
29042904
Rep = Builder.CreateZExt(Rep, CI->getType(), "");
29052905
} else if (Name.starts_with("avx.vbroadcast.s") ||
@@ -3389,7 +3389,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
33893389
IID = Intrinsic::x86_avx512_add_pd_512;
33903390

33913391
Rep = Builder.CreateIntrinsic(
3392-
IID, {},
3392+
IID,
33933393
{CI->getArgOperand(0), CI->getArgOperand(1), CI->getArgOperand(4)});
33943394
} else {
33953395
Rep = Builder.CreateFAdd(CI->getArgOperand(0), CI->getArgOperand(1));
@@ -3405,7 +3405,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
34053405
IID = Intrinsic::x86_avx512_div_pd_512;
34063406

34073407
Rep = Builder.CreateIntrinsic(
3408-
IID, {},
3408+
IID,
34093409
{CI->getArgOperand(0), CI->getArgOperand(1), CI->getArgOperand(4)});
34103410
} else {
34113411
Rep = Builder.CreateFDiv(CI->getArgOperand(0), CI->getArgOperand(1));
@@ -3421,7 +3421,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
34213421
IID = Intrinsic::x86_avx512_mul_pd_512;
34223422

34233423
Rep = Builder.CreateIntrinsic(
3424-
IID, {},
3424+
IID,
34253425
{CI->getArgOperand(0), CI->getArgOperand(1), CI->getArgOperand(4)});
34263426
} else {
34273427
Rep = Builder.CreateFMul(CI->getArgOperand(0), CI->getArgOperand(1));
@@ -3437,7 +3437,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
34373437
IID = Intrinsic::x86_avx512_sub_pd_512;
34383438

34393439
Rep = Builder.CreateIntrinsic(
3440-
IID, {},
3440+
IID,
34413441
{CI->getArgOperand(0), CI->getArgOperand(1), CI->getArgOperand(4)});
34423442
} else {
34433443
Rep = Builder.CreateFSub(CI->getArgOperand(0), CI->getArgOperand(1));
@@ -3455,7 +3455,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
34553455
Intrinsic::ID IID = MinMaxTbl[IsMin][IsDouble];
34563456

34573457
Rep = Builder.CreateIntrinsic(
3458-
IID, {},
3458+
IID,
34593459
{CI->getArgOperand(0), CI->getArgOperand(1), CI->getArgOperand(4)});
34603460
Rep =
34613461
emitX86Select(Builder, CI->getArgOperand(3), Rep, CI->getArgOperand(2));
@@ -3753,7 +3753,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
37533753
IID = Intrinsic::x86_avx512_vfmadd_f64;
37543754
else
37553755
IID = Intrinsic::x86_avx512_vfmadd_f32;
3756-
Rep = Builder.CreateIntrinsic(IID, {}, Ops);
3756+
Rep = Builder.CreateIntrinsic(IID, Ops);
37573757
} else {
37583758
Rep = Builder.CreateFMA(A, B, C);
37593759
}
@@ -3806,7 +3806,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
38063806
else
38073807
IID = Intrinsic::x86_avx512_vfmadd_pd_512;
38083808

3809-
Rep = Builder.CreateIntrinsic(IID, {}, {A, B, C, CI->getArgOperand(4)});
3809+
Rep = Builder.CreateIntrinsic(IID, {A, B, C, CI->getArgOperand(4)});
38103810
} else {
38113811
Rep = Builder.CreateFMA(A, B, C);
38123812
}
@@ -3834,7 +3834,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
38343834
Value *Ops[] = {CI->getArgOperand(0), CI->getArgOperand(1),
38353835
CI->getArgOperand(2)};
38363836
Ops[2] = Builder.CreateFNeg(Ops[2]);
3837-
Rep = Builder.CreateIntrinsic(IID, {}, Ops);
3837+
Rep = Builder.CreateIntrinsic(IID, Ops);
38383838
} else if (Name.starts_with("avx512.mask.vfmaddsub.p") ||
38393839
Name.starts_with("avx512.mask3.vfmaddsub.p") ||
38403840
Name.starts_with("avx512.maskz.vfmaddsub.p") ||
@@ -3857,7 +3857,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
38573857
if (IsSubAdd)
38583858
Ops[2] = Builder.CreateFNeg(Ops[2]);
38593859

3860-
Rep = Builder.CreateIntrinsic(IID, {}, Ops);
3860+
Rep = Builder.CreateIntrinsic(IID, Ops);
38613861
} else {
38623862
int NumElts = cast<FixedVectorType>(CI->getType())->getNumElements();
38633863

@@ -3908,7 +3908,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
39083908

39093909
Value *Args[] = {CI->getArgOperand(0), CI->getArgOperand(1),
39103910
CI->getArgOperand(2), CI->getArgOperand(3)};
3911-
Rep = Builder.CreateIntrinsic(IID, {}, Args);
3911+
Rep = Builder.CreateIntrinsic(IID, Args);
39123912
Value *PassThru = ZeroMask ? ConstantAggregateZero::get(CI->getType())
39133913
: CI->getArgOperand(0);
39143914
Rep = emitX86Select(Builder, CI->getArgOperand(4), Rep, PassThru);
@@ -3935,7 +3935,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
39353935

39363936
Value *Args[] = {CI->getArgOperand(0), CI->getArgOperand(1),
39373937
CI->getArgOperand(2)};
3938-
Rep = Builder.CreateIntrinsic(IID, {}, Args);
3938+
Rep = Builder.CreateIntrinsic(IID, Args);
39393939
Value *PassThru = ZeroMask ? ConstantAggregateZero::get(CI->getType())
39403940
: CI->getArgOperand(0);
39413941
Rep = emitX86Select(Builder, CI->getArgOperand(3), Rep, PassThru);
@@ -3970,7 +3970,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
39703970

39713971
Value *Args[] = {CI->getArgOperand(0), CI->getArgOperand(1),
39723972
CI->getArgOperand(2)};
3973-
Rep = Builder.CreateIntrinsic(IID, {}, Args);
3973+
Rep = Builder.CreateIntrinsic(IID, Args);
39743974
Value *PassThru = ZeroMask ? ConstantAggregateZero::get(CI->getType())
39753975
: CI->getArgOperand(0);
39763976
Rep = emitX86Select(Builder, CI->getArgOperand(3), Rep, PassThru);
@@ -3999,7 +3999,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
39993999

40004000
Value *Args[] = {CI->getArgOperand(0), CI->getArgOperand(1),
40014001
CI->getArgOperand(2)};
4002-
Rep = Builder.CreateIntrinsic(IID, {}, Args);
4002+
Rep = Builder.CreateIntrinsic(IID, Args);
40034003
Value *PassThru = ZeroMask ? ConstantAggregateZero::get(CI->getType())
40044004
: CI->getArgOperand(0);
40054005
Rep = emitX86Select(Builder, CI->getArgOperand(3), Rep, PassThru);
@@ -4021,7 +4021,7 @@ static Value *upgradeX86IntrinsicCall(StringRef Name, CallBase *CI, Function *F,
40214021
// Make a call with 3 operands.
40224022
Value *Args[] = {CI->getArgOperand(0), CI->getArgOperand(1),
40234023
CI->getArgOperand(2)};
4024-
Value *NewCall = Builder.CreateIntrinsic(IID, {}, Args);
4024+
Value *NewCall = Builder.CreateIntrinsic(IID, Args);
40254025

40264026
// Extract the second result and store it.
40274027
Value *Data = Builder.CreateExtractValue(NewCall, 1);
@@ -4089,7 +4089,7 @@ static Value *upgradeAArch64IntrinsicCall(StringRef Name, CallBase *CI,
40894089
Args[1] = Builder.CreateIntrinsic(
40904090
Intrinsic::aarch64_sve_convert_from_svbool, GoodPredTy, Args[1]);
40914091

4092-
return Builder.CreateIntrinsic(NewID, {}, Args, /*FMFSource=*/nullptr,
4092+
return Builder.CreateIntrinsic(NewID, Args, /*FMFSource=*/nullptr,
40934093
CI->getName());
40944094
}
40954095

‎llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28059,7 +28059,7 @@ Value *AArch64TargetLowering::emitLoadLinked(IRBuilderBase &Builder,
2805928059
IsAcquire ? Intrinsic::aarch64_ldaxp : Intrinsic::aarch64_ldxp;
2806028060

2806128061
Value *LoHi =
28062-
Builder.CreateIntrinsic(Int, {}, Addr, /*FMFSource=*/nullptr, "lohi");
28062+
Builder.CreateIntrinsic(Int, Addr, /*FMFSource=*/nullptr, "lohi");
2806328063

2806428064
Value *Lo = Builder.CreateExtractValue(LoHi, 0, "lo");
2806528065
Value *Hi = Builder.CreateExtractValue(LoHi, 1, "hi");
@@ -28089,7 +28089,7 @@ Value *AArch64TargetLowering::emitLoadLinked(IRBuilderBase &Builder,
2808928089

2809028090
void AArch64TargetLowering::emitAtomicCmpXchgNoStoreLLBalance(
2809128091
IRBuilderBase &Builder) const {
28092-
Builder.CreateIntrinsic(Intrinsic::aarch64_clrex, {}, {});
28092+
Builder.CreateIntrinsic(Intrinsic::aarch64_clrex, {});
2809328093
}
2809428094

2809528095
Value *AArch64TargetLowering::emitStoreConditional(IRBuilderBase &Builder,

‎llvm/lib/Target/AArch64/AArch64TargetTransformInfo.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,7 @@ static std::optional<Instruction *> instCombineRDFFR(InstCombiner &IC,
14761476
auto *PTrue = IC.Builder.CreateIntrinsic(Intrinsic::aarch64_sve_ptrue,
14771477
{II.getType()}, {AllPat});
14781478
auto *RDFFR =
1479-
IC.Builder.CreateIntrinsic(Intrinsic::aarch64_sve_rdffr_z, {}, {PTrue});
1479+
IC.Builder.CreateIntrinsic(Intrinsic::aarch64_sve_rdffr_z, {PTrue});
14801480
RDFFR->takeName(&II);
14811481
return IC.replaceInstUsesWith(II, RDFFR);
14821482
}

‎llvm/lib/Target/AMDGPU/AMDGPUAsanInstrumentation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static Instruction *genAMDGPUReportBlock(Module &M, IRBuilder<> &IRB,
7373

7474
Trm = SplitBlockAndInsertIfThen(Cond, Trm, false);
7575
IRB.SetInsertPoint(Trm);
76-
return IRB.CreateIntrinsic(Intrinsic::amdgcn_unreachable, {}, {});
76+
return IRB.CreateIntrinsic(Intrinsic::amdgcn_unreachable, {});
7777
}
7878

7979
static Value *createSlowPathCmp(Module &M, IRBuilder<> &IRB, Type *IntptrTy,

‎llvm/lib/Target/AMDGPU/AMDGPUAtomicOptimizer.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ void AMDGPUAtomicOptimizerImpl::optimizeAtomic(Instruction &I,
666666
// Record I's original position as the entry block.
667667
PixelEntryBB = I.getParent();
668668

669-
Value *const Cond = B.CreateIntrinsic(Intrinsic::amdgcn_ps_live, {}, {});
669+
Value *const Cond = B.CreateIntrinsic(Intrinsic::amdgcn_ps_live, {});
670670
Instruction *const NonHelperTerminator =
671671
SplitBlockAndInsertIfThen(Cond, &I, false, nullptr, &DTU, nullptr);
672672

@@ -698,15 +698,14 @@ void AMDGPUAtomicOptimizerImpl::optimizeAtomic(Instruction &I,
698698
// using the mbcnt intrinsic.
699699
Value *Mbcnt;
700700
if (ST.isWave32()) {
701-
Mbcnt = B.CreateIntrinsic(Intrinsic::amdgcn_mbcnt_lo, {},
702-
{Ballot, B.getInt32(0)});
701+
Mbcnt =
702+
B.CreateIntrinsic(Intrinsic::amdgcn_mbcnt_lo, {Ballot, B.getInt32(0)});
703703
} else {
704704
Value *const ExtractLo = B.CreateTrunc(Ballot, Int32Ty);
705705
Value *const ExtractHi = B.CreateTrunc(B.CreateLShr(Ballot, 32), Int32Ty);
706-
Mbcnt = B.CreateIntrinsic(Intrinsic::amdgcn_mbcnt_lo, {},
706+
Mbcnt = B.CreateIntrinsic(Intrinsic::amdgcn_mbcnt_lo,
707707
{ExtractLo, B.getInt32(0)});
708-
Mbcnt =
709-
B.CreateIntrinsic(Intrinsic::amdgcn_mbcnt_hi, {}, {ExtractHi, Mbcnt});
708+
Mbcnt = B.CreateIntrinsic(Intrinsic::amdgcn_mbcnt_hi, {ExtractHi, Mbcnt});
710709
}
711710

712711
Function *F = I.getFunction();

‎llvm/lib/Target/AMDGPU/AMDGPUCodeGenPrepare.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,7 @@ Value *AMDGPUCodeGenPrepareImpl::optimizeWithFDivFast(
10331033
if (!HasFP32DenormalFlush && !NumIsOne)
10341034
return nullptr;
10351035

1036-
return Builder.CreateIntrinsic(Intrinsic::amdgcn_fdiv_fast, {}, {Num, Den});
1036+
return Builder.CreateIntrinsic(Intrinsic::amdgcn_fdiv_fast, {Num, Den});
10371037
}
10381038

10391039
Value *AMDGPUCodeGenPrepareImpl::visitFDivElement(

‎llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ static bool lowerKernelArguments(Function &F, const TargetMachine &TM) {
304304
return false;
305305

306306
CallInst *KernArgSegment =
307-
Builder.CreateIntrinsic(Intrinsic::amdgcn_kernarg_segment_ptr, {}, {},
307+
Builder.CreateIntrinsic(Intrinsic::amdgcn_kernarg_segment_ptr, {},
308308
nullptr, F.getName() + ".kernarg.segment");
309309
KernArgSegment->addRetAttr(Attribute::NonNull);
310310
KernArgSegment->addRetAttr(

‎llvm/lib/Target/AMDGPU/AMDGPULowerModuleLDSPass.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,7 @@ class AMDGPULowerModuleLDS {
532532
auto InsertAt = F->getEntryBlock().getFirstNonPHIOrDbgOrAlloca();
533533
IRBuilder<> Builder(&*InsertAt);
534534

535-
It->second =
536-
Builder.CreateIntrinsic(Intrinsic::amdgcn_lds_kernel_id, {}, {});
535+
It->second = Builder.CreateIntrinsic(Intrinsic::amdgcn_lds_kernel_id, {});
537536
}
538537

539538
return It->second;

0 commit comments

Comments
 (0)