From cfca06d7963fa0909f90483b42a6d7d194d01e08 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 26 Jul 2020 19:36:28 +0000 Subject: Vendor import of llvm-project master 2e10b7a39b9, the last commit before the llvmorg-12-init tag, from which release/11.x was branched. --- llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp') diff --git a/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp b/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp index e4160ac11c86..8124df68f688 100644 --- a/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp +++ b/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp @@ -159,8 +159,7 @@ unsigned CFStack::getSubEntrySize(CFStack::StackItem Item) { } void CFStack::updateMaxStackSize() { - unsigned CurrentStackSize = - CurrentEntries + (alignTo(CurrentSubEntries, 4) / 4); + unsigned CurrentStackSize = CurrentEntries + divideCeil(CurrentSubEntries, 4); MaxStackSize = std::max(CurrentStackSize, MaxStackSize); } @@ -308,7 +307,7 @@ private: DstMI = Reg; else DstMI = TRI->getMatchingSuperReg(Reg, - AMDGPURegisterInfo::getSubRegFromChannel(TRI->getHWRegChan(Reg)), + R600RegisterInfo::getSubRegFromChannel(TRI->getHWRegChan(Reg)), &R600::R600_Reg128RegClass); } if (MO.isUse()) { @@ -317,7 +316,7 @@ private: SrcMI = Reg; else SrcMI = TRI->getMatchingSuperReg(Reg, - AMDGPURegisterInfo::getSubRegFromChannel(TRI->getHWRegChan(Reg)), + R600RegisterInfo::getSubRegFromChannel(TRI->getHWRegChan(Reg)), &R600::R600_Reg128RegClass); } } -- cgit v1.2.3