diff options
author | Daniel Neilson <dneilson@azul.com> | 2018-01-31 16:42:15 +0000 |
---|---|---|
committer | Daniel Neilson <dneilson@azul.com> | 2018-01-31 16:42:15 +0000 |
commit | 147810d28a0fc8a17b5fe404acb6edeaefd77468 (patch) | |
tree | 6009847d4d1221b00613009e90af54c93031940e | |
parent | 5740ff5bed8a0e2a91c219266211f7757da0f8b4 (diff) | |
download | llvm-147810d28a0fc8a17b5fe404acb6edeaefd77468.zip llvm-147810d28a0fc8a17b5fe404acb6edeaefd77468.tar.gz llvm-147810d28a0fc8a17b5fe404acb6edeaefd77468.tar.bz2 |
[Lint] Upgrade uses of MemoryIntrinic::getAlignment() to new API. (NFCI)
Summary:
This change is part of step five in the series of changes to remove alignment argument from
memcpy/memmove/memset in favour of alignment attributes. In particular, this changes the Lint
analysis to cease using the old getAlignment() API of MemoryIntrinsic in favour of getting
source & dest specific alignments through the new API.
Steps:
Step 1) Remove alignment parameter and create alignment parameter attributes for
memcpy/memmove/memset. ( rL322965, rC322964, rL322963 )
Step 2) Expand the IRBuilder API to allow creation of memcpy/memmove with differing
source and dest alignments. ( rL323597 )
Step 3) Update Clang to use the new IRBuilder API. ( rC323617 )
Step 4) Update Polly to use the new IRBuilder API. ( rL323618 )
Step 5) Update LLVM passes that create memcpy/memmove calls to use the new IRBuilder API,
and those that use use MemIntrinsicInst::[get|set]Alignment() to use [get|set]DestAlignment()
and [get|set]SourceAlignment() instead.
Step 6) Remove the single-alignment IRBuilder API for memcpy/memmove, and the
MemIntrinsicInst::[get|set]Alignment() methods.
Reference
http://lists.llvm.org/pipermail/llvm-dev/2015-August/089384.html
http://lists.llvm.org/pipermail/llvm-commits/Week-of-Mon-20151109/312083.html
llvm-svn: 323886
-rw-r--r-- | llvm/lib/Analysis/Lint.cpp | 10 | ||||
-rw-r--r-- | llvm/test/Analysis/Lint/memintrin.ll | 61 |
2 files changed, 66 insertions, 5 deletions
diff --git a/llvm/lib/Analysis/Lint.cpp b/llvm/lib/Analysis/Lint.cpp index 0e3f498..327f09a 100644 --- a/llvm/lib/Analysis/Lint.cpp +++ b/llvm/lib/Analysis/Lint.cpp @@ -323,9 +323,9 @@ void Lint::visitCallSite(CallSite CS) { MemCpyInst *MCI = cast<MemCpyInst>(&I); // TODO: If the size is known, use it. visitMemoryReference(I, MCI->getDest(), MemoryLocation::UnknownSize, - MCI->getAlignment(), nullptr, MemRef::Write); + MCI->getDestAlignment(), nullptr, MemRef::Write); visitMemoryReference(I, MCI->getSource(), MemoryLocation::UnknownSize, - MCI->getAlignment(), nullptr, MemRef::Read); + MCI->getSourceAlignment(), nullptr, MemRef::Read); // Check that the memcpy arguments don't overlap. The AliasAnalysis API // isn't expressive enough for what we really want to do. Known partial @@ -345,16 +345,16 @@ void Lint::visitCallSite(CallSite CS) { MemMoveInst *MMI = cast<MemMoveInst>(&I); // TODO: If the size is known, use it. visitMemoryReference(I, MMI->getDest(), MemoryLocation::UnknownSize, - MMI->getAlignment(), nullptr, MemRef::Write); + MMI->getDestAlignment(), nullptr, MemRef::Write); visitMemoryReference(I, MMI->getSource(), MemoryLocation::UnknownSize, - MMI->getAlignment(), nullptr, MemRef::Read); + MMI->getSourceAlignment(), nullptr, MemRef::Read); break; } case Intrinsic::memset: { MemSetInst *MSI = cast<MemSetInst>(&I); // TODO: If the size is known, use it. visitMemoryReference(I, MSI->getDest(), MemoryLocation::UnknownSize, - MSI->getAlignment(), nullptr, MemRef::Write); + MSI->getDestAlignment(), nullptr, MemRef::Write); break; } diff --git a/llvm/test/Analysis/Lint/memintrin.ll b/llvm/test/Analysis/Lint/memintrin.ll new file mode 100644 index 0000000..1b87760 --- /dev/null +++ b/llvm/test/Analysis/Lint/memintrin.ll @@ -0,0 +1,61 @@ +; RUN: opt -lint -disable-output < %s 2>&1 | FileCheck %s + +declare void @llvm.memcpy.p0i8.p0i8.i32(i8* nocapture writeonly, i8* nocapture readonly, i32, i1) nounwind argmemonly + +define void @f_memcpy() { +entry: + %dst = alloca [1000 x i8], align 2 + %src = alloca [1000 x i8], align 4 + %dst.i8 = bitcast [1000 x i8]* %dst to i8* + %src.i8 = bitcast [1000 x i8]* %src to i8* +; CHECK: Undefined behavior: Memory reference address is misaligned +; CHECK-NEXT: call void @llvm.memcpy.p0i8.p0i8.i32(i8* align 8 %dst.i8, i8* align 4 %src.i8, i32 200, i1 false) + call void @llvm.memcpy.p0i8.p0i8.i32(i8* align 8 %dst.i8, i8* align 4 %src.i8, i32 200, i1 false) +; CHECK: Undefined behavior: Memory reference address is misaligned +; CHECK-NEXT: call void @llvm.memcpy.p0i8.p0i8.i32(i8* align 2 %dst.i8, i8* align 8 %src.i8, i32 200, i1 false) + call void @llvm.memcpy.p0i8.p0i8.i32(i8* align 2 %dst.i8, i8* align 8 %src.i8, i32 200, i1 false) +; CHECK-NOT: @llvm.memcpy.p0i8.p0i8.i32 + call void @llvm.memcpy.p0i8.p0i8.i32(i8* align 1 %dst.i8, i8* align 4 %src.i8, i32 200, i1 false) + call void @llvm.memcpy.p0i8.p0i8.i32(i8* align 2 %dst.i8, i8* align 2 %src.i8, i32 200, i1 false) + call void @llvm.memcpy.p0i8.p0i8.i32(i8* align 2 %dst.i8, i8* align 4 %src.i8, i32 200, i1 false) + + ret void +} + +declare void @llvm.memmove.p0i8.p0i8.i32(i8* nocapture writeonly, i8* nocapture readonly, i32, i1) nounwind argmemonly + +define void @f_memmove() { +entry: + %dst = alloca [1000 x i8], align 2 + %src = alloca [1000 x i8], align 4 + %dst.i8 = bitcast [1000 x i8]* %dst to i8* + %src.i8 = bitcast [1000 x i8]* %src to i8* +; CHECK: Undefined behavior: Memory reference address is misaligned +; CHECK-NEXT: call void @llvm.memmove.p0i8.p0i8.i32(i8* align 4 %dst.i8, i8* align 4 %src.i8, i32 200, i1 false) + call void @llvm.memmove.p0i8.p0i8.i32(i8* align 4 %dst.i8, i8* align 4 %src.i8, i32 200, i1 false) +; CHECK: Undefined behavior: Memory reference address is misaligned +; CHECK-NEXT: call void @llvm.memmove.p0i8.p0i8.i32(i8* align 2 %dst.i8, i8* align 8 %src.i8, i32 200, i1 false) + call void @llvm.memmove.p0i8.p0i8.i32(i8* align 2 %dst.i8, i8* align 8 %src.i8, i32 200, i1 false) +; CHECK-NOT: @llvm.memmove.p0i8.p0i8.i32 + call void @llvm.memmove.p0i8.p0i8.i32(i8* align 1 %dst.i8, i8* align 4 %src.i8, i32 200, i1 false) + call void @llvm.memmove.p0i8.p0i8.i32(i8* align 2 %dst.i8, i8* align 2 %src.i8, i32 200, i1 false) + call void @llvm.memmove.p0i8.p0i8.i32(i8* align 2 %dst.i8, i8* align 4 %src.i8, i32 200, i1 false) + + ret void +} + +declare void @llvm.memset.p0i8.i32(i8* nocapture writeonly, i8, i32, i1) nounwind argmemonly + +define void @f_memset() { +entry: + %dst = alloca [1000 x i8], align 2 + %dst.i8 = bitcast [1000 x i8]* %dst to i8* +; CHECK: Undefined behavior: Memory reference address is misaligned +; CHECK-NEXT: call void @llvm.memset.p0i8.i32(i8* align 4 %dst.i8, i8 55, i32 200, i1 false) + call void @llvm.memset.p0i8.i32(i8* align 4 %dst.i8, i8 55, i32 200, i1 false) +; CHECK-NOT: @llvm.memset.p0i8.i32 + call void @llvm.memset.p0i8.i32(i8* align 1 %dst.i8, i8 55, i32 200, i1 false) + call void @llvm.memset.p0i8.i32(i8* align 2 %dst.i8, i8 55, i32 200, i1 false) + + ret void +} |