https://github.com/gbossu created https://github.com/llvm/llvm-project/pull/238866
When rewriting a %1:gpr32 def into %0.sub_32:gpr64, the new def operand can be marked with undef if no lanes from the larger gpr64 reg are live. Assisted-by: codex (test reduction) --- <sub>Stack created with <a href="https://github.com/github/gh-stack">GitHub Stacks CLI</a> • <a href="https://gh.io/stacks-feedback">Give Feedback 💬</a></sub> From 9a0bb332b04d22c543bdfad8126906539d0f5f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Bossu?= <[email protected]> Date: Wed, 21 Oct 2026 16:07:15 +0000 Subject: [PATCH] Coalescer: Preserve read-undef when coalescing into a larger reg. When rewriting a %1:gpr32 def into %0.sub_32:gpr64, the new def operand can be marked with undef if no lanes from the larger gpr64 reg are live. Assisted-by: codex (test reduction) --- llvm/lib/CodeGen/RegisterCoalescer.cpp | 15 ++- ...escer-readundef-subreg-def-subregtoreg.mir | 65 ++++++++++ .../coalescer-readundef-subreg-def.mir | 115 ++++++++++++++++++ 3 files changed, 194 insertions(+), 1 deletion(-) create mode 100644 llvm/test/CodeGen/AArch64/coalescer-readundef-subreg-def-subregtoreg.mir create mode 100644 llvm/test/CodeGen/AArch64/coalescer-readundef-subreg-def.mir diff --git a/llvm/lib/CodeGen/RegisterCoalescer.cpp b/llvm/lib/CodeGen/RegisterCoalescer.cpp index 50ac9e6a7a9f9e..9462fce0c96ef9 100644 --- a/llvm/lib/CodeGen/RegisterCoalescer.cpp +++ b/llvm/lib/CodeGen/RegisterCoalescer.cpp @@ -1898,11 +1898,13 @@ void RegisterCoalescer::addUndefFlag(const LiveInterval &Int, SlotIndex UseIdx, } } +// Update %SrcReg to %DstReg.SubIdx void RegisterCoalescer::updateRegDefsUses(Register SrcReg, Register DstReg, unsigned SubIdx) { bool DstIsPhys = DstReg.isPhysical(); LiveInterval *DstInt = DstIsPhys ? nullptr : &LIS->getInterval(DstReg); + // Joining Src and Dst may have exposed undef lanes. Visit existing Dst refs. if (DstInt && DstReg != SrcReg) { bool HasSubRanges = DstInt->hasSubRanges(); for (MachineOperand &MO : MRI->reg_nodbg_operands(DstReg)) { @@ -1927,6 +1929,8 @@ void RegisterCoalescer::updateRegDefsUses(Register SrcReg, Register DstReg, } } + // Now update SrcReg use/defs to DstReg.SubIdx + // LiveIntervals have already been updated. SmallPtrSet<MachineInstr *, 8> Visited; for (MachineRegisterInfo::reg_instr_iterator I = MRI->reg_instr_begin(SrcReg), E = MRI->reg_instr_end(); @@ -1957,8 +1961,17 @@ void RegisterCoalescer::updateRegDefsUses(Register SrcReg, Register DstReg, // Adjust <undef> flags in case of sub-register joins. We don't want to // turn a full def into a read-modify-write sub-register def and vice // versa. - if (SubIdx && MO.isDef()) + if (SubIdx && MO.isDef()) { MO.setIsUndef(!Reads); + // If live lanes at UseIdx are all covered by SubIdx, this Def can still + // be marked as read-undef because all the live lanes get re-defined. + if (Reads && DstInt && DstInt->hasSubRanges()) { + unsigned SubDefIdx = + TRI->composeSubRegIndices(SubIdx, MO.getSubReg()); + SlotIndex UseIdx = LIS->getInstructionIndex(*UseMI).getRegSlot(true); + addUndefFlag(*DstInt, UseIdx, MO, SubDefIdx); + } + } // A subreg use of a partially undef (super) register may be a complete // undef use now and then has to be marked that way. diff --git a/llvm/test/CodeGen/AArch64/coalescer-readundef-subreg-def-subregtoreg.mir b/llvm/test/CodeGen/AArch64/coalescer-readundef-subreg-def-subregtoreg.mir new file mode 100644 index 00000000000000..61aeb60495723a --- /dev/null +++ b/llvm/test/CodeGen/AArch64/coalescer-readundef-subreg-def-subregtoreg.mir @@ -0,0 +1,65 @@ +# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 6 +# RUN: llc -mtriple=aarch64 -enable-subreg-liveness \ +# RUN: -passes='require<live-intervals>,verify,register-coalescer,invalidate<live-intervals>,require<live-intervals>,verify' \ +# RUN: %s -o - | FileCheck %s + +# Similar to coalescer-readundef-subreg-def.mir but with a SUBREG_TO_REG instead of a read-undef partial COPY. +# The coalescing issue is the same. + +--- +name: coalescer_subreg_to_reg_undef +isSSA: false +tracksRegLiveness: true +body: | + ; CHECK-LABEL: name: coalescer_subreg_to_reg_undef + ; CHECK: bb.0: + ; CHECK-NEXT: successors: %bb.1(0x80000000) + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: undef [[COPY:%[0-9]+]].sub_32:gpr64common = COPY $wzr + ; CHECK-NEXT: B %bb.1 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: bb.1: + ; CHECK-NEXT: successors: %bb.2(0x80000000) + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: B %bb.2 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: bb.2: + ; CHECK-NEXT: successors: %bb.2(0x40000000), %bb.3(0x40000000) + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: [[COPY:%[0-9]+]]:gpr64common = ADDXri [[COPY]], 1, 0 + ; CHECK-NEXT: CBNZX [[COPY]], %bb.2 + ; CHECK-NEXT: B %bb.3 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: bb.3: + ; CHECK-NEXT: successors: %bb.1(0x80000000) + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: undef [[COPY:%[0-9]+]].sub_32:gpr64common = SUBWri [[COPY]].sub_32, 1, 0 + ; CHECK-NEXT: B %bb.1 + bb.0: + successors: %bb.1 + + %0:gpr32all = COPY $wzr + B %bb.1 + + bb.1: + successors: %bb.2 + + %1:gpr32common = COPY %0 + B %bb.2 + + bb.2: + successors: %bb.2, %bb.3 + + %2:gpr64common = SUBREG_TO_REG %1, %subreg.sub_32 + %3:gpr64common = ADDXri %2, 1, 0 + %1:gpr32common = COPY %3.sub_32 + CBNZX %3, %bb.2 + B %bb.3 + + bb.3: + successors: %bb.1 + + %4:gpr32common = SUBWri %1, 1, 0 + %0:gpr32all = COPY %4 + B %bb.1 +... diff --git a/llvm/test/CodeGen/AArch64/coalescer-readundef-subreg-def.mir b/llvm/test/CodeGen/AArch64/coalescer-readundef-subreg-def.mir new file mode 100644 index 00000000000000..e1430aa4cb3a71 --- /dev/null +++ b/llvm/test/CodeGen/AArch64/coalescer-readundef-subreg-def.mir @@ -0,0 +1,115 @@ +# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 6 +# RUN: llc -mtriple=aarch64 -enable-subreg-liveness \ +# RUN: -passes='require<live-intervals>,verify,register-coalescer,invalidate<live-intervals>,require<live-intervals>,verify' \ +# RUN: %s -o - | FileCheck %s +# RUN: llc -mtriple=aarch64 -enable-subreg-liveness -verify-machineinstrs \ +# RUN: -passes='register-coalescer,greedy,virt-reg-rewriter' \ +# RUN: %s -o - | FileCheck %s --check-prefix RA +# +# Coalescing must preserve read-undef on the final SUBWri definition. Rebuild +# LiveIntervals after coalescing to check that the MIR describes undefined lanes. + +# CFG: +# +# bb.0 +# | +# v +# bb.1 <--------+ +# | | +# v | +# bb.2 <---+ | +# | | | +# +------+ | +# | | +# v | +# bb.3 ---------+ +# +# The coalescer joins all %0, %1, %2, %3, and %4 into %2:gpr64common. +# The final %4 -> %0 join rewrites SUBWri as a %2.sub_32 definition. Its use of +# the low lane must not prevent read-undef from marking the high lane undefined. + +--- +name: coalescer_preserves_subreg_undef +isSSA: false +tracksRegLiveness: true +body: | + ; CHECK-LABEL: name: coalescer_preserves_subreg_undef + ; CHECK: bb.0: + ; CHECK-NEXT: successors: %bb.1(0x80000000) + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: undef [[COPY:%[0-9]+]].sub_32:gpr64common = COPY $wzr + ; CHECK-NEXT: B %bb.1 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: bb.1: + ; CHECK-NEXT: successors: %bb.2(0x80000000) + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: B %bb.2 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: bb.2: + ; CHECK-NEXT: successors: %bb.2(0x40000000), %bb.3(0x40000000) + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: [[COPY:%[0-9]+]]:gpr64common = ADDXri [[COPY]], 1, 0 + ; CHECK-NEXT: CBNZX [[COPY]], %bb.2 + ; CHECK-NEXT: B %bb.3 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: bb.3: + ; CHECK-NEXT: successors: %bb.1(0x80000000) + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: undef [[COPY:%[0-9]+]].sub_32:gpr64common = SUBWri [[COPY]].sub_32, 1, 0 + ; CHECK-NEXT: B %bb.1 + ; + ; RA-LABEL: name: coalescer_preserves_subreg_undef + ; RA: bb.0: + ; RA-NEXT: successors: %bb.1(0x80000000) + ; RA-NEXT: {{ $}} + ; RA-NEXT: renamable $w8 = COPY $wzr + ; RA-NEXT: B %bb.1 + ; RA-NEXT: {{ $}} + ; RA-NEXT: bb.1: + ; RA-NEXT: successors: %bb.2(0x80000000) + ; RA-NEXT: liveins: $x8:0x0000000000000040 + ; RA-NEXT: {{ $}} + ; RA-NEXT: B %bb.2 + ; RA-NEXT: {{ $}} + ; RA-NEXT: bb.2: + ; RA-NEXT: successors: %bb.2(0x40000000), %bb.3(0x40000000) + ; RA-NEXT: liveins: $x8:0x0000000000000040 + ; RA-NEXT: {{ $}} + ; RA-NEXT: renamable $x8 = ADDXri killed renamable $x8, 1, 0 + ; RA-NEXT: CBNZX renamable $x8, %bb.2 + ; RA-NEXT: B %bb.3 + ; RA-NEXT: {{ $}} + ; RA-NEXT: bb.3: + ; RA-NEXT: successors: %bb.1(0x80000000) + ; RA-NEXT: liveins: $x8:0x0000000000000040 + ; RA-NEXT: {{ $}} + ; RA-NEXT: renamable $w8 = SUBWri renamable $w8, 1, 0 + ; RA-NEXT: B %bb.1 + bb.0: + successors: %bb.1 + + %0:gpr32all = COPY $wzr + B %bb.1 + + bb.1: + successors: %bb.2 + + %1:gpr32common = COPY %0 + B %bb.2 + + bb.2: + successors: %bb.2, %bb.3 + + undef %2.sub_32:gpr64common = COPY %1 + %3:gpr64common = ADDXri %2, 1, 0 + %1:gpr32common = COPY %3.sub_32 + CBNZX %3, %bb.2 + B %bb.3 + + bb.3: + successors: %bb.1 + + %4:gpr32common = SUBWri %1, 1, 0 + %0:gpr32all = COPY %4 + B %bb.1 +... _______________________________________________ llvm-branch-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
