Skip to content

Commit c74951c

Browse files
vitalybukavitalybuka
authored
Revert "Reapply "[JTS][Passes] Enable JTS By Default" (llvm#193409)" (llvm#193649)
Breaks asan buildbots https://lab.llvm.org/buildbot/#/builders/52/builds/16717 This reverts commit bb76209 from llvm#193409. Symbolized report https://gist.github.com/vitalybuka/f60465c13ffad56b8870e87b0fc443ff Probably false positive caused by pass, but can't tell for sure.
1 parent 2855525 commit c74951c

8 files changed

Lines changed: 13 additions & 9 deletions

‎llvm/lib/Passes/PassBuilderPipelines.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ static cl::opt<bool>
252252
cl::desc("Enable the GVN sinking pass (default = off)"));
253253

254254
static cl::opt<bool> EnableJumpTableToSwitch(
255-
"enable-jump-table-to-switch", cl::init(true),
256-
cl::desc("Enable JumpTableToSwitch pass (default = true)"));
255+
"enable-jump-table-to-switch",
256+
cl::desc("Enable JumpTableToSwitch pass (default = off)"));
257257

258258
// This option is used in simplifying testing SampleFDO optimizations for
259259
// profile loading.

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

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

72+
; RUN: opt -disable-verify -verify-analysis-invalidation=0 -eagerly-invalidate-analyses=0 -debug-pass-manager \
73+
; RUN: -passes='default<O3>' -enable-jump-table-to-switch -S %s 2>&1 \
74+
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-DEFAULT,CHECK-O3,CHECK-O23,CHECK-JUMP-TABLE-TO-SWITCH,%llvmcheckext
75+
7276
; RUN: opt -disable-verify -verify-analysis-invalidation=0 -eagerly-invalidate-analyses=0 -debug-pass-manager \
7377
; RUN: -passes='default<O3>' -enable-matrix -S %s 2>&1 \
7478
; RUN: | FileCheck %s --check-prefixes=CHECK-O,CHECK-DEFAULT,CHECK-O3,CHECK-O23,%llvmcheckext,CHECK-MATRIX
@@ -148,7 +152,7 @@
148152
; CHECK-O23-NEXT: Running analysis: LazyValueAnalysis
149153
; CHECK-O23-NEXT: Running pass: CorrelatedValuePropagationPass
150154
; CHECK-O23-NEXT: Invalidating analysis: LazyValueAnalysis
151-
; CHECK-O23-NEXT: Running pass: JumpTableToSwitchPass
155+
; CHECK-JUMP-TABLE-TO-SWITCH-NEXT: Running pass: JumpTableToSwitchPass
152156
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
153157
; CHECK-O-NEXT: Running pass: InstCombinePass
154158
; CHECK-O23-NEXT: Running pass: AggressiveInstCombinePass

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
; CHECK-O23-NEXT: Running analysis: LazyValueAnalysis
8686
; CHECK-O23-NEXT: Running pass: CorrelatedValuePropagationPass
8787
; CHECK-O23-NEXT: Invalidating analysis: LazyValueAnalysis
88-
; CHECK-O23-NEXT: Running pass: JumpTableToSwitchPass
88+
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
8989
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
9090
; CHECK-O-NEXT: Running pass: InstCombinePass
9191
; CHECK-O23-NEXT: Running pass: AggressiveInstCombinePass

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
; CHECK-O23-NEXT: Running analysis: LazyValueAnalysis
7474
; CHECK-O23-NEXT: Running pass: CorrelatedValuePropagationPass
7575
; CHECK-O23-NEXT: Invalidating analysis: LazyValueAnalysis
76-
; CHECK-O23-NEXT: Running pass: JumpTableToSwitchPass
76+
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
7777
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
7878
; CHECK-O-NEXT: Running pass: InstCombinePass
7979
; CHECK-O23-NEXT: Running pass: AggressiveInstCombinePass

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
; CHECK-O23-NEXT: Running analysis: LazyValueAnalysis
8181
; CHECK-O23-NEXT: Running pass: CorrelatedValuePropagationPass
8282
; CHECK-O23-NEXT: Invalidating analysis: LazyValueAnalysis
83-
; CHECK-O23-NEXT: Running pass: JumpTableToSwitchPass
83+
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
8484
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
8585
; CHECK-O-NEXT: Running pass: InstCombinePass
8686
; CHECK-O23-NEXT: Running pass: AggressiveInstCombinePass

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
; CHECK-O23-NEXT: Running analysis: LazyValueAnalysis
112112
; CHECK-O23-NEXT: Running pass: CorrelatedValuePropagationPass
113113
; CHECK-O23-NEXT: Invalidating analysis: LazyValueAnalysis
114-
; CHECK-O23-NEXT: Running pass: JumpTableToSwitchPass
114+
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
115115
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
116116
; CHECK-O-NEXT: Running pass: InstCombinePass
117117
; CHECK-O23-NEXT: Running pass: AggressiveInstCombinePass

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
; CHECK-O23-NEXT: Running analysis: LazyValueAnalysis
114114
; CHECK-O23-NEXT: Running pass: CorrelatedValuePropagationPass
115115
; CHECK-O23-NEXT: Invalidating analysis: LazyValueAnalysis
116-
; CHECK-O23-NEXT: Running pass: JumpTableToSwitchPass
116+
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
117117
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
118118
; CHECK-O-NEXT: Running pass: InstCombinePass
119119
; CHECK-O-NEXT: Running analysis: LastRunTrackingAnalysis

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
; CHECK-O23-NEXT: Running analysis: LazyValueAnalysis
8686
; CHECK-O23-NEXT: Running pass: CorrelatedValuePropagationPass
8787
; CHECK-O23-NEXT: Invalidating analysis: LazyValueAnalysis
88-
; CHECK-O23-NEXT: Running pass: JumpTableToSwitchPass
88+
; CHECK-O23SZ-NEXT: Running pass: JumpTableToSwitchPass
8989
; CHECK-O-NEXT: Running pass: SimplifyCFGPass
9090
; CHECK-O-NEXT: Running pass: InstCombinePass
9191
; CHECK-O23-NEXT: Running pass: AggressiveInstCombinePass

0 commit comments

Comments
 (0)