[llvm] r298945 - [AMDGPU] Fix recorded region boundaries in max-occupancy scheduler
Stanislav Mekhanoshin via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 28 14:48:55 PDT 2017
Author: rampitec
Date: Tue Mar 28 16:48:54 2017
New Revision: 298945
URL: http://llvm.org/viewvc/llvm-project?rev=298945&view=rev
Log:
[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
Modified:
llvm/trunk/lib/Target/AMDGPU/GCNSchedStrategy.cpp
llvm/trunk/lib/Target/AMDGPU/GCNSchedStrategy.h
Modified: llvm/trunk/lib/Target/AMDGPU/GCNSchedStrategy.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/GCNSchedStrategy.cpp?rev=298945&r1=298944&r2=298945&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/GCNSchedStrategy.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/GCNSchedStrategy.cpp Tue Mar 28 16:48:54 2017
@@ -321,16 +321,6 @@ GCNScheduleDAGMILive::GCNScheduleDAGMILi
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();
}
Modified: llvm/trunk/lib/Target/AMDGPU/GCNSchedStrategy.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/GCNSchedStrategy.h?rev=298945&r1=298944&r2=298945&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/GCNSchedStrategy.h (original)
+++ llvm/trunk/lib/Target/AMDGPU/GCNSchedStrategy.h Tue Mar 28 16:48:54 2017
@@ -75,8 +75,8 @@ class GCNScheduleDAGMILive : public Sche
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;
More information about the llvm-commits
mailing list