Changes from pull/111452 + use the new recede

Change-Id: I9d6ba224894947f6e94df9ece3faf3f73d4e700f

Author: jrbyrnes

llvm/lib/Target/AMDGPU/GCNRegPressure.cpp

@@ -352,16 +352,6 @@ static LaneBitmask findUseBetween(unsigned Reg, LaneBitmask LastUseMask,
   return LastUseMask;
 }
 
-/// Mostly copy/paste from CodeGen/RegisterPressure.cpp
-static LaneBitmask getLiveLanesAt(const LiveIntervals &LIS,
-                                  const MachineRegisterInfo &MRI,
-                                  bool TrackLaneMasks, Register RegUnit,
-                                  SlotIndex Pos) {
-  return getLanesWithProperty(
-      LIS, MRI, TrackLaneMasks, RegUnit, Pos, LaneBitmask::getAll(),
-      [](const LiveRange &LR, SlotIndex Pos) { return LR.liveAt(Pos); });
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // GCNRPTracker
 

llvm/lib/Target/AMDGPU/GCNSchedStrategy.cpp

@@ -179,7 +179,8 @@ static void getRegisterPressures(
     NewPressure = TempDownwardTracker.bumpDownwardPressure(MI, SRI);
   } else {
     GCNUpwardRPTracker TempUpwardTracker(UpwardTracker);
-    NewPressure = TempUpwardTracker.bumpUpwardPressure(MI, SRI);
+    TempUpwardTracker.recede(*MI);
+    NewPressure = TempUpwardTracker.getPressure();
   }
   Pressure[AMDGPU::RegisterPressureSets::SReg_32] = NewPressure.getSGPRNum();
   Pressure[AMDGPU::RegisterPressureSets::VGPR_32] =