[llvm] r329412 - [InstCombine] add potential calloc tests and regenerate checks; NFC
Sanjay Patel via llvm-commits
llvm-commits at lists.llvm.org
Fri Apr 6 09:06:09 PDT 2018
Author: spatel
Date: Fri Apr 6 09:06:08 2018
New Revision: 329412
URL: http://llvm.org/viewvc/llvm-project?rev=329412&view=rev
Log:
[InstCombine] add potential calloc tests and regenerate checks; NFC
D45344 is proposing to remove the use restriction that made the calloc
transform safe, but it doesn't currently address the problematic example
given inD16337. Add a test to make sure that doesn't break.
Modified:
llvm/trunk/test/Transforms/InstCombine/memset-1.ll
Modified: llvm/trunk/test/Transforms/InstCombine/memset-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/memset-1.ll?rev=329412&r1=329411&r2=329412&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/memset-1.ll (original)
+++ llvm/trunk/test/Transforms/InstCombine/memset-1.ll Fri Apr 6 09:06:08 2018
@@ -1,3 +1,4 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
; Test that the memset library call simplifier works correctly.
;
; RUN: opt < %s -instcombine -S | FileCheck %s
@@ -5,31 +6,52 @@
target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
declare i8* @memset(i8*, i32, i32)
+declare void @llvm.memset.p0i8.i32(i8* nocapture writeonly, i8, i32, i32, i1)
+declare noalias i8* @malloc(i32) #1
; Check memset(mem1, val, size) -> llvm.memset(mem1, val, size, 1).
define i8* @test_simplify1(i8* %mem, i32 %val, i32 %size) {
; CHECK-LABEL: @test_simplify1(
+; CHECK-NEXT: [[TMP1:%.*]] = trunc i32 [[VAL:%.*]] to i8
+; CHECK-NEXT: call void @llvm.memset.p0i8.i32(i8* align 1 [[MEM:%.*]], i8 [[TMP1]], i32 [[SIZE:%.*]], i1 false)
+; CHECK-NEXT: ret i8* [[MEM]]
+;
%ret = call i8* @memset(i8* %mem, i32 %val, i32 %size)
-; CHECK: call void @llvm.memset
ret i8* %ret
-; CHECK: ret i8* %mem
}
define i8* @pr25892_lite(i32 %size) #0 {
+; CHECK-LABEL: @pr25892_lite(
+; CHECK-NEXT: [[CALLOC:%.*]] = call i8* @calloc(i32 1, i32 [[SIZE:%.*]])
+; CHECK-NEXT: ret i8* [[CALLOC]]
+;
%call1 = call i8* @malloc(i32 %size) #1
%call2 = call i8* @memset(i8* %call1, i32 0, i32 %size) #1
ret i8* %call2
+}
-; CHECK-LABEL: @pr25892_lite(
-; CHECK-NEXT: %calloc = call i8* @calloc(i32 1, i32 %size)
-; CHECK-NEXT: ret i8* %calloc
+; FIXME: A memset intrinsic should be handled similarly to a memset() libcall.
+
+define i8* @malloc_and_memset_intrinsic(i32 %n) #0 {
+; CHECK-LABEL: @malloc_and_memset_intrinsic(
+; CHECK-NEXT: [[CALL:%.*]] = call i8* @malloc(i32 [[N:%.*]])
+; CHECK-NEXT: call void @llvm.memset.p0i8.i32(i8* align 1 [[CALL]], i8 0, i32 [[N]], i1 false)
+; CHECK-NEXT: ret i8* [[CALL]]
+;
+ %call = call i8* @malloc(i32 %n)
+ call void @llvm.memset.p0i8.i32(i8* %call, i8 0, i32 %n, i32 1, i1 false)
+ ret i8* %call
}
-; This should not create a calloc and not crash the compiler.
-; CHECK-LABEL: @notmalloc_memset
-; CHECK-NOT: @calloc
+; This should not create a calloc and should not crash the compiler.
+
define i8* @notmalloc_memset(i32 %size, i8*(i32)* %notmalloc) {
+; CHECK-LABEL: @notmalloc_memset(
+; CHECK-NEXT: [[CALL1:%.*]] = call i8* [[NOTMALLOC:%.*]](i32 [[SIZE:%.*]]) #0
+; CHECK-NEXT: call void @llvm.memset.p0i8.i32(i8* align 1 [[CALL1]], i8 0, i32 [[SIZE]], i1 false)
+; CHECK-NEXT: ret i8* [[CALL1]]
+;
%call1 = call i8* %notmalloc(i32 %size) #1
%call2 = call i8* @memset(i8* %call1, i32 0, i32 %size) #1
ret i8* %call2
@@ -39,6 +61,19 @@ define i8* @notmalloc_memset(i32 %size,
; This doesn't fire currently because the malloc has more than one use.
define float* @pr25892(i32 %size) #0 {
+; CHECK-LABEL: @pr25892(
+; CHECK-NEXT: entry:
+; CHECK-NEXT: [[CALL:%.*]] = tail call i8* @malloc(i32 [[SIZE:%.*]]) #0
+; CHECK-NEXT: [[CMP:%.*]] = icmp eq i8* [[CALL]], null
+; CHECK-NEXT: br i1 [[CMP]], label [[CLEANUP:%.*]], label [[IF_END:%.*]]
+; CHECK: if.end:
+; CHECK-NEXT: [[BC:%.*]] = bitcast i8* [[CALL]] to float*
+; CHECK-NEXT: call void @llvm.memset.p0i8.i32(i8* nonnull align 1 [[CALL]], i8 0, i32 [[SIZE]], i1 false)
+; CHECK-NEXT: br label [[CLEANUP]]
+; CHECK: cleanup:
+; CHECK-NEXT: [[RETVAL_0:%.*]] = phi float* [ [[BC]], [[IF_END]] ], [ null, [[ENTRY:%.*]] ]
+; CHECK-NEXT: ret float* [[RETVAL_0]]
+;
entry:
%call = tail call i8* @malloc(i32 %size) #1
%cmp = icmp eq i8* %call, null
@@ -50,23 +85,22 @@ if.end:
cleanup:
%retval.0 = phi float* [ %bc, %if.end ], [ null, %entry ]
ret float* %retval.0
-
-; CHECK-LABEL: @pr25892(
-; CHECK: entry:
-; CHECK-NEXT: %call = tail call i8* @malloc(i32 %size) #1
-; CHECK-NEXT: %cmp = icmp eq i8* %call, null
-; CHECK-NEXT: br i1 %cmp, label %cleanup, label %if.end
-; CHECK: if.end:
-; CHECK-NEXT: %bc = bitcast i8* %call to float*
-; CHECK-NEXT: call void @llvm.memset.p0i8.i32(i8* nonnull align 1 %call, i8 0, i32 %size, i1 false)
-; CHECK-NEXT: br label %cleanup
-; CHECK: cleanup:
-; CHECK-NEXT: %retval.0 = phi float* [ %bc, %if.end ], [ null, %entry ]
-; CHECK-NEXT: ret float* %retval.0
}
-declare noalias i8* @malloc(i32) #1
-declare i64 @llvm.objectsize.i64.p0i8(i8*, i1) #2
+; If there's a calloc transform, the store must also be eliminated.
+
+define i8* @buffer_is_modified_then_memset(i32 %size) {
+; CHECK-LABEL: @buffer_is_modified_then_memset(
+; CHECK-NEXT: [[PTR:%.*]] = tail call i8* @malloc(i32 [[SIZE:%.*]]) #0
+; CHECK-NEXT: store i8 1, i8* [[PTR]], align 1
+; CHECK-NEXT: call void @llvm.memset.p0i8.i32(i8* align 1 [[PTR]], i8 0, i32 [[SIZE]], i1 false)
+; CHECK-NEXT: ret i8* [[PTR]]
+;
+ %ptr = tail call i8* @malloc(i32 %size) #1
+ store i8 1, i8* %ptr ;; fdata[0] = 1;
+ %memset = tail call i8* @memset(i8* nonnull %ptr, i32 0, i32 %size) #1
+ ret i8* %memset
+}
attributes #0 = { nounwind ssp uwtable }
attributes #1 = { nounwind }
More information about the llvm-commits
mailing list