commit b933c3f55422f2657d2017b002e827b82b28a2da
author Stanislav Mekhanoshin <Stanislav.Mekhanoshin@amd.com> Tue Mar 28 21:48:54 2017 +0000
committer Stanislav Mekhanoshin <Stanislav.Mekhanoshin@amd.com> Tue Mar 28 21:48:54 2017 +0000
tree cfbab623b3d73512163bf9c5d6a27a6f7ceccf85
parent d2a26db991b42feb5a1a1b574e0ef7887e1b0220

[AMDGPU] Fix recorded region boundaries in max-occupancy scheduler

This is incorrect to record region boundaries before scheduling,
it may change after scheduling. As a result second pass may see less
instructions to schedule than it should.

Differential Revision: https://reviews.llvm.org/D31434

llvm-svn: 298945

llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp

diff --git a/llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp b/llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp
index f65b4d7..ea305a9 100644
--- a/llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp
+++ b/llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp
@@ -321,16 +321,6 @@
   DEBUG(dbgs() << "Starting occupancy is " << StartingOccupancy << ".\n");
 }
 
-void GCNScheduleDAGMILive::enterRegion(MachineBasicBlock *bb,
-                                       MachineBasicBlock::iterator begin,
-                                       MachineBasicBlock::iterator end,
-                                       unsigned regioninstrs) {
-  ScheduleDAGMILive::enterRegion(bb, begin, end, regioninstrs);
-
-  if (Stage == 0)
-    Regions.push_back(std::make_pair(begin, end));
-}
-
 void GCNScheduleDAGMILive::schedule() {
   std::vector<MachineInstr*> Unsched;
   Unsched.reserve(NumRegionInstrs);
@@ -345,6 +335,9 @@
   }
 
   ScheduleDAGMILive::schedule();
+  if (Stage == 0)
+    Regions.push_back(std::make_pair(RegionBegin, RegionEnd));
+
   if (!LIS)
     return;
 
@@ -405,6 +398,8 @@
     DEBUG(dbgs() << "Scheduling " << *MI);
   }
   RegionBegin = Unsched.front()->getIterator();
+  if (Stage == 0)
+    Regions.back() = std::make_pair(RegionBegin, RegionEnd);
 
   placeDebugValues();
 }

llvm/lib/Target/AMDGPU/GCNSchedStrategy.h

diff --git a/llvm/lib/Target/AMDGPU/GCNSchedStrategy.h b/llvm/lib/Target/AMDGPU/GCNSchedStrategy.h
index daf0d71..15af232 100644
--- a/llvm/lib/Target/AMDGPU/GCNSchedStrategy.h
+++ b/llvm/lib/Target/AMDGPU/GCNSchedStrategy.h
@@ -75,8 +75,8 @@
   unsigned Stage;
 
   // Vecor of regions recorder for later rescheduling
-  SmallVector<std::pair<const MachineBasicBlock::iterator,
-                        const MachineBasicBlock::iterator>, 32> Regions;
+  SmallVector<std::pair<MachineBasicBlock::iterator,
+                        MachineBasicBlock::iterator>, 32> Regions;
 
   // Region live-ins.
   DenseMap<unsigned, LaneBitmask> LiveIns;
@@ -94,11 +94,6 @@
   GCNScheduleDAGMILive(MachineSchedContext *C,
                        std::unique_ptr<MachineSchedStrategy> S);
 
-  void enterRegion(MachineBasicBlock *bb,
-                   MachineBasicBlock::iterator begin,
-                   MachineBasicBlock::iterator end,
-                   unsigned regioninstrs) override;
-
   void schedule() override;
 
   void finalizeSchedule() override;