[PostRASink] Make sure to remove subregisters from live-ins as well

llvm-svn: 342492
This commit is contained in:
Krzysztof Parzyszek 2018-09-18 16:10:51 +00:00
parent 0594162f32
commit c1e2f39b35
2 changed files with 38 additions and 2 deletions

View File

@ -1037,8 +1037,11 @@ static void clearKillFlags(MachineInstr *MI, MachineBasicBlock &CurBB,
static void updateLiveIn(MachineInstr *MI, MachineBasicBlock *SuccBB,
SmallVectorImpl<unsigned> &UsedOpsInCopy,
SmallVectorImpl<unsigned> &DefedRegsInCopy) {
for (auto DefReg : DefedRegsInCopy)
SuccBB->removeLiveIn(DefReg);
MachineFunction &MF = *SuccBB->getParent();
const TargetRegisterInfo *TRI = MF.getSubtarget().getRegisterInfo();
for (unsigned DefReg : DefedRegsInCopy)
for (MCSubRegIterator S(DefReg, TRI, true); S.isValid(); ++S)
SuccBB->removeLiveIn(*S);
for (auto U : UsedOpsInCopy) {
unsigned Reg = MI->getOperand(U).getReg();
if (!SuccBB->isLiveIn(Reg))

View File

@ -0,0 +1,33 @@
# RUN: llc -march=hexagon -run-pass postra-machine-sink,postrapseudos,if-converter -verify-machineinstrs -o - %s | FileCheck %s
# 1. Post-RA machine sinking moves the copy (1) to block %bb.1. The
# subregisters $r2 and $r3 of $d1 are not removed from the live-ins.
# 2. Expand post-RA pseudos replaces the COPY with A2_tfrp which is
# predicable.
# 3. If-conversion predicates block %bb.1. Since $d1 (made of $r2 and $r3)
# is in the live-in list to %bb.1, it assumes that $d1 in (1) is live,
# and adds an implicit use of $d1 to the predicated copy.
# This results in an invalid machine code, since the implicit use
# refers to an undefined register.
# Make sure that post-RA machine sinking removes subregisters from live-ins
# to block bb.1.
# CHECK: $d1 = A2_tfrpf $p0, $d0
# CHECK-NOT: implicit killed $d1
name: fred
tracksRegLiveness: true
body: |
bb.0:
liveins: $d0, $p0
renamable $d1 = COPY $d0 ;; (1)
J2_jumpt $p0, %bb.2, implicit-def $pc
bb.1:
liveins: $r2, $r3
$r0 = A2_addi $r2, 1
bb.2:
liveins: $r0
A2_nop
J2_jumpr $r31, implicit-def $pc
...