diff options
-rw-r--r-- | include/llvm/Intrinsics.td | 28 | ||||
-rw-r--r-- | utils/TableGen/CodeGenIntrinsics.h | 12 | ||||
-rw-r--r-- | utils/TableGen/CodeGenTarget.cpp | 5 |
3 files changed, 29 insertions, 16 deletions
diff --git a/include/llvm/Intrinsics.td b/include/llvm/Intrinsics.td index a641caa91a..8145700f39 100644 --- a/include/llvm/Intrinsics.td +++ b/include/llvm/Intrinsics.td @@ -51,6 +51,11 @@ def IntrWriteMem : IntrinsicProperty; // Commutative - This intrinsic is commutative: X op Y == Y op X. def Commutative : IntrinsicProperty; +// NoCapture - The specified argument pointer is not captured by the intrinsic. +class NoCapture<int argNo> : IntrinsicProperty { + int ArgNo = argNo; +} + //===----------------------------------------------------------------------===// // Types used by intrinsics. //===----------------------------------------------------------------------===// @@ -199,17 +204,18 @@ def int_stackprotector : Intrinsic<[llvm_void_ty], //===------------------- Standard C Library Intrinsics --------------------===// // -let Properties = [IntrWriteArgMem] in { - def int_memcpy : Intrinsic<[llvm_void_ty], - [llvm_ptr_ty, llvm_ptr_ty, - llvm_anyint_ty, llvm_i32_ty]>; - def int_memmove : Intrinsic<[llvm_void_ty], - [llvm_ptr_ty, llvm_ptr_ty, - llvm_anyint_ty, llvm_i32_ty]>; - def int_memset : Intrinsic<[llvm_void_ty], - [llvm_ptr_ty, llvm_i8_ty, - llvm_anyint_ty, llvm_i32_ty]>; -} +def int_memcpy : Intrinsic<[llvm_void_ty], + [llvm_ptr_ty, llvm_ptr_ty, llvm_anyint_ty, + llvm_i32_ty], + [IntrWriteArgMem, NoCapture<0>, NoCapture<1>]>; +def int_memmove : Intrinsic<[llvm_void_ty], + [llvm_ptr_ty, llvm_ptr_ty, llvm_anyint_ty, + llvm_i32_ty], + [IntrWriteArgMem, NoCapture<0>, NoCapture<1>]>; +def int_memset : Intrinsic<[llvm_void_ty], + [llvm_ptr_ty, llvm_i8_ty, llvm_anyint_ty, + llvm_i32_ty], + [IntrWriteArgMem, NoCapture<0>]>; // These functions do not actually read memory, but they are sensitive to the // rounding mode. This needs to be modelled separately; in the meantime diff --git a/utils/TableGen/CodeGenIntrinsics.h b/utils/TableGen/CodeGenIntrinsics.h index 1170da0f35..dd99e319d6 100644 --- a/utils/TableGen/CodeGenIntrinsics.h +++ b/utils/TableGen/CodeGenIntrinsics.h @@ -63,13 +63,17 @@ namespace llvm { NoMem, ReadArgMem, ReadMem, WriteArgMem, WriteMem } ModRef; - // This is set to true if the intrinsic is overloaded by its argument - // types. + /// This is set to true if the intrinsic is overloaded by its argument + /// types. bool isOverloaded; - // isCommutative - True if the intrinsic is commutative. - // + /// isCommutative - True if the intrinsic is commutative. bool isCommutative; + + enum ArgAttribute { + NoCapture + }; + std::vector<std::pair<unsigned, ArgAttribute> > ArgumentAttributes; CodeGenIntrinsic(Record *R); }; diff --git a/utils/TableGen/CodeGenTarget.cpp b/utils/TableGen/CodeGenTarget.cpp index 0039a89497..274cc78c35 100644 --- a/utils/TableGen/CodeGenTarget.cpp +++ b/utils/TableGen/CodeGenTarget.cpp @@ -546,7 +546,10 @@ CodeGenIntrinsic::CodeGenIntrinsic(Record *R) { ModRef = WriteMem; else if (Property->getName() == "Commutative") isCommutative = true; - else + else if (Property->isSubClassOf("NoCapture")) { + unsigned ArgNo = Property->getValueAsInt("ArgNo"); + ArgumentAttributes.push_back(std::make_pair(ArgNo, NoCapture)); + } else assert(0 && "Unknown property!"); } } |