Author: Jamie Schmeiser Date: 2022-09-09T13:45:14-04:00 New Revision: 5e3ac7969039678fc017a5599b051ea2b78075a4
URL: https://github.com/llvm/llvm-project/commit/5e3ac7969039678fc017a5599b051ea2b78075a4 DIFF: https://github.com/llvm/llvm-project/commit/5e3ac7969039678fc017a5599b051ea2b78075a4.diff LOG: Loop names used in reporting can grow very large Summary: The code for generating a name for loops for various reporting scenarios created a name by serializing the loop into a string. This may result in a very large name for a loop containing many blocks. Use the getName() function on the loop instead. Author: Jamie Schmeiser <schme...@ca.ibm.com> Reviewed By: Whitney (Whitney Tsang), aeubanks (Arthur Eubanks) Differential Revision: https://reviews.llvm.org/D133587 Added: Modified: clang/test/CodeGen/thinlto-distributed-newpm.ll llvm/lib/Passes/StandardInstrumentations.cpp llvm/test/Other/loop-pass-ordering.ll llvm/test/Other/loop-pass-printer.ll llvm/test/Other/loopnest-pass-ordering.ll llvm/test/Other/new-pm-lto-defaults.ll llvm/test/Other/new-pm-thinlto-defaults.ll llvm/test/Other/pass-pipeline-parsing.ll llvm/test/Other/print-before-after.ll llvm/test/Transforms/LoopPredication/invalidate-analyses.ll llvm/test/Transforms/LoopPredication/preserve-bpi.ll llvm/test/Transforms/LoopRotate/pr35210.ll llvm/test/Transforms/LoopUnroll/revisit.ll llvm/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-markloopasdeleted.ll Removed: ################################################################################ diff --git a/clang/test/CodeGen/thinlto-distributed-newpm.ll b/clang/test/CodeGen/thinlto-distributed-newpm.ll index 463fc522c6a28..3dbc55e23e28d 100644 --- a/clang/test/CodeGen/thinlto-distributed-newpm.ll +++ b/clang/test/CodeGen/thinlto-distributed-newpm.ll @@ -83,7 +83,7 @@ ; CHECK-O: Running pass: LowerConstantIntrinsicsPass on main ; CHECK-O: Running pass: LoopSimplifyPass on main ; CHECK-O: Running pass: LCSSAPass on main -; CHECK-O: Running pass: LoopRotatePass on Loop at depth 1 containing: %b +; CHECK-O: Running pass: LoopRotatePass on b ; CHECK-O: Running pass: LoopDistributePass on main ; CHECK-O: Running pass: InjectTLIMappings on main ; CHECK-O: Running pass: LoopVectorizePass on main @@ -99,7 +99,7 @@ ; CHECK-O: Running pass: RequireAnalysisPass<{{.*}}OptimizationRemarkEmitterAnalysis ; CHECK-O: Running pass: LoopSimplifyPass on main ; CHECK-O: Running pass: LCSSAPass on main -; CHECK-O: Running pass: LICMPass on Loop at depth 1 containing: %b +; CHECK-O: Running pass: LICMPass on b ; CHECK-O: Running pass: AlignmentFromAssumptionsPass on main ; CHECK-O: Running pass: LoopSinkPass on main ; CHECK-O: Running pass: InstSimplifyPass on main diff --git a/llvm/lib/Passes/StandardInstrumentations.cpp b/llvm/lib/Passes/StandardInstrumentations.cpp index 861e76b38f66b..1ac557d975cec 100644 --- a/llvm/lib/Passes/StandardInstrumentations.cpp +++ b/llvm/lib/Passes/StandardInstrumentations.cpp @@ -188,10 +188,7 @@ std::string getIRName(Any IR) { if (any_isa<const Loop *>(IR)) { const Loop *L = any_cast<const Loop *>(IR); - std::string S; - raw_string_ostream OS(S); - L->print(OS, /*Verbose*/ false, /*PrintNested*/ false); - return OS.str(); + return L->getName().str(); } llvm_unreachable("Unknown wrapped IR type"); diff --git a/llvm/test/Other/loop-pass-ordering.ll b/llvm/test/Other/loop-pass-ordering.ll index ab3839f5cc997..fde49a7b73a5f 100644 --- a/llvm/test/Other/loop-pass-ordering.ll +++ b/llvm/test/Other/loop-pass-ordering.ll @@ -8,11 +8,11 @@ ; / \ \ ; loop.0.0 loop.0.1 loop.1.0 ; -; CHECK: Running pass: NoOpLoopPass on Loop at depth 2 containing: %loop.0.0 -; CHECK: Running pass: NoOpLoopPass on Loop at depth 2 containing: %loop.0.1 -; CHECK: Running pass: NoOpLoopPass on Loop at depth 1 containing: %loop.0 -; CHECK: Running pass: NoOpLoopPass on Loop at depth 2 containing: %loop.1.0 -; CHECK: Running pass: NoOpLoopPass on Loop at depth 1 containing: %loop.1 +; CHECK: Running pass: NoOpLoopPass on loop.0.0 +; CHECK: Running pass: NoOpLoopPass on loop.0.1 +; CHECK: Running pass: NoOpLoopPass on loop.0 +; CHECK: Running pass: NoOpLoopPass on loop.1.0 +; CHECK: Running pass: NoOpLoopPass on loop.1 define void @f() { entry: diff --git a/llvm/test/Other/loop-pass-printer.ll b/llvm/test/Other/loop-pass-printer.ll index 98ad72b142bca..60bfdbbaea9ef 100644 --- a/llvm/test/Other/loop-pass-printer.ll +++ b/llvm/test/Other/loop-pass-printer.ll @@ -35,7 +35,7 @@ ; BAR: ; Exit blocks ; BAR: end: -; FOO-MODULE: IR Dump After {{Unroll|LoopFullUnrollPass}} {{.*}}%loop +; FOO-MODULE: IR Dump After {{Unroll|LoopFullUnrollPass}} {{.*}}loop ; FOO-MODULE-NEXT: ModuleID = ; FOO-MODULE: define void @foo ; FOO-MODULE: define void @bar diff --git a/llvm/test/Other/loopnest-pass-ordering.ll b/llvm/test/Other/loopnest-pass-ordering.ll index 4f176a8094c61..963653280d10c 100644 --- a/llvm/test/Other/loopnest-pass-ordering.ll +++ b/llvm/test/Other/loopnest-pass-ordering.ll @@ -8,9 +8,9 @@ ; / \ \ ; loop.0.0 loop.0.1 loop.1.0 ; -; CHECK: Running pass: NoOpLoopNestPass on Loop at depth 1 containing: %loop.0<header><exiting>,%loop.0.0,%loop.0.1,%loop.0.1.preheader,%loop.0.loopexit<latch>,%loop.0.0.preheader -; CHECK: Running pass: NoOpLoopNestPass on Loop at depth 1 containing: %loop.1<header>,%loop.1.bb1,%loop.1.bb2<exiting>,%loop.1.0,%loop.1.0.preheader,%loop.1.loopexit,%loop.1.backedge<latch> -; CHECK-NOT: Running pass: NoOpLoopNestPass on Loop at depth 2 +; CHECK: Running pass: NoOpLoopNestPass on loop.0 +; CHECK: Running pass: NoOpLoopNestPass on loop.1 +; CHECK-NOT: Running pass: NoOpLoopNestPass on {{loop\..*\..*}} define void @f() { entry: diff --git a/llvm/test/Other/new-pm-lto-defaults.ll b/llvm/test/Other/new-pm-lto-defaults.ll index da66e71a5bf8d..2007114c8b3ec 100644 --- a/llvm/test/Other/new-pm-lto-defaults.ll +++ b/llvm/test/Other/new-pm-lto-defaults.ll @@ -106,7 +106,7 @@ ; CHECK-O23SZ-NEXT: Running analysis: AAManager on foo ; CHECK-O23SZ-NEXT: Running analysis: ScalarEvolutionAnalysis on foo ; CHECK-O23SZ-NEXT: Running analysis: InnerAnalysisManagerProxy -; CHECK-O23SZ-NEXT: Running pass: LICMPass on Loop +; CHECK-O23SZ-NEXT: Running pass: LICMPass on loop ; CHECK-O23SZ-NEXT: Running pass: GVNPass on foo ; CHECK-O23SZ-NEXT: Running analysis: MemoryDependenceAnalysis on foo ; CHECK-O23SZ-NEXT: Running analysis: PhiValuesAnalysis on foo @@ -116,9 +116,9 @@ ; CHECK-O23SZ-NEXT: Running pass: MergedLoadStoreMotionPass on foo ; CHECK-O23SZ-NEXT: Running pass: LoopSimplifyPass on foo ; CHECK-O23SZ-NEXT: Running pass: LCSSAPass on foo -; CHECK-O23SZ-NEXT: Running pass: IndVarSimplifyPass on Loop -; CHECK-O23SZ-NEXT: Running pass: LoopDeletionPass on Loop -; CHECK-O23SZ-NEXT: Running pass: LoopFullUnrollPass on Loop +; CHECK-O23SZ-NEXT: Running pass: IndVarSimplifyPass on loop +; CHECK-O23SZ-NEXT: Running pass: LoopDeletionPass on loop +; CHECK-O23SZ-NEXT: Running pass: LoopFullUnrollPass on loop ; CHECK-O23SZ-NEXT: Running pass: LoopDistributePass on foo ; CHECK-O23SZ-NEXT: Running pass: LoopVectorizePass on foo ; CHECK-O23SZ-NEXT: Running analysis: BlockFrequencyAnalysis on foo diff --git a/llvm/test/Other/new-pm-thinlto-defaults.ll b/llvm/test/Other/new-pm-thinlto-defaults.ll index b7557baa296b2..b251102aeefb7 100644 --- a/llvm/test/Other/new-pm-thinlto-defaults.ll +++ b/llvm/test/Other/new-pm-thinlto-defaults.ll @@ -191,7 +191,7 @@ ; CHECK-O23SZ-NEXT: Running pass: DSEPass ; CHECK-O23SZ-NEXT: Running pass: LoopSimplifyPass ; CHECK-O23SZ-NEXT: Running pass: LCSSAPass -; CHECK-O23SZ-NEXT: Running pass: LICMPass on Loop at depth 1 containing: %loop +; CHECK-O23SZ-NEXT: Running pass: LICMPass on loop ; CHECK-O23SZ-NEXT: Running pass: CoroElidePass ; CHECK-O-NEXT: Running pass: SimplifyCFGPass ; CHECK-O-NEXT: Running pass: InstCombinePass diff --git a/llvm/test/Other/pass-pipeline-parsing.ll b/llvm/test/Other/pass-pipeline-parsing.ll index 668b06de862c5..e84afe9ee7975 100644 --- a/llvm/test/Other/pass-pipeline-parsing.ll +++ b/llvm/test/Other/pass-pipeline-parsing.ll @@ -149,7 +149,7 @@ ; CHECK-ADAPTORS: Running pass: NoOpFunctionPass ; CHECK-ADAPTORS: Running pass: ModuleToFunctionPassAdaptor ; CHECK-ADAPTORS: Running pass: FunctionToLoopPassAdaptor -; CHECK-ADAPTORS: Running pass: NoOpLoopPass on Loop at depth 1 containing: %loop +; CHECK-ADAPTORS: Running pass: NoOpLoopPass on loop ; CHECK-ADAPTORS: Running pass: ModuleToPostOrderCGSCCPassAdaptor ; CHECK-ADAPTORS: Running pass: NoOpCGSCCPass ; CHECK-ADAPTORS: Running pass: ModuleToPostOrderCGSCCPassAdaptor @@ -158,11 +158,11 @@ ; CHECK-ADAPTORS: Running pass: NoOpFunctionPass ; CHECK-ADAPTORS: Running pass: CGSCCToFunctionPassAdaptor ; CHECK-ADAPTORS: Running pass: FunctionToLoopPassAdaptor -; CHECK-ADAPTORS: Running pass: NoOpLoopPass on Loop at depth 1 containing: %loop +; CHECK-ADAPTORS: Running pass: NoOpLoopPass on loop ; CHECK-ADAPTORS: Running pass: ModuleToFunctionPassAdaptor ; CHECK-ADAPTORS: Running pass: PassManager{{.*}}Function ; CHECK-ADAPTORS: Running pass: FunctionToLoopPassAdaptor -; CHECK-ADAPTORS: Running pass: NoOpLoopPass on Loop at depth 1 containing: %loop +; CHECK-ADAPTORS: Running pass: NoOpLoopPass on loop ; RUN: opt -disable-output -debug-pass-manager \ ; RUN: -passes='module(function(no-op-function,loop(no-op-loop,no-op-loop)))' %s 2>&1 \ diff --git a/llvm/test/Other/print-before-after.ll b/llvm/test/Other/print-before-after.ll index 583c5767f7e2c..5d1e8827ad0ce 100644 --- a/llvm/test/Other/print-before-after.ll +++ b/llvm/test/Other/print-before-after.ll @@ -33,12 +33,12 @@ ; CHECK-LV: *** IR Dump After LoopVectorizePass on bar *** ; Verify that we can handle loop passes with params. -; CHECK-UNSWITCH: *** IR Dump Before SimpleLoopUnswitchPass on Loop at depth 1 containing -; CHECK-UNSWITCH: *** IR Dump After SimpleLoopUnswitchPass on Loop at depth 1 containing -; CHECK-UNSWITCH: *** IR Dump Before SimpleLoopUnswitchPass on Loop at depth 1 containing -; CHECK-UNSWITCH: *** IR Dump After SimpleLoopUnswitchPass on Loop at depth 1 containing -; CHECK-UNSWITCH: *** IR Dump Before SimpleLoopUnswitchPass on Loop at depth 1 containing -; CHECK-UNSWITCH: *** IR Dump After SimpleLoopUnswitchPass on Loop at depth 1 containing +; CHECK-UNSWITCH: *** IR Dump Before SimpleLoopUnswitchPass on loop +; CHECK-UNSWITCH: *** IR Dump After SimpleLoopUnswitchPass on loop +; CHECK-UNSWITCH: *** IR Dump Before SimpleLoopUnswitchPass on loop +; CHECK-UNSWITCH: *** IR Dump After SimpleLoopUnswitchPass on loop +; CHECK-UNSWITCH: *** IR Dump Before SimpleLoopUnswitchPass on loop +; CHECK-UNSWITCH: *** IR Dump After SimpleLoopUnswitchPass on loop define void @foo() { ret void diff --git a/llvm/test/Transforms/LoopPredication/invalidate-analyses.ll b/llvm/test/Transforms/LoopPredication/invalidate-analyses.ll index c43188adebc7c..7afacd564939b 100644 --- a/llvm/test/Transforms/LoopPredication/invalidate-analyses.ll +++ b/llvm/test/Transforms/LoopPredication/invalidate-analyses.ll @@ -5,10 +5,10 @@ ; please update this test some other analysis that isn't preserved. ; CHECK: Running analysis: LazyValueAnalysis on drop_a_wc_and_leave_early -; CHECK: Running pass: LoopPredicationPass on Loop at depth 1 containing: %loop<header><exiting>,%guarded<exiting>,%guarded2<latch><exiting> +; CHECK: Running pass: LoopPredicationPass on loop ; CHECK: Invalidating analysis: LazyValueAnalysis on drop_a_wc_and_leave_early ; CHECK: Running analysis: LazyValueAnalysis on drop_a_wc_and_leave -; CHECK: Running pass: LoopPredicationPass on Loop at depth 1 containing: %loop<header><exiting>,%guarded<exiting>,%guarded2<latch><exiting> +; CHECK: Running pass: LoopPredicationPass on loop ; CHECK: Invalidating analysis: LazyValueAnalysis on drop_a_wc_and_leave diff --git a/llvm/test/Transforms/LoopPredication/preserve-bpi.ll b/llvm/test/Transforms/LoopPredication/preserve-bpi.ll index e41ffeaffec5c..f87184cfdbdb4 100644 --- a/llvm/test/Transforms/LoopPredication/preserve-bpi.ll +++ b/llvm/test/Transforms/LoopPredication/preserve-bpi.ll @@ -7,15 +7,14 @@ ; LoopStandardAnalysisResults). declare void @llvm.experimental.guard(i1, ...) -; CHECK: Running pass: LoopPredicationPass on Loop at depth 1 -; CHECK-NEXT: Running pass: LICMPass on Loop at depth 1 -; CHECK-NEXT: Running pass: SimpleLoopUnswitchPass on Loop at depth 1 +; CHECK: Running pass: LoopPredicationPass on loop +; CHECK-NEXT: Running pass: LICMPass on loop +; CHECK-NEXT: Running pass: SimpleLoopUnswitchPass on loop ; CHECK-NEXT: Running analysis: OuterAnalysisManagerProxy -; CHECK-NEXT: Running pass: LoopPredicationPass on Loop at depth 1 -; CHECK-NEXT: Running pass: LICMPass on Loop at depth 1 -; CHECK-NEXT: Running pass: SimpleLoopUnswitchPass on Loop at depth 1 -; CHECK-NEXT: Running pass: LoopSimplifyCFGPass on Loop at depth 1 - +; CHECK-NEXT: Running pass: LoopPredicationPass on loop +; CHECK-NEXT: Running pass: LICMPass on loop +; CHECK-NEXT: Running pass: SimpleLoopUnswitchPass on loop +; CHECK-NEXT: Running pass: LoopSimplifyCFGPass on loop define i32 @unsigned_loop_0_to_n_ult_check(i32* %array, i32 %length, i32 %n) { entry: diff --git a/llvm/test/Transforms/LoopRotate/pr35210.ll b/llvm/test/Transforms/LoopRotate/pr35210.ll index 739ae73ded61a..836db38f2c47d 100644 --- a/llvm/test/Transforms/LoopRotate/pr35210.ll +++ b/llvm/test/Transforms/LoopRotate/pr35210.ll @@ -17,7 +17,7 @@ ; CHECK-NEXT: Running analysis: TargetLibraryAnalysis on f ; CHECK-NEXT: Running analysis: ScalarEvolutionAnalysis on f ; CHECK-NEXT: Running analysis: InnerAnalysisManagerProxy{{.*}} on f -; CHECK-NEXT: Running pass: LoopRotatePass on Loop at depth 1 containing: %bb<header><exiting>,%bb4<latch> +; CHECK-NEXT: Running pass: LoopRotatePass on bb ; CHECK-NEXT: Folding loop latch bb4 into bb ; CHECK-NEXT: Invalidating analysis: PostDominatorTreeAnalysis on f ; CHECK-NEXT: Running pass: ADCEPass on f @@ -36,7 +36,7 @@ ; MSSA-NEXT: Running analysis: TargetLibraryAnalysis on f ; MSSA-NEXT: Running analysis: ScalarEvolutionAnalysis on f ; MSSA-NEXT: Running analysis: InnerAnalysisManagerProxy{{.*}} on f -; MSSA-NEXT: Running pass: LoopRotatePass on Loop at depth 1 containing: %bb<header><exiting>,%bb4<latch> +; MSSA-NEXT: Running pass: LoopRotatePass on bb ; MSSA-NEXT: Folding loop latch bb4 into bb ; MSSA-NEXT: Invalidating analysis: PostDominatorTreeAnalysis on f ; MSSA-NEXT: Running pass: ADCEPass on f diff --git a/llvm/test/Transforms/LoopUnroll/revisit.ll b/llvm/test/Transforms/LoopUnroll/revisit.ll index 2cbe68f86983f..2cfc07f1fd890 100644 --- a/llvm/test/Transforms/LoopUnroll/revisit.ll +++ b/llvm/test/Transforms/LoopUnroll/revisit.ll @@ -39,7 +39,7 @@ l0.0.0.ph: l0.0.0: %cond.0.0.0 = load volatile i1, i1* %ptr br i1 %cond.0.0.0, label %l0.0.0, label %l0.0.1.ph -; CHECK: LoopFullUnrollPass on Loop at depth 3 containing: %l0.0.0<header> +; CHECK: LoopFullUnrollPass on l0.0.0 ; CHECK-NOT: LoopFullUnrollPass l0.0.1.ph: @@ -48,29 +48,29 @@ l0.0.1.ph: l0.0.1: %cond.0.0.1 = load volatile i1, i1* %ptr br i1 %cond.0.0.1, label %l0.0.1, label %l0.0.latch -; CHECK: LoopFullUnrollPass on Loop at depth 3 containing: %l0.0.1<header> +; CHECK: LoopFullUnrollPass on l0.0.1 ; CHECK-NOT: LoopFullUnrollPass l0.0.latch: %cmp = icmp slt i32 %iv.next, 2 br i1 %cmp, label %l0.0, label %l0.latch -; CHECK: LoopFullUnrollPass on Loop at depth 2 containing: %l0.0 +; CHECK: LoopFullUnrollPass on l0.0 ; CHECK-NOT: LoopFullUnrollPass ; ; Unrolling occurs, so we visit what were the inner loops twice over. First we ; visit their clones, and then we visit the original loops re-parented. -; CHECK: LoopFullUnrollPass on Loop at depth 2 containing: %l0.0.1.1<header> +; CHECK: LoopFullUnrollPass on l0.0.1.1 ; CHECK-NOT: LoopFullUnrollPass -; CHECK: LoopFullUnrollPass on Loop at depth 2 containing: %l0.0.0.1<header> +; CHECK: LoopFullUnrollPass on l0.0.0.1 ; CHECK-NOT: LoopFullUnrollPass -; CHECK: LoopFullUnrollPass on Loop at depth 2 containing: %l0.0.1<header> +; CHECK: LoopFullUnrollPass on l0.0.1 ; CHECK-NOT: LoopFullUnrollPass -; CHECK: LoopFullUnrollPass on Loop at depth 2 containing: %l0.0.0<header> +; CHECK: LoopFullUnrollPass on l0.0.0 ; CHECK-NOT: LoopFullUnrollPass l0.latch: br label %l0 -; CHECK: LoopFullUnrollPass on Loop at depth 1 containing: %l0<header> +; CHECK: LoopFullUnrollPass on l0 ; CHECK-NOT: LoopFullUnrollPass exit: @@ -105,7 +105,7 @@ l0.0.0.ph: l0.0.0: %cond.0.0.0 = load volatile i1, i1* %ptr br i1 %cond.0.0.0, label %l0.0.0, label %l0.0.1.ph -; CHECK: LoopFullUnrollPass on Loop at depth 3 containing: %l0.0.0<header> +; CHECK: LoopFullUnrollPass on l0.0.0 ; CHECK-NOT: LoopFullUnrollPass l0.0.1.ph: @@ -114,39 +114,39 @@ l0.0.1.ph: l0.0.1: %cond.0.0.1 = load volatile i1, i1* %ptr br i1 %cond.0.0.1, label %l0.0.1, label %l0.0.latch -; CHECK: LoopFullUnrollPass on Loop at depth 3 containing: %l0.0.1<header> +; CHECK: LoopFullUnrollPass on l0.0.1 ; CHECK-NOT: LoopFullUnrollPass l0.0.latch: %cmp = icmp slt i32 %iv.next, %count br i1 %cmp, label %l0.0, label %l0.latch, !llvm.loop !1 -; CHECK: LoopFullUnrollPass on Loop at depth 2 containing: %l0.0 +; CHECK: LoopFullUnrollPass on l0.0 ; CHECK-NOT: LoopFullUnrollPass ; ; Partial unrolling occurs which introduces both new child loops and new sibling ; loops. We only visit the child loops in a special mode, not by default. -; CHECK-CHILDREN: LoopFullUnrollPass on Loop at depth 3 containing: %l0.0.0<header> +; CHECK-CHILDREN: LoopFullUnrollPass on l0.0.0 ; CHECK-CHILDREN-NOT: LoopFullUnrollPass -; CHECK-CHILDREN: LoopFullUnrollPass on Loop at depth 3 containing: %l0.0.1<header> +; CHECK-CHILDREN: LoopFullUnrollPass on l0.0.1 ; CHECK-CHILDREN-NOT: LoopFullUnrollPass -; CHECK-CHILDREN: LoopFullUnrollPass on Loop at depth 3 containing: %l0.0.0.1<header> +; CHECK-CHILDREN: LoopFullUnrollPass on l0.0.0.1 ; CHECK-CHILDREN-NOT: LoopFullUnrollPass -; CHECK-CHILDREN: LoopFullUnrollPass on Loop at depth 3 containing: %l0.0.1.1<header> +; CHECK-CHILDREN: LoopFullUnrollPass on l0.0.1.1 ; CHECK-CHILDREN-NOT: LoopFullUnrollPass ; ; When we revisit children, we also revisit the current loop. -; CHECK-CHILDREN: LoopFullUnrollPass on Loop at depth 2 containing: %l0.0<header> +; CHECK-CHILDREN: LoopFullUnrollPass on l0.0 ; CHECK-CHILDREN-NOT: LoopFullUnrollPass ; ; Revisit the children of the outer loop that are part of the epilogue. ; -; CHECK: LoopFullUnrollPass on Loop at depth 2 containing: %l0.0.1.epil<header> +; CHECK: LoopFullUnrollPass on l0.0.1.epil ; CHECK-NOT: LoopFullUnrollPass -; CHECK: LoopFullUnrollPass on Loop at depth 2 containing: %l0.0.0.epil<header> +; CHECK: LoopFullUnrollPass on l0.0.0.epil ; CHECK-NOT: LoopFullUnrollPass l0.latch: br label %l0 -; CHECK: LoopFullUnrollPass on Loop at depth 1 containing: %l0<header> +; CHECK: LoopFullUnrollPass on l0 ; CHECK-NOT: LoopFullUnrollPass exit: diff --git a/llvm/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll b/llvm/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll index a93aaa6775dff..67d99c894536f 100644 --- a/llvm/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll +++ b/llvm/test/Transforms/LoopUnroll/unroll-loop-invalidation.ll @@ -8,22 +8,22 @@ ; CHECK: Running analysis: LoopAnalysis ; CHECK: Running analysis: InnerAnalysisManagerProxy< ; CHECK: Running pass: RequireAnalysisPass<{{.*}}LoopAccessAnalysis -; CHECK: Running analysis: LoopAccessAnalysis on Loop at depth 2 containing: %inner1.header +; CHECK: Running analysis: LoopAccessAnalysis on inner1.header ; CHECK: Running pass: RequireAnalysisPass<{{.*}}LoopAccessAnalysis -; CHECK: Running analysis: LoopAccessAnalysis on Loop at depth 2 containing: %inner2.header +; CHECK: Running analysis: LoopAccessAnalysis on inner2.header ; CHECK: Running pass: RequireAnalysisPass<{{.*}}LoopAccessAnalysis -; CHECK: Running analysis: LoopAccessAnalysis on Loop at depth 1 containing: %outer.header +; CHECK: Running analysis: LoopAccessAnalysis on outer.header ; CHECK: Running pass: LoopUnrollPass ; CHECK: Clearing all analysis results for: inner2.header ; CHECK: Clearing all analysis results for: outer.header ; CHECK: Invalidating analysis: LoopAccessAnalysis on {{.*}}inner1.header ; CHECK-NOT: Invalidating analysis: LoopAccessAnalysis on {{.*}}inner1.header.1 ; CHECK: Running pass: LoopAccessInfoPrinterPass -; CHECK: Running analysis: LoopAccessAnalysis on Loop at depth 1 containing: %inner1.header +; CHECK: Running analysis: LoopAccessAnalysis on inner1.header ; CHECK: Loop access info in function 'test': ; CHECK: inner1.header: ; CHECK: Running pass: LoopAccessInfoPrinterPass -; CHECK: Running analysis: LoopAccessAnalysis on Loop at depth 1 containing: %inner1.header.1 +; CHECK: Running analysis: LoopAccessAnalysis on inner1.header.1 ; CHECK: Loop access info in function 'test': ; CHECK: inner1.header.1: diff --git a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-markloopasdeleted.ll b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-markloopasdeleted.ll index 3a193da617bfe..70c5072279434 100644 --- a/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-markloopasdeleted.ll +++ b/llvm/test/Transforms/SimpleLoopUnswitch/nontrivial-unswitch-markloopasdeleted.ll @@ -4,7 +4,7 @@ ; Running loop-distribute will result in LoopAccessAnalysis being required and ; cached in the LoopAnalysisManagerFunctionProxy. ; -; CHECK: Running analysis: LoopAccessAnalysis on Loop at depth 2 containing: %loop_a_inner<header><latch><exiting> +; CHECK: Running analysis: LoopAccessAnalysis on loop_a_inner ; Then simple-loop-unswitch is removing/replacing some loops (resulting in @@ -17,7 +17,7 @@ ; SimpleLoopUnswitch not marking the Loop as removed, so we missed clearing ; the analysis caches. ; -; CHECK: Running pass: SimpleLoopUnswitchPass on Loop at depth 1 containing: %loop_begin<header>,%loop_b,%loop_b_inner,%loop_b_inner_exit,%loop_a,%loop_a_inner,%loop_a_inner_exit,%latch<latch><exiting> +; CHECK: Running pass: SimpleLoopUnswitchPass on loop_begin ; CHECK-NEXT: Running analysis: OuterAnalysisManagerProxy ; CHECK-NEXT: Clearing all analysis results for: loop_a_inner @@ -27,7 +27,7 @@ ; loop_a_inner.us). This kind of verifies that it was correct to remove the ; loop_a_inner related analysis above. ; -; CHECK: Running analysis: LoopAccessAnalysis on Loop at depth 2 containing: %loop_a_inner.us<header><latch><exiting> +; CHECK: Running analysis: LoopAccessAnalysis on loop_a_inner.us define i32 @test6(i1* %ptr, i1 %cond1, i32* %a.ptr, i32* %b.ptr) { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
