Updated testing system in loop analysis and GCM

+ Fixed bug in loop analysis
techie-mike · Dec 18, 2023 · a7be06b · a7be06b
1 parent f2fd196
commit a7be06b
Show file tree

Hide file tree

Showing 9 changed files with 204 additions and 36 deletions.
diff --git a/src/graph.cpp b/src/graph.cpp
@@ -111,10 +111,6 @@ void Graph::DumpPlacedInsts(std::ostream &out) {
         for (Inst *inst = region->GetFirst(); inst != nullptr; inst = inst->GetNext()) {
             inst->Dump(out);
         }
-        if (region->GetOpcode() != Opcode::End) {
-            ASSERT(region->GetExitFromRegion());
-            region->GetExitFromRegion()->Dump(out);
-        }
         out << "----------------------------\n";
         first = false;
     }

diff --git a/src/inst.cpp b/src/inst.cpp
@@ -238,6 +238,18 @@ void RegionInst::PushBackInst(Inst *inst) {
     last_ = inst;
 }
 
+void RegionInst::PushFrontInst(Inst *inst) {
+    inst->SetPlaced();
+    if (first_ == nullptr) {
+        AddFirstInst(inst);
+        return;
+    }
+
+    first_->SetPrev(inst);
+    inst->SetNext(first_);
+    first_ = inst;
+}
+
 RegionInst *Inst::CastToRegion() {
     ASSERT(IsRegion());
     return static_cast<RegionInst *>(this);

diff --git a/src/inst.h b/src/inst.h
@@ -439,6 +439,7 @@ class RegionInst : public ControlProp<DynamicInputs>
 
     bool IsLoopHeader();
     void PushBackInst(Inst *inst);
+    void PushFrontInst(Inst *inst);
 
     Inst *GetFirst() {
         return first_;
@@ -448,15 +449,6 @@ class RegionInst : public ControlProp<DynamicInputs>
         return last_;
     }
 
-    Inst *GetExitFromRegion() {
-        return exit_region_;
-    }
-
-    void SetExitRegion(Inst *inst) {
-        ASSERT(inst->GetOpcode() == Opcode::If || inst->GetOpcode() == Opcode::Jump);
-        exit_region_ = inst;
-    }
-
 private:
     void AddFirstInst(Inst *inst);
 

diff --git a/src/ir_constructor.h b/src/ir_constructor.h
@@ -23,6 +23,20 @@ class IrConstructor {
         return *this;
     }
 
+    Inst *GetInst(id_t index) {
+        auto inst = graph_->GetInstByIndex(index);
+        current_inst_ = inst;
+        return inst;
+    }
+
+    RegionInst *GetRegion(id_t index) {
+        auto inst = graph_->GetInstByIndex(index);
+        if (!inst->IsRegion()) {
+            UNREACHABLE();
+        }
+        return inst->CastToRegion();
+    }
+
     IrConstructor &Imm(int64_t imm) {
         ASSERT(current_inst_ != nullptr);
 

diff --git a/src/optimizations/analysis/liveness_analyzer.cpp b/src/optimizations/analysis/liveness_analyzer.cpp
@@ -59,8 +59,8 @@ void LivenessAnalyzer::DumpLifeLinearData(std::ostream &out) {
             PrintLifeLinearData(inst, out);
         }
         if (region->GetOpcode() != Opcode::End) {
-            ASSERT(region->GetExitFromRegion());
-            auto inst = region->GetExitFromRegion();
+            ASSERT(region->GetLast());
+            auto inst = region->GetLast();
             inst->Dump(out);
             if (inst->GetOpcode() != Opcode::Jump) {
                 PrintLifeLinearData(inst, out);
@@ -81,16 +81,16 @@ void LivenessAnalyzer::PrintLifeLinearData(Inst *inst, std::ostream &out) {
 }
 
 void LivenessAnalyzer::BuildLifeIfJump(RegionInst *region, LinearNumber &linear_number, LifeNumber &life_number) {
-    if (region->GetExitFromRegion() == nullptr) {
+    if (region->GetLast() == nullptr) {
         return;
     }
 
-    if (region->GetExitFromRegion()->GetOpcode() == Opcode::If) {
-        region->GetExitFromRegion()->SetLinearNumber(linear_number++);
+    if (region->GetLast()->GetOpcode() == Opcode::If) {
+        region->GetLast()->SetLinearNumber(linear_number++);
     }
-    ASSERT(region->GetExitFromRegion()->GetOpcode() == Opcode::Jump);
+    ASSERT(region->GetLast()->GetOpcode() == Opcode::Jump);
     life_number += 2;
-    region->GetExitFromRegion()->SetLifeNumber(life_number);
+    region->GetLast()->SetLifeNumber(life_number);
 }
 
 }
diff --git a/src/optimizations/analysis/loop_analysis.cpp b/src/optimizations/analysis/loop_analysis.cpp
@@ -44,6 +44,7 @@ Loop *LoopAnalysis::CreateLoop(RegionInst *region) {
     region->SetLoop(loop);
     loop->SetId(graph_->GetNumLoops());
     loop->SetHeader(region);
+    loop->AddRegion(region);
     return loop;
 }
 

diff --git a/src/optimizations/analysis/loop_analysis.h b/src/optimizations/analysis/loop_analysis.h
@@ -43,17 +43,25 @@ class Loop
         return backedge_;
     }
 
+    bool LoopContaine(RegionInst *region) {
+        return std::find(body_.begin(), body_.end(), region) != body_.end();
+    }
+
     void AddBackedge(RegionInst *region) {
         ASSERT(std::find(backedge_.begin(), backedge_.end(), region) == backedge_.end())
         backedge_.push_back(region);
     }
 
     void AddRegion(RegionInst *region) {
-        ASSERT(std::find(body_.begin(), body_.end(),  region) == body_.end());
+        ASSERT(!LoopContaine(region));
         region->SetLoop(this);
         body_.push_back(region);
     }
 
+    const std::vector<RegionInst *> &GetBody() {
+        return body_;
+    }
+
     void SetOuterLoop(Loop *loop) {
         outer_loop_ = loop;
     }

diff --git a/src/optimizations/gcm.cpp b/src/optimizations/gcm.cpp
@@ -33,7 +33,7 @@ void GCM::PlacingDataInst(Inst *inst, RegionInst *region) {
 
     auto opc = inst->GetOpcode();
     if (opc == Opcode::Constant || opc == Opcode::Parameter) {
-        graph_->GetStartRegion()->PushBackInst(inst);
+        graph_->GetStartRegion()->PushFrontInst(inst);
         inst->SetPlaced();
         return;
     }
@@ -51,13 +51,13 @@ void GCM::PlacingExitFromRegion(Inst *inst, RegionInst *region) {
     ASSERT(opc == Opcode::Jump || opc == Opcode::If);
     if (opc == Opcode::Jump) {
         // TODO: Find more good place for this fill
-        region->SetExitRegion(inst);
+        region->PushBackInst(inst);
         return;
     }
 
     if (opc == Opcode::If) {
         // TODO: Find more good place for this fill
-        region->SetExitRegion(inst);
+        region->PushBackInst(inst);
         PlacingDataInst(inst->GetDataInput(0), region);
         return;
     }