Skip to content

Commit 639c1f2

Browse files
committed
[RISCV] Enable load clustering by default
This just flips the default for the option. A later patch may remove it altogether.
1 parent 39b2e35 commit 639c1f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+10419
-10413
lines changed

llvm/lib/Target/RISCV/RISCVTargetMachine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static cl::opt<bool>
9696
static cl::opt<bool> EnableMISchedLoadClustering(
9797
"riscv-misched-load-clustering", cl::Hidden,
9898
cl::desc("Enable load clustering in the machine scheduler"),
99-
cl::init(false));
99+
cl::init(true));
100100

101101
static cl::opt<bool> EnableVSETVLIAfterRVVRegAlloc(
102102
"riscv-vsetvl-after-rvv-regalloc", cl::Hidden,

llvm/test/CodeGen/RISCV/GlobalISel/vararg.ll

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ define i32 @va1(ptr %fmt, ...) {
6969
; RV64-NEXT: sd a2, 32(sp)
7070
; RV64-NEXT: sd a3, 40(sp)
7171
; RV64-NEXT: sd a4, 48(sp)
72-
; RV64-NEXT: sd a5, 56(sp)
7372
; RV64-NEXT: addi a0, sp, 24
7473
; RV64-NEXT: sd a0, 8(sp)
75-
; RV64-NEXT: lw a0, 12(sp)
76-
; RV64-NEXT: lwu a1, 8(sp)
74+
; RV64-NEXT: lwu a0, 8(sp)
75+
; RV64-NEXT: lw a1, 12(sp)
76+
; RV64-NEXT: sd a5, 56(sp)
7777
; RV64-NEXT: sd a6, 64(sp)
7878
; RV64-NEXT: sd a7, 72(sp)
79-
; RV64-NEXT: slli a0, a0, 32
80-
; RV64-NEXT: or a0, a0, a1
79+
; RV64-NEXT: slli a1, a1, 32
80+
; RV64-NEXT: or a0, a1, a0
8181
; RV64-NEXT: addi a1, a0, 4
8282
; RV64-NEXT: srli a2, a1, 32
8383
; RV64-NEXT: sw a1, 8(sp)
@@ -128,15 +128,15 @@ define i32 @va1(ptr %fmt, ...) {
128128
; RV64-WITHFP-NEXT: sd a2, 16(s0)
129129
; RV64-WITHFP-NEXT: sd a3, 24(s0)
130130
; RV64-WITHFP-NEXT: sd a4, 32(s0)
131-
; RV64-WITHFP-NEXT: sd a5, 40(s0)
132131
; RV64-WITHFP-NEXT: addi a0, s0, 8
133132
; RV64-WITHFP-NEXT: sd a0, -24(s0)
134-
; RV64-WITHFP-NEXT: lw a0, -20(s0)
135-
; RV64-WITHFP-NEXT: lwu a1, -24(s0)
133+
; RV64-WITHFP-NEXT: lwu a0, -24(s0)
134+
; RV64-WITHFP-NEXT: lw a1, -20(s0)
135+
; RV64-WITHFP-NEXT: sd a5, 40(s0)
136136
; RV64-WITHFP-NEXT: sd a6, 48(s0)
137137
; RV64-WITHFP-NEXT: sd a7, 56(s0)
138-
; RV64-WITHFP-NEXT: slli a0, a0, 32
139-
; RV64-WITHFP-NEXT: or a0, a0, a1
138+
; RV64-WITHFP-NEXT: slli a1, a1, 32
139+
; RV64-WITHFP-NEXT: or a0, a1, a0
140140
; RV64-WITHFP-NEXT: addi a1, a0, 4
141141
; RV64-WITHFP-NEXT: srli a2, a1, 32
142142
; RV64-WITHFP-NEXT: sw a1, -24(s0)
@@ -1609,22 +1609,22 @@ define i32 @va_large_stack(ptr %fmt, ...) {
16091609
; RV64-NEXT: add a0, sp, a0
16101610
; RV64-NEXT: sd a4, 304(a0)
16111611
; RV64-NEXT: lui a0, 24414
1612-
; RV64-NEXT: add a0, sp, a0
1613-
; RV64-NEXT: sd a5, 312(a0)
1614-
; RV64-NEXT: lui a0, 24414
16151612
; RV64-NEXT: addiw a0, a0, 280
16161613
; RV64-NEXT: add a0, sp, a0
16171614
; RV64-NEXT: sd a0, 8(sp)
1618-
; RV64-NEXT: lw a0, 12(sp)
1619-
; RV64-NEXT: lwu a1, 8(sp)
1615+
; RV64-NEXT: lwu a0, 8(sp)
1616+
; RV64-NEXT: lw a1, 12(sp)
1617+
; RV64-NEXT: lui a2, 24414
1618+
; RV64-NEXT: add a2, sp, a2
1619+
; RV64-NEXT: sd a5, 312(a2)
16201620
; RV64-NEXT: lui a2, 24414
16211621
; RV64-NEXT: add a2, sp, a2
16221622
; RV64-NEXT: sd a6, 320(a2)
16231623
; RV64-NEXT: lui a2, 24414
16241624
; RV64-NEXT: add a2, sp, a2
16251625
; RV64-NEXT: sd a7, 328(a2)
1626-
; RV64-NEXT: slli a0, a0, 32
1627-
; RV64-NEXT: or a0, a0, a1
1626+
; RV64-NEXT: slli a1, a1, 32
1627+
; RV64-NEXT: or a0, a1, a0
16281628
; RV64-NEXT: addi a1, a0, 4
16291629
; RV64-NEXT: srli a2, a1, 32
16301630
; RV64-NEXT: sw a1, 8(sp)
@@ -1692,15 +1692,15 @@ define i32 @va_large_stack(ptr %fmt, ...) {
16921692
; RV64-WITHFP-NEXT: sd a2, 16(s0)
16931693
; RV64-WITHFP-NEXT: sd a3, 24(s0)
16941694
; RV64-WITHFP-NEXT: sd a4, 32(s0)
1695-
; RV64-WITHFP-NEXT: sd a5, 40(s0)
16961695
; RV64-WITHFP-NEXT: addi a1, s0, 8
16971696
; RV64-WITHFP-NEXT: sd a1, 0(a0)
1698-
; RV64-WITHFP-NEXT: lw a1, 4(a0)
1699-
; RV64-WITHFP-NEXT: lwu a2, 0(a0)
1697+
; RV64-WITHFP-NEXT: lwu a1, 0(a0)
1698+
; RV64-WITHFP-NEXT: lw a2, 4(a0)
1699+
; RV64-WITHFP-NEXT: sd a5, 40(s0)
17001700
; RV64-WITHFP-NEXT: sd a6, 48(s0)
17011701
; RV64-WITHFP-NEXT: sd a7, 56(s0)
1702-
; RV64-WITHFP-NEXT: slli a1, a1, 32
1703-
; RV64-WITHFP-NEXT: or a1, a1, a2
1702+
; RV64-WITHFP-NEXT: slli a2, a2, 32
1703+
; RV64-WITHFP-NEXT: or a1, a2, a1
17041704
; RV64-WITHFP-NEXT: addi a2, a1, 4
17051705
; RV64-WITHFP-NEXT: srli a3, a2, 32
17061706
; RV64-WITHFP-NEXT: sw a2, 0(a0)

0 commit comments

Comments
 (0)