[llvm] 7ca135c - [Instrumentation] Remove unneeded pointer casts and migrate away from getInt8PtrTy. NFC
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Wed Nov 15 12:50:55 PST 2023
Author: Fangrui Song
Date: 2023-11-15T12:50:49-08:00
New Revision: 7ca135cd863609be188f94870356aa74e80af335
URL: https://github.com/llvm/llvm-project/commit/7ca135cd863609be188f94870356aa74e80af335
DIFF: https://github.com/llvm/llvm-project/commit/7ca135cd863609be188f94870356aa74e80af335.diff
LOG: [Instrumentation] Remove unneeded pointer casts and migrate away from getInt8PtrTy. NFC
After opaque pointer migration, getInt8PtrTy() is considered legacy.
Replace it with getPtrTy(), and while here, remove some unneeded pointer
casts.
Added:
Modified:
llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp
llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp
index 50b791ff5fff501..2ba127bba6f6827 100644
--- a/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/DataFlowSanitizer.cpp
@@ -1288,7 +1288,7 @@ void DataFlowSanitizer::buildExternWeakCheckIfNeeded(IRBuilder<> &IRB,
// for a extern weak function, add a check here to help identify the issue.
if (GlobalValue::isExternalWeakLinkage(F->getLinkage())) {
std::vector<Value *> Args;
- Args.push_back(IRB.CreatePointerCast(F, IRB.getInt8PtrTy()));
+ Args.push_back(F);
Args.push_back(IRB.CreateGlobalStringPtr(F->getName()));
IRB.CreateCall(DFSanWrapperExternWeakNullFn, Args);
}
@@ -2270,8 +2270,7 @@ std::pair<Value *, Value *> DFSanFunction::loadShadowOriginSansLoadTracking(
IRBuilder<> IRB(Pos);
CallInst *Call =
IRB.CreateCall(DFS.DFSanLoadLabelAndOriginFn,
- {IRB.CreatePointerCast(Addr, IRB.getInt8PtrTy()),
- ConstantInt::get(DFS.IntptrTy, Size)});
+ {Addr, ConstantInt::get(DFS.IntptrTy, Size)});
Call->addRetAttr(Attribute::ZExt);
return {IRB.CreateTrunc(IRB.CreateLShr(Call, DFS.OriginWidthBits),
DFS.PrimitiveShadowTy),
@@ -2527,10 +2526,9 @@ void DFSanFunction::storeOrigin(Instruction *Pos, Value *Addr, uint64_t Size,
}
if (shouldInstrumentWithCall()) {
- IRB.CreateCall(DFS.DFSanMaybeStoreOriginFn,
- {CollapsedShadow,
- IRB.CreatePointerCast(Addr, IRB.getInt8PtrTy()),
- ConstantInt::get(DFS.IntptrTy, Size), Origin});
+ IRB.CreateCall(
+ DFS.DFSanMaybeStoreOriginFn,
+ {CollapsedShadow, Addr, ConstantInt::get(DFS.IntptrTy, Size), Origin});
} else {
Value *Cmp = convertToBool(CollapsedShadow, IRB, "_dfscmp");
DomTreeUpdater DTU(DT, DomTreeUpdater::UpdateStrategy::Lazy);
@@ -2924,8 +2922,7 @@ void DFSanVisitor::visitMemTransferInst(MemTransferInst &I) {
if (DFSF.DFS.shouldTrackOrigins()) {
IRB.CreateCall(
DFSF.DFS.DFSanMemOriginTransferFn,
- {IRB.CreatePointerCast(I.getArgOperand(0), IRB.getInt8PtrTy()),
- IRB.CreatePointerCast(I.getArgOperand(1), IRB.getInt8PtrTy()),
+ {I.getArgOperand(0), I.getArgOperand(1),
IRB.CreateIntCast(I.getArgOperand(2), DFSF.DFS.IntptrTy, false)});
}
@@ -3213,10 +3210,9 @@ void DFSanVisitor::visitLibAtomicLoad(CallBase &CB) {
// TODO: Support ClCombinePointerLabelsOnLoad
// TODO: Support ClEventCallbacks
- NextIRB.CreateCall(DFSF.DFS.DFSanMemShadowOriginTransferFn,
- {NextIRB.CreatePointerCast(DstPtr, NextIRB.getInt8PtrTy()),
- NextIRB.CreatePointerCast(SrcPtr, NextIRB.getInt8PtrTy()),
- NextIRB.CreateIntCast(Size, DFSF.DFS.IntptrTy, false)});
+ NextIRB.CreateCall(
+ DFSF.DFS.DFSanMemShadowOriginTransferFn,
+ {DstPtr, SrcPtr, NextIRB.CreateIntCast(Size, DFSF.DFS.IntptrTy, false)});
}
Value *DFSanVisitor::makeAddReleaseOrderingTable(IRBuilder<> &IRB) {
@@ -3252,10 +3248,9 @@ void DFSanVisitor::visitLibAtomicStore(CallBase &CB) {
// TODO: Support ClCombinePointerLabelsOnStore
// TODO: Support ClEventCallbacks
- IRB.CreateCall(DFSF.DFS.DFSanMemShadowOriginTransferFn,
- {IRB.CreatePointerCast(DstPtr, IRB.getInt8PtrTy()),
- IRB.CreatePointerCast(SrcPtr, IRB.getInt8PtrTy()),
- IRB.CreateIntCast(Size, DFSF.DFS.IntptrTy, false)});
+ IRB.CreateCall(
+ DFSF.DFS.DFSanMemShadowOriginTransferFn,
+ {DstPtr, SrcPtr, IRB.CreateIntCast(Size, DFSF.DFS.IntptrTy, false)});
}
void DFSanVisitor::visitLibAtomicExchange(CallBase &CB) {
@@ -3273,16 +3268,14 @@ void DFSanVisitor::visitLibAtomicExchange(CallBase &CB) {
// the additional complexity to address this is not warrented.
// Current Target to Dest
- IRB.CreateCall(DFSF.DFS.DFSanMemShadowOriginTransferFn,
- {IRB.CreatePointerCast(DstPtr, IRB.getInt8PtrTy()),
- IRB.CreatePointerCast(TargetPtr, IRB.getInt8PtrTy()),
- IRB.CreateIntCast(Size, DFSF.DFS.IntptrTy, false)});
+ IRB.CreateCall(
+ DFSF.DFS.DFSanMemShadowOriginTransferFn,
+ {DstPtr, TargetPtr, IRB.CreateIntCast(Size, DFSF.DFS.IntptrTy, false)});
// Current Src to Target (overriding)
- IRB.CreateCall(DFSF.DFS.DFSanMemShadowOriginTransferFn,
- {IRB.CreatePointerCast(TargetPtr, IRB.getInt8PtrTy()),
- IRB.CreatePointerCast(SrcPtr, IRB.getInt8PtrTy()),
- IRB.CreateIntCast(Size, DFSF.DFS.IntptrTy, false)});
+ IRB.CreateCall(
+ DFSF.DFS.DFSanMemShadowOriginTransferFn,
+ {TargetPtr, SrcPtr, IRB.CreateIntCast(Size, DFSF.DFS.IntptrTy, false)});
}
void DFSanVisitor::visitLibAtomicCompareExchange(CallBase &CB) {
@@ -3305,13 +3298,10 @@ void DFSanVisitor::visitLibAtomicCompareExchange(CallBase &CB) {
// If original call returned true, copy Desired to Target.
// If original call returned false, copy Target to Expected.
- NextIRB.CreateCall(
- DFSF.DFS.DFSanMemShadowOriginConditionalExchangeFn,
- {NextIRB.CreateIntCast(&CB, NextIRB.getInt8Ty(), false),
- NextIRB.CreatePointerCast(TargetPtr, NextIRB.getInt8PtrTy()),
- NextIRB.CreatePointerCast(ExpectedPtr, NextIRB.getInt8PtrTy()),
- NextIRB.CreatePointerCast(DesiredPtr, NextIRB.getInt8PtrTy()),
- NextIRB.CreateIntCast(Size, DFSF.DFS.IntptrTy, false)});
+ NextIRB.CreateCall(DFSF.DFS.DFSanMemShadowOriginConditionalExchangeFn,
+ {NextIRB.CreateIntCast(&CB, NextIRB.getInt8Ty(), false),
+ TargetPtr, ExpectedPtr, DesiredPtr,
+ NextIRB.CreateIntCast(Size, DFSF.DFS.IntptrTy, false)});
}
void DFSanVisitor::visitCallBase(CallBase &CB) {
diff --git a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
index 9a78227c00f5ebe..b6eb553e90011c7 100644
--- a/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
+++ b/llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp
@@ -1100,7 +1100,7 @@ Function *GCOVProfiler::insertCounterWriteout(
// Collect the relevant data into a large constant data structure that we can
// walk to write out everything.
StructType *StartFileCallArgsTy = StructType::create(
- {Builder.getInt8PtrTy(), Builder.getInt32Ty(), Builder.getInt32Ty()},
+ {Builder.getPtrTy(), Builder.getInt32Ty(), Builder.getInt32Ty()},
"start_file_args_ty");
StructType *EmitFunctionCallArgsTy = StructType::create(
{Builder.getInt32Ty(), Builder.getInt32Ty(), Builder.getInt32Ty()},
diff --git a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp b/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
index 480817a23d2c208..c00cf0612b1a4f5 100644
--- a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
+++ b/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp
@@ -671,13 +671,13 @@ void InstrProfiling::lowerValueProfileInst(InstrProfValueProfileInst *Ind) {
Ind->getOperandBundlesAsDefs(OpBundles);
if (!IsMemOpSize) {
Value *Args[3] = {Ind->getTargetValue(),
- Builder.CreateBitCast(DataVar, Builder.getInt8PtrTy()),
+ Builder.CreateBitCast(DataVar, Builder.getPtrTy()),
Builder.getInt32(Index)};
Call = Builder.CreateCall(getOrInsertValueProfilingCall(*M, *TLI), Args,
OpBundles);
} else {
Value *Args[3] = {Ind->getTargetValue(),
- Builder.CreateBitCast(DataVar, Builder.getInt8PtrTy()),
+ Builder.CreateBitCast(DataVar, Builder.getPtrTy()),
Builder.getInt32(Index)};
Call = Builder.CreateCall(
getOrInsertValueProfilingCall(*M, *TLI, ValueProfilingCallType::MemOp),
diff --git a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
index e7ad39c2788e201..c6134ce77136364 100644
--- a/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
+++ b/llvm/lib/Transforms/Instrumentation/MemProfiler.cpp
@@ -182,6 +182,7 @@ class MemProfiler {
C = &(M.getContext());
LongSize = M.getDataLayout().getPointerSizeInBits();
IntptrTy = Type::getIntNTy(*C, LongSize);
+ PtrTy = PointerType::getUnqual(*C);
}
/// If it is an interesting memory access, populate information
@@ -209,6 +210,7 @@ class MemProfiler {
LLVMContext *C;
int LongSize;
Type *IntptrTy;
+ PointerType *PtrTy;
ShadowMapping Mapping;
// These arrays is indexed by AccessIsWrite
@@ -267,15 +269,13 @@ Value *MemProfiler::memToShadow(Value *Shadow, IRBuilder<> &IRB) {
void MemProfiler::instrumentMemIntrinsic(MemIntrinsic *MI) {
IRBuilder<> IRB(MI);
if (isa<MemTransferInst>(MI)) {
- IRB.CreateCall(
- isa<MemMoveInst>(MI) ? MemProfMemmove : MemProfMemcpy,
- {IRB.CreatePointerCast(MI->getOperand(0), IRB.getInt8PtrTy()),
- IRB.CreatePointerCast(MI->getOperand(1), IRB.getInt8PtrTy()),
- IRB.CreateIntCast(MI->getOperand(2), IntptrTy, false)});
+ IRB.CreateCall(isa<MemMoveInst>(MI) ? MemProfMemmove : MemProfMemcpy,
+ {MI->getOperand(0), MI->getOperand(1),
+ IRB.CreateIntCast(MI->getOperand(2), IntptrTy, false)});
} else if (isa<MemSetInst>(MI)) {
IRB.CreateCall(
MemProfMemset,
- {IRB.CreatePointerCast(MI->getOperand(0), IRB.getInt8PtrTy()),
+ {MI->getOperand(0),
IRB.CreateIntCast(MI->getOperand(1), IRB.getInt32Ty(), false),
IRB.CreateIntCast(MI->getOperand(2), IntptrTy, false)});
}
@@ -519,14 +519,12 @@ void MemProfiler::initializeCallbacks(Module &M) {
FunctionType::get(IRB.getVoidTy(), Args1, false));
}
MemProfMemmove = M.getOrInsertFunction(
- ClMemoryAccessCallbackPrefix + "memmove", IRB.getInt8PtrTy(),
- IRB.getInt8PtrTy(), IRB.getInt8PtrTy(), IntptrTy);
+ ClMemoryAccessCallbackPrefix + "memmove", PtrTy, PtrTy, PtrTy, IntptrTy);
MemProfMemcpy = M.getOrInsertFunction(ClMemoryAccessCallbackPrefix + "memcpy",
- IRB.getInt8PtrTy(), IRB.getInt8PtrTy(),
- IRB.getInt8PtrTy(), IntptrTy);
- MemProfMemset = M.getOrInsertFunction(ClMemoryAccessCallbackPrefix + "memset",
- IRB.getInt8PtrTy(), IRB.getInt8PtrTy(),
- IRB.getInt32Ty(), IntptrTy);
+ PtrTy, PtrTy, PtrTy, IntptrTy);
+ MemProfMemset =
+ M.getOrInsertFunction(ClMemoryAccessCallbackPrefix + "memset", PtrTy,
+ PtrTy, IRB.getInt32Ty(), IntptrTy);
}
bool MemProfiler::maybeInsertMemProfInitAtFunctionEntry(Function &F) {
More information about the llvm-commits
mailing list