From 7a9c51436fa73490adde88660bb31f1205cffd42 Mon Sep 17 00:00:00 2001
From: Stanislav Mekhanoshin <Stanislav.Mekhanoshin@amd.com>
Date: Tue, 28 Mar 2017 21:48:54 +0000
Subject: [PATCH] [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

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@298945 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/AMDGPU/GCNSchedStrategy.cpp | 15 +++++----------
 lib/Target/AMDGPU/GCNSchedStrategy.h   |  9 ++-------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/lib/Target/AMDGPU/GCNSchedStrategy.cpp b/lib/Target/AMDGPU/GCNSchedStrategy.cpp
index f65b4d7e40d..ea305a92fc6 100644
--- a/lib/Target/AMDGPU/GCNSchedStrategy.cpp
+++ b/lib/Target/AMDGPU/GCNSchedStrategy.cpp
@@ -321,16 +321,6 @@ GCNScheduleDAGMILive::GCNScheduleDAGMILive(MachineSchedContext *C,
   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 @@ void GCNScheduleDAGMILive::schedule() {
   }
 
   ScheduleDAGMILive::schedule();
+  if (Stage == 0)
+    Regions.push_back(std::make_pair(RegionBegin, RegionEnd));
+
   if (!LIS)
     return;
 
@@ -405,6 +398,8 @@ void GCNScheduleDAGMILive::schedule() {
     DEBUG(dbgs() << "Scheduling " << *MI);
   }
   RegionBegin = Unsched.front()->getIterator();
+  if (Stage == 0)
+    Regions.back() = std::make_pair(RegionBegin, RegionEnd);
 
   placeDebugValues();
 }
diff --git a/lib/Target/AMDGPU/GCNSchedStrategy.h b/lib/Target/AMDGPU/GCNSchedStrategy.h
index daf0d71f47b..15af232704f 100644
--- a/lib/Target/AMDGPU/GCNSchedStrategy.h
+++ b/lib/Target/AMDGPU/GCNSchedStrategy.h
@@ -75,8 +75,8 @@ class GCNScheduleDAGMILive : public ScheduleDAGMILive {
   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 @@ public:
   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;
-- 
2.40.0