maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "[Polly] Reject reject regions entered by an indirectbr/callbr." 

This reverts commit 91f46bb77e which
causes test failures when assertions are off.
This commit is contained in:
Haowei Wu 2021-09-27 16:05:33 -07:00
parent 6fe2e9a9cc
commit 283ed7de32
4 changed files with 1 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
polly/include/polly/ScopDetectionDiagnostic.h
View File

@ -73,7 +73,6 @@ enum class RejectReasonKind {
InvalidTerminator,
IrreducibleRegion,
UnreachableInExit,
IndirectPredecessor,
LastCFG,
// Non-Affinity
@ -276,32 +275,6 @@ public:
//@}
};
//===----------------------------------------------------------------------===//
/// Captures regions with an IndirectBr predecessor.
class ReportIndirectPredecessor : public ReportCFG {
Instruction *Inst;
DebugLoc DbgLoc;
public:
ReportIndirectPredecessor(Instruction *Inst, DebugLoc DbgLoc)
: ReportCFG(RejectReasonKind::IndirectPredecessor), Inst(Inst),
DbgLoc(DbgLoc) {}
/// @name LLVM-RTTI interface
//@{
static bool classof(const RejectReason *RR);
//@}
/// @name RejectReason interface
//@{
std::string getRemarkName() const override;
const Value *getRemarkBB() const override;
std::string getMessage() const override;
std::string getEndUserMessage() const override;
const DebugLoc &getDebugLoc() const override;
//@}
};
//===----------------------------------------------------------------------===//
/// Base class for non-affine reject reasons.
///

7
polly/lib/Analysis/ScopDetection.cpp
View File

@ -1757,13 +1757,6 @@ bool ScopDetection::isValidRegion(DetectionContext &Context) {
return false;
}
for (BasicBlock *Pred : predecessors(CurRegion.getEntry())) {
Instruction *PredTerm = Pred->getTerminator();
if (isa<IndirectBrInst>(PredTerm) || isa<CallBrInst>(PredTerm))
return invalid<ReportIndirectPredecessor>(
Context, /*Assert=*/true, PredTerm, PredTerm->getDebugLoc());
}
// SCoP cannot contain the entry block of the function, because we need
// to insert alloca instruction there when translate scalar to array.
if (!PollyAllowFullFunction &&

34
polly/lib/Analysis/ScopDetectionDiagnostic.cpp
View File

@ -50,9 +50,8 @@ using namespace llvm;
static Statistic RejectStatistics[] = {
SCOP_STAT(CFG, ""),
SCOP_STAT(InvalidTerminator, "Unsupported terminator instruction"),
SCOP_STAT(IrreducibleRegion, "Irreducible loops"),
SCOP_STAT(UnreachableInExit, "Unreachable in exit block"),
SCOP_STAT(IndirectPredecessor, "Branch from indirect terminator"),
SCOP_STAT(IrreducibleRegion, "Irreducible loops"),
SCOP_STAT(LastCFG, ""),
SCOP_STAT(AffFunc, ""),
SCOP_STAT(UndefCond, "Undefined branch condition"),
@ -240,37 +239,6 @@ bool ReportUnreachableInExit::classof(const RejectReason *RR) {
return RR->getKind() == RejectReasonKind::UnreachableInExit;
}
//===----------------------------------------------------------------------===//
// IndirectPredecessor.
std::string ReportIndirectPredecessor::getRemarkName() const {
return "IndirectPredecessor";
}
const Value *ReportIndirectPredecessor::getRemarkBB() const {
if (Inst)
return Inst->getParent();
return nullptr;
}
std::string ReportIndirectPredecessor::getMessage() const {
if (Inst)
return "Branch from indirect terminator: " + *Inst;
return getEndUserMessage();
}
const DebugLoc &ReportIndirectPredecessor::getDebugLoc() const {
return DbgLoc;
}
std::string ReportIndirectPredecessor::getEndUserMessage() const {
return "Branch from indirect terminator.";
}
bool ReportIndirectPredecessor::classof(const RejectReason *RR) {
return RR->getKind() == RejectReasonKind::IndirectPredecessor;
}
//===----------------------------------------------------------------------===//
// ReportIrreducibleRegion.

38
polly/test/ScopDetect/callbr.ll
View File

@ -1,38 +0,0 @@
; RUN: opt %loadPolly -polly-detect -polly-detect-track-failures -disable-output -pass-remarks-missed=polly-detect < %s 2>&1 | FileCheck %s --check-prefix=REMARK
; RUN: opt %loadPolly -polly-detect -polly-detect-track-failures -disable-output -stats < %s 2>&1 | FileCheck %s --check-prefix=STAT
; REMARK: Branch from indirect terminator.
; STAT: 1 polly-detect - Number of rejected regions: Branch from indirect terminator
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
define void @func(i32 %n, double* noalias nonnull %A) {
entry:
callbr void asm sideeffect "", "X,~{dirflag},~{fpsr},~{flags}"(i8* blockaddress(@func, %for)) #1
to label %fallthrough [label %for]
fallthrough:
br label %for
for:
%j = phi i32 [0, %entry], [0, %fallthrough], [%j.inc, %inc]
%j.cmp = icmp slt i32 %j, %n
br i1 %j.cmp, label %body, label %exit
body:
store double 42.0, double* %A
br label %inc
inc:
%j.inc = add nuw nsw i32 %j, 1
br label %for
exit:
br label %return
return:
ret void
}