Skip to content

Commit 18c6d1d

Browse files
authored
Cranelift: update to regalloc2 0.12.0. (#10571)
* Cranelift: update to regalloc2 0.12.0. This pulls in bytecodealliance/regalloc2#220, a fix to an infinite loop in register allocation. Fixes #10562. * cargo-vet update
1 parent 9ca321e commit 18c6d1d

File tree

6 files changed

+36
-24
lines changed

6 files changed

+36
-24
lines changed

Diff for: Cargo.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ byte-array-literals = { path = "crates/wasi-preview1-component-adapter/byte-arra
287287

288288
# Bytecode Alliance maintained dependencies:
289289
# ---------------------------
290-
regalloc2 = "0.11.3"
290+
regalloc2 = "0.12.0"
291291

292292
# cap-std family:
293293
target-lexicon = "0.13.0"

Diff for: cranelift/filetests/filetests/isa/riscv64/call.clif

+14-2
Original file line numberDiff line numberDiff line change
@@ -627,17 +627,20 @@ block0(v0: i128, v1: i64):
627627
; mv fp,sp
628628
; addi sp,sp,-32
629629
; sd s1,24(sp)
630+
; sd s3,16(sp)
630631
; block0:
631632
; sd a1,0(sp)
632633
; load_sym s1,%f14+0
633634
; mv a5,a1
634635
; mv a6,a2
635636
; mv a7,a0
637+
; mv s3,a1
636638
; mv a2,a7
637639
; mv a3,a5
638640
; mv a4,a7
639641
; callind s1
640642
; ld s1,24(sp)
643+
; ld s3,16(sp)
641644
; addi sp,sp,32
642645
; ld ra,8(sp)
643646
; ld fp,0(sp)
@@ -652,7 +655,8 @@ block0(v0: i128, v1: i64):
652655
; mv s0, sp
653656
; addi sp, sp, -0x20
654657
; sd s1, 0x18(sp)
655-
; block1: ; offset 0x18
658+
; sd s3, 0x10(sp)
659+
; block1: ; offset 0x1c
656660
; sd a1, 0(sp)
657661
; auipc s1, 0
658662
; ld s1, 0xc(s1)
@@ -662,11 +666,13 @@ block0(v0: i128, v1: i64):
662666
; mv a5, a1
663667
; mv a6, a2
664668
; mv a7, a0
669+
; mv s3, a1
665670
; mv a2, a7
666671
; mv a3, a5
667672
; mv a4, a7
668673
; jalr s1
669674
; ld s1, 0x18(sp)
675+
; ld s3, 0x10(sp)
670676
; addi sp, sp, 0x20
671677
; ld ra, 8(sp)
672678
; ld s0, 0(sp)
@@ -720,17 +726,20 @@ block0(v0: i128, v1: i64):
720726
; mv fp,sp
721727
; addi sp,sp,-32
722728
; sd s1,24(sp)
729+
; sd s3,16(sp)
723730
; block0:
724731
; sd a1,0(sp)
725732
; load_sym s1,%f15+0
726733
; mv a5,a1
727734
; mv a6,a2
728735
; mv a7,a0
736+
; mv s3,a1
729737
; mv a2,a7
730738
; mv a3,a5
731739
; mv a4,a7
732740
; callind s1
733741
; ld s1,24(sp)
742+
; ld s3,16(sp)
734743
; addi sp,sp,32
735744
; ld ra,8(sp)
736745
; ld fp,0(sp)
@@ -745,7 +754,8 @@ block0(v0: i128, v1: i64):
745754
; mv s0, sp
746755
; addi sp, sp, -0x20
747756
; sd s1, 0x18(sp)
748-
; block1: ; offset 0x18
757+
; sd s3, 0x10(sp)
758+
; block1: ; offset 0x1c
749759
; sd a1, 0(sp)
750760
; auipc s1, 0
751761
; ld s1, 0xc(s1)
@@ -755,11 +765,13 @@ block0(v0: i128, v1: i64):
755765
; mv a5, a1
756766
; mv a6, a2
757767
; mv a7, a0
768+
; mv s3, a1
758769
; mv a2, a7
759770
; mv a3, a5
760771
; mv a4, a7
761772
; jalr s1
762773
; ld s1, 0x18(sp)
774+
; ld s3, 0x10(sp)
763775
; addi sp, sp, 0x20
764776
; ld ra, 8(sp)
765777
; ld s0, 0(sp)

Diff for: cranelift/filetests/filetests/isa/x64/fma-call.clif

+16-16
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,19 @@ block0(v0: f32x4, v1: f32x4, v2: f32x4):
7474
; movdqu rsp(0 + virtual offset), %xmm4
7575
; movdqu %xmm0, rsp(80 + virtual offset)
7676
; pshufd $1, %xmm4, %xmm0
77-
; movdqu rsp(16 + virtual offset), %xmm2
78-
; pshufd $1, %xmm2, %xmm1
79-
; movdqu rsp(32 + virtual offset), %xmm5
80-
; pshufd $1, %xmm5, %xmm2
77+
; movdqu rsp(16 + virtual offset), %xmm1
78+
; pshufd $1, %xmm1, %xmm1
79+
; movdqu rsp(32 + virtual offset), %xmm2
80+
; pshufd $1, %xmm2, %xmm2
8181
; load_ext_name %FmaF32+0, %r9
8282
; call *%r9
8383
; movdqu rsp(0 + virtual offset), %xmm4
8484
; movdqu %xmm0, rsp(48 + virtual offset)
8585
; pshufd $2, %xmm4, %xmm0
86-
; movdqu rsp(16 + virtual offset), %xmm7
87-
; pshufd $2, %xmm7, %xmm1
88-
; movdqu rsp(32 + virtual offset), %xmm3
89-
; pshufd $2, %xmm3, %xmm2
86+
; movdqu rsp(16 + virtual offset), %xmm1
87+
; pshufd $2, %xmm1, %xmm1
88+
; movdqu rsp(32 + virtual offset), %xmm2
89+
; pshufd $2, %xmm2, %xmm2
9090
; load_ext_name %FmaF32+0, %r10
9191
; call *%r10
9292
; movdqu rsp(0 + virtual offset), %xmm4
@@ -125,19 +125,19 @@ block0(v0: f32x4, v1: f32x4, v2: f32x4):
125125
; movdqu (%rsp), %xmm4
126126
; movdqu %xmm0, 0x50(%rsp)
127127
; pshufd $1, %xmm4, %xmm0
128-
; movdqu 0x10(%rsp), %xmm2
129-
; pshufd $1, %xmm2, %xmm1
130-
; movdqu 0x20(%rsp), %xmm5
131-
; pshufd $1, %xmm5, %xmm2
128+
; movdqu 0x10(%rsp), %xmm1
129+
; pshufd $1, %xmm1, %xmm1
130+
; movdqu 0x20(%rsp), %xmm2
131+
; pshufd $1, %xmm2, %xmm2
132132
; movabsq $0, %r9 ; reloc_external Abs8 %FmaF32 0
133133
; callq *%r9
134134
; movdqu (%rsp), %xmm4
135135
; movdqu %xmm0, 0x30(%rsp)
136136
; pshufd $2, %xmm4, %xmm0
137-
; movdqu 0x10(%rsp), %xmm7
138-
; pshufd $2, %xmm7, %xmm1
139-
; movdqu 0x20(%rsp), %xmm3
140-
; pshufd $2, %xmm3, %xmm2
137+
; movdqu 0x10(%rsp), %xmm1
138+
; pshufd $2, %xmm1, %xmm1
139+
; movdqu 0x20(%rsp), %xmm2
140+
; pshufd $2, %xmm2, %xmm2
141141
; movabsq $0, %r10 ; reloc_external Abs8 %FmaF32 0
142142
; callq *%r10
143143
; movdqu (%rsp), %xmm4

Diff for: supply-chain/imports.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -933,8 +933,8 @@ user-login = "dtolnay"
933933
user-name = "David Tolnay"
934934

935935
[[publisher.regalloc2]]
936-
version = "0.11.3"
937-
when = "2025-04-07"
936+
version = "0.12.0"
937+
when = "2025-04-11"
938938
user-id = 3726
939939
user-login = "cfallin"
940940
user-name = "Chris Fallin"

Diff for: tests/disas/pulley/epoch-simple.wat

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
;; br_if_xulteq64 x7, x6, 0x9 // target = 0x26
1515
;; 24: pop_frame
1616
;; ret
17-
;; 26: call 0x8a // target = 0xb0
17+
;; 26: call 0x8d // target = 0xb3
1818
;; 2b: jump -0x7 // target = 0x24

0 commit comments

Comments
 (0)