RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

Prevent dead uses in register coalescer after rematerialization

Browse Source 
The coalescer does not check if register uses are available
at the point of rematerialization. If it attempts to rematerialize
an instruction with such uses it can end up with use without a def.

LiveRangeEdit does such check during rematerialization, so just
call LiveRangeEdit::allUsesAvailableAt() to avoid the problem.

Differential Revision: https://reviews.llvm.org/D106396
This commit is contained in:
Stanislav Mekhanoshin 2021-07-20 13:53:14 -07:00
parent f9cc27a4e9
commit 2ef5dd8386
3 changed files with 115 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/llvm/CodeGen/LiveRangeEdit.h
View File

@ -97,11 +97,6 @@ private:
/// scanRemattable - Identify the Parent values that may rematerialize. /// scanRemattable - Identify the Parent values that may rematerialize.
void scanRemattable(AAResults *aa); void scanRemattable(AAResults *aa);
/// allUsesAvailableAt - Return true if all registers used by OrigMI at
/// OrigIdx are also available with the same value at UseIdx.
bool allUsesAvailableAt(const MachineInstr *OrigMI, SlotIndex OrigIdx,
SlotIndex UseIdx) const;
/// foldAsLoad - If LI has a single use and a single def that can be folded as /// foldAsLoad - If LI has a single use and a single def that can be folded as
/// a load, eliminate the register by folding the def into the use. /// a load, eliminate the register by folding the def into the use.
bool foldAsLoad(LiveInterval *LI, SmallVectorImpl<MachineInstr *> &Dead); bool foldAsLoad(LiveInterval *LI, SmallVectorImpl<MachineInstr *> &Dead);
@ -207,6 +202,11 @@ public:
explicit Remat(VNInfo *ParentVNI) : ParentVNI(ParentVNI) {} explicit Remat(VNInfo *ParentVNI) : ParentVNI(ParentVNI) {}
}; };
/// allUsesAvailableAt - Return true if all registers used by OrigMI at
/// OrigIdx are also available with the same value at UseIdx.
bool allUsesAvailableAt(const MachineInstr *OrigMI, SlotIndex OrigIdx,
SlotIndex UseIdx) const;
/// canRematerializeAt - Determine if ParentVNI can be rematerialized at /// canRematerializeAt - Determine if ParentVNI can be rematerialized at
/// UseIdx. It is assumed that parent_.getVNINfoAt(UseIdx) == ParentVNI. /// UseIdx. It is assumed that parent_.getVNINfoAt(UseIdx) == ParentVNI.
/// When cheapAsAMove is set, only cheap remats are allowed. /// When cheapAsAMove is set, only cheap remats are allowed.

16
lib/CodeGen/RegisterCoalescer.cpp
View File

@ -201,6 +201,11 @@ namespace {
/// Recursively eliminate dead defs in DeadDefs. /// Recursively eliminate dead defs in DeadDefs.
void eliminateDeadDefs(); void eliminateDeadDefs();
/// allUsesAvailableAt - Return true if all registers used by OrigMI at
/// OrigIdx are also available with the same value at UseIdx.
bool allUsesAvailableAt(const MachineInstr *OrigMI, SlotIndex OrigIdx,
SlotIndex UseIdx);
/// LiveRangeEdit callback for eliminateDeadDefs(). /// LiveRangeEdit callback for eliminateDeadDefs().
void LRE_WillEraseInstruction(MachineInstr *MI) override; void LRE_WillEraseInstruction(MachineInstr *MI) override;
@ -604,6 +609,14 @@ void RegisterCoalescer::eliminateDeadDefs() {
nullptr, this).eliminateDeadDefs(DeadDefs); nullptr, this).eliminateDeadDefs(DeadDefs);
} }
bool RegisterCoalescer::allUsesAvailableAt(const MachineInstr *OrigMI,
SlotIndex OrigIdx,
SlotIndex UseIdx) {
SmallVector<Register, 8> NewRegs;
return LiveRangeEdit(nullptr, NewRegs, *MF, *LIS, nullptr, this)
.allUsesAvailableAt(OrigMI, OrigIdx, UseIdx);
}
void RegisterCoalescer::LRE_WillEraseInstruction(MachineInstr *MI) { void RegisterCoalescer::LRE_WillEraseInstruction(MachineInstr *MI) {
// MI may be in WorkList. Make sure we don't visit it. // MI may be in WorkList. Make sure we don't visit it.
ErasedInstrs.insert(MI); ErasedInstrs.insert(MI);
@ -1343,6 +1356,9 @@ bool RegisterCoalescer::reMaterializeTrivialDef(const CoalescerPair &CP,
} }
} }
if (!allUsesAvailableAt(DefMI, ValNo->def, CopyIdx))
return false;
DebugLoc DL = CopyMI->getDebugLoc(); DebugLoc DL = CopyMI->getDebugLoc();
MachineBasicBlock *MBB = CopyMI->getParent(); MachineBasicBlock *MBB = CopyMI->getParent();
MachineBasicBlock::iterator MII = MachineBasicBlock::iterator MII =

94
test/CodeGen/AMDGPU/coalescer-remat-dead-use.mir Normal file
View File

@ -0,0 +1,94 @@
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
# RUN: llc -march=amdgcn -mcpu=gfx900 -o - -verify-coalescing -run-pass=simple-register-coalescing %s | FileCheck -check-prefix=GCN %s
---
# Do not rematerialize V_MOV_B32 at COPY because source register %1 is killed.
name: no_remat_killed_src_in_inst
tracksRegLiveness: true
body: |
bb.0:
liveins: $vgpr0
; GCN-LABEL: name: no_remat_killed_src_in_inst
; GCN: liveins: $vgpr0
; GCN: [[COPY:%[0-9]+]]:vgpr_32 = COPY $vgpr0
; GCN: [[V_ADD_U32_e32_:%[0-9]+]]:vgpr_32 = V_ADD_U32_e32 1, [[COPY]], implicit $exec
; GCN: [[V_MOV_B32_e32_:%[0-9]+]]:vgpr_32 = V_MOV_B32_e32 [[V_ADD_U32_e32_]], implicit $exec
; GCN: $vgpr0 = COPY [[V_MOV_B32_e32_]]
; GCN: SI_RETURN_TO_EPILOG $vgpr0
%0:vgpr_32 = COPY $vgpr0
%1:vgpr_32 = V_ADD_U32_e32 1, %0, implicit $exec
%2:vgpr_32 = V_MOV_B32_e32 killed %1, implicit $exec
$vgpr0 = COPY killed %2
SI_RETURN_TO_EPILOG killed $vgpr0
...
---
# Do not rematerialize V_MOV_B32 at COPY because source register %1 is killed
# after the MOV but before the COPY.
name: no_remat_killed_src_after_inst
tracksRegLiveness: true
body: |
bb.0:
liveins: $vgpr0
; GCN-LABEL: name: no_remat_killed_src_after_inst
; GCN: liveins: $vgpr0
; GCN: [[COPY:%[0-9]+]]:vgpr_32 = COPY $vgpr0
; GCN: [[V_ADD_U32_e32_:%[0-9]+]]:vgpr_32 = V_ADD_U32_e32 1, [[COPY]], implicit $exec
; GCN: [[V_MOV_B32_e32_:%[0-9]+]]:vgpr_32 = V_MOV_B32_e32 [[V_ADD_U32_e32_]], implicit $exec
; GCN: KILL [[V_ADD_U32_e32_]]
; GCN: $vgpr0 = COPY [[V_MOV_B32_e32_]]
; GCN: SI_RETURN_TO_EPILOG $vgpr0
%0:vgpr_32 = COPY $vgpr0
%1:vgpr_32 = V_ADD_U32_e32 1, %0, implicit $exec
%2:vgpr_32 = V_MOV_B32_e32 %1, implicit $exec
KILL %1
$vgpr0 = COPY killed %2
SI_RETURN_TO_EPILOG killed $vgpr0
...
---
# Even if %1 is not killed do not rematerialize V_MOV_B32 so that we do not
# extend %1 liverange.
name: no_remat_alive_src_in_inst_unused
tracksRegLiveness: true
body: |
bb.0:
liveins: $vgpr0
; GCN-LABEL: name: no_remat_alive_src_in_inst_unused
; GCN: liveins: $vgpr0
; GCN: [[COPY:%[0-9]+]]:vgpr_32 = COPY $vgpr0
; GCN: [[V_ADD_U32_e32_:%[0-9]+]]:vgpr_32 = V_ADD_U32_e32 1, [[COPY]], implicit $exec
; GCN: [[V_MOV_B32_e32_:%[0-9]+]]:vgpr_32 = V_MOV_B32_e32 [[V_ADD_U32_e32_]], implicit $exec
; GCN: $vgpr0 = COPY [[V_MOV_B32_e32_]]
; GCN: SI_RETURN_TO_EPILOG $vgpr0
%0:vgpr_32 = COPY $vgpr0
%1:vgpr_32 = V_ADD_U32_e32 1, %0, implicit $exec
%2:vgpr_32 = V_MOV_B32_e32 %1, implicit $exec
$vgpr0 = COPY killed %2
SI_RETURN_TO_EPILOG killed $vgpr0
...
---
# Rematerialize V_MOV_B32 since %1 is available at COPY and still alive.
name: remat_alive_src_in_inst_used_and_available
tracksRegLiveness: true
body: |
bb.0:
liveins: $vgpr0
; GCN-LABEL: name: remat_alive_src_in_inst_used_and_available
; GCN: liveins: $vgpr0
; GCN: [[COPY:%[0-9]+]]:vgpr_32 = COPY $vgpr0
; GCN: [[V_ADD_U32_e32_:%[0-9]+]]:vgpr_32 = V_ADD_U32_e32 1, [[COPY]], implicit $exec
; GCN: $vgpr0 = V_MOV_B32_e32 [[V_ADD_U32_e32_]], implicit $exec
; GCN: SI_RETURN_TO_EPILOG $vgpr0
%0:vgpr_32 = COPY $vgpr0
%1:vgpr_32 = V_ADD_U32_e32 1, %0, implicit $exec
%2:vgpr_32 = V_MOV_B32_e32 %1, implicit $exec
$vgpr0 = COPY killed %2, implicit %1
SI_RETURN_TO_EPILOG killed $vgpr0
...