Skip to content

Commit ba9b4ea

Browse files
aeubanksaeubanks
committed
Revert "[NewPM][opt] Run the "default" AA pipeline by default"
This reverts commit be61143. Other/new-pm-lto-defaults.ll failing
1 parent aee622f commit ba9b4ea

36 files changed

+640
-585
lines changed

‎llvm/test/Analysis/MemorySSA/pr43569.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -pgo-kind=pgo-instr-gen-pipeline -passes="default<O3>" -enable-nontrivial-unswitch -S < %s | FileCheck %s
1+
; RUN: opt -pgo-kind=pgo-instr-gen-pipeline -aa-pipeline=default -passes="default<O3>" -enable-nontrivial-unswitch -S < %s | FileCheck %s
22
; REQUIRES: asserts
33

44
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"

‎llvm/test/CodeGen/Hexagon/loop-idiom/pmpy-mod.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
; get this opportunity regardless of what happens before.
44

55
; RUN: opt -O2 -march=hexagon -S < %s | FileCheck %s
6-
; RUN: opt -passes='default<O2>' -march=hexagon -S < %s | FileCheck %s
6+
; RUN: opt -aa-pipeline=default -passes='default<O2>' -march=hexagon -S < %s | FileCheck %s
77

88
target triple = "hexagon"
99
target datalayout = "e-m:e-p:32:32:32-a:0-n16:32-i64:64:64-i32:32:32-i16:16:16-i1:8:8-f32:32:32-f64:64:64-v32:32:32-v64:64:64-v512:512:512-v1024:1024:1024-v2048:2048:2048"

‎llvm/test/Other/loop-pm-invalidation.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
;
33
; Check that we always nuke the LPM stuff when the loops themselves are
44
; invalidated.
5-
; RUN: opt -disable-output -disable-verify -debug-pass-manager -aa-pipeline= %s 2>&1 \
5+
; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
66
; RUN: -passes='loop(no-op-loop),invalidate<loops>,loop(no-op-loop)' \
77
; RUN: | FileCheck %s --check-prefix=CHECK-LOOP-INV
88
;
99
; If we ended up building the standard analyses, their invalidation should nuke
1010
; stuff as well.
11-
; RUN: opt -disable-output -disable-verify -debug-pass-manager %s -aa-pipeline= 2>&1 \
11+
; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
1212
; RUN: -passes='loop(no-op-loop),invalidate<scalar-evolution>,loop(no-op-loop)' \
1313
; RUN: | FileCheck %s --check-prefix=CHECK-SCEV-INV
1414
;
1515
; Also provide a test that can delete loops after populating analyses for them.
16-
; RUN: opt -disable-output -disable-verify -debug-pass-manager %s -aa-pipeline= 2>&1 \
16+
; RUN: opt -disable-output -disable-verify -debug-pass-manager %s 2>&1 \
1717
; RUN: -passes='loop(no-op-loop,loop-deletion),invalidate<scalar-evolution>,loop(no-op-loop)' \
1818
; RUN: | FileCheck %s --check-prefix=CHECK-SCEV-INV-AFTER-DELETE
1919

‎llvm/test/Other/new-pass-manager.ll

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,6 @@
445445
; CHECK-REPEAT-LOOP-PASS-NEXT: Finished llvm::Function pass manager run
446446
; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: AAManager
447447
; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: TargetLibraryAnalysis
448-
; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: BasicAA
449-
; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: ScopedNoAliasAA
450-
; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: TypeBasedAA
451-
; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: OuterAnalysisManagerProxy
452448
; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: ScalarEvolutionAnalysis
453449
; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: TargetIRAnalysis
454450
; CHECK-REPEAT-LOOP-PASS-NEXT: Running analysis: InnerAnalysisManagerProxy<{{.*}}>

‎llvm/test/Other/new-pm-defaults.ll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,6 @@
9898
; CHECK-O-NEXT: Running pass: InstCombinePass
9999
; CHECK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis
100100
; CHECK-O-NEXT: Running analysis: AAManager
101-
; CHECK-O-NEXT: Running analysis: BasicAA
102-
; CHECK-O-NEXT: Running analysis: ScopedNoAliasAA
103-
; CHECK-O-NEXT: Running analysis: TypeBasedAA
104101
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
105102
; CHECK-EP-PEEPHOLE-NEXT: Running pass: NoOpFunctionPass
106103
; CHECK-O-NEXT: Running pass: SimplifyCFGPass

‎llvm/test/Other/new-pm-lto-defaults.ll

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@
4949
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy<{{.*}}LazyCallGraph{{.*}}>
5050
; CHECK-O-NEXT: Running pass: PostOrderFunctionAttrsPass
5151
; CHECK-O-NEXT: Running analysis: AAManager
52-
; CHECK-O-NEXT: Running analysis: BasicAA
53-
; CHECK-O1-NEXT: Running analysis: AssumptionAnalysis on foo
54-
; CHECK-O1-NEXT: Running analysis: DominatorTreeAnalysis
55-
; CHECK-O-NEXT: Running analysis: ScopedNoAliasAA
56-
; CHECK-O-NEXT: Running analysis: TypeBasedAA
57-
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
5852
; CHECK-O-NEXT: Running pass: ReversePostOrderFunctionAttrsPass
5953
; CHECK-O-NEXT: Running analysis: CallGraphAnalysis
6054
; CHECK-O-NEXT: Running pass: GlobalSplitPass
@@ -67,6 +61,7 @@
6761
; CHECK-O2-NEXT: Starting llvm::Function pass manager run.
6862
; CHECK-O3-NEXT: Running pass: AggressiveInstCombinePass
6963
; CHECK-O2-NEXT: Running pass: InstCombinePass
64+
; CHECK-O2-NEXT: Running analysis: OuterAnalysisManagerProxy
7065
; CHECK-EP-Peephole-NEXT: Running pass: NoOpFunctionPass
7166
; CHECK-O2-NEXT: Finished llvm::Function pass manager run.
7267
; CHECK-O2-NEXT: Running pass: ModuleInlinerWrapperPass

‎llvm/test/Other/new-pm-pr42726-cgscc.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; RUN: opt -passes="default<O1>" %s -S | FileCheck %s
1+
; RUN: opt -aa-pipeline=default -passes="default<O1>" %s -S | FileCheck %s
22
; REQUIRES: asserts
33

44
declare void @bar()

‎llvm/test/Other/new-pm-thinlto-defaults.ll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@
8484
; CHECK-O-NEXT: Running pass: InstCombinePass
8585
; CHECK-PRELINK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis
8686
; CHECK-O-NEXT: Running analysis: AAManager
87-
; CHECK-O-NEXT: Running analysis: BasicAA
88-
; CHECK-O-NEXT: Running analysis: ScopedNoAliasAA
89-
; CHECK-O-NEXT: Running analysis: TypeBasedAA
9087
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
9188
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
9289
; CHECK-O-NEXT: Finished llvm::Function pass manager run.

‎llvm/test/Other/new-pm-thinlto-postlink-pgo-defaults.ll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@
5353
; CHECK-O-NEXT: Starting {{.*}}Function pass manager run.
5454
; CHECK-O-NEXT: Running pass: InstCombinePass
5555
; CHECK-O-NEXT: Running analysis: AAManager
56-
; CHECK-O-NEXT: Running analysis: BasicAA
57-
; CHECK-O-NEXT: Running analysis: ScopedNoAliasAA
58-
; CHECK-O-NEXT: Running analysis: TypeBasedAA
5956
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
6057
; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo
6158
; These next two can appear in any order since they are accessed as parameters

‎llvm/test/Other/new-pm-thinlto-postlink-samplepgo-defaults.ll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@
4848
; CHECK-O-NEXT: Running pass: InstCombinePass on foo
4949
; CHECK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis on foo
5050
; CHECK-O-NEXT: Running analysis: AAManager on foo
51-
; CHECK-O-NEXT: Running analysis: BasicAA
52-
; CHECK-O-NEXT: Running analysis: ScopedNoAliasAA
53-
; CHECK-O-NEXT: Running analysis: TypeBasedAA
5451
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
5552
; CHECK-O-NEXT: Finished {{.*}}Function pass manager run.
5653
; CHECK-O-NEXT: Running pass: SampleProfileLoaderPass

‎llvm/test/Other/new-pm-thinlto-prelink-pgo-defaults.ll

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@
5454
; CHECK-O-NEXT: Running pass: InstCombinePass
5555
; CHECK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis
5656
; CHECK-O-NEXT: Running analysis: AAManager
57-
; CHECK-O-NEXT: Running analysis: BasicAA
58-
; CHECK-O-NEXT: Running analysis: ScopedNoAliasAA
59-
; CHECK-O-NEXT: Running analysis: TypeBasedAA
6057
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
6158
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
6259
; CHECK-O-NEXT: Finished {{.*}}Function pass manager run.
@@ -107,19 +104,17 @@
107104
; CHECK-O-NEXT: Running pass: InlinerPass
108105
; CHECK-O-NEXT: Running pass: InlinerPass
109106
; CHECK-O-NEXT: Running pass: PostOrderFunctionAttrsPass
110-
; CHECK-O-NEXT: Running analysis: AAManager
111-
; CHECK-O-NEXT: Running analysis: BasicAA
112-
; CHECK-O-NEXT: Running analysis: AssumptionAnalysis
113-
; CHECK-O-NEXT: Running analysis: DominatorTreeAnalysis
114-
; CHECK-O-NEXT: Running analysis: ScopedNoAliasAA
115-
; CHECK-O-NEXT: Running analysis: TypeBasedAA
116-
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
107+
; CHECK-O-NEXT: Running analysis: AAManager on foo
117108
; CHECK-O3-NEXT: Running pass: ArgumentPromotionPass
118109
; CHECK-O3-NEXT: Running analysis: TargetIRAnalysis
119110
; CHECK-O2-NEXT: Running pass: OpenMPOptPass
120111
; CHECK-O3-NEXT: Running pass: OpenMPOptPass
121112
; CHECK-O-NEXT: Starting {{.*}}Function pass manager run.
122113
; CHECK-O-NEXT: Running pass: SROA
114+
; These next two can appear in any order since they are accessed as parameters
115+
; on the same call to SROA::runImpl
116+
; CHECK-O-DAG: Running analysis: DominatorTreeAnalysis on foo
117+
; CHECK-O-DAG: Running analysis: AssumptionAnalysis on foo
123118
; CHECK-O-NEXT: Running pass: EarlyCSEPass
124119
; CHECK-O1-NEXT: Running analysis: TargetIRAnalysis on foo
125120
; CHECK-O2-NEXT: Running analysis: TargetIRAnalysis on foo
@@ -134,6 +129,7 @@
134129
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
135130
; CHECK-O3-NEXT: Running pass: AggressiveInstCombinePass
136131
; CHECK-O-NEXT: Running pass: InstCombinePass
132+
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
137133
; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo
138134
; These next two can appear in any order since they are accessed as parameters
139135
; on the same call to BlockFrequencyInfo::calculate.

‎llvm/test/Other/new-pm-thinlto-prelink-samplepgo-defaults.ll

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@
4646
; CHECK-O-NEXT: Running pass: InstCombinePass on foo
4747
; CHECK-O-NEXT: Running analysis: OptimizationRemarkEmitterAnalysis on foo
4848
; CHECK-O-NEXT: Running analysis: AAManager on foo
49-
; CHECK-O-NEXT: Running analysis: BasicAA
50-
; CHECK-O-NEXT: Running analysis: ScopedNoAliasAA
51-
; CHECK-O-NEXT: Running analysis: TypeBasedAA
5249
; CHECK-O-NEXT: Running analysis: OuterAnalysisManagerProxy
5350
; CHECK-O-NEXT: Finished {{.*}}Function pass manager run.
5451
; CHECK-O-NEXT: Running pass: SampleProfileLoaderPass

‎llvm/test/Other/pass-pipeline-parsing.ll

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,33 +46,6 @@
4646
; CHECK-MIXED-FP-AND-MP: Running pass: NoOpModulePass
4747
; CHECK-MIXED-FP-AND-MP: Finished llvm::Module pass manager run
4848

49-
; RUN: opt -disable-output -debug-pass-manager \
50-
; RUN: -aa-pipeline= -passes='require<aa>' %s 2>&1 \
51-
; RUN: | FileCheck %s --check-prefix=CHECK-EMPTY-AA
52-
; CHECK-EMPTY-AA: Running analysis: AAManager
53-
; CHECK-EMPTY-AA-NOT: Running analysis: BasicAA
54-
55-
; RUN: opt -disable-output -debug-pass-manager \
56-
; RUN: -aa-pipeline=basic-aa -passes='require<aa>' %s 2>&1 \
57-
; RUN: | FileCheck %s --check-prefix=CHECK-BASIC-AA
58-
; CHECK-BASIC-AA: Running analysis: AAManager
59-
; CHECK-BASIC-AA: Running analysis: BasicAA
60-
; CHECK-BASIC-AA-NOT: Running analysis: TypeBasedAA
61-
62-
; RUN: opt -disable-output -debug-pass-manager \
63-
; RUN: -aa-pipeline=basic-aa,tbaa -passes='require<aa>' %s 2>&1 \
64-
; RUN: | FileCheck %s --check-prefix=CHECK-TWO-AA
65-
; CHECK-TWO-AA: Running analysis: AAManager
66-
; CHECK-TWO-AA: Running analysis: BasicAA
67-
; CHECK-TWO-AA: Running analysis: TypeBasedAA
68-
69-
; RUN: opt -disable-output -debug-pass-manager \
70-
; RUN: -aa-pipeline=default -passes='require<aa>' %s 2>&1 \
71-
; RUN: | FileCheck %s --check-prefix=CHECK-DEFAULT-AA
72-
; CHECK-DEFAULT-AA: Running analysis: AAManager
73-
; CHECK-DEFAULT-AA-DAG: Running analysis: BasicAA
74-
; CHECK-DEFAULT-AA-DAG: Running analysis: TypeBasedAA
75-
7649
; RUN: not opt -disable-output -debug-pass-manager \
7750
; RUN: -passes='no-op-module)' %s 2>&1 \
7851
; RUN: | FileCheck %s --check-prefix=CHECK-UNBALANCED1

‎llvm/test/Transforms/Coroutines/coro-elide-musttail.ll

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ declare dso_local fastcc void @"bar.resume"(%"bar.Frame"*) align 2
1717
define internal fastcc void @foo.resume_musttail(%"foo.Frame"* %FramePtr) {
1818
; CHECK-LABEL: @foo.resume_musttail(
1919
; CHECK-NEXT: entry:
20-
; CHECK-NEXT: [[TMP0:%.*]] = tail call token @llvm.coro.id(i32 16, i8* null, i8* bitcast (void ()* @bar to i8*), i8* bitcast ([3 x void (%bar.Frame*)*]* @bar.resumers to i8*))
20+
; CHECK-NEXT: [[TMP0:%.*]] = tail call token @llvm.coro.id
2121
; CHECK-NEXT: [[TMP1:%.*]] = tail call i1 @llvm.coro.alloc(token [[TMP0]])
2222
; CHECK-NEXT: [[TMP2:%.*]] = tail call i8* @llvm.coro.begin(token [[TMP0]], i8* null)
2323
; CHECK-NEXT: [[CALL34:%.*]] = call i8* undef()
@@ -39,9 +39,9 @@ define internal fastcc void @foo.resume_no_musttail(%"foo.Frame"* %FramePtr) {
3939
; CHECK-NEXT: entry:
4040
; CHECK-NEXT: [[TMP0:%.*]] = alloca [24 x i8], align 8
4141
; CHECK-NEXT: [[VFRAME:%.*]] = bitcast [24 x i8]* [[TMP0]] to i8*
42-
; CHECK-NEXT: [[TMP1:%.*]] = tail call token @llvm.coro.id(i32 16, i8* null, i8* bitcast (void ()* @bar to i8*), i8* bitcast ([3 x void (%bar.Frame*)*]* @bar.resumers to i8*))
42+
; CHECK-NEXT: [[TMP1:%.*]] = call token @llvm.coro.id
4343
; CHECK-NEXT: [[CALL34:%.*]] = call i8* undef()
44-
; CHECK-NEXT: tail call fastcc void undef(i8* [[CALL34]])
44+
; CHECK-NEXT: call fastcc void undef(i8* [[CALL34]])
4545
; CHECK-NEXT: ret void
4646
;
4747
entry:

‎llvm/test/Transforms/Coroutines/coro-retcon.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; First example from Doc/Coroutines.rst (two block loop) converted to retcon
22
; RUN: opt < %s -enable-coroutines -O2 -S -enable-new-pm=0 | FileCheck %s
3-
; RUN: opt < %s -enable-coroutines -passes='default<O2>' -S | FileCheck %s
3+
; RUN: opt < %s -enable-coroutines -aa-pipeline=default -passes='default<O2>' -S | FileCheck %s
44

55
define i8* @f(i8* %buffer, i32 %n) {
66
entry:

‎llvm/test/Transforms/Inline/cgscc-incremental-invalidate.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
; Test for a subtle bug when computing analyses during inlining and mutating
22
; the SCC structure. Without care, this can fail to invalidate analyses.
33
;
4-
; RUN: opt < %s -aa-pipeline= -passes='cgscc(inline,function(verify<domtree>))' -debug-pass-manager -S 2>&1 | FileCheck %s
4+
; RUN: opt < %s -passes='cgscc(inline,function(verify<domtree>))' -debug-pass-manager -S 2>&1 | FileCheck %s
55

66
; First we check that the passes run in the way we expect. Otherwise this test
77
; may stop testing anything.

‎llvm/test/Transforms/LoopRotate/pr35210.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
;RUN: opt %s -aa-pipeline= -passes='adce,loop(loop-rotate),adce' -S -debug-pass-manager -debug-only=loop-rotate 2>&1 | FileCheck %s
2-
;RUN: opt %s -aa-pipeline= -passes='adce,loop-mssa(loop-rotate),adce' -S -debug-pass-manager -debug-only=loop-rotate -verify-memoryssa 2>&1 | FileCheck %s --check-prefix=MSSA
1+
;RUN: opt %s -passes='adce,loop(loop-rotate),adce' -S -debug-pass-manager -debug-only=loop-rotate 2>&1 | FileCheck %s
2+
;RUN: opt %s -passes='adce,loop-mssa(loop-rotate),adce' -S -debug-pass-manager -debug-only=loop-rotate -verify-memoryssa 2>&1 | FileCheck %s --check-prefix=MSSA
33
;REQUIRES: asserts
44

55
; This test is to make sure we invalidate the post dominator pass after loop rotate simplifies the loop latch.

0 commit comments

Comments
 (0)