Skip to content

Commit dd70834

Browse files
lattnerlattner
committed
reapply Sanjiv's patch to genericize memcpy/memset/memmove to take an
arbitrary integer width for the count. llvm-svn: 59823
1 parent 5d58c3a commit dd70834

File tree

12 files changed

+70
-80
lines changed

12 files changed

+70
-80
lines changed

‎llvm/docs/LangRef.html

+18
Original file line numberDiff line numberDiff line change
@@ -5070,7 +5070,13 @@ <h5>Semantics:</h5>
50705070
<div class="doc_text">
50715071

50725072
<h5>Syntax:</h5>
5073+
<p>This is an overloaded intrinsic. You can use llvm.memcpy on any integer bit
5074+
width. Not all targets support all bit widths however.</p>
50735075
<pre>
5076+
declare void @llvm.memcpy.i8(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
5077+
i8 &lt;len&gt;, i32 &lt;align&gt;)
5078+
declare void @llvm.memcpy.i16(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
5079+
i16 &lt;len&gt;, i32 &lt;align&gt;)
50745080
declare void @llvm.memcpy.i32(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
50755081
i32 &lt;len&gt;, i32 &lt;align&gt;)
50765082
declare void @llvm.memcpy.i64(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
@@ -5124,7 +5130,13 @@ <h5>Semantics:</h5>
51245130
<div class="doc_text">
51255131

51265132
<h5>Syntax:</h5>
5133+
<p>This is an overloaded intrinsic. You can use llvm.memmove on any integer bit
5134+
width. Not all targets support all bit widths however.</p>
51275135
<pre>
5136+
declare void @llvm.memmove.i8(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
5137+
i8 &lt;len&gt;, i32 &lt;align&gt;)
5138+
declare void @llvm.memmove.i16(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
5139+
i16 &lt;len&gt;, i32 &lt;align&gt;)
51285140
declare void @llvm.memmove.i32(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
51295141
i32 &lt;len&gt;, i32 &lt;align&gt;)
51305142
declare void @llvm.memmove.i64(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
@@ -5179,7 +5191,13 @@ <h5>Semantics:</h5>
51795191
<div class="doc_text">
51805192

51815193
<h5>Syntax:</h5>
5194+
<p>This is an overloaded intrinsic. You can use llvm.memset on any integer bit
5195+
width. Not all targets support all bit widths however.</p>
51825196
<pre>
5197+
declare void @llvm.memset.i8(i8 * &lt;dest&gt;, i8 &lt;val&gt;,
5198+
i8 &lt;len&gt;, i32 &lt;align&gt;)
5199+
declare void @llvm.memset.i16(i8 * &lt;dest&gt;, i8 &lt;val&gt;,
5200+
i16 &lt;len&gt;, i32 &lt;align&gt;)
51835201
declare void @llvm.memset.i32(i8 * &lt;dest&gt;, i8 &lt;val&gt;,
51845202
i32 &lt;len&gt;, i32 &lt;align&gt;)
51855203
declare void @llvm.memset.i64(i8 * &lt;dest&gt;, i8 &lt;val&gt;,

‎llvm/examples/BrainF/BrainF.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ void BrainF::header() {
5353
//Function prototypes
5454

5555
//declare void @llvm.memset.i32(i8 *, i8, i32, i32)
56-
Function *memset_func = Intrinsic::getDeclaration(module, Intrinsic::memset_i32);
56+
const Type *Tys[] = { Type::Int32Ty };
57+
Function *memset_func = Intrinsic::getDeclaration(module, Intrinsic::memset,
58+
Tys, 1);
5759

5860
//declare i32 @getchar()
5961
getchar_func = cast<Function>(module->

‎llvm/include/llvm/IntrinsicInst.h

+6-12
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,9 @@ namespace llvm {
208208
static inline bool classof(const MemIntrinsic *) { return true; }
209209
static inline bool classof(const IntrinsicInst *I) {
210210
switch (I->getIntrinsicID()) {
211-
case Intrinsic::memcpy_i32:
212-
case Intrinsic::memcpy_i64:
213-
case Intrinsic::memmove_i32:
214-
case Intrinsic::memmove_i64:
215-
case Intrinsic::memset_i32:
216-
case Intrinsic::memset_i64:
211+
case Intrinsic::memcpy:
212+
case Intrinsic::memmove:
213+
case Intrinsic::memset:
217214
return true;
218215
default: return false;
219216
}
@@ -246,8 +243,7 @@ namespace llvm {
246243
// Methods for support type inquiry through isa, cast, and dyn_cast:
247244
static inline bool classof(const MemCpyInst *) { return true; }
248245
static inline bool classof(const IntrinsicInst *I) {
249-
return I->getIntrinsicID() == Intrinsic::memcpy_i32 ||
250-
I->getIntrinsicID() == Intrinsic::memcpy_i64;
246+
return I->getIntrinsicID() == Intrinsic::memcpy;
251247
}
252248
static inline bool classof(const Value *V) {
253249
return isa<IntrinsicInst>(V) && classof(cast<IntrinsicInst>(V));
@@ -275,8 +271,7 @@ namespace llvm {
275271
// Methods for support type inquiry through isa, cast, and dyn_cast:
276272
static inline bool classof(const MemMoveInst *) { return true; }
277273
static inline bool classof(const IntrinsicInst *I) {
278-
return I->getIntrinsicID() == Intrinsic::memmove_i32 ||
279-
I->getIntrinsicID() == Intrinsic::memmove_i64;
274+
return I->getIntrinsicID() == Intrinsic::memmove;
280275
}
281276
static inline bool classof(const Value *V) {
282277
return isa<IntrinsicInst>(V) && classof(cast<IntrinsicInst>(V));
@@ -299,8 +294,7 @@ namespace llvm {
299294
// Methods for support type inquiry through isa, cast, and dyn_cast:
300295
static inline bool classof(const MemSetInst *) { return true; }
301296
static inline bool classof(const IntrinsicInst *I) {
302-
return I->getIntrinsicID() == Intrinsic::memset_i32 ||
303-
I->getIntrinsicID() == Intrinsic::memset_i64;
297+
return I->getIntrinsicID() == Intrinsic::memset;
304298
}
305299
static inline bool classof(const Value *V) {
306300
return isa<IntrinsicInst>(V) && classof(cast<IntrinsicInst>(V));

‎llvm/include/llvm/Intrinsics.td

+8-26
Original file line numberDiff line numberDiff line change
@@ -193,33 +193,15 @@ def int_stackprotector : Intrinsic<[llvm_void_ty],
193193
//
194194

195195
let Properties = [IntrWriteArgMem] in {
196-
def int_memcpy_i16 : Intrinsic<[llvm_void_ty],
196+
def int_memcpy : Intrinsic<[llvm_void_ty],
197+
[llvm_ptr_ty, llvm_ptr_ty,
198+
llvm_anyint_ty, llvm_i32_ty]>;
199+
def int_memmove : Intrinsic<[llvm_void_ty],
197200
[llvm_ptr_ty, llvm_ptr_ty,
198-
llvm_i16_ty, llvm_i16_ty]>;
199-
def int_memcpy_i32 : Intrinsic<[llvm_void_ty],
200-
[llvm_ptr_ty, llvm_ptr_ty,
201-
llvm_i32_ty, llvm_i32_ty]>;
202-
def int_memcpy_i64 : Intrinsic<[llvm_void_ty],
203-
[llvm_ptr_ty, llvm_ptr_ty,
204-
llvm_i64_ty, llvm_i32_ty]>;
205-
def int_memmove_i16 : Intrinsic<[llvm_void_ty],
206-
[llvm_ptr_ty, llvm_ptr_ty,
207-
llvm_i16_ty, llvm_i16_ty]>;
208-
def int_memmove_i32 : Intrinsic<[llvm_void_ty],
209-
[llvm_ptr_ty, llvm_ptr_ty,
210-
llvm_i32_ty, llvm_i32_ty]>;
211-
def int_memmove_i64 : Intrinsic<[llvm_void_ty],
212-
[llvm_ptr_ty, llvm_ptr_ty,
213-
llvm_i64_ty, llvm_i32_ty]>;
214-
def int_memset_i16 : Intrinsic<[llvm_void_ty],
215-
[llvm_ptr_ty, llvm_i8_ty,
216-
llvm_i16_ty, llvm_i16_ty]>;
217-
def int_memset_i32 : Intrinsic<[llvm_void_ty],
218-
[llvm_ptr_ty, llvm_i8_ty,
219-
llvm_i32_ty, llvm_i32_ty]>;
220-
def int_memset_i64 : Intrinsic<[llvm_void_ty],
221-
[llvm_ptr_ty, llvm_i8_ty,
222-
llvm_i64_ty, llvm_i32_ty]>;
201+
llvm_anyint_ty, llvm_i32_ty]>;
202+
def int_memset : Intrinsic<[llvm_void_ty],
203+
[llvm_ptr_ty, llvm_i8_ty,
204+
llvm_anyint_ty, llvm_i32_ty]>;
223205
}
224206

225207
// These functions do not actually read memory, but they are sensitive to the

‎llvm/lib/Analysis/IPA/Andersens.cpp

+3-4
Original file line numberDiff line numberDiff line change
@@ -903,8 +903,7 @@ bool Andersens::AddConstraintsForExternalCall(CallSite CS, Function *F) {
903903
F->getName() == "atol" || F->getName() == "atoll" ||
904904
F->getName() == "remove" || F->getName() == "unlink" ||
905905
F->getName() == "rename" || F->getName() == "memcmp" ||
906-
F->getName() == "llvm.memset.i32" ||
907-
F->getName() == "llvm.memset.i64" ||
906+
F->getName() == "llvm.memset" ||
908907
F->getName() == "strcmp" || F->getName() == "strncmp" ||
909908
F->getName() == "execl" || F->getName() == "execlp" ||
910909
F->getName() == "execle" || F->getName() == "execv" ||
@@ -942,8 +941,8 @@ bool Andersens::AddConstraintsForExternalCall(CallSite CS, Function *F) {
942941

943942

944943
// These functions do induce points-to edges.
945-
if (F->getName() == "llvm.memcpy.i32" || F->getName() == "llvm.memcpy.i64" ||
946-
F->getName() == "llvm.memmove.i32" ||F->getName() == "llvm.memmove.i64" ||
944+
if (F->getName() == "llvm.memcpy" ||
945+
F->getName() == "llvm.memmove" ||
947946
F->getName() == "memmove") {
948947

949948
// *Dest = *Src, which requires an artificial graph node to represent the

‎llvm/lib/CodeGen/IntrinsicLowering.cpp

+6-12
Original file line numberDiff line numberDiff line change
@@ -98,22 +98,19 @@ void IntrinsicLowering::AddPrototypes(Module &M) {
9898
EnsureFunctionExists(M, "abort", I->arg_end(), I->arg_end(),
9999
Type::VoidTy);
100100
break;
101-
case Intrinsic::memcpy_i32:
102-
case Intrinsic::memcpy_i64:
101+
case Intrinsic::memcpy:
103102
M.getOrInsertFunction("memcpy", PointerType::getUnqual(Type::Int8Ty),
104103
PointerType::getUnqual(Type::Int8Ty),
105104
PointerType::getUnqual(Type::Int8Ty),
106105
TD.getIntPtrType(), (Type *)0);
107106
break;
108-
case Intrinsic::memmove_i32:
109-
case Intrinsic::memmove_i64:
107+
case Intrinsic::memmove:
110108
M.getOrInsertFunction("memmove", PointerType::getUnqual(Type::Int8Ty),
111109
PointerType::getUnqual(Type::Int8Ty),
112110
PointerType::getUnqual(Type::Int8Ty),
113111
TD.getIntPtrType(), (Type *)0);
114112
break;
115-
case Intrinsic::memset_i32:
116-
case Intrinsic::memset_i64:
113+
case Intrinsic::memset:
117114
M.getOrInsertFunction("memset", PointerType::getUnqual(Type::Int8Ty),
118115
PointerType::getUnqual(Type::Int8Ty),
119116
Type::Int32Ty,
@@ -784,8 +781,7 @@ void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) {
784781
case Intrinsic::var_annotation:
785782
break; // Strip out annotate intrinsic
786783

787-
case Intrinsic::memcpy_i32:
788-
case Intrinsic::memcpy_i64: {
784+
case Intrinsic::memcpy: {
789785
static Constant *MemcpyFCache = 0;
790786
Value *Size = CI->getOperand(3);
791787
const Type *IntPtr = TD.getIntPtrType();
@@ -803,8 +799,7 @@ void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) {
803799
MemcpyFCache);
804800
break;
805801
}
806-
case Intrinsic::memmove_i32:
807-
case Intrinsic::memmove_i64: {
802+
case Intrinsic::memmove: {
808803
static Constant *MemmoveFCache = 0;
809804
Value *Size = CI->getOperand(3);
810805
const Type *IntPtr = TD.getIntPtrType();
@@ -822,8 +817,7 @@ void IntrinsicLowering::LowerIntrinsicCall(CallInst *CI) {
822817
MemmoveFCache);
823818
break;
824819
}
825-
case Intrinsic::memset_i32:
826-
case Intrinsic::memset_i64: {
820+
case Intrinsic::memset: {
827821
static Constant *MemsetFCache = 0;
828822
Value *Size = CI->getOperand(3);
829823
const Type *IntPtr = TD.getIntPtrType();

‎llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -3663,8 +3663,7 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
36633663
case Intrinsic::longjmp:
36643664
return "_longjmp"+!TLI.usesUnderscoreLongJmp();
36653665
break;
3666-
case Intrinsic::memcpy_i32:
3667-
case Intrinsic::memcpy_i64: {
3666+
case Intrinsic::memcpy: {
36683667
SDValue Op1 = getValue(I.getOperand(1));
36693668
SDValue Op2 = getValue(I.getOperand(2));
36703669
SDValue Op3 = getValue(I.getOperand(3));
@@ -3673,8 +3672,7 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
36733672
I.getOperand(1), 0, I.getOperand(2), 0));
36743673
return 0;
36753674
}
3676-
case Intrinsic::memset_i32:
3677-
case Intrinsic::memset_i64: {
3675+
case Intrinsic::memset: {
36783676
SDValue Op1 = getValue(I.getOperand(1));
36793677
SDValue Op2 = getValue(I.getOperand(2));
36803678
SDValue Op3 = getValue(I.getOperand(3));
@@ -3683,8 +3681,7 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
36833681
I.getOperand(1), 0));
36843682
return 0;
36853683
}
3686-
case Intrinsic::memmove_i32:
3687-
case Intrinsic::memmove_i64: {
3684+
case Intrinsic::memmove: {
36883685
SDValue Op1 = getValue(I.getOperand(1));
36893686
SDValue Op2 = getValue(I.getOperand(2));
36903687
SDValue Op3 = getValue(I.getOperand(3));

‎llvm/lib/Transforms/Scalar/InstructionCombining.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -9200,12 +9200,11 @@ Instruction *InstCombiner::visitCallInst(CallInst &CI) {
92009200
if (GlobalVariable *GVSrc = dyn_cast<GlobalVariable>(MMI->getSource()))
92019201
if (GVSrc->isConstant()) {
92029202
Module *M = CI.getParent()->getParent()->getParent();
9203-
Intrinsic::ID MemCpyID;
9204-
if (CI.getOperand(3)->getType() == Type::Int32Ty)
9205-
MemCpyID = Intrinsic::memcpy_i32;
9206-
else
9207-
MemCpyID = Intrinsic::memcpy_i64;
9208-
CI.setOperand(0, Intrinsic::getDeclaration(M, MemCpyID));
9203+
Intrinsic::ID MemCpyID = Intrinsic::memcpy;
9204+
const Type *Tys[1];
9205+
Tys[0] = CI.getOperand(3)->getType();
9206+
CI.setOperand(0,
9207+
Intrinsic::getDeclaration(M, MemCpyID, Tys, 1));
92099208
Changed = true;
92109209
}
92119210

‎llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp

+8-3
Original file line numberDiff line numberDiff line change
@@ -427,9 +427,12 @@ bool MemCpyOpt::processStore(StoreInst *SI, BasicBlock::iterator& BBI) {
427427
// instruction needed by the start of the block.
428428
BasicBlock::iterator InsertPt = BI;
429429

430-
if (MemSetF == 0)
430+
if (MemSetF == 0) {
431+
const Type *Tys[] = {Type::Int64Ty};
431432
MemSetF = Intrinsic::getDeclaration(SI->getParent()->getParent()
432-
->getParent(), Intrinsic::memset_i64);
433+
->getParent(), Intrinsic::memset,
434+
Tys, 1);
435+
}
433436

434437
// Get the starting pointer of the block.
435438
StartPtr = Range.StartPtr;
@@ -671,9 +674,11 @@ bool MemCpyOpt::processMemCpy(MemCpyInst* M) {
671674
return false;
672675

673676
// If all checks passed, then we can transform these memcpy's
677+
const Type *Tys[1];
678+
Tys[0] = M->getLength()->getType();
674679
Function* MemCpyFun = Intrinsic::getDeclaration(
675680
M->getParent()->getParent()->getParent(),
676-
M->getIntrinsicID());
681+
M->getIntrinsicID(), Tys, 1);
677682

678683
std::vector<Value*> args;
679684
args.push_back(M->getRawDest());

‎llvm/lib/Transforms/Scalar/SimplifyLibCalls.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,10 @@ Value *LibCallOptimization::EmitStrLen(Value *Ptr, IRBuilder<> &B) {
130130
Value *LibCallOptimization::EmitMemCpy(Value *Dst, Value *Src, Value *Len,
131131
unsigned Align, IRBuilder<> &B) {
132132
Module *M = Caller->getParent();
133-
Intrinsic::ID IID = Len->getType() == Type::Int32Ty ?
134-
Intrinsic::memcpy_i32 : Intrinsic::memcpy_i64;
135-
Value *MemCpy = Intrinsic::getDeclaration(M, IID);
133+
Intrinsic::ID IID = Intrinsic::memcpy;
134+
const Type *Tys[1];
135+
Tys[0] = Len->getType();
136+
Value *MemCpy = Intrinsic::getDeclaration(M, IID, Tys, 1);
136137
return B.CreateCall4(MemCpy, CastToCStr(Dst, B), CastToCStr(Src, B), Len,
137138
ConstantInt::get(Type::Int32Ty, Align));
138139
}

‎llvm/lib/Transforms/Utils/InlineFunction.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,10 @@ bool llvm::InlineFunction(CallSite CS, CallGraph *CG, const TargetData *TD) {
257257
Value *NewAlloca = new AllocaInst(AggTy, 0, Align, I->getName(),
258258
Caller->begin()->begin());
259259
// Emit a memcpy.
260+
const Type *Tys[] = { Type::Int64Ty };
260261
Function *MemCpyFn = Intrinsic::getDeclaration(Caller->getParent(),
261-
Intrinsic::memcpy_i64);
262+
Intrinsic::memcpy,
263+
Tys, 1);
262264
Value *DestCast = new BitCastInst(NewAlloca, VoidPtrTy, "tmp", TheCall);
263265
Value *SrcCast = new BitCastInst(*AI, VoidPtrTy, "tmp", TheCall);
264266

‎llvm/lib/VMCore/Verifier.cpp

+3-6
Original file line numberDiff line numberDiff line change
@@ -1336,12 +1336,9 @@ void Verifier::visitIntrinsicFunctionCall(Intrinsic::ID ID, CallInst &CI) {
13361336
switch (ID) {
13371337
default:
13381338
break;
1339-
case Intrinsic::memcpy_i32:
1340-
case Intrinsic::memcpy_i64:
1341-
case Intrinsic::memmove_i32:
1342-
case Intrinsic::memmove_i64:
1343-
case Intrinsic::memset_i32:
1344-
case Intrinsic::memset_i64:
1339+
case Intrinsic::memcpy:
1340+
case Intrinsic::memmove:
1341+
case Intrinsic::memset:
13451342
Assert1(isa<ConstantInt>(CI.getOperand(4)),
13461343
"alignment argument of memory intrinsics must be a constant int",
13471344
&CI);

0 commit comments

Comments
 (0)