Skip to content

Commit

Permalink
[LiveRangeEdit] Remove any MemoryOperand on MI when converting it to …
Browse files Browse the repository at this point in the history
…KILL. (#114407)

When LiveRangeEdit::eliminateDeadDef() converts an MI to a KILL instruction,
it should also call dropMemRefs() in order to erase any MachineMemOperand
present.

This was discovered in testing as the MachineVerifier does not accept an MMO
without the corresponding MI mayLoad/mayStore flag, which the KILL opcode
lacks.
  • Loading branch information
JonPsson1 authored Nov 5, 2024
1 parent 652db7e commit 117e952
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
1 change: 1 addition & 0 deletions llvm/lib/CodeGen/LiveRangeEdit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ void LiveRangeEdit::eliminateDeadDef(MachineInstr *MI, ToShrinkSet &ToShrink) {
continue;
MI->removeOperand(i-1);
}
MI->dropMemRefs(*MI->getMF());
LLVM_DEBUG(dbgs() << "Converted physregs to:\t" << *MI);
} else {
// If the dest of MI is an original reg and MI is reMaterializable,
Expand Down
29 changes: 29 additions & 0 deletions llvm/test/CodeGen/SystemZ/liverangeedit-kill-memop.mir
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# RUN: llc -o /dev/null %s -mtriple=s390x-linux-gnu -mcpu=z16 \
# RUN: -verify-machineinstrs -run-pass=register-coalescer

# The LOCMux below produces a dead definition and will be turned into
# a KILL instruction (by LiveRangeEdit::eliminateDeadDef()). When this
# happens, the MemoryOperand must also be removed as this is required
# by the machine verifier.

---
name: fun
tracksRegLiveness: true
body: |
bb.0:
liveins: $r2d
%3:addr64bit = COPY killed $r2d
bb.1:
%5:grx32bit = LMux killed %3, 0, $noreg :: (load (s32))
CHIMux killed %5, 0, implicit-def $cc
%7:grx32bit = LHIMux 0
%1:grx32bit = COPY killed %7
%1:grx32bit = LOCMux %1, undef %8:addr64bit, 0, 14, 6, implicit killed $cc :: (load (s32))
dead %0:grx32bit = COPY killed %1
bb.2:
J %bb.2
...

0 comments on commit 117e952

Please sign in to comment.