From 5b6bbc8515cbf44cc03db11468d461caaac157e4 Mon Sep 17 00:00:00 2001 From: Max Kazantsev Date: Fri, 15 Feb 2019 07:06:52 +0000 Subject: [PATCH] [TEST] Update test comments, refactor checks with update_test_checks.py This patch changes messages in guards-related tests to adequately reflect reality. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@354101 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Transforms/LICM/guards.ll | 306 +++++++++++++++++++++++---------- 1 file changed, 216 insertions(+), 90 deletions(-) diff --git a/test/Transforms/LICM/guards.ll b/test/Transforms/LICM/guards.ll index d0c9533823d..6c25eb167f9 100644 --- a/test/Transforms/LICM/guards.ll +++ b/test/Transforms/LICM/guards.ll @@ -1,3 +1,4 @@ +; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; REQUIRES: asserts ; RUN: opt -licm -basicaa -ipt-expensive-asserts=true < %s -S | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='require,require,require,require,loop(licm)' -ipt-expensive-asserts=true < %s -S | FileCheck %s @@ -5,10 +6,15 @@ ; Hoist guard and load. define void @test1(i1 %cond, i32* %ptr) { ; CHECK-LABEL: @test1( -; CHECK-LABEL: entry: -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %cond) -; CHECK: %val = load i32, i32* %ptr -; CHECK-LABEL: loop: +; CHECK-NEXT: entry: +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[COND:%.*]]) [ "deopt"(i32 0) ] +; CHECK-NEXT: [[VAL:%.*]] = load i32, i32* [[PTR:%.*]] +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[X:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[X_INC:%.*]], [[LOOP]] ] +; CHECK-NEXT: [[X_INC]] = add i32 [[X]], [[VAL]] +; CHECK-NEXT: br label [[LOOP]] +; entry: br label %loop @@ -24,10 +30,16 @@ loop: ; Can't hoist over a side effect define void @test2(i1 %cond, i32* %ptr) { ; CHECK-LABEL: @test2( -; CHECK-LABEL: entry: -; CHECK-LABEL: loop: -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %cond) -; CHECK: %val = load i32, i32* %ptr +; CHECK-NEXT: entry: +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[X:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[X_INC:%.*]], [[LOOP]] ] +; CHECK-NEXT: store i32 0, i32* [[PTR:%.*]] +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[COND:%.*]]) [ "deopt"(i32 0) ] +; CHECK-NEXT: [[VAL:%.*]] = load i32, i32* [[PTR]] +; CHECK-NEXT: [[X_INC]] = add i32 [[X]], [[VAL]] +; CHECK-NEXT: br label [[LOOP]] +; entry: br label %loop @@ -44,10 +56,17 @@ loop: ; Can't hoist over a side effect define void @test2b(i1 %cond, i32* %ptr) { ; CHECK-LABEL: @test2b( -; CHECK-LABEL: entry: -; CHECK-LABEL: loop: -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %cond) -; CHECK: %val = load i32, i32* %ptr +; CHECK-NEXT: entry: +; CHECK-NEXT: [[P2:%.*]] = getelementptr i32, i32* [[PTR:%.*]], i32 1 +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[X:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[X_INC:%.*]], [[LOOP]] ] +; CHECK-NEXT: store i32 0, i32* [[P2]] +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[COND:%.*]]) [ "deopt"(i32 0) ] +; CHECK-NEXT: [[VAL:%.*]] = load i32, i32* [[PTR]] +; CHECK-NEXT: [[X_INC]] = add i32 [[X]], [[VAL]] +; CHECK-NEXT: br label [[LOOP]] +; entry: br label %loop @@ -62,15 +81,19 @@ loop: br label %loop } - ; Hoist guard. Cannot hoist load because of aliasing. define void @test3(i1 %cond, i32* %ptr) { ; CHECK-LABEL: @test3( -; CHECK-LABEL: entry: -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %cond) -; CHECK-LABEL: loop: -; CHECK: %val = load i32, i32* %ptr -; CHECK: store i32 0, i32* %ptr +; CHECK-NEXT: entry: +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[COND:%.*]]) [ "deopt"(i32 0) ] +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[X:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[X_INC:%.*]], [[LOOP]] ] +; CHECK-NEXT: [[VAL:%.*]] = load i32, i32* [[PTR:%.*]] +; CHECK-NEXT: store i32 0, i32* [[PTR]] +; CHECK-NEXT: [[X_INC]] = add i32 [[X]], [[VAL]] +; CHECK-NEXT: br label [[LOOP]] +; entry: br label %loop @@ -84,16 +107,28 @@ loop: br label %loop } - +; Hoist load and guard. define void @test4(i1 %c, i32* %p) { - ; CHECK-LABEL: @test4( -; CHECK-LABEL: entry: -; CHECK: %a = load i32, i32* %p -; CHECK: %invariant_cond = icmp ne i32 %a, 100 -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %invariant_cond) -; CHECK-LABEL: loop: -; CHECK-LABEL: backedge: +; CHECK-NEXT: entry: +; CHECK-NEXT: [[A:%.*]] = load i32, i32* [[P:%.*]] +; CHECK-NEXT: [[INVARIANT_COND:%.*]] = icmp ne i32 [[A]], 100 +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[INVARIANT_COND]]) [ "deopt"() ] +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[IV:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[BACKEDGE:%.*]] ] +; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 +; CHECK-NEXT: br i1 [[C:%.*]], label [[IF_TRUE:%.*]], label [[IF_FALSE:%.*]] +; CHECK: if.true: +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: if.false: +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: backedge: +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp slt i32 [[IV_NEXT]], 1000 +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK: exit: +; CHECK-NEXT: ret void +; entry: br label %loop @@ -122,16 +157,27 @@ exit: ; Do not hoist across a conditionally executed side effect. define void @test4a(i1 %c, i32* %p, i32* %q) { - ; CHECK-LABEL: @test4a( -; CHECK-LABEL: entry: -; CHECK-LABEL: loop: -; CHECK-LABEL: if.true: -; CHECK: store -; CHECK-LABEL: backedge: -; CHECK: %a = load i32, i32* %p -; CHECK: %invariant_cond = icmp ne i32 %a, 100 -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %invariant_cond) +; CHECK-NEXT: entry: +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[IV:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[BACKEDGE:%.*]] ] +; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 +; CHECK-NEXT: br i1 [[C:%.*]], label [[IF_TRUE:%.*]], label [[IF_FALSE:%.*]] +; CHECK: if.true: +; CHECK-NEXT: store i32 123, i32* [[Q:%.*]] +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: if.false: +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: backedge: +; CHECK-NEXT: [[A:%.*]] = load i32, i32* [[P:%.*]] +; CHECK-NEXT: [[INVARIANT_COND:%.*]] = icmp ne i32 [[A]], 100 +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[INVARIANT_COND]]) [ "deopt"() ] +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp slt i32 [[IV_NEXT]], 1000 +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK: exit: +; CHECK-NEXT: ret void +; entry: br label %loop @@ -161,15 +207,26 @@ exit: ; Do not hoist a conditionally executed guard. define void @test4b(i1 %c, i32* %p, i32* %q) { - ; CHECK-LABEL: @test4b( -; CHECK-LABEL: entry: -; CHECK-LABEL: loop: -; CHECK-LABEL: if.true: -; CHECK: %a = load i32, i32* %p -; CHECK: %invariant_cond = icmp ne i32 %a, 100 -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %invariant_cond) -; CHECK-LABEL: backedge: +; CHECK-NEXT: entry: +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[IV:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[BACKEDGE:%.*]] ] +; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 +; CHECK-NEXT: br i1 [[C:%.*]], label [[IF_TRUE:%.*]], label [[IF_FALSE:%.*]] +; CHECK: if.true: +; CHECK-NEXT: [[A:%.*]] = load i32, i32* [[P:%.*]] +; CHECK-NEXT: [[INVARIANT_COND:%.*]] = icmp ne i32 [[A]], 100 +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[INVARIANT_COND]]) [ "deopt"() ] +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: if.false: +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: backedge: +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp slt i32 [[IV_NEXT]], 1000 +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK: exit: +; CHECK-NEXT: ret void +; entry: br label %loop @@ -196,16 +253,29 @@ exit: ret void } -; Check that we don't hoist across a store in the header. +; Hoist store, load and guard. define void @test4c(i1 %c, i32* %p, i8* noalias %s) { - ; CHECK-LABEL: @test4c( -; CHECK-LABEL: entry: -; CHECK: %a = load i32, i32* %p -; CHECK: %invariant_cond = icmp ne i32 %a, 100 -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %invariant_cond) -; CHECK-LABEL: loop: -; CHECK-LABEL: backedge: +; CHECK-NEXT: entry: +; CHECK-NEXT: store i8 0, i8* [[S:%.*]] +; CHECK-NEXT: [[A:%.*]] = load i32, i32* [[P:%.*]] +; CHECK-NEXT: [[INVARIANT_COND:%.*]] = icmp ne i32 [[A]], 100 +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[INVARIANT_COND]]) [ "deopt"() ] +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[IV:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[BACKEDGE:%.*]] ] +; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 +; CHECK-NEXT: br i1 [[C:%.*]], label [[IF_TRUE:%.*]], label [[IF_FALSE:%.*]] +; CHECK: if.true: +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: if.false: +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: backedge: +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp slt i32 [[IV_NEXT]], 1000 +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK: exit: +; CHECK-NEXT: ret void +; entry: br label %loop @@ -233,16 +303,29 @@ exit: ret void } -; Check that we don't hoist across a store in a conditionally execute block. +; Check that we don't hoist across a store in a conditionally executed block. define void @test4d(i1 %c, i32* %p, i8* noalias %s) { - ; CHECK-LABEL: @test4d( -; CHECK-LABEL: entry: -; CHECK: %a = load i32, i32* %p -; CHECK: %invariant_cond = icmp ne i32 %a, 100 -; CHECK-LABEL: loop: -; CHECK-LABEL: backedge: -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %invariant_cond) +; CHECK-NEXT: entry: +; CHECK-NEXT: [[A:%.*]] = load i32, i32* [[P:%.*]] +; CHECK-NEXT: [[INVARIANT_COND:%.*]] = icmp ne i32 [[A]], 100 +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[IV:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[BACKEDGE:%.*]] ] +; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 +; CHECK-NEXT: br i1 [[C:%.*]], label [[IF_TRUE:%.*]], label [[IF_FALSE:%.*]] +; CHECK: if.true: +; CHECK-NEXT: store i8 0, i8* [[S:%.*]] +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: if.false: +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: backedge: +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[INVARIANT_COND]]) [ "deopt"() ] +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp slt i32 [[IV_NEXT]], 1000 +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK: exit: +; CHECK-NEXT: ret void +; entry: br label %loop @@ -272,15 +355,27 @@ exit: ; Check that we don't hoist across a store before the guard in the backedge. define void @test4e(i1 %c, i32* %p, i8* noalias %s) { - ; CHECK-LABEL: @test4e( -; CHECK-LABEL: entry: -; CHECK: %a = load i32, i32* %p -; CHECK: %invariant_cond = icmp ne i32 %a, 100 -; CHECK: store i8 0, i8* %s -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %invariant_cond) -; CHECK-LABEL: loop: -; CHECK-LABEL: backedge: +; CHECK-NEXT: entry: +; CHECK-NEXT: [[A:%.*]] = load i32, i32* [[P:%.*]] +; CHECK-NEXT: [[INVARIANT_COND:%.*]] = icmp ne i32 [[A]], 100 +; CHECK-NEXT: store i8 0, i8* [[S:%.*]] +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[INVARIANT_COND]]) [ "deopt"() ] +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[IV:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[BACKEDGE:%.*]] ] +; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 +; CHECK-NEXT: br i1 [[C:%.*]], label [[IF_TRUE:%.*]], label [[IF_FALSE:%.*]] +; CHECK: if.true: +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: if.false: +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: backedge: +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp slt i32 [[IV_NEXT]], 1000 +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK: exit: +; CHECK-NEXT: ret void +; entry: br label %loop @@ -310,14 +405,27 @@ exit: ; Check that we can hoist the guard in spite of store which happens after. define void @test4f(i1 %c, i32* %p, i8* noalias %s) { - ; CHECK-LABEL: @test4f( -; CHECK-LABEL: entry: -; CHECK: %a = load i32, i32* %p -; CHECK: %invariant_cond = icmp ne i32 %a, 100 -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %invariant_cond) -; CHECK-LABEL: loop: -; CHECK-LABEL: backedge: +; CHECK-NEXT: entry: +; CHECK-NEXT: [[A:%.*]] = load i32, i32* [[P:%.*]] +; CHECK-NEXT: [[INVARIANT_COND:%.*]] = icmp ne i32 [[A]], 100 +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[INVARIANT_COND]]) [ "deopt"() ] +; CHECK-NEXT: store i8 0, i8* [[S:%.*]] +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[IV:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[BACKEDGE:%.*]] ] +; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 +; CHECK-NEXT: br i1 [[C:%.*]], label [[IF_TRUE:%.*]], label [[IF_FALSE:%.*]] +; CHECK: if.true: +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: if.false: +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: backedge: +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp slt i32 [[IV_NEXT]], 1000 +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK: exit: +; CHECK-NEXT: ret void +; entry: br label %loop @@ -347,15 +455,24 @@ exit: ; Do not hoist an invariant guard across a variant guard. define void @test5(i1 %c, i32* %p, i32* %q) { - ; CHECK-LABEL: @test5( -; CHECK-LABEL: entry: -; CHECK: %a = load i32, i32* %p -; CHECK: %invariant_cond = icmp ne i32 %a, 100 -; CHECK-LABEL: loop: -; CHECK: %variant_cond = icmp ne i32 %a, %iv -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %variant_cond) -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %invariant_cond) +; CHECK-NEXT: entry: +; CHECK-NEXT: [[A:%.*]] = load i32, i32* [[P:%.*]] +; CHECK-NEXT: [[INVARIANT_COND:%.*]] = icmp ne i32 [[A]], 100 +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[IV:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[BACKEDGE:%.*]] ] +; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 +; CHECK-NEXT: [[VARIANT_COND:%.*]] = icmp ne i32 [[A]], [[IV]] +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[VARIANT_COND]]) [ "deopt"() ] +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[INVARIANT_COND]]) [ "deopt"() ] +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: backedge: +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp slt i32 [[IV_NEXT]], 1000 +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK: exit: +; CHECK-NEXT: ret void +; entry: br label %loop @@ -380,15 +497,24 @@ exit: ; Hoist an invariant guard, leave the following variant guard in the loop. define void @test5a(i1 %c, i32* %p, i32* %q) { - ; CHECK-LABEL: @test5a( -; CHECK-LABEL: entry: -; CHECK: %a = load i32, i32* %p -; CHECK: %invariant_cond = icmp ne i32 %a, 100 -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %invariant_cond) -; CHECK-LABEL: loop: -; CHECK: %variant_cond = icmp ne i32 %a, %iv -; CHECK: call void (i1, ...) @llvm.experimental.guard(i1 %variant_cond) +; CHECK-NEXT: entry: +; CHECK-NEXT: [[A:%.*]] = load i32, i32* [[P:%.*]] +; CHECK-NEXT: [[INVARIANT_COND:%.*]] = icmp ne i32 [[A]], 100 +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[INVARIANT_COND]]) [ "deopt"() ] +; CHECK-NEXT: br label [[LOOP:%.*]] +; CHECK: loop: +; CHECK-NEXT: [[IV:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[IV_NEXT:%.*]], [[BACKEDGE:%.*]] ] +; CHECK-NEXT: [[IV_NEXT]] = add i32 [[IV]], 1 +; CHECK-NEXT: [[VARIANT_COND:%.*]] = icmp ne i32 [[A]], [[IV]] +; CHECK-NEXT: call void (i1, ...) @llvm.experimental.guard(i1 [[VARIANT_COND]]) [ "deopt"() ] +; CHECK-NEXT: br label [[BACKEDGE]] +; CHECK: backedge: +; CHECK-NEXT: [[LOOP_COND:%.*]] = icmp slt i32 [[IV_NEXT]], 1000 +; CHECK-NEXT: br i1 [[LOOP_COND]], label [[LOOP]], label [[EXIT:%.*]] +; CHECK: exit: +; CHECK-NEXT: ret void +; entry: br label %loop -- 2.50.1