Skip to content

Commit 4b87023

Browse files
alinasalinas
committed
Revert enabling MemorySSA.
Breaks sanitizers bots. Differential Revision: https://reviews.llvm.org/D58311 llvm-svn: 370397
1 parent acbdd07 commit 4b87023

File tree

6 files changed

+38
-53
lines changed

6 files changed

+38
-53
lines changed

‎llvm/lib/Analysis/MemorySSA.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ bool llvm::VerifyMemorySSA = false;
8484
#endif
8585
/// Enables memory ssa as a dependency for loop passes in legacy pass manager.
8686
cl::opt<bool> llvm::EnableMSSALoopDependency(
87-
"enable-mssa-loop-dependency", cl::Hidden, cl::init(true),
87+
"enable-mssa-loop-dependency", cl::Hidden, cl::init(false),
8888
cl::desc("Enable MemorySSA dependency for loop pass manager"));
8989

9090
static cl::opt<bool, true>

‎llvm/lib/Transforms/Utils/LoopUtils.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "llvm/Analysis/InstructionSimplify.h"
2020
#include "llvm/Analysis/LoopInfo.h"
2121
#include "llvm/Analysis/LoopPass.h"
22-
#include "llvm/Analysis/MemorySSA.h"
2322
#include "llvm/Analysis/MemorySSAUpdater.h"
2423
#include "llvm/Analysis/MustExecute.h"
2524
#include "llvm/Analysis/ScalarEvolution.h"
@@ -171,8 +170,6 @@ void llvm::getLoopAnalysisUsage(AnalysisUsage &AU) {
171170
AU.addPreserved<SCEVAAWrapperPass>();
172171
AU.addRequired<ScalarEvolutionWrapperPass>();
173172
AU.addPreserved<ScalarEvolutionWrapperPass>();
174-
// FIXME: When all loop passes preserve MemorySSA, it can be required and
175-
// preserved here instead of the individual handling in each pass.
176173
}
177174

178175
/// Manually defined generic "LoopPass" dependency initialization. This is used
@@ -193,7 +190,6 @@ void llvm::initializeLoopPassPass(PassRegistry &Registry) {
193190
INITIALIZE_PASS_DEPENDENCY(GlobalsAAWrapperPass)
194191
INITIALIZE_PASS_DEPENDENCY(SCEVAAWrapperPass)
195192
INITIALIZE_PASS_DEPENDENCY(ScalarEvolutionWrapperPass)
196-
INITIALIZE_PASS_DEPENDENCY(MemorySSAWrapperPass)
197193
}
198194

199195
/// Create MDNode for input string.

‎llvm/test/CodeGen/PowerPC/sms-grp-order.ll

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,25 @@
44

55
define void @lame_encode_buffer_interleaved() local_unnamed_addr {
66
; CHECK-LABEL: lame_encode_buffer_interleaved:
7-
; CHECK: # %bb.0:
8-
; CHECK-NEXT: lha 3, 0(3)
9-
; CHECK-NEXT: li 5, 1
10-
; CHECK-NEXT: sldi 5, 5, 62
11-
; CHECK-NEXT: lhz 4, 0(0)
12-
; CHECK-NEXT: mtctr 5
13-
; CHECK-NEXT: srawi 3, 3, 1
14-
; CHECK-NEXT: addze 3, 3
15-
; CHECK-NEXT: .p2align 4
16-
; CHECK-NEXT: .LBB0_1:
17-
; CHECK-NEXT: extsh 4, 4
18-
; CHECK-NEXT: srawi 4, 4, 1
19-
; CHECK-NEXT: addze 4, 4
20-
; CHECK-NEXT: bdnz .LBB0_1
21-
; CHECK-NEXT: # %bb.2:
22-
; CHECK-NEXT: sth 4, 0(0)
23-
; CHECK-NEXT: sth 3, 0(3)
24-
; CHECK-NEXT: blr
7+
; CHECK: # %bb.0:
8+
; CHECK-NEXT: lhz 3, 0(0)
9+
; CHECK-NEXT: li 5, 1
10+
; CHECK-NEXT: sldi 5, 5, 62
11+
; CHECK-NEXT: lhz 4, 0(3)
12+
; CHECK-NEXT: mtctr 5
13+
; CHECK-NEXT: .p2align 5
14+
; CHECK-NEXT: .LBB0_1: #
15+
; CHECK-NEXT: extsh 3, 3
16+
; CHECK-NEXT: extsh 4, 4
17+
; CHECK-NEXT: srawi 3, 3, 1
18+
; CHECK-NEXT: addze 3, 3
19+
; CHECK-NEXT: srawi 4, 4, 1
20+
; CHECK-NEXT: addze 4, 4
21+
; CHECK-NEXT: bdnz .LBB0_1
22+
; CHECK-NEXT: # %bb.2:
23+
; CHECK-NEXT: sth 3, 0(0)
24+
; CHECK-NEXT: sth 4, 0(3)
25+
; CHECK-NEXT: blr
2526
br label %1
2627

2728
1: ; preds = %1, %0

‎llvm/test/Other/opt-O2-pipeline.ll

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,12 @@
9393
; CHECK-NEXT: Simplify the CFG
9494
; CHECK-NEXT: Reassociate expressions
9595
; CHECK-NEXT: Dominator Tree Construction
96-
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
97-
; CHECK-NEXT: Function Alias Analysis Results
98-
; CHECK-NEXT: Memory SSA
9996
; CHECK-NEXT: Natural Loop Information
10097
; CHECK-NEXT: Canonicalize natural loops
10198
; CHECK-NEXT: LCSSA Verifier
10299
; CHECK-NEXT: Loop-Closed SSA Form Pass
100+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
101+
; CHECK-NEXT: Function Alias Analysis Results
103102
; CHECK-NEXT: Scalar Evolution Analysis
104103
; CHECK-NEXT: Loop Pass Manager
105104
; CHECK-NEXT: Rotate Loops
@@ -154,13 +153,12 @@
154153
; CHECK-NEXT: Phi Values Analysis
155154
; CHECK-NEXT: Memory Dependence Analysis
156155
; CHECK-NEXT: Dead Store Elimination
157-
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
158-
; CHECK-NEXT: Function Alias Analysis Results
159-
; CHECK-NEXT: Memory SSA
160156
; CHECK-NEXT: Natural Loop Information
161157
; CHECK-NEXT: Canonicalize natural loops
162158
; CHECK-NEXT: LCSSA Verifier
163159
; CHECK-NEXT: Loop-Closed SSA Form Pass
160+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
161+
; CHECK-NEXT: Function Alias Analysis Results
164162
; CHECK-NEXT: Scalar Evolution Analysis
165163
; CHECK-NEXT: Loop Pass Manager
166164
; CHECK-NEXT: Loop Invariant Code Motion
@@ -187,13 +185,12 @@
187185
; CHECK-NEXT: FunctionPass Manager
188186
; CHECK-NEXT: Float to int
189187
; CHECK-NEXT: Dominator Tree Construction
190-
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
191-
; CHECK-NEXT: Function Alias Analysis Results
192-
; CHECK-NEXT: Memory SSA
193188
; CHECK-NEXT: Natural Loop Information
194189
; CHECK-NEXT: Canonicalize natural loops
195190
; CHECK-NEXT: LCSSA Verifier
196191
; CHECK-NEXT: Loop-Closed SSA Form Pass
192+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
193+
; CHECK-NEXT: Function Alias Analysis Results
197194
; CHECK-NEXT: Scalar Evolution Analysis
198195
; CHECK-NEXT: Loop Pass Manager
199196
; CHECK-NEXT: Rotate Loops
@@ -249,7 +246,6 @@
249246
; CHECK-NEXT: Lazy Block Frequency Analysis
250247
; CHECK-NEXT: Optimization Remark Emitter
251248
; CHECK-NEXT: Combine redundant instructions
252-
; CHECK-NEXT: Memory SSA
253249
; CHECK-NEXT: Canonicalize natural loops
254250
; CHECK-NEXT: LCSSA Verifier
255251
; CHECK-NEXT: Loop-Closed SSA Form Pass

‎llvm/test/Other/opt-O3-pipeline.ll

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,12 @@
9898
; CHECK-NEXT: Simplify the CFG
9999
; CHECK-NEXT: Reassociate expressions
100100
; CHECK-NEXT: Dominator Tree Construction
101-
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
102-
; CHECK-NEXT: Function Alias Analysis Results
103-
; CHECK-NEXT: Memory SSA
104101
; CHECK-NEXT: Natural Loop Information
105102
; CHECK-NEXT: Canonicalize natural loops
106103
; CHECK-NEXT: LCSSA Verifier
107104
; CHECK-NEXT: Loop-Closed SSA Form Pass
105+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
106+
; CHECK-NEXT: Function Alias Analysis Results
108107
; CHECK-NEXT: Scalar Evolution Analysis
109108
; CHECK-NEXT: Loop Pass Manager
110109
; CHECK-NEXT: Rotate Loops
@@ -159,13 +158,12 @@
159158
; CHECK-NEXT: Phi Values Analysis
160159
; CHECK-NEXT: Memory Dependence Analysis
161160
; CHECK-NEXT: Dead Store Elimination
162-
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
163-
; CHECK-NEXT: Function Alias Analysis Results
164-
; CHECK-NEXT: Memory SSA
165161
; CHECK-NEXT: Natural Loop Information
166162
; CHECK-NEXT: Canonicalize natural loops
167163
; CHECK-NEXT: LCSSA Verifier
168164
; CHECK-NEXT: Loop-Closed SSA Form Pass
165+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
166+
; CHECK-NEXT: Function Alias Analysis Results
169167
; CHECK-NEXT: Scalar Evolution Analysis
170168
; CHECK-NEXT: Loop Pass Manager
171169
; CHECK-NEXT: Loop Invariant Code Motion
@@ -192,13 +190,12 @@
192190
; CHECK-NEXT: FunctionPass Manager
193191
; CHECK-NEXT: Float to int
194192
; CHECK-NEXT: Dominator Tree Construction
195-
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
196-
; CHECK-NEXT: Function Alias Analysis Results
197-
; CHECK-NEXT: Memory SSA
198193
; CHECK-NEXT: Natural Loop Information
199194
; CHECK-NEXT: Canonicalize natural loops
200195
; CHECK-NEXT: LCSSA Verifier
201196
; CHECK-NEXT: Loop-Closed SSA Form Pass
197+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
198+
; CHECK-NEXT: Function Alias Analysis Results
202199
; CHECK-NEXT: Scalar Evolution Analysis
203200
; CHECK-NEXT: Loop Pass Manager
204201
; CHECK-NEXT: Rotate Loops
@@ -254,7 +251,6 @@
254251
; CHECK-NEXT: Lazy Block Frequency Analysis
255252
; CHECK-NEXT: Optimization Remark Emitter
256253
; CHECK-NEXT: Combine redundant instructions
257-
; CHECK-NEXT: Memory SSA
258254
; CHECK-NEXT: Canonicalize natural loops
259255
; CHECK-NEXT: LCSSA Verifier
260256
; CHECK-NEXT: Loop-Closed SSA Form Pass

‎llvm/test/Other/opt-Os-pipeline.ll

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,12 @@
8080
; CHECK-NEXT: Simplify the CFG
8181
; CHECK-NEXT: Reassociate expressions
8282
; CHECK-NEXT: Dominator Tree Construction
83-
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
84-
; CHECK-NEXT: Function Alias Analysis Results
85-
; CHECK-NEXT: Memory SSA
8683
; CHECK-NEXT: Natural Loop Information
8784
; CHECK-NEXT: Canonicalize natural loops
8885
; CHECK-NEXT: LCSSA Verifier
8986
; CHECK-NEXT: Loop-Closed SSA Form Pass
87+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
88+
; CHECK-NEXT: Function Alias Analysis Results
9089
; CHECK-NEXT: Scalar Evolution Analysis
9190
; CHECK-NEXT: Loop Pass Manager
9291
; CHECK-NEXT: Rotate Loops
@@ -141,13 +140,12 @@
141140
; CHECK-NEXT: Phi Values Analysis
142141
; CHECK-NEXT: Memory Dependence Analysis
143142
; CHECK-NEXT: Dead Store Elimination
144-
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
145-
; CHECK-NEXT: Function Alias Analysis Results
146-
; CHECK-NEXT: Memory SSA
147143
; CHECK-NEXT: Natural Loop Information
148144
; CHECK-NEXT: Canonicalize natural loops
149145
; CHECK-NEXT: LCSSA Verifier
150146
; CHECK-NEXT: Loop-Closed SSA Form Pass
147+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
148+
; CHECK-NEXT: Function Alias Analysis Results
151149
; CHECK-NEXT: Scalar Evolution Analysis
152150
; CHECK-NEXT: Loop Pass Manager
153151
; CHECK-NEXT: Loop Invariant Code Motion
@@ -174,13 +172,12 @@
174172
; CHECK-NEXT: FunctionPass Manager
175173
; CHECK-NEXT: Float to int
176174
; CHECK-NEXT: Dominator Tree Construction
177-
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
178-
; CHECK-NEXT: Function Alias Analysis Results
179-
; CHECK-NEXT: Memory SSA
180175
; CHECK-NEXT: Natural Loop Information
181176
; CHECK-NEXT: Canonicalize natural loops
182177
; CHECK-NEXT: LCSSA Verifier
183178
; CHECK-NEXT: Loop-Closed SSA Form Pass
179+
; CHECK-NEXT: Basic Alias Analysis (stateless AA impl)
180+
; CHECK-NEXT: Function Alias Analysis Results
184181
; CHECK-NEXT: Scalar Evolution Analysis
185182
; CHECK-NEXT: Loop Pass Manager
186183
; CHECK-NEXT: Rotate Loops
@@ -236,7 +233,6 @@
236233
; CHECK-NEXT: Lazy Block Frequency Analysis
237234
; CHECK-NEXT: Optimization Remark Emitter
238235
; CHECK-NEXT: Combine redundant instructions
239-
; CHECK-NEXT: Memory SSA
240236
; CHECK-NEXT: Canonicalize natural loops
241237
; CHECK-NEXT: LCSSA Verifier
242238
; CHECK-NEXT: Loop-Closed SSA Form Pass

0 commit comments

Comments
 (0)