[llvm] abc388a - Revert "Update tests by update_test_checks.py"

Nico Weber via llvm-commits llvm-commits at lists.llvm.org
Tue Dec 13 07:27:52 PST 2022


Author: Nico Weber
Date: 2022-12-13T10:27:00-05:00
New Revision: abc388ac66c58191a40e3ace04ea628268447d96

URL: https://github.com/llvm/llvm-project/commit/abc388ac66c58191a40e3ace04ea628268447d96
DIFF: https://github.com/llvm/llvm-project/commit/abc388ac66c58191a40e3ace04ea628268447d96.diff

LOG: Revert "Update tests by update_test_checks.py"

This reverts commit 3a8f4649a0a4b7b9cab93d73c0651a14b0fd1c34.
Broke check-llvm everywhere, see e.g.:
* https://lab.llvm.org/buildbot/#/builders/139/builds/32724
* http://45.33.8.238/linux/94174/step_12.txt
* http://45.33.8.238/macm1/50831/step_11.txt
* http://45.33.8.238/win/71928/step_11.txt

Added: 
    

Modified: 
    llvm/test/Transforms/LoopFusion/guarded.ll

Removed: 
    


################################################################################
diff  --git a/llvm/test/Transforms/LoopFusion/guarded.ll b/llvm/test/Transforms/LoopFusion/guarded.ll
index 278e6f75708f5..b52cc339bd497 100644
--- a/llvm/test/Transforms/LoopFusion/guarded.ll
+++ b/llvm/test/Transforms/LoopFusion/guarded.ll
@@ -1,46 +1,19 @@
-; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt -S -passes=loop-fusion < %s | FileCheck %s
 
 @B = common global [1024 x i32] zeroinitializer, align 16
 
 ; CHECK: void @dep_free_parametric
 ; CHECK-next: entry:
+; CHECK: br i1 %{{.*}}, label %[[LOOP1PREHEADER:bb[0-9]*]], label %[[LOOP1SUCC:bb[0-9]+]]
+; CHECK: [[LOOP1PREHEADER]]
+; CHECK-NEXT: br label %[[LOOP1BODY:bb[0-9]*]]
+; CHECK: [[LOOP1BODY]]
+; CHECK: br i1 %{{.*}}, label %[[LOOP1BODY]], label %[[LOOP2EXIT:bb[0-9]+]]
+; CHECK: [[LOOP2EXIT]]
+; CHECK: br label %[[LOOP1SUCC]]
+; CHECK: [[LOOP1SUCC]]
 ; CHECK: ret void
 define void @dep_free_parametric(i32* noalias %A, i64 %N) {
-; CHECK-LABEL: @dep_free_parametric(
-; CHECK-NEXT:  entry:
-; CHECK-NEXT:    [[CMP4:%.*]] = icmp slt i64 0, [[N:%.*]]
-; CHECK-NEXT:    [[CMP31:%.*]] = icmp slt i64 0, [[N]]
-; CHECK-NEXT:    br i1 [[CMP4]], label [[BB3:%.*]], label [[BB12:%.*]]
-; CHECK:       bb3:
-; CHECK-NEXT:    br label [[BB5:%.*]]
-; CHECK:       bb5:
-; CHECK-NEXT:    [[I_05:%.*]] = phi i64 [ [[INC:%.*]], [[BB5]] ], [ 0, [[BB3]] ]
-; CHECK-NEXT:    [[I1_02:%.*]] = phi i64 [ [[INC14:%.*]], [[BB5]] ], [ 0, [[BB3]] ]
-; CHECK-NEXT:    [[SUB:%.*]] = sub nsw i64 [[I_05]], 3
-; CHECK-NEXT:    [[ADD:%.*]] = add nsw i64 [[I_05]], 3
-; CHECK-NEXT:    [[MUL:%.*]] = mul nsw i64 [[SUB]], [[ADD]]
-; CHECK-NEXT:    [[REM:%.*]] = srem i64 [[MUL]], [[I_05]]
-; CHECK-NEXT:    [[CONV:%.*]] = trunc i64 [[REM]] to i32
-; CHECK-NEXT:    [[ARRAYIDX:%.*]] = getelementptr inbounds i32, i32* [[A:%.*]], i64 [[I_05]]
-; CHECK-NEXT:    store i32 [[CONV]], i32* [[ARRAYIDX]], align 4
-; CHECK-NEXT:    [[INC]] = add nsw i64 [[I_05]], 1
-; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i64 [[INC]], [[N]]
-; CHECK-NEXT:    [[SUB7:%.*]] = sub nsw i64 [[I1_02]], 3
-; CHECK-NEXT:    [[ADD8:%.*]] = add nsw i64 [[I1_02]], 3
-; CHECK-NEXT:    [[MUL9:%.*]] = mul nsw i64 [[SUB7]], [[ADD8]]
-; CHECK-NEXT:    [[REM10:%.*]] = srem i64 [[MUL9]], [[I1_02]]
-; CHECK-NEXT:    [[CONV11:%.*]] = trunc i64 [[REM10]] to i32
-; CHECK-NEXT:    [[ARRAYIDX12:%.*]] = getelementptr inbounds [1024 x i32], [1024 x i32]* @B, i64 0, i64 [[I1_02]]
-; CHECK-NEXT:    store i32 [[CONV11]], i32* [[ARRAYIDX12]], align 4
-; CHECK-NEXT:    [[INC14]] = add nsw i64 [[I1_02]], 1
-; CHECK-NEXT:    [[CMP3:%.*]] = icmp slt i64 [[INC14]], [[N]]
-; CHECK-NEXT:    br i1 [[CMP3]], label [[BB5]], label [[BB15:%.*]]
-; CHECK:       bb15:
-; CHECK-NEXT:    br label [[BB12]]
-; CHECK:       bb12:
-; CHECK-NEXT:    ret void
-;
 entry:
   %cmp4 = icmp slt i64 0, %N
   br i1 %cmp4, label %bb3, label %bb14
@@ -107,30 +80,6 @@ bb12:                                        ; preds = %bb15, %bb14
 ; CHECK-LABEL: for.end:
 ; CHECK-NEXT:   ret void
 define void @moveinsts_preheader(i32* noalias %A, i32* noalias %B, i64 %N, i32 %x) {
-; CHECK-LABEL: @moveinsts_preheader(
-; CHECK-NEXT:  for.first.guard:
-; CHECK-NEXT:    [[CMP_GUARD:%.*]] = icmp slt i64 0, [[N:%.*]]
-; CHECK-NEXT:    br i1 [[CMP_GUARD]], label [[FOR_FIRST_PREHEADER:%.*]], label [[FOR_END:%.*]]
-; CHECK:       for.first.preheader:
-; CHECK-NEXT:    [[ADD:%.*]] = add nsw i32 [[X:%.*]], 1
-; CHECK-NEXT:    br label [[FOR_FIRST:%.*]]
-; CHECK:       for.first:
-; CHECK-NEXT:    [[I:%.*]] = phi i64 [ [[INC_I:%.*]], [[FOR_FIRST]] ], [ 0, [[FOR_FIRST_PREHEADER]] ]
-; CHECK-NEXT:    [[J:%.*]] = phi i64 [ [[INC_J:%.*]], [[FOR_FIRST]] ], [ 0, [[FOR_FIRST_PREHEADER]] ]
-; CHECK-NEXT:    [[AI:%.*]] = getelementptr inbounds i32, i32* [[A:%.*]], i64 [[I]]
-; CHECK-NEXT:    store i32 0, i32* [[AI]], align 4
-; CHECK-NEXT:    [[INC_I]] = add nsw i64 [[I]], 1
-; CHECK-NEXT:    [[CMP_I:%.*]] = icmp slt i64 [[INC_I]], [[N]]
-; CHECK-NEXT:    [[BJ:%.*]] = getelementptr inbounds i32, i32* [[B:%.*]], i64 [[J]]
-; CHECK-NEXT:    store i32 0, i32* [[BJ]], align 4
-; CHECK-NEXT:    [[INC_J]] = add nsw i64 [[J]], 1
-; CHECK-NEXT:    [[CMP_J:%.*]] = icmp slt i64 [[INC_J]], [[N]]
-; CHECK-NEXT:    br i1 [[CMP_J]], label [[FOR_FIRST]], label [[FOR_SECOND_EXIT:%.*]]
-; CHECK:       for.second.exit:
-; CHECK-NEXT:    br label [[FOR_END]]
-; CHECK:       for.end:
-; CHECK-NEXT:    ret void
-;
 for.first.guard:
   %cmp.guard = icmp slt i64 0, %N
   br i1 %cmp.guard, label %for.first.preheader, label %for.second.guard
@@ -187,30 +136,6 @@ for.end:
 ; CHECK-LABEL: for.end:
 ; CHECK-NEXT:   ret void
 define void @moveinsts_exitblock(i32* noalias %A, i32* noalias %B, i64 %N, i32 %x) {
-; CHECK-LABEL: @moveinsts_exitblock(
-; CHECK-NEXT:  for.first.guard:
-; CHECK-NEXT:    [[CMP_GUARD:%.*]] = icmp slt i64 0, [[N:%.*]]
-; CHECK-NEXT:    br i1 [[CMP_GUARD]], label [[FOR_FIRST_PREHEADER:%.*]], label [[FOR_END:%.*]]
-; CHECK:       for.first.preheader:
-; CHECK-NEXT:    br label [[FOR_FIRST:%.*]]
-; CHECK:       for.first:
-; CHECK-NEXT:    [[I_04:%.*]] = phi i64 [ [[INC:%.*]], [[FOR_FIRST]] ], [ 0, [[FOR_FIRST_PREHEADER]] ]
-; CHECK-NEXT:    [[J_02:%.*]] = phi i64 [ [[INC6:%.*]], [[FOR_FIRST]] ], [ 0, [[FOR_FIRST_PREHEADER]] ]
-; CHECK-NEXT:    [[ARRAYIDX:%.*]] = getelementptr inbounds i32, i32* [[A:%.*]], i64 [[I_04]]
-; CHECK-NEXT:    store i32 0, i32* [[ARRAYIDX]], align 4
-; CHECK-NEXT:    [[INC]] = add nsw i64 [[I_04]], 1
-; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i64 [[INC]], [[N]]
-; CHECK-NEXT:    [[ARRAYIDX4:%.*]] = getelementptr inbounds i32, i32* [[B:%.*]], i64 [[J_02]]
-; CHECK-NEXT:    store i32 0, i32* [[ARRAYIDX4]], align 4
-; CHECK-NEXT:    [[INC6]] = add nsw i64 [[J_02]], 1
-; CHECK-NEXT:    [[CMP_J:%.*]] = icmp slt i64 [[INC6]], [[N]]
-; CHECK-NEXT:    br i1 [[CMP_J]], label [[FOR_FIRST]], label [[FOR_SECOND_EXIT:%.*]]
-; CHECK:       for.second.exit:
-; CHECK-NEXT:    [[ADD:%.*]] = add nsw i32 [[X:%.*]], 1
-; CHECK-NEXT:    br label [[FOR_END]]
-; CHECK:       for.end:
-; CHECK-NEXT:    ret void
-;
 for.first.guard:
   %cmp.guard = icmp slt i64 0, %N
   br i1 %cmp.guard, label %for.first.preheader, label %for.second.guard
@@ -268,30 +193,6 @@ for.end:
 ; CHECK-LABEL: for.end:
 ; CHECK-NEXT:   ret void
 define void @moveinsts_guardblock(i32* noalias %A, i32* noalias %B, i64 %N, i32 %x) {
-; CHECK-LABEL: @moveinsts_guardblock(
-; CHECK-NEXT:  for.first.guard:
-; CHECK-NEXT:    [[CMP_GUARD:%.*]] = icmp slt i64 0, [[N:%.*]]
-; CHECK-NEXT:    [[ADD:%.*]] = add nsw i32 [[X:%.*]], 1
-; CHECK-NEXT:    br i1 [[CMP_GUARD]], label [[FOR_FIRST_PREHEADER:%.*]], label [[FOR_END:%.*]]
-; CHECK:       for.first.preheader:
-; CHECK-NEXT:    br label [[FOR_FIRST:%.*]]
-; CHECK:       for.first:
-; CHECK-NEXT:    [[I_04:%.*]] = phi i64 [ [[INC:%.*]], [[FOR_FIRST]] ], [ 0, [[FOR_FIRST_PREHEADER]] ]
-; CHECK-NEXT:    [[J_02:%.*]] = phi i64 [ [[INC6:%.*]], [[FOR_FIRST]] ], [ 0, [[FOR_FIRST_PREHEADER]] ]
-; CHECK-NEXT:    [[ARRAYIDX:%.*]] = getelementptr inbounds i32, i32* [[A:%.*]], i64 [[I_04]]
-; CHECK-NEXT:    store i32 0, i32* [[ARRAYIDX]], align 4
-; CHECK-NEXT:    [[INC]] = add nsw i64 [[I_04]], 1
-; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i64 [[INC]], [[N]]
-; CHECK-NEXT:    [[ARRAYIDX4:%.*]] = getelementptr inbounds i32, i32* [[B:%.*]], i64 [[J_02]]
-; CHECK-NEXT:    store i32 0, i32* [[ARRAYIDX4]], align 4
-; CHECK-NEXT:    [[INC6]] = add nsw i64 [[J_02]], 1
-; CHECK-NEXT:    [[CMP_J:%.*]] = icmp slt i64 [[INC6]], [[N]]
-; CHECK-NEXT:    br i1 [[CMP_J]], label [[FOR_FIRST]], label [[FOR_SECOND_EXIT:%.*]]
-; CHECK:       for.second.exit:
-; CHECK-NEXT:    br label [[FOR_END]]
-; CHECK:       for.end:
-; CHECK-NEXT:    ret void
-;
 for.first.guard:
   %cmp.guard = icmp slt i64 0, %N
   br i1 %cmp.guard, label %for.first.preheader, label %for.second.guard
@@ -351,30 +252,6 @@ for.end:
 ; CHECK-NEXT:   ret i64 %j.lcssa
 
 define i64 @updatephi_guardnonloopblock(i32* noalias %A, i32* noalias %B, i64 %N, i32 %x) {
-; CHECK-LABEL: @updatephi_guardnonloopblock(
-; CHECK-NEXT:  for.first.guard:
-; CHECK-NEXT:    [[CMP_GUARD:%.*]] = icmp slt i64 0, [[N:%.*]]
-; CHECK-NEXT:    br i1 [[CMP_GUARD]], label [[FOR_FIRST_PREHEADER:%.*]], label [[FOR_END:%.*]]
-; CHECK:       for.first.preheader:
-; CHECK-NEXT:    br label [[FOR_FIRST:%.*]]
-; CHECK:       for.first:
-; CHECK-NEXT:    [[I_04:%.*]] = phi i64 [ [[INC:%.*]], [[FOR_FIRST]] ], [ 0, [[FOR_FIRST_PREHEADER]] ]
-; CHECK-NEXT:    [[J_02:%.*]] = phi i64 [ [[INC6:%.*]], [[FOR_FIRST]] ], [ 0, [[FOR_FIRST_PREHEADER]] ]
-; CHECK-NEXT:    [[ARRAYIDX:%.*]] = getelementptr inbounds i32, i32* [[A:%.*]], i64 [[I_04]]
-; CHECK-NEXT:    store i32 0, i32* [[ARRAYIDX]], align 4
-; CHECK-NEXT:    [[INC]] = add nsw i64 [[I_04]], 1
-; CHECK-NEXT:    [[CMP:%.*]] = icmp slt i64 [[INC]], [[N]]
-; CHECK-NEXT:    [[ARRAYIDX4:%.*]] = getelementptr inbounds i32, i32* [[B:%.*]], i64 [[J_02]]
-; CHECK-NEXT:    store i32 0, i32* [[ARRAYIDX4]], align 4
-; CHECK-NEXT:    [[INC6]] = add nsw i64 [[J_02]], 1
-; CHECK-NEXT:    [[CMP_J:%.*]] = icmp slt i64 [[INC6]], [[N]]
-; CHECK-NEXT:    br i1 [[CMP_J]], label [[FOR_FIRST]], label [[FOR_SECOND_EXIT:%.*]]
-; CHECK:       for.second.exit:
-; CHECK-NEXT:    br label [[FOR_END]]
-; CHECK:       for.end:
-; CHECK-NEXT:    [[J_LCSSA:%.*]] = phi i64 [ 0, [[FOR_FIRST_GUARD:%.*]] ], [ [[J_02]], [[FOR_SECOND_EXIT]] ]
-; CHECK-NEXT:    ret i64 [[J_LCSSA]]
-;
 for.first.guard:
   %cmp.guard = icmp slt i64 0, %N
   br i1 %cmp.guard, label %for.first.preheader, label %for.second.guard


        


More information about the llvm-commits mailing list