Put VPDT as pointer into State

Author: Mel-Chen

llvm/lib/Transforms/Vectorize/VPlan.cpp

@@ -225,7 +225,10 @@ VPTransformState::VPTransformState(const TargetTransformInfo *TTI,
                                    DominatorTree *DT, IRBuilderBase &Builder,
                                    InnerLoopVectorizer *ILV, VPlan *Plan)
     : TTI(TTI), VF(VF), CFG(DT), LI(LI), Builder(Builder), ILV(ILV), Plan(Plan),
-      LVer(nullptr), TypeAnalysis(Plan->getCanonicalIV()->getScalarType()) {}
+      LVer(nullptr), TypeAnalysis(Plan->getCanonicalIV()->getScalarType()),
+      VPDT(new VPDominatorTree(*Plan)) {}
+
+VPTransformState::~VPTransformState() { delete VPDT; }
 
 Value *VPTransformState::get(VPValue *Def, const VPLane &Lane) {
   if (Def->isLiveIn())
@@ -268,11 +271,10 @@ Value *VPTransformState::get(VPValue *Def, bool NeedsScalar) {
     return Data.VPV2Vector[Def];
 
   auto GetBroadcastInstrs = [this, Def](Value *V) {
-    VPDominatorTree VPDT(*Plan);
     bool SafeToHoist =
         !Def->hasDefiningRecipe() ||
-        VPDT.properlyDominates(Def->getDefiningRecipe()->getParent(),
-                               Plan->getVectorPreheader());
+        VPDT->properlyDominates(Def->getDefiningRecipe()->getParent(),
+                                Plan->getVectorPreheader());
 
     if (VF.isScalar())
       return V;

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -67,6 +67,7 @@ class VPlanSlp;
 class Value;
 class LoopVectorizationCostModel;
 class LoopVersioning;
+class VPDominatorTree;
 
 struct VPCostContext;
 
@@ -237,6 +238,7 @@ struct VPTransformState {
   VPTransformState(const TargetTransformInfo *TTI, ElementCount VF, unsigned UF,
                    LoopInfo *LI, DominatorTree *DT, IRBuilderBase &Builder,
                    InnerLoopVectorizer *ILV, VPlan *Plan);
+  ~VPTransformState();
   /// Target Transform Info.
   const TargetTransformInfo *TTI;
 
@@ -389,6 +391,9 @@ struct VPTransformState {
 
   /// VPlan-based type analysis.
   VPTypeAnalysis TypeAnalysis;
+
+  /// VPlan-based dominator tree.
+  VPDominatorTree *VPDT = nullptr;
 };
 
 /// VPBlockBase is the building block of the Hierarchical Control-Flow Graph.