Skip to content

Commit 08536b0

Browse files
authored
[LAA] refactor tryToCreateDiffCheck (NFC) (#92110)
tryToCreateDiffCheck has one caller, and exits early if CanUseDiffCheck is false. Hence, we can get/set CanUseDiffCheck in the caller to avoid wastefully calling tryToCreateDiffCheck. This patch is an NFC simplification of program logic.
1 parent 82434c7 commit 08536b0

File tree

2 files changed

+21
-36
lines changed

2 files changed

+21
-36
lines changed

llvm/include/llvm/Analysis/LoopAccessAnalysis.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ class RuntimePointerChecking {
540540
/// Try to create add a new (pointer-difference, access size) pair to
541541
/// DiffCheck for checking groups \p CGI and \p CGJ. If pointer-difference
542542
/// checks cannot be used for the groups, set CanUseDiffCheck to false.
543-
void tryToCreateDiffCheck(const RuntimeCheckingPtrGroup &CGI,
543+
bool tryToCreateDiffCheck(const RuntimeCheckingPtrGroup &CGI,
544544
const RuntimeCheckingPtrGroup &CGJ);
545545

546546
MemoryDepChecker &DC;

llvm/lib/Analysis/LoopAccessAnalysis.cpp

Lines changed: 20 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -250,62 +250,51 @@ void RuntimePointerChecking::insert(Loop *Lp, Value *Ptr, const SCEV *PtrExpr,
250250
NeedsFreeze);
251251
}
252252

253-
void RuntimePointerChecking::tryToCreateDiffCheck(
253+
bool RuntimePointerChecking::tryToCreateDiffCheck(
254254
const RuntimeCheckingPtrGroup &CGI, const RuntimeCheckingPtrGroup &CGJ) {
255-
if (!CanUseDiffCheck)
256-
return;
257-
258255
// If either group contains multiple different pointers, bail out.
259256
// TODO: Support multiple pointers by using the minimum or maximum pointer,
260257
// depending on src & sink.
261-
if (CGI.Members.size() != 1 || CGJ.Members.size() != 1) {
262-
CanUseDiffCheck = false;
263-
return;
264-
}
258+
if (CGI.Members.size() != 1 || CGJ.Members.size() != 1)
259+
return false;
265260

266261
PointerInfo *Src = &Pointers[CGI.Members[0]];
267262
PointerInfo *Sink = &Pointers[CGJ.Members[0]];
268263

269264
// If either pointer is read and written, multiple checks may be needed. Bail
270265
// out.
271266
if (!DC.getOrderForAccess(Src->PointerValue, !Src->IsWritePtr).empty() ||
272-
!DC.getOrderForAccess(Sink->PointerValue, !Sink->IsWritePtr).empty()) {
273-
CanUseDiffCheck = false;
274-
return;
275-
}
267+
!DC.getOrderForAccess(Sink->PointerValue, !Sink->IsWritePtr).empty())
268+
return false;
276269

277270
ArrayRef<unsigned> AccSrc =
278271
DC.getOrderForAccess(Src->PointerValue, Src->IsWritePtr);
279272
ArrayRef<unsigned> AccSink =
280273
DC.getOrderForAccess(Sink->PointerValue, Sink->IsWritePtr);
281274
// If either pointer is accessed multiple times, there may not be a clear
282275
// src/sink relation. Bail out for now.
283-
if (AccSrc.size() != 1 || AccSink.size() != 1) {
284-
CanUseDiffCheck = false;
285-
return;
286-
}
276+
if (AccSrc.size() != 1 || AccSink.size() != 1)
277+
return false;
278+
287279
// If the sink is accessed before src, swap src/sink.
288280
if (AccSink[0] < AccSrc[0])
289281
std::swap(Src, Sink);
290282

291283
auto *SrcAR = dyn_cast<SCEVAddRecExpr>(Src->Expr);
292284
auto *SinkAR = dyn_cast<SCEVAddRecExpr>(Sink->Expr);
293285
if (!SrcAR || !SinkAR || SrcAR->getLoop() != DC.getInnermostLoop() ||
294-
SinkAR->getLoop() != DC.getInnermostLoop()) {
295-
CanUseDiffCheck = false;
296-
return;
297-
}
286+
SinkAR->getLoop() != DC.getInnermostLoop())
287+
return false;
298288

299289
SmallVector<Instruction *, 4> SrcInsts =
300290
DC.getInstructionsForAccess(Src->PointerValue, Src->IsWritePtr);
301291
SmallVector<Instruction *, 4> SinkInsts =
302292
DC.getInstructionsForAccess(Sink->PointerValue, Sink->IsWritePtr);
303293
Type *SrcTy = getLoadStoreType(SrcInsts[0]);
304294
Type *DstTy = getLoadStoreType(SinkInsts[0]);
305-
if (isa<ScalableVectorType>(SrcTy) || isa<ScalableVectorType>(DstTy)) {
306-
CanUseDiffCheck = false;
307-
return;
308-
}
295+
if (isa<ScalableVectorType>(SrcTy) || isa<ScalableVectorType>(DstTy))
296+
return false;
297+
309298
const DataLayout &DL =
310299
SinkAR->getLoop()->getHeader()->getModule()->getDataLayout();
311300
unsigned AllocSize =
@@ -316,10 +305,8 @@ void RuntimePointerChecking::tryToCreateDiffCheck(
316305
// future.
317306
auto *Step = dyn_cast<SCEVConstant>(SinkAR->getStepRecurrence(*SE));
318307
if (!Step || Step != SrcAR->getStepRecurrence(*SE) ||
319-
Step->getAPInt().abs() != AllocSize) {
320-
CanUseDiffCheck = false;
321-
return;
322-
}
308+
Step->getAPInt().abs() != AllocSize)
309+
return false;
323310

324311
IntegerType *IntTy =
325312
IntegerType::get(Src->PointerValue->getContext(),
@@ -332,10 +319,8 @@ void RuntimePointerChecking::tryToCreateDiffCheck(
332319
const SCEV *SinkStartInt = SE->getPtrToIntExpr(SinkAR->getStart(), IntTy);
333320
const SCEV *SrcStartInt = SE->getPtrToIntExpr(SrcAR->getStart(), IntTy);
334321
if (isa<SCEVCouldNotCompute>(SinkStartInt) ||
335-
isa<SCEVCouldNotCompute>(SrcStartInt)) {
336-
CanUseDiffCheck = false;
337-
return;
338-
}
322+
isa<SCEVCouldNotCompute>(SrcStartInt))
323+
return false;
339324

340325
const Loop *InnerLoop = SrcAR->getLoop();
341326
// If the start values for both Src and Sink also vary according to an outer
@@ -356,8 +341,7 @@ void RuntimePointerChecking::tryToCreateDiffCheck(
356341
SinkStartAR->getStepRecurrence(*SE)) {
357342
LLVM_DEBUG(dbgs() << "LAA: Not creating diff runtime check, since these "
358343
"cannot be hoisted out of the outer loop\n");
359-
CanUseDiffCheck = false;
360-
return;
344+
return false;
361345
}
362346
}
363347

@@ -366,6 +350,7 @@ void RuntimePointerChecking::tryToCreateDiffCheck(
366350
<< "SinkStartInt: " << *SinkStartInt << '\n');
367351
DiffChecks.emplace_back(SrcStartInt, SinkStartInt, AllocSize,
368352
Src->NeedsFreeze || Sink->NeedsFreeze);
353+
return true;
369354
}
370355

371356
SmallVector<RuntimePointerCheck, 4> RuntimePointerChecking::generateChecks() {
@@ -377,7 +362,7 @@ SmallVector<RuntimePointerCheck, 4> RuntimePointerChecking::generateChecks() {
377362
const RuntimeCheckingPtrGroup &CGJ = CheckingGroups[J];
378363

379364
if (needsChecking(CGI, CGJ)) {
380-
tryToCreateDiffCheck(CGI, CGJ);
365+
CanUseDiffCheck = CanUseDiffCheck && tryToCreateDiffCheck(CGI, CGJ);
381366
Checks.push_back(std::make_pair(&CGI, &CGJ));
382367
}
383368
}

0 commit comments

Comments
 (0)