Skip to content

[LoongArch] Fix MergeBaseOffset for constant pool index operand #159336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2025
Merged

[LoongArch] Fix MergeBaseOffset for constant pool index operand #159336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions llvm/include/llvm/CodeGen/MachineOperand.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,9 @@ class MachineOperand {
LLVM_ABI void ChangeToBA(const BlockAddress *BA, int64_t Offset,
unsigned TargetFlags = 0);

/// ChangeToCPI - Replace this operand with a new constant pool index operand.
LLVM_ABI void ChangeToCPI(unsigned Idx, int Offset, unsigned TargetFlags = 0);

/// ChangeToMCSymbol - Replace this operand with a new MC symbol operand.
LLVM_ABI void ChangeToMCSymbol(MCSymbol *Sym, unsigned TargetFlags = 0);

Expand Down
13 changes: 13 additions & 0 deletions llvm/lib/CodeGen/MachineOperand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,19 @@ void MachineOperand::ChangeToBA(const BlockAddress *BA, int64_t Offset,
setTargetFlags(TargetFlags);
}

void MachineOperand::ChangeToCPI(unsigned Idx, int Offset,
unsigned TargetFlags) {
assert((!isReg() || !isTied()) &&
"Cannot change a tied operand into a constant pool index");

removeRegFromUses();

OpKind = MO_ConstantPoolIndex;
setIndex(Idx);
setOffset(Offset);
setTargetFlags(TargetFlags);
}

void MachineOperand::ChangeToMCSymbol(MCSymbol *Sym, unsigned TargetFlags) {
assert((!isReg() || !isTied()) &&
"Cannot change a tied operand into an MCSymbol");
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/Target/LoongArch/LoongArchAsmPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ bool LoongArchAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI,
else if (OffsetMO.isImm())
OS << ", " << OffsetMO.getImm();
else if (OffsetMO.isGlobal() || OffsetMO.isBlockAddress() ||
OffsetMO.isMCSymbol()) {
OffsetMO.isMCSymbol() || OffsetMO.isCPI()) {
OS << ", ";
MAI->printExpr(OS, *MCO.getExpr());
} else
Expand Down
4 changes: 4 additions & 0 deletions llvm/lib/Target/LoongArch/LoongArchMergeBaseOffset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,6 +759,10 @@ bool LoongArchMergeBaseOffsetOpt::foldIntoMemoryOps(MachineInstr &Hi20,
MO.ChangeToBA(ImmOp.getBlockAddress(), ImmOp.getOffset(),
LoongArchII::getDirectFlags(ImmOp));
break;
case MachineOperand::MO_ConstantPoolIndex:
MO.ChangeToCPI(ImmOp.getIndex(), ImmOp.getOffset(),
LoongArchII::getDirectFlags(ImmOp));
break;
default:
report_fatal_error("unsupported machine operand type");
break;
Expand Down
38 changes: 38 additions & 0 deletions llvm/test/CodeGen/LoongArch/inline-asm-constraint-m.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,44 @@ define i32 @m_offset_2048(ptr %p) nounwind {
ret i32 %2
}

define i32 @m_constant_0() nounwind {
; LA32-LABEL: m_constant_0:
; LA32: # %bb.0:
; LA32-NEXT: pcalau12i $a0, %pc_hi20(.LCPI7_0)
; LA32-NEXT: #APP
; LA32-NEXT: #NO_APP
; LA32-NEXT: ret
;
; LA64-LABEL: m_constant_0:
; LA64: # %bb.0:
; LA64-NEXT: pcalau12i $a0, %pc_hi20(.LCPI7_0)
; LA64-NEXT: #APP
; LA64-NEXT: #NO_APP
; LA64-NEXT: ret
%1 = call i32 asm sideeffect "", "=r,m"(i64 0)
ret i32 %1
}

define i32 @m_constant_1() nounwind {
; LA32-LABEL: m_constant_1:
; LA32: # %bb.0:
; LA32-NEXT: pcalau12i $a0, %pc_hi20(.LCPI8_0)
; LA32-NEXT: #APP
; LA32-NEXT: ld.w $a0, $a0, %pc_lo12(.LCPI8_0)
; LA32-NEXT: #NO_APP
; LA32-NEXT: ret
;
; LA64-LABEL: m_constant_1:
; LA64: # %bb.0:
; LA64-NEXT: pcalau12i $a0, %pc_hi20(.LCPI8_0)
; LA64-NEXT: #APP
; LA64-NEXT: ld.w $a0, $a0, %pc_lo12(.LCPI8_0)
; LA64-NEXT: #NO_APP
; LA64-NEXT: ret
%1 = call i32 asm sideeffect "ld.w $0, $1", "=r,m"(i64 1)
ret i32 %1
}

@g_i32 = dso_local global i32 0

define i32 @m_addr_pcrel() nounwind {
Expand Down