Subzero: Improve LoopAnalyzer Interface

src/IceCfg.h

 //===- subzero/src/IceCfg.h - Control flow graph ----------------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// \brief Declares the Cfg class, which represents the control flow graph and
 /// the overall per-function compilation context.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef SUBZERO_SRC_ICECFG_H
 #define SUBZERO_SRC_ICECFG_H
 
 #include "IceAssembler.h"
 #include "IceClFlags.h"
 #include "IceDefs.h"
 #include "IceGlobalContext.h"
 #include "IceStringPool.h"
 #include "IceTypes.h"
+#include "IceLoopAnalyzer.h"

[Jim Stichnoth, 2016/07/15 22:14:33]

alphabetize includes if possible

[manasijm, 2016/07/18 22:27:46]

Done.

 
 namespace Ice {
 
 class Cfg {
   Cfg() = delete;
   Cfg(const Cfg &) = delete;
   Cfg &operator=(const Cfg &) = delete;
 
 public:
   ~Cfg();
@@ skipping 259 matching lines @@
 
   enum AllocaBaseVariableType {
     BVT_StackPointer,
     BVT_FramePointer,
     BVT_UserPointer
   };
   void sortAndCombineAllocas(CfgVector<InstAlloca *> &Allocas,
                              uint32_t CombinedAlignment, InstList &Insts,
                              AllocaBaseVariableType BaseVariableType);
   void findRematerializable();
-  CfgVector<Inst *> findLoopInvariantInstructions(SizeT LoopHeaderIndex);
+  CfgVector<Inst *>
+  findLoopInvariantInstructions(const CfgUnorderedSet<SizeT> &Body);
 
   GlobalContext *Ctx;
   uint32_t SequenceNumber; /// output order for emission
   OptLevel OptimizationLevel = Opt_m1;
   uint32_t ConstantBlindingCookie = 0; /// cookie for constant blinding
   VerboseMask VMask;
   GlobalString FunctionName;
   Type ReturnType = IceType_void;
   bool IsInternalLinkage = false;
   bool HasError = false;
@@ skipping 10 matching lines @@
   // of the uniqueness requirement, and assumptions in lit tests.
   std::unique_ptr<StringPool> NodeStrings;
   std::unique_ptr<StringPool> VarStrings;
   std::unique_ptr<Liveness> Live;
   std::unique_ptr<TargetLowering> Target;
   std::unique_ptr<VariablesMetadata> VMetadata;
   std::unique_ptr<Assembler> TargetAssembler;
   /// Globals required by this CFG. Mostly used for the profiler's globals.
   std::unique_ptr<VariableDeclarationList> GlobalInits;
   CfgVector<InstJumpTable *> JumpTables;
-  CfgUnorderedMap<SizeT, CfgVector<SizeT>> LoopInfo;
   /// CurrentNode is maintained during dumping/emitting just for validating
   /// Variable::DefNode. Normally, a traversal over CfgNodes maintains this, but
   /// before global operations like register allocation, resetCurrentNode()
   /// should be called to avoid spurious validation failures.
   const CfgNode *CurrentNode = nullptr;
+  LoopAnalyzer::LoopInfo Loops;
 
 public:
   static void TlsInit() { CfgAllocatorTraits::init(); }
 };
 
 template <> Variable *Cfg::makeVariable<Variable>(Type Ty);
 
 struct NodeStringPoolTraits {
   using OwnerType = Cfg;
   static StringPool *getStrings(const OwnerType *PoolOwner) {
     return PoolOwner->getNodeStrings();
   }
 };
 using NodeString = StringID<NodeStringPoolTraits>;
 
 struct VariableStringPoolTraits {
   using OwnerType = Cfg;
   static StringPool *getStrings(const OwnerType *PoolOwner) {
     return PoolOwner->getVarStrings();
   }
 };
 using VariableString = StringID<VariableStringPoolTraits>;
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICECFG_H