Skip to content

[LoongArch][MC] Add relocation support for fld fst [x]vld [x]vst #133225

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 7 commits into from
Mar 28, 2025
Merged

[LoongArch][MC] Add relocation support for fld fst [x]vld [x]vst #133225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
13751a2
[𝘀𝗽𝗿] changes to main this commit is based on
wangleiat Mar 27, 2025
cfc5a04
[𝘀𝗽𝗿] initial version
wangleiat Mar 27, 2025
3532066
[𝘀𝗽𝗿] changes introduced through rebase
wangleiat Mar 27, 2025
8f0391f
rebase
wangleiat Mar 27, 2025
702b360
fix test
wangleiat Mar 28, 2025
dbf84fe
[𝘀𝗽𝗿] changes introduced through rebase
wangleiat Mar 28, 2025
bd50bee
rebase
wangleiat Mar 28, 2025
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
4 changes: 2 additions & 2 deletions llvm/lib/Target/LoongArch/LoongArchFloatInstrFormats.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ class FP_LOAD_3R<bits<32> op, RegisterClass rc = FPR32>
: FPFmtMEM<op, (outs rc:$fd), (ins GPR:$rj, GPR:$rk),
"$fd, $rj, $rk">;
class FP_LOAD_2RI12<bits<32> op, RegisterClass rc = FPR32>
: FPFmt2RI12<op, (outs rc:$fd), (ins GPR:$rj, simm12:$imm12),
: FPFmt2RI12<op, (outs rc:$fd), (ins GPR:$rj, simm12_addlike:$imm12),
"$fd, $rj, $imm12">;
} // hasSideEffects = 0, mayLoad = 1, mayStore = 0

Expand All @@ -215,7 +215,7 @@ class FP_STORE_3R<bits<32> op, RegisterClass rc = FPR32>
: FPFmtMEM<op, (outs), (ins rc:$fd, GPR:$rj, GPR:$rk),
"$fd, $rj, $rk">;
class FP_STORE_2RI12<bits<32> op, RegisterClass rc = FPR32>
: FPFmt2RI12<op, (outs), (ins rc:$fd, GPR:$rj, simm12:$imm12),
: FPFmt2RI12<op, (outs), (ins rc:$fd, GPR:$rj, simm12_addlike:$imm12),
"$fd, $rj, $imm12">;
} // hasSideEffects = 0, mayLoad = 0, mayStore = 1

Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Target/LoongArch/LoongArchLASXInstrInfo.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,10 @@ class LASX2RI10_Load<bits<32> op, Operand ImmOpnd = simm10_lsl2>
class LASX2RI11_Load<bits<32> op, Operand ImmOpnd = simm11_lsl1>
: Fmt2RI11_XRI<op, (outs LASX256:$xd), (ins GPR:$rj, ImmOpnd:$imm11),
"$xd, $rj, $imm11">;
class LASX2RI12_Load<bits<32> op, Operand ImmOpnd = simm12>
class LASX2RI12_Load<bits<32> op, Operand ImmOpnd = simm12_addlike>
: Fmt2RI12_XRI<op, (outs LASX256:$xd), (ins GPR:$rj, ImmOpnd:$imm12),
"$xd, $rj, $imm12">;
class LASX2RI12_Store<bits<32> op, Operand ImmOpnd = simm12>
class LASX2RI12_Store<bits<32> op, Operand ImmOpnd = simm12_addlike>
: Fmt2RI12_XRI<op, (outs), (ins LASX256:$xd, GPR:$rj, ImmOpnd:$imm12),
"$xd, $rj, $imm12">;

Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,10 +374,10 @@ class LSX2RI10_Load<bits<32> op, Operand ImmOpnd = simm10_lsl2>
class LSX2RI11_Load<bits<32> op, Operand ImmOpnd = simm11_lsl1>
: Fmt2RI11_VRI<op, (outs LSX128:$vd), (ins GPR:$rj, ImmOpnd:$imm11),
"$vd, $rj, $imm11">;
class LSX2RI12_Load<bits<32> op, Operand ImmOpnd = simm12>
class LSX2RI12_Load<bits<32> op, Operand ImmOpnd = simm12_addlike>
: Fmt2RI12_VRI<op, (outs LSX128:$vd), (ins GPR:$rj, ImmOpnd:$imm12),
"$vd, $rj, $imm12">;
class LSX2RI12_Store<bits<32> op, Operand ImmOpnd = simm12>
class LSX2RI12_Store<bits<32> op, Operand ImmOpnd = simm12_addlike>
: Fmt2RI12_VRI<op, (outs), (ins LSX128:$vd, GPR:$rj, ImmOpnd:$imm12),
"$vd, $rj, $imm12">;

Expand Down
31 changes: 18 additions & 13 deletions llvm/test/MC/LoongArch/Relocations/relocations.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
# RUN: llvm-mc --filetype=obj --triple=loongarch64 < %s \
# RUN: | llvm-readobj -r - | FileCheck --check-prefix=RELOC %s

# RUN: not llvm-mc --triple=loongarch64 --defsym=FIXME=1 < %s 2>&1 \
# RUN: | FileCheck --check-prefix=ERROR %s

## Check prefixes:
## RELOC - Check the relocation in the object.
## FIXUP - Check the fixup on the instruction.
Expand Down Expand Up @@ -312,24 +309,32 @@ pcaddi $t1, %desc_pcrel_20(foo)
# INSTR: pcaddi $t1, %desc_pcrel_20(foo)
# FIXUP: fixup A - offset: 0, value: %desc_pcrel_20(foo), kind: FK_NONE

.ifdef FIXME

fld.s $ft1, $a0, %pc_lo12(foo)
# ERROR: :[[#@LINE-1]]:18: error: immediate must be an integer in the range [-2048, 2047]
# RELOC: R_LARCH_PCALA_LO12 foo 0x0
# INSTR: fld.s $ft1, $a0, %pc_lo12(foo)
# FIXUP: fixup A - offset: 0, value: %pc_lo12(foo), kind: FK_NONE

fst.d $ft1, $a0, %pc_lo12(foo)
# ERROR: :[[#@LINE-1]]:18: error: immediate must be an integer in the range [-2048, 2047]
# RELOC: R_LARCH_PCALA_LO12 foo 0x0
# INSTR: fst.d $ft1, $a0, %pc_lo12(foo)
# FIXUP: fixup A - offset: 0, value: %pc_lo12(foo), kind: FK_NONE

vld $vr9, $a0, %pc_lo12(foo)
# ERROR: :[[#@LINE-1]]:16: error: immediate must be an integer in the range [-2048, 2047]
# RELOC: R_LARCH_PCALA_LO12 foo 0x0
# INSTR: vld $vr9, $a0, %pc_lo12(foo)
# FIXUP: fixup A - offset: 0, value: %pc_lo12(foo), kind: FK_NONE

vst $vr9, $a0, %pc_lo12(foo)
# ERROR: :[[#@LINE-1]]:16: error: immediate must be an integer in the range [-2048, 2047]
# RELOC: R_LARCH_PCALA_LO12 foo 0x0
# INSTR: vst $vr9, $a0, %pc_lo12(foo)
# FIXUP: fixup A - offset: 0, value: %pc_lo12(foo), kind: FK_NONE

xvld $xr9, $a0, %pc_lo12(foo)
# ERROR: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [-2048, 2047]
# RELOC: R_LARCH_PCALA_LO12 foo 0x0
# INSTR: xvld $xr9, $a0, %pc_lo12(foo)
# FIXUP: fixup A - offset: 0, value: %pc_lo12(foo), kind: FK_NONE

xvst $xr9, $a0, %pc_lo12(foo)
# ERROR: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [-2048, 2047]

.endif
# RELOC: R_LARCH_PCALA_LO12 foo 0x0
# INSTR: xvst $xr9, $a0, %pc_lo12(foo)
# FIXUP: fixup A - offset: 0, value: %pc_lo12(foo), kind: FK_NONE
12 changes: 6 additions & 6 deletions llvm/test/MC/LoongArch/lasx/invalid-imm.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,22 +1167,22 @@ xvldrepl.h $xr0, $a0, 2048

## simm12
xvldrepl.b $xr0, $a0, -2049
# CHECK: :[[#@LINE-1]]:23: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:23: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

xvldrepl.b $xr0, $a0, 2048
# CHECK: :[[#@LINE-1]]:23: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:23: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

xvst $xr0, $a0, -2049
# CHECK: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:17: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

xvst $xr0, $a0, 2048
# CHECK: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:17: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

xvld $xr0, $a0, -2049
# CHECK: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:17: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

xvld $xr0, $a0, 2048
# CHECK: :[[#@LINE-1]]:17: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:17: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

## simm13
xvldi $xr0, -4097
Expand Down
12 changes: 6 additions & 6 deletions llvm/test/MC/LoongArch/lsx/invalid-imm.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,22 +1167,22 @@ vldrepl.h $vr0, $a0, 2048

## simm12
vldrepl.b $vr0, $a0, -2049
# CHECK: :[[#@LINE-1]]:22: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:22: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

vldrepl.b $vr0, $a0, 2048
# CHECK: :[[#@LINE-1]]:22: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:22: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

vst $vr0, $a0, -2049
# CHECK: :[[#@LINE-1]]:16: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:16: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

vst $vr0, $a0, 2048
# CHECK: :[[#@LINE-1]]:16: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:16: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

vld $vr0, $a0, -2049
# CHECK: :[[#@LINE-1]]:16: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:16: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

vld $vr0, $a0, 2048
# CHECK: :[[#@LINE-1]]:16: error: immediate must be an integer in the range [-2048, 2047]
# CHECK: :[[#@LINE-1]]:16: error: operand must be a symbol with modifier (e.g. %pc_lo12) or an integer in the range [-2048, 2047]

## simm13
vldi $vr0, -4097
Expand Down
Loading