diff options
| -rw-r--r-- | include/llvm/CodeGen/RegisterPressure.h | 13 | ||||
| -rw-r--r-- | lib/CodeGen/RegisterPressure.cpp | 10 |
2 files changed, 16 insertions, 7 deletions
diff --git a/include/llvm/CodeGen/RegisterPressure.h b/include/llvm/CodeGen/RegisterPressure.h index e810f8c64b..2043155bc5 100644 --- a/include/llvm/CodeGen/RegisterPressure.h +++ b/include/llvm/CodeGen/RegisterPressure.h @@ -249,19 +249,22 @@ public: /// Get the pressure of each PSet after traversing this instruction bottom-up. void getUpwardPressure(const MachineInstr *MI, - std::vector<unsigned> &PressureResult); + std::vector<unsigned> &PressureResult, + std::vector<unsigned> &MaxPressureResult); /// Get the pressure of each PSet after traversing this instruction top-down. void getDownwardPressure(const MachineInstr *MI, - std::vector<unsigned> &PressureResult); + std::vector<unsigned> &PressureResult, + std::vector<unsigned> &MaxPressureResult); void getPressureAfterInst(const MachineInstr *MI, - std::vector<unsigned> &PressureResult) { + std::vector<unsigned> &PressureResult, + std::vector<unsigned> &MaxPressureResult) { if (isTopClosed()) - return getUpwardPressure(MI, PressureResult); + return getUpwardPressure(MI, PressureResult, MaxPressureResult); assert(isBottomClosed() && "Uninitialized pressure tracker"); - return getDownwardPressure(MI, PressureResult); + return getDownwardPressure(MI, PressureResult, MaxPressureResult); } protected: diff --git a/lib/CodeGen/RegisterPressure.cpp b/lib/CodeGen/RegisterPressure.cpp index 52174d8f37..43448c850a 100644 --- a/lib/CodeGen/RegisterPressure.cpp +++ b/lib/CodeGen/RegisterPressure.cpp @@ -811,25 +811,31 @@ getMaxDownwardPressureDelta(const MachineInstr *MI, RegPressureDelta &Delta, /// Get the pressure of each PSet after traversing this instruction bottom-up. void RegPressureTracker:: getUpwardPressure(const MachineInstr *MI, - std::vector<unsigned> &PressureResult) { + std::vector<unsigned> &PressureResult, + std::vector<unsigned> &MaxPressureResult) { // Snapshot pressure. PressureResult = CurrSetPressure; + MaxPressureResult = P.MaxSetPressure; bumpUpwardPressure(MI); // Current pressure becomes the result. Restore current pressure. + P.MaxSetPressure.swap(MaxPressureResult); CurrSetPressure.swap(PressureResult); } /// Get the pressure of each PSet after traversing this instruction top-down. void RegPressureTracker:: getDownwardPressure(const MachineInstr *MI, - std::vector<unsigned> &PressureResult) { + std::vector<unsigned> &PressureResult, + std::vector<unsigned> &MaxPressureResult) { // Snapshot pressure. PressureResult = CurrSetPressure; + MaxPressureResult = P.MaxSetPressure; bumpDownwardPressure(MI); // Current pressure becomes the result. Restore current pressure. + P.MaxSetPressure.swap(MaxPressureResult); CurrSetPressure.swap(PressureResult); } |