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

[HardwareLoops] NFC - move loop with irreducible control flow checking logic to HarewareLoopInfo. 

llvm-svn: 364415
This commit is contained in:
Chen Zheng 2019-06-26 12:02:43 +00:00
parent 6876de90e8
commit aa99952896
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/Analysis/TargetTransformInfo.h
View File

@ -96,6 +96,7 @@ struct HardwareLoopInfo {
bool isHardwareLoopCandidate(ScalarEvolution &SE, LoopInfo &LI, bool isHardwareLoopCandidate(ScalarEvolution &SE, LoopInfo &LI,
DominatorTree &DT, bool ForceNestedLoop = false, DominatorTree &DT, bool ForceNestedLoop = false,
bool ForceHardwareLoopPHI = false); bool ForceHardwareLoopPHI = false);
bool canAnalyze(LoopInfo &LI);
}; };
/// This pass provides access to the codegen interfaces that are needed /// This pass provides access to the codegen interfaces that are needed
@ -473,8 +474,7 @@ public:
/// Query the target whether it would be profitable to convert the given loop /// Query the target whether it would be profitable to convert the given loop
/// into a hardware loop. /// into a hardware loop.
bool isHardwareLoopProfitable(Loop *L, LoopInfo &LI, bool isHardwareLoopProfitable(Loop *L, ScalarEvolution &SE,
ScalarEvolution &SE,
AssumptionCache &AC, AssumptionCache &AC,
TargetLibraryInfo *LibInfo, TargetLibraryInfo *LibInfo,
HardwareLoopInfo &HWLoopInfo) const; HardwareLoopInfo &HWLoopInfo) const;

18
llvm/lib/Analysis/TargetTransformInfo.cpp
View File

@ -42,6 +42,16 @@ struct NoTTIImpl : TargetTransformInfoImplCRTPBase<NoTTIImpl> {
}; };
} }
bool HardwareLoopInfo::canAnalyze(LoopInfo &LI) {
// If the loop has irreducible control flow, it can not be converted to
// Hardware loop.
LoopBlocksRPO RPOT(L);
RPOT.perform(&LI);
if (containsIrreducibleCFG<const BasicBlock *>(RPOT, LI))
return false;
return true;
}
bool HardwareLoopInfo::isHardwareLoopCandidate(ScalarEvolution &SE, bool HardwareLoopInfo::isHardwareLoopCandidate(ScalarEvolution &SE,
LoopInfo &LI, DominatorTree &DT, LoopInfo &LI, DominatorTree &DT,
bool ForceNestedLoop, bool ForceNestedLoop,
@ -218,14 +228,8 @@ bool TargetTransformInfo::isLoweredToCall(const Function *F) const {
} }
bool TargetTransformInfo::isHardwareLoopProfitable( bool TargetTransformInfo::isHardwareLoopProfitable(
Loop *L, LoopInfo &LI, ScalarEvolution &SE, AssumptionCache &AC, Loop *L, ScalarEvolution &SE, AssumptionCache &AC,
TargetLibraryInfo *LibInfo, HardwareLoopInfo &HWLoopInfo) const { TargetLibraryInfo *LibInfo, HardwareLoopInfo &HWLoopInfo) const {
// If the loop has irreducible control flow, it can not be converted to
// Hardware loop.
LoopBlocksRPO RPOT(L);
RPOT.perform(&LI);
if (containsIrreducibleCFG<const BasicBlock *>(RPOT, LI))
return false;
return TTIImpl->isHardwareLoopProfitable(L, SE, AC, LibInfo, HWLoopInfo); return TTIImpl->isHardwareLoopProfitable(L, SE, AC, LibInfo, HWLoopInfo);
} }

5
llvm/lib/CodeGen/HardwareLoops.cpp
View File

@ -198,7 +198,10 @@ bool HardwareLoops::TryConvertLoop(Loop *L) {
return true; // Stop search. return true; // Stop search.
HardwareLoopInfo HWLoopInfo(L); HardwareLoopInfo HWLoopInfo(L);
if (TTI->isHardwareLoopProfitable(L, *LI, *SE, *AC, LibInfo, HWLoopInfo) || if (!HWLoopInfo.canAnalyze(*LI))
return false;
if (TTI->isHardwareLoopProfitable(L, *SE, *AC, LibInfo, HWLoopInfo) ||
ForceHardwareLoops) { ForceHardwareLoops) {
// Allow overriding of the counter width and loop decrement value. // Allow overriding of the counter width and loop decrement value.