[llvm] e446d1d - CodeGenPrepare: Don't use anonymous values some in tests
Matt Arsenault via llvm-commits
llvm-commits at lists.llvm.org
Sun Nov 27 07:31:21 PST 2022
Author: Matt Arsenault
Date: 2022-11-27T10:30:37-05:00
New Revision: e446d1d93f12e16e54a046bd005f0f75a2342bc1
URL: https://github.com/llvm/llvm-project/commit/e446d1d93f12e16e54a046bd005f0f75a2342bc1
DIFF: https://github.com/llvm/llvm-project/commit/e446d1d93f12e16e54a046bd005f0f75a2342bc1.diff
LOG: CodeGenPrepare: Don't use anonymous values some in tests
These are always an obstacle to test updates, and often break after
running opaquify scripts on them.
Added:
Modified:
llvm/test/Transforms/CodeGenPrepare/AArch64/combine-address-mode.ll
llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll
Removed:
################################################################################
diff --git a/llvm/test/Transforms/CodeGenPrepare/AArch64/combine-address-mode.ll b/llvm/test/Transforms/CodeGenPrepare/AArch64/combine-address-mode.ll
index c3e9c0d2a2e6a..cc47653c972a7 100644
--- a/llvm/test/Transforms/CodeGenPrepare/AArch64/combine-address-mode.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/AArch64/combine-address-mode.ll
@@ -5,74 +5,76 @@
define dso_local i32 @f(i1 %a, i8 %b) local_unnamed_addr {
; CHECK-LABEL: @f(
-; CHECK-NEXT: br label [[TMP6:%.*]]
-; CHECK: 1:
-; CHECK-NEXT: br i1 [[A:%.*]], label [[TMP2:%.*]], label [[TMP6]]
-; CHECK: 2:
-; CHECK-NEXT: [[TMP3:%.*]] = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), [[TMP1:%.*]] ], [ [[TMP16:%.*]], [[TMP14:%.*]] ]
-; CHECK-NEXT: [[TMP4:%.*]] = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), [[TMP1]] ], [ [[TMP15:%.*]], [[TMP14]] ]
+; CHECK-NEXT: bb:
+; CHECK-NEXT: br label [[BB10:%.*]]
+; CHECK: bb1:
+; CHECK-NEXT: br i1 [[A:%.*]], label [[BB2:%.*]], label [[BB10]]
+; CHECK: bb2:
+; CHECK-NEXT: [[I:%.*]] = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), [[BB1:%.*]] ], [ [[I20:%.*]], [[BB18:%.*]] ]
+; CHECK-NEXT: [[I3:%.*]] = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), [[BB1]] ], [ [[I19:%.*]], [[BB18]] ]
; CHECK-NEXT: ret i32 0
-; CHECK: 5:
-; CHECK-NEXT: br label [[TMP6]]
-; CHECK: 6:
-; CHECK-NEXT: [[TMP7:%.*]] = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 0), [[TMP0:%.*]] ], [ [[TMP3]], [[TMP5:%.*]] ], [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), [[TMP1]] ]
-; CHECK-NEXT: [[TMP8:%.*]] = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 0), [[TMP0]] ], [ [[TMP4]], [[TMP5]] ], [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), [[TMP1]] ]
-; CHECK-NEXT: br label [[TMP9:%.*]]
-; CHECK: 9:
-; CHECK-NEXT: [[TMP10:%.*]] = phi i32* [ [[TMP16]], [[TMP14]] ], [ [[TMP7]], [[TMP6]] ]
-; CHECK-NEXT: [[TMP11:%.*]] = phi i32* [ [[TMP16]], [[TMP14]] ], [ [[TMP8]], [[TMP6]] ]
-; CHECK-NEXT: [[TMP12:%.*]] = phi i32* [ [[TMP15]], [[TMP14]] ], [ [[TMP8]], [[TMP6]] ]
-; CHECK-NEXT: br i1 [[A]], label [[TMP14]], label [[TMP13:%.*]]
-; CHECK: 13:
-; CHECK-NEXT: store i32 5, i32* [[TMP11]], align 4
-; CHECK-NEXT: br label [[TMP14]]
-; CHECK: 14:
-; CHECK-NEXT: [[TMP15]] = phi i32* [ [[TMP12]], [[TMP13]] ], [ [[TMP10]], [[TMP9]] ]
-; CHECK-NEXT: [[TMP16]] = phi i32* [ [[TMP11]], [[TMP13]] ], [ [[TMP10]], [[TMP9]] ]
-; CHECK-NEXT: br i1 [[A]], label [[TMP2]], label [[TMP9]]
+; CHECK: bb4:
+; CHECK-NEXT: br label [[BB10]]
+; CHECK: bb10:
+; CHECK-NEXT: [[I11:%.*]] = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 0), [[BB:%.*]] ], [ [[I]], [[BB4:%.*]] ], [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), [[BB1]] ]
+; CHECK-NEXT: [[I12:%.*]] = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 0), [[BB]] ], [ [[I3]], [[BB4]] ], [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), [[BB1]] ]
+; CHECK-NEXT: br label [[BB13:%.*]]
+; CHECK: bb13:
+; CHECK-NEXT: [[I14:%.*]] = phi i32* [ [[I20]], [[BB18]] ], [ [[I11]], [[BB10]] ]
+; CHECK-NEXT: [[I15:%.*]] = phi i32* [ [[I20]], [[BB18]] ], [ [[I12]], [[BB10]] ]
+; CHECK-NEXT: [[I16:%.*]] = phi i32* [ [[I19]], [[BB18]] ], [ [[I12]], [[BB10]] ]
+; CHECK-NEXT: br i1 [[A]], label [[BB18]], label [[BB17:%.*]]
+; CHECK: bb17:
+; CHECK-NEXT: store i32 5, i32* [[I15]], align 4
+; CHECK-NEXT: br label [[BB18]]
+; CHECK: bb18:
+; CHECK-NEXT: [[I19]] = phi i32* [ [[I16]], [[BB17]] ], [ [[I14]], [[BB13]] ]
+; CHECK-NEXT: [[I20]] = phi i32* [ [[I15]], [[BB17]] ], [ [[I14]], [[BB13]] ]
+; CHECK-NEXT: br i1 [[A]], label [[BB2]], label [[BB13]]
;
- br label %11
+bb:
+ br label %bb10
-1: ; No predecessors!
- br i1 %a, label %2, label %10
+bb1: ; No predecessors!
+ br i1 %a, label %bb2, label %bb9
-2: ; preds = %22, %1
- %3 = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), %1 ], [ %21, %22 ]
- %4 = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), %1 ], [ %20, %22 ]
+bb2: ; preds = %bb21, %bb1
+ %i = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), %bb1 ], [ %i20, %bb21 ]
+ %i3 = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), %bb1 ], [ %i19, %bb21 ]
ret i32 0
-5: ; No predecessors!
- %6 = icmp ugt i8 %b, 50
- br label %7
+bb4: ; No predecessors!
+ %i5 = icmp ugt i8 %b, 50
+ br label %bb6
-7: ; preds = %10, %5
- %8 = phi i32* [ %3, %5 ], [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), %10 ]
- %9 = phi i32* [ %4, %5 ], [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), %10 ]
- br label %11
+bb6: ; preds = %bb9, %bb4
+ %i7 = phi i32* [ %i, %bb4 ], [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), %bb9 ]
+ %i8 = phi i32* [ %i3, %bb4 ], [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 1), %bb9 ]
+ br label %bb10
-10: ; preds = %1
- br label %7
+bb9: ; preds = %bb1
+ br label %bb6
-11: ; preds = %7, %0
- %12 = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 0), %0 ], [ %8, %7 ]
- %13 = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 0), %0 ], [ %9, %7 ]
- br label %14
+bb10: ; preds = %bb6, %bb
+ %i11 = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 0), %bb ], [ %i7, %bb6 ]
+ %i12 = phi i32* [ getelementptr inbounds (<{ i32, i32 }>, <{ i32, i32 }>* @_MergedGlobals, i32 0, i32 0), %bb ], [ %i8, %bb6 ]
+ br label %bb13
-14: ; preds = %19, %11
- %15 = phi i32* [ %21, %19 ], [ %12, %11 ]
- %16 = phi i32* [ %21, %19 ], [ %13, %11 ]
- %17 = phi i32* [ %20, %19 ], [ %13, %11 ]
- br i1 %a, label %19, label %18
+bb13: ; preds = %bb18, %bb10
+ %i14 = phi i32* [ %i20, %bb18 ], [ %i11, %bb10 ]
+ %i15 = phi i32* [ %i20, %bb18 ], [ %i12, %bb10 ]
+ %i16 = phi i32* [ %i19, %bb18 ], [ %i12, %bb10 ]
+ br i1 %a, label %bb18, label %bb17
-18: ; preds = %14
- store i32 5, i32* %16, align 4
- br label %19
+bb17: ; preds = %bb13
+ store i32 5, i32* %i15, align 4
+ br label %bb18
-19: ; preds = %18, %14
- %20 = phi i32* [ %17, %18 ], [ %15, %14 ]
- %21 = phi i32* [ %16, %18 ], [ %15, %14 ]
- br i1 %a, label %22, label %14
+bb18: ; preds = %bb17, %bb13
+ %i19 = phi i32* [ %i16, %bb17 ], [ %i14, %bb13 ]
+ %i20 = phi i32* [ %i15, %bb17 ], [ %i14, %bb13 ]
+ br i1 %a, label %bb21, label %bb13
-22: ; preds = %19
- br label %2
+bb21: ; preds = %bb18
+ br label %bb2
}
diff --git a/llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll b/llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll
index 8ef74e8e594e6..f8bbe50e12ed0 100644
--- a/llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll
+++ b/llvm/test/Transforms/CodeGenPrepare/AArch64/large-offset-gep.ll
@@ -258,40 +258,40 @@ while_end:
declare i8* @llvm.strip.invariant.group.p0i8(i8*)
-define void @test_invariant_group(i32) {
+define void @test_invariant_group(i32 %arg) {
; CHECK-LABEL: test_invariant_group:
-; CHECK: // %bb.0:
+; CHECK: // %bb.0: // %bb
; CHECK-NEXT: cbz wzr, .LBB5_2
-; CHECK-NEXT: // %bb.1:
+; CHECK-NEXT: // %bb.1: // %bb6
; CHECK-NEXT: cbz w0, .LBB5_3
-; CHECK-NEXT: .LBB5_2:
+; CHECK-NEXT: .LBB5_2: // %bb5
; CHECK-NEXT: ret
-; CHECK-NEXT: .LBB5_3:
+; CHECK-NEXT: .LBB5_3: // %bb2
; CHECK-NEXT: cbnz wzr, .LBB5_2
-; CHECK-NEXT: // %bb.4:
+; CHECK-NEXT: // %bb.4: // %bb4
; CHECK-NEXT: mov w8, #1
; CHECK-NEXT: str x8, [x8]
; CHECK-NEXT: ret
- br i1 undef, label %8, label %7
+bb:
+ br i1 undef, label %bb6, label %bb5
-; <label>:2: ; preds = %8, %2
- br i1 undef, label %2, label %7
+bb1: ; preds = %bb6, %bb1
+ br i1 undef, label %bb1, label %bb5
-; <label>:3: ; preds = %8
- %4 = getelementptr inbounds i8, i8* %9, i32 40000
- %5 = bitcast i8* %4 to i64*
- br i1 undef, label %7, label %6
+bb2: ; preds = %bb6
+ %i = getelementptr inbounds i8, i8* %i7, i32 40000
+ %i3 = bitcast i8* %i to i64*
+ br i1 undef, label %bb5, label %bb4
-; <label>:6: ; preds = %3
- store i64 1, i64* %5, align 8
- br label %7
+bb4: ; preds = %bb2
+ store i64 1, i64* %i3, align 8
+ br label %bb5
-; <label>:7: ; preds = %6, %3, %2, %1
+bb5: ; preds = %bb4, %bb2, %bb1, %bb
ret void
-; <label>:8: ; preds = %1
- %9 = call i8* @llvm.strip.invariant.group.p0i8(i8* nonnull undef)
- %10 = icmp eq i32 %0, 0
- br i1 %10, label %3, label %2
+bb6: ; preds = %bb
+ %i7 = call i8* @llvm.strip.invariant.group.p0i8(i8* nonnull undef)
+ %i8 = icmp eq i32 %arg, 0
+ br i1 %i8, label %bb2, label %bb1
}
-
More information about the llvm-commits
mailing list