Skip to content

Commit 0822780

Browse files
authored
[LoongArch] Fix incorrect logic in isLegalAddressingMode() (#88694)
This will adress issue: ClangBuiltLinux/linux#2014
1 parent 4513776 commit 0822780

File tree

2 files changed

+12
-17
lines changed

2 files changed

+12
-17
lines changed

llvm/lib/Target/LoongArch/LoongArchISelLowering.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4876,28 +4876,27 @@ bool LoongArchTargetLowering::isLegalAddressingMode(const DataLayout &DL,
48764876
if (AM.BaseGV)
48774877
return false;
48784878

4879-
// Require a 12 or 14 bit signed offset.
4880-
if (!isInt<12>(AM.BaseOffs) || !isShiftedInt<14, 2>(AM.BaseOffs))
4879+
// Require a 12-bit signed offset or 14-bit signed offset left-shifted by 2
4880+
// with `UAL` feature.
4881+
if (!isInt<12>(AM.BaseOffs) &&
4882+
!(isShiftedInt<14, 2>(AM.BaseOffs) && Subtarget.hasUAL()))
48814883
return false;
48824884

48834885
switch (AM.Scale) {
48844886
case 0:
4885-
// "i" is not allowed.
4886-
if (!AM.HasBaseReg)
4887-
return false;
4888-
// Otherwise we have "r+i".
4887+
// "r+i" or just "i", depending on HasBaseReg.
48894888
break;
48904889
case 1:
48914890
// "r+r+i" is not allowed.
4892-
if (AM.HasBaseReg && AM.BaseOffs != 0)
4891+
if (AM.HasBaseReg && AM.BaseOffs)
48934892
return false;
48944893
// Otherwise we have "r+r" or "r+i".
48954894
break;
48964895
case 2:
48974896
// "2*r+r" or "2*r+i" is not allowed.
48984897
if (AM.HasBaseReg || AM.BaseOffs)
48994898
return false;
4900-
// Otherwise we have "r+r".
4899+
// Allow "2*r" as "r+r".
49014900
break;
49024901
default:
49034902
return false;

llvm/test/CodeGen/LoongArch/gep-imm.ll

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,19 @@
44
define void @test(ptr %sp, ptr %t, i32 %n) {
55
; CHECK-LABEL: test:
66
; CHECK: # %bb.0: # %entry
7+
; CHECK-NEXT: ld.d $a0, $a0, 0
78
; CHECK-NEXT: move $a3, $zero
8-
; CHECK-NEXT: ld.d $a4, $a0, 0
9-
; CHECK-NEXT: lu12i.w $a0, 1
10-
; CHECK-NEXT: ori $a5, $a0, 3904
11-
; CHECK-NEXT: add.d $a0, $a1, $a5
12-
; CHECK-NEXT: add.d $a1, $a4, $a5
139
; CHECK-NEXT: addi.w $a2, $a2, 0
1410
; CHECK-NEXT: addi.w $a4, $a3, 0
1511
; CHECK-NEXT: bge $a4, $a2, .LBB0_2
1612
; CHECK-NEXT: .p2align 4, , 16
1713
; CHECK-NEXT: .LBB0_1: # %while_body
1814
; CHECK-NEXT: # =>This Inner Loop Header: Depth=1
1915
; CHECK-NEXT: addi.d $a4, $a3, 1
20-
; CHECK-NEXT: st.w $a4, $a1, 0
21-
; CHECK-NEXT: st.w $a3, $a1, 4
22-
; CHECK-NEXT: st.w $a4, $a0, 0
23-
; CHECK-NEXT: st.w $a3, $a0, 4
16+
; CHECK-NEXT: stptr.w $a4, $a0, 8000
17+
; CHECK-NEXT: stptr.w $a3, $a0, 8004
18+
; CHECK-NEXT: stptr.w $a4, $a1, 8000
19+
; CHECK-NEXT: stptr.w $a3, $a1, 8004
2420
; CHECK-NEXT: move $a3, $a4
2521
; CHECK-NEXT: addi.w $a4, $a3, 0
2622
; CHECK-NEXT: blt $a4, $a2, .LBB0_1

0 commit comments

Comments
 (0)