From 53da3faab8e56115dec73d2d9d6d8c073c7dd0f5 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Mon, 30 Jun 2014 20:44:28 +0000 Subject: [PATCH] Convert some byval argpromotion grep tests to FileCheck Surprisingly, the i32* byval parameter is not transformed by argpromotion. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@212067 91177308-0d34-0410-b5e6-96231b3b80d8 --- .../Transforms/ArgumentPromotion/basictest.ll | 32 +++++++++------- test/Transforms/ArgumentPromotion/byval-2.ll | 37 +++++++++++-------- test/Transforms/ArgumentPromotion/byval.ll | 33 +++++++++-------- 3 files changed, 58 insertions(+), 44 deletions(-) diff --git a/test/Transforms/ArgumentPromotion/basictest.ll b/test/Transforms/ArgumentPromotion/basictest.ll index d3d21fcabee..8f78b98437b 100644 --- a/test/Transforms/ArgumentPromotion/basictest.ll +++ b/test/Transforms/ArgumentPromotion/basictest.ll @@ -1,23 +1,29 @@ -; RUN: opt < %s -basicaa -argpromotion -mem2reg -S | not grep alloca +; RUN: opt < %s -basicaa -argpromotion -mem2reg -S | FileCheck %s target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128" + define internal i32 @test(i32* %X, i32* %Y) { - %A = load i32* %X ; [#uses=1] - %B = load i32* %Y ; [#uses=1] - %C = add i32 %A, %B ; [#uses=1] - ret i32 %C +; CHECK-LABEL: define internal i32 @test(i32 %X.val, i32 %Y.val) + %A = load i32* %X + %B = load i32* %Y + %C = add i32 %A, %B + ret i32 %C } define internal i32 @caller(i32* %B) { - %A = alloca i32 ; [#uses=2] - store i32 1, i32* %A - %C = call i32 @test( i32* %A, i32* %B ) ; [#uses=1] - ret i32 %C +; CHECK-LABEL: define internal i32 @caller(i32 %B.val1) + %A = alloca i32 + store i32 1, i32* %A + %C = call i32 @test(i32* %A, i32* %B) +; CHECK: call i32 @test(i32 1, i32 %B.val1) + ret i32 %C } define i32 @callercaller() { - %B = alloca i32 ; [#uses=2] - store i32 2, i32* %B - %X = call i32 @caller( i32* %B ) ; [#uses=1] - ret i32 %X +; CHECK-LABEL: define i32 @callercaller() + %B = alloca i32 + store i32 2, i32* %B + %X = call i32 @caller(i32* %B) +; CHECK: call i32 @caller(i32 2) + ret i32 %X } diff --git a/test/Transforms/ArgumentPromotion/byval-2.ll b/test/Transforms/ArgumentPromotion/byval-2.ll index 368c6896cf8..b412f5ef085 100644 --- a/test/Transforms/ArgumentPromotion/byval-2.ll +++ b/test/Transforms/ArgumentPromotion/byval-2.ll @@ -1,26 +1,31 @@ -; RUN: opt < %s -argpromotion -S | grep -F "i32* byval" | count 2 -; Argpromote + scalarrepl should change this to passing the two integers by value. +; RUN: opt < %s -argpromotion -S | FileCheck %s - %struct.ss = type { i32, i64 } +; Arg promotion eliminates the struct argument. +; FIXME: Should it eliminate the i32* argument? + +%struct.ss = type { i32, i64 } define internal void @f(%struct.ss* byval %b, i32* byval %X) nounwind { +; CHECK-LABEL: define internal void @f(i32 %b.0, i64 %b.1, i32* byval %X) entry: - %tmp = getelementptr %struct.ss* %b, i32 0, i32 0 - %tmp1 = load i32* %tmp, align 4 - %tmp2 = add i32 %tmp1, 1 - store i32 %tmp2, i32* %tmp, align 4 + %tmp = getelementptr %struct.ss* %b, i32 0, i32 0 + %tmp1 = load i32* %tmp, align 4 + %tmp2 = add i32 %tmp1, 1 + store i32 %tmp2, i32* %tmp, align 4 - store i32 0, i32* %X - ret void + store i32 0, i32* %X + ret void } define i32 @test(i32* %X) { +; CHECK-LABEL: define i32 @test entry: - %S = alloca %struct.ss ; <%struct.ss*> [#uses=4] - %tmp1 = getelementptr %struct.ss* %S, i32 0, i32 0 ; [#uses=1] - store i32 1, i32* %tmp1, align 8 - %tmp4 = getelementptr %struct.ss* %S, i32 0, i32 1 ; [#uses=1] - store i64 2, i64* %tmp4, align 4 - call void @f( %struct.ss* byval %S, i32* byval %X) - ret i32 0 + %S = alloca %struct.ss + %tmp1 = getelementptr %struct.ss* %S, i32 0, i32 0 + store i32 1, i32* %tmp1, align 8 + %tmp4 = getelementptr %struct.ss* %S, i32 0, i32 1 + store i64 2, i64* %tmp4, align 4 + call void @f( %struct.ss* byval %S, i32* byval %X) +; CHECK: call void @f(i32 %{{.*}}, i64 %{{.*}}, i32* byval %{{.*}}) + ret i32 0 } diff --git a/test/Transforms/ArgumentPromotion/byval.ll b/test/Transforms/ArgumentPromotion/byval.ll index 44b26fc2f30..27305e92068 100644 --- a/test/Transforms/ArgumentPromotion/byval.ll +++ b/test/Transforms/ArgumentPromotion/byval.ll @@ -1,25 +1,28 @@ -; RUN: opt < %s -argpromotion -scalarrepl -S | not grep load +; RUN: opt < %s -argpromotion -S | FileCheck %s + target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128" -; Argpromote + scalarrepl should change this to passing the two integers by value. - %struct.ss = type { i32, i64 } +%struct.ss = type { i32, i64 } define internal void @f(%struct.ss* byval %b) nounwind { +; CHECK-LABEL: define internal void @f(i32 %b.0, i64 %b.1) entry: - %tmp = getelementptr %struct.ss* %b, i32 0, i32 0 ; [#uses=2] - %tmp1 = load i32* %tmp, align 4 ; [#uses=1] - %tmp2 = add i32 %tmp1, 1 ; [#uses=1] - store i32 %tmp2, i32* %tmp, align 4 - ret void + %tmp = getelementptr %struct.ss* %b, i32 0, i32 0 ; [#uses=2] + %tmp1 = load i32* %tmp, align 4 ; [#uses=1] + %tmp2 = add i32 %tmp1, 1 ; [#uses=1] + store i32 %tmp2, i32* %tmp, align 4 + ret void } define i32 @main() nounwind { +; CHECK-LABEL: define i32 @main entry: - %S = alloca %struct.ss ; <%struct.ss*> [#uses=4] - %tmp1 = getelementptr %struct.ss* %S, i32 0, i32 0 ; [#uses=1] - store i32 1, i32* %tmp1, align 8 - %tmp4 = getelementptr %struct.ss* %S, i32 0, i32 1 ; [#uses=1] - store i64 2, i64* %tmp4, align 4 - call void @f( %struct.ss* byval %S ) nounwind - ret i32 0 + %S = alloca %struct.ss ; <%struct.ss*> [#uses=4] + %tmp1 = getelementptr %struct.ss* %S, i32 0, i32 0 ; [#uses=1] + store i32 1, i32* %tmp1, align 8 + %tmp4 = getelementptr %struct.ss* %S, i32 0, i32 1 ; [#uses=1] + store i64 2, i64* %tmp4, align 4 + call void @f( %struct.ss* byval %S ) nounwind +; CHECK: call void @f(i32 %{{.*}}, i64 %{{.*}}) + ret i32 0 } -- 2.50.0