Skip to content

Commit 56ab2f4

Browse files
wangleiatSixWeining
authored andcommitted
[LoongArch] Offset folding for frameindex
This patch is for frameindex calculations. Differential Revision: https://reviews.llvm.org/D130248
1 parent fd65453 commit 56ab2f4

File tree

4 files changed

+26
-18
lines changed

4 files changed

+26
-18
lines changed

llvm/lib/Target/LoongArch/LoongArchInstrInfo.td

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,12 @@ class PatGprImm_32<SDPatternOperator OpNode, LAInst Inst, Operand ImmOpnd>
587587
: Pat<(sext_inreg (OpNode GPR:$rj, ImmOpnd:$imm), i32),
588588
(Inst GPR:$rj, ImmOpnd:$imm)>;
589589

590+
/// Predicates
591+
def AddLike: PatFrags<(ops node:$A, node:$B),
592+
[(add node:$A, node:$B), (or node:$A, node:$B)], [{
593+
return N->getOpcode() == ISD::ADD || isOrEquivalentToAdd(N);
594+
}]>;
595+
590596
/// Simple arithmetic operations
591597

592598
// Match both a plain shift and one where the shift amount is masked (this is
@@ -654,6 +660,16 @@ def : PatGprImm<or, ORI, uimm12>;
654660
def : PatGprGpr<xor, XOR>;
655661
def : PatGprImm<xor, XORI, uimm12>;
656662

663+
/// FrameIndex calculations
664+
let Predicates = [IsLA32] in {
665+
def : Pat<(AddLike (i32 BaseAddr:$rj), simm12:$imm12),
666+
(ADDI_W (i32 BaseAddr:$rj), simm12:$imm12)>;
667+
} // Predicates = [IsLA32]
668+
let Predicates = [IsLA64] in {
669+
def : Pat<(AddLike (i64 BaseAddr:$rj), simm12:$imm12),
670+
(ADDI_D (i64 BaseAddr:$rj), simm12:$imm12)>;
671+
} // Predicates = [IsLA64]
672+
657673
/// Shift
658674

659675
let Predicates = [IsLA32] in {
@@ -804,7 +820,7 @@ def : Pat<(loongarch_bstrpick GPR:$rj, uimm6:$msbd, uimm6:$lsbd),
804820

805821
multiclass LdPat<PatFrag LoadOp, LAInst Inst, ValueType vt = GRLenVT> {
806822
def : Pat<(vt (LoadOp BaseAddr:$rj)), (Inst BaseAddr:$rj, 0)>;
807-
def : Pat<(vt (LoadOp (add BaseAddr:$rj, simm12:$imm12))),
823+
def : Pat<(vt (LoadOp (AddLike BaseAddr:$rj, simm12:$imm12))),
808824
(Inst BaseAddr:$rj, simm12:$imm12)>;
809825
}
810826

@@ -828,7 +844,7 @@ multiclass StPat<PatFrag StoreOp, LAInst Inst, RegisterClass StTy,
828844
ValueType vt> {
829845
def : Pat<(StoreOp (vt StTy:$rd), BaseAddr:$rj),
830846
(Inst StTy:$rd, BaseAddr:$rj, 0)>;
831-
def : Pat<(StoreOp (vt StTy:$rd), (add BaseAddr:$rj, simm12:$imm12)),
847+
def : Pat<(StoreOp (vt StTy:$rd), (AddLike BaseAddr:$rj, simm12:$imm12)),
832848
(Inst StTy:$rd, BaseAddr:$rj, simm12:$imm12)>;
833849
}
834850

llvm/test/CodeGen/LoongArch/frame.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
12
; RUN: llc --mtriple=loongarch64 < %s | FileCheck %s
23

34
%struct.key_t = type { i32, [16 x i8] }
@@ -10,8 +11,7 @@ define i32 @test() nounwind {
1011
; CHECK-NEXT: st.w $zero, $sp, 16
1112
; CHECK-NEXT: st.d $zero, $sp, 8
1213
; CHECK-NEXT: st.d $zero, $sp, 0
13-
; CHECK-NEXT: addi.d $a0, $sp, 0
14-
; CHECK-NEXT: ori $a0, $a0, 4
14+
; CHECK-NEXT: addi.d $a0, $sp, 4
1515
; CHECK-NEXT: bl test1
1616
; CHECK-NEXT: move $a0, $zero
1717
; CHECK-NEXT: ld.d $ra, $sp, 24 # 8-byte Folded Reload

llvm/test/CodeGen/LoongArch/ir-instruction/double-convert.ll

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,8 @@ define double @convert_u32_to_double(i32 %a) nounwind {
229229
; LA32-LABEL: convert_u32_to_double:
230230
; LA32: # %bb.0:
231231
; LA32-NEXT: addi.w $sp, $sp, -16
232-
; LA32-NEXT: addi.w $a1, $sp, 8
233-
; LA32-NEXT: ori $a1, $a1, 4
234-
; LA32-NEXT: lu12i.w $a2, 275200
235-
; LA32-NEXT: st.w $a2, $a1, 0
232+
; LA32-NEXT: lu12i.w $a1, 275200
233+
; LA32-NEXT: st.w $a1, $sp, 12
236234
; LA32-NEXT: st.w $a0, $sp, 8
237235
; LA32-NEXT: pcalau12i $a0, .LCPI12_0
238236
; LA32-NEXT: addi.w $a0, $a0, .LCPI12_0
@@ -292,9 +290,7 @@ define double @bitcast_i64_to_double(i64 %a, i64 %b) nounwind {
292290
; LA32-LABEL: bitcast_i64_to_double:
293291
; LA32: # %bb.0:
294292
; LA32-NEXT: addi.w $sp, $sp, -16
295-
; LA32-NEXT: addi.w $a2, $sp, 8
296-
; LA32-NEXT: ori $a2, $a2, 4
297-
; LA32-NEXT: st.w $a1, $a2, 0
293+
; LA32-NEXT: st.w $a1, $sp, 12
298294
; LA32-NEXT: st.w $a0, $sp, 8
299295
; LA32-NEXT: fld.d $fa0, $sp, 8
300296
; LA32-NEXT: addi.w $sp, $sp, 16
@@ -313,10 +309,8 @@ define i64 @bitcast_double_to_i64(double %a) nounwind {
313309
; LA32: # %bb.0:
314310
; LA32-NEXT: addi.w $sp, $sp, -16
315311
; LA32-NEXT: fst.d $fa0, $sp, 8
316-
; LA32-NEXT: addi.w $a0, $sp, 8
317-
; LA32-NEXT: ori $a0, $a0, 4
318-
; LA32-NEXT: ld.w $a1, $a0, 0
319312
; LA32-NEXT: ld.w $a0, $sp, 8
313+
; LA32-NEXT: ld.w $a1, $sp, 12
320314
; LA32-NEXT: addi.w $sp, $sp, 16
321315
; LA32-NEXT: jirl $zero, $ra, 0
322316
;

llvm/test/CodeGen/LoongArch/ir-instruction/float-convert.ll

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -500,10 +500,8 @@ define float @convert_u32_to_float(i32 %a) nounwind {
500500
; LA32D-LABEL: convert_u32_to_float:
501501
; LA32D: # %bb.0:
502502
; LA32D-NEXT: addi.w $sp, $sp, -16
503-
; LA32D-NEXT: addi.w $a1, $sp, 8
504-
; LA32D-NEXT: ori $a1, $a1, 4
505-
; LA32D-NEXT: lu12i.w $a2, 275200
506-
; LA32D-NEXT: st.w $a2, $a1, 0
503+
; LA32D-NEXT: lu12i.w $a1, 275200
504+
; LA32D-NEXT: st.w $a1, $sp, 12
507505
; LA32D-NEXT: st.w $a0, $sp, 8
508506
; LA32D-NEXT: pcalau12i $a0, .LCPI14_0
509507
; LA32D-NEXT: addi.w $a0, $a0, .LCPI14_0

0 commit comments

Comments
 (0)