Skip to content

Commit 2902bde

Browse files
committed
[MemCpyOpt] Use AA to check for MustAlias between memset and memcpy
Rather than checking for simple equality, check for MustAlias, as we do in other transforms. This catches equivalent GEPs.
1 parent 9080444 commit 2902bde

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1134,7 +1134,7 @@ bool MemCpyOptPass::processMemCpyMemCpyDependence(MemCpyInst *M,
11341134
bool MemCpyOptPass::processMemSetMemCpyDependence(MemCpyInst *MemCpy,
11351135
MemSetInst *MemSet) {
11361136
// We can only transform memset/memcpy with the same destination.
1137-
if (MemSet->getDest() != MemCpy->getDest())
1137+
if (!AA->isMustAlias(MemSet->getDest(), MemCpy->getDest()))
11381138
return false;
11391139

11401140
// Check that src and dst of the memcpy aren't the same. While memcpy

llvm/test/Transforms/MemCpyOpt/memset-memcpy-redundant-memset.ll

+6-3
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ define void @test_same_dynamic_size(i8* noalias %src, i8* noalias %dst, i64 %siz
261261
define void @test_must_alias_same_size(i8* noalias %src, i8* noalias %dst, i8 %c) {
262262
; CHECK-LABEL: @test_must_alias_same_size(
263263
; CHECK-NEXT: [[GEP1:%.*]] = getelementptr i8, i8* [[DST:%.*]], i64 16
264-
; CHECK-NEXT: call void @llvm.memset.p0i8.i64(i8* [[GEP1]], i8 [[C:%.*]], i64 16, i1 false)
265264
; CHECK-NEXT: [[GEP2:%.*]] = getelementptr i8, i8* [[DST]], i64 16
266265
; CHECK-NEXT: call void @llvm.memcpy.p0i8.p0i8.i64(i8* [[GEP2]], i8* [[SRC:%.*]], i64 16, i1 false)
267266
; CHECK-NEXT: ret void
@@ -276,9 +275,13 @@ define void @test_must_alias_same_size(i8* noalias %src, i8* noalias %dst, i8 %c
276275
define void @test_must_alias_different_size(i8* noalias %src, i64 %src_size, i8* noalias %dst, i64 %dst_size, i8 %c) {
277276
; CHECK-LABEL: @test_must_alias_different_size(
278277
; CHECK-NEXT: [[GEP1:%.*]] = getelementptr i8, i8* [[DST:%.*]], i64 16
279-
; CHECK-NEXT: call void @llvm.memset.p0i8.i64(i8* [[GEP1]], i8 [[C:%.*]], i64 [[DST_SIZE:%.*]], i1 false)
280278
; CHECK-NEXT: [[GEP2:%.*]] = getelementptr i8, i8* [[DST]], i64 16
281-
; CHECK-NEXT: call void @llvm.memcpy.p0i8.p0i8.i64(i8* [[GEP2]], i8* [[SRC:%.*]], i64 [[SRC_SIZE:%.*]], i1 false)
279+
; CHECK-NEXT: [[TMP1:%.*]] = icmp ule i64 [[DST_SIZE:%.*]], [[SRC_SIZE:%.*]]
280+
; CHECK-NEXT: [[TMP2:%.*]] = sub i64 [[DST_SIZE]], [[SRC_SIZE]]
281+
; CHECK-NEXT: [[TMP3:%.*]] = select i1 [[TMP1]], i64 0, i64 [[TMP2]]
282+
; CHECK-NEXT: [[TMP4:%.*]] = getelementptr i8, i8* [[GEP2]], i64 [[SRC_SIZE]]
283+
; CHECK-NEXT: call void @llvm.memset.p0i8.i64(i8* align 1 [[TMP4]], i8 [[C:%.*]], i64 [[TMP3]], i1 false)
284+
; CHECK-NEXT: call void @llvm.memcpy.p0i8.p0i8.i64(i8* [[GEP2]], i8* [[SRC:%.*]], i64 [[SRC_SIZE]], i1 false)
282285
; CHECK-NEXT: ret void
283286
;
284287
%gep1 = getelementptr i8, i8* %dst, i64 16

0 commit comments

Comments
 (0)