Skip to content

Commit 9c5ca6b

Browse files
DavidSpickettDavidSpickett
committed
Revert "Enable JumpTableToSwitch pass by default (#82546)"
This reverts commit 1069823. This has caused second stage timeouts when building Flang on AArch64: https://lab.llvm.org/buildbot/#/builders/179/builds/9442
1 parent d41615e commit 9c5ca6b

8 files changed

+6
-8
lines changed

‎llvm/lib/Passes/PassBuilderPipelines.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ static cl::opt<bool>
247247

248248
static cl::opt<bool> EnableJumpTableToSwitch(
249249
"enable-jump-table-to-switch",
250-
cl::desc("Enable JumpTableToSwitch pass (default = on)"), cl::init(true));
250+
cl::desc("Enable JumpTableToSwitch pass (default = off)"));
251251

252252
// This option is used in simplifying testing SampleFDO optimizations for
253253
// profile loading.

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@
7171
; RUN: -passes='default<O3>' -S %s 2>&1 \
7272
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-DEFAULT,CHECK-O3,%llvmcheckext,CHECK-EP-OPTIMIZER-LAST,CHECK-O23SZ
7373

74+
; RUN: opt -disable-verify -verify-analysis-invalidation=0 -eagerly-invalidate-analyses=0 -debug-pass-manager \
75+
; RUN: -passes='default<O3>' -enable-jump-table-to-switch -S %s 2>&1 \
76+
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-DEFAULT,CHECK-O3,CHECK-JUMP-TABLE-TO-SWITCH,CHECK-O23SZ,%llvmcheckext
77+
7478
; RUN: opt -disable-verify -verify-analysis-invalidation=0 -eagerly-invalidate-analyses=0 -debug-pass-manager \
7579
; RUN: -passes='default<O3>' -enable-matrix -S %s 2>&1 \
7680
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-DEFAULT,CHECK-O3,CHECK-O23SZ,%llvmcheckext,CHECK-MATRIX
@@ -151,7 +155,7 @@
151155
; CHECK-O23SZ-NEXT: Running analysis: LazyValueAnalysis
152156
; CHECK-O23SZ-NEXT: Running pass: CorrelatedValuePropagationPass
153157
; CHECK-O23SZ-NEXT: Invalidating analysis: LazyValueAnalysis
154-
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
158+
; CHECK-JUMP-TABLE-TO-SWITCH-NEXT: Running pass: JumpTableToSwitchPass
155159
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
156160
; CHECK-O-NEXT: Running pass: InstCombinePass
157161
; CHECK-O23SZ-NEXT: Running pass: AggressiveInstCombinePass

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
; CHECK-O23SZ-NEXT: Running analysis: LazyValueAnalysis
9191
; CHECK-O23SZ-NEXT: Running pass: CorrelatedValuePropagationPass
9292
; CHECK-O23SZ-NEXT: Invalidating analysis: LazyValueAnalysis
93-
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
9493
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
9594
; CHECK-O-NEXT: Running pass: InstCombinePass
9695
; CHECK-O23SZ-NEXT: Running pass: AggressiveInstCombinePass

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
; CHECK-O23SZ-NEXT: Running analysis: LazyValueAnalysis
7979
; CHECK-O23SZ-NEXT: Running pass: CorrelatedValuePropagationPass
8080
; CHECK-O23SZ-NEXT: Invalidating analysis: LazyValueAnalysis
81-
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
8281
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
8382
; CHECK-O-NEXT: Running pass: InstCombinePass
8483
; CHECK-O23SZ-NEXT: Running pass: AggressiveInstCombinePass

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
; CHECK-O23SZ-NEXT: Running analysis: LazyValueAnalysis
8787
; CHECK-O23SZ-NEXT: Running pass: CorrelatedValuePropagationPass
8888
; CHECK-O23SZ-NEXT: Invalidating analysis: LazyValueAnalysis
89-
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
9089
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
9190
; CHECK-O-NEXT: Running pass: InstCombinePass
9291
; CHECK-O23SZ-NEXT: Running pass: AggressiveInstCombinePass

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
; CHECK-O23SZ-NEXT: Running analysis: LazyValueAnalysis
122122
; CHECK-O23SZ-NEXT: Running pass: CorrelatedValuePropagationPass
123123
; CHECK-O23SZ-NEXT: Invalidating analysis: LazyValueAnalysis
124-
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
125124
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
126125
; CHECK-O-NEXT: Running pass: InstCombinePass
127126
; CHECK-O23SZ-NEXT: Running pass: AggressiveInstCombinePass

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
; CHECK-O23SZ-NEXT: Running analysis: LazyValueAnalysis
119119
; CHECK-O23SZ-NEXT: Running pass: CorrelatedValuePropagationPass
120120
; CHECK-O23SZ-NEXT: Invalidating analysis: LazyValueAnalysis
121-
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
122121
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
123122
; CHECK-O-NEXT: Running pass: InstCombinePass
124123
; CHECK-O-NEXT: Running analysis: BlockFrequencyAnalysis on foo

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
; CHECK-O23SZ-NEXT: Running analysis: LazyValueAnalysis
9191
; CHECK-O23SZ-NEXT: Running pass: CorrelatedValuePropagationPass
9292
; CHECK-O23SZ-NEXT: Invalidating analysis: LazyValueAnalysis
93-
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
9493
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
9594
; CHECK-O-NEXT: Running pass: InstCombinePass
9695
; CHECK-O23SZ-NEXT: Running pass: AggressiveInstCombinePass

0 commit comments

Comments
 (0)