Browse Source

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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@364415 91177308-0d34-0410-b5e6-96231b3b80d8
Chen Zheng 6 years ago
parent
commit
3a6c5d72b9

+ 2 - 2
include/llvm/Analysis/TargetTransformInfo.h

@@ -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,
-                                ScalarEvolution &SE,
+  bool isHardwareLoopProfitable(Loop *L, ScalarEvolution &SE,
                                 AssumptionCache &AC,
                                 AssumptionCache &AC,
                                 TargetLibraryInfo *LibInfo,
                                 TargetLibraryInfo *LibInfo,
                                 HardwareLoopInfo &HWLoopInfo) const;
                                 HardwareLoopInfo &HWLoopInfo) const;

+ 11 - 7
lib/Analysis/TargetTransformInfo.cpp

@@ -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);
 }
 }
 
 

+ 4 - 1
lib/CodeGen/HardwareLoops.cpp

@@ -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.