Adjust loongarch assembly test This generates different code on loongarch32r now.
Signed-off-by: Khem Raj <[email protected]> --- .../0001-Adjust-loongarch-assembly-test.patch | 66 +++++++++++++++++++ meta/recipes-devtools/rust/rust-source.inc | 1 + 2 files changed, 67 insertions(+) create mode 100644 meta/recipes-devtools/rust/files/0001-Adjust-loongarch-assembly-test.patch diff --git a/meta/recipes-devtools/rust/files/0001-Adjust-loongarch-assembly-test.patch b/meta/recipes-devtools/rust/files/0001-Adjust-loongarch-assembly-test.patch new file mode 100644 index 0000000000..67c649ebd8 --- /dev/null +++ b/meta/recipes-devtools/rust/files/0001-Adjust-loongarch-assembly-test.patch @@ -0,0 +1,66 @@ +From e015fc820db5d7fe2495c09b1fdd5e2092ed3cd1 Mon Sep 17 00:00:00 2001 +From: Nikita Popov <[email protected]> +Date: Tue, 27 Jan 2026 12:03:48 +0100 +Subject: [PATCH] Adjust loongarch assembly test + +This generates different code on loongarch32r now. + +Upstream-Status: Backport [https://github.com/rust-lang/rust/commit/e015fc820db5d7fe2495c09b1fdd5e2092ed3cd1] +Signed-off-by: Khem Raj <[email protected]> +--- + tests/assembly-llvm/asm/loongarch-type.rs | 27 +++++++++++++++++------ + 1 file changed, 20 insertions(+), 7 deletions(-) + +diff --git a/tests/assembly-llvm/asm/loongarch-type.rs b/tests/assembly-llvm/asm/loongarch-type.rs +index e0a7940f89a..5efad583a39 100644 +--- a/tests/assembly-llvm/asm/loongarch-type.rs ++++ b/tests/assembly-llvm/asm/loongarch-type.rs +@@ -1,10 +1,14 @@ + //@ add-minicore +-//@ revisions: loongarch32 loongarch64 ++//@ revisions: loongarch32s loongarch32r loongarch64 + + //@ assembly-output: emit-asm + +-//@[loongarch32] compile-flags: --target loongarch32-unknown-none +-//@[loongarch32] needs-llvm-components: loongarch ++//@[loongarch32s] compile-flags: --target loongarch32-unknown-none -Ctarget-feature=+32s ++//@[loongarch32s] needs-llvm-components: loongarch ++ ++//@[loongarch32r] compile-flags: --target loongarch32-unknown-none ++//@[loongarch32r] needs-llvm-components: loongarch ++//@[loongarch32r] min-llvm-version: 22 + + //@[loongarch64] compile-flags: --target loongarch64-unknown-none + //@[loongarch64] needs-llvm-components: loongarch +@@ -28,8 +32,12 @@ + + // CHECK-LABEL: sym_fn: + // CHECK: #APP +-// CHECK: pcalau12i $t0, %got_pc_hi20(extern_func) +-// CHECK: ld.{{[wd]}} $t0, $t0, %got_pc_lo12(extern_func) ++// loongarch64: pcalau12i $t0, %got_pc_hi20(extern_func) ++// loongarch64: ld.d $t0, $t0, %got_pc_lo12(extern_func) ++// loongarch32s: pcalau12i $t0, %got_pc_hi20(extern_func) ++// loongarch32s: ld.w $t0, $t0, %got_pc_lo12(extern_func) ++// loongarch32r: pcaddu12i $t0, %got_pcadd_hi20(extern_func) ++// loongarch32r: ld.w $t0, $t0, %got_pcadd_lo12(.Lpcadd_hi0) + // CHECK: #NO_APP + #[no_mangle] + pub unsafe fn sym_fn() { +@@ -38,8 +46,13 @@ pub unsafe fn sym_fn() { + + // CHECK-LABEL: sym_static: + // CHECK: #APP +-// CHECK: pcalau12i $t0, %got_pc_hi20(extern_static) +-// CHECK: ld.{{[wd]}} $t0, $t0, %got_pc_lo12(extern_static) ++// loongarch64: pcalau12i $t0, %got_pc_hi20(extern_static) ++// loongarch64: ld.d $t0, $t0, %got_pc_lo12(extern_static) ++// loongarch32s: pcalau12i $t0, %got_pc_hi20(extern_static) ++// loongarch32s: ld.w $t0, $t0, %got_pc_lo12(extern_static) ++// loongarch32r: pcaddu12i $t0, %got_pcadd_hi20(extern_static) ++// loongarch32r: ld.w $t0, $t0, %got_pcadd_lo12(.Lpcadd_hi1) ++ + // CHECK: #NO_APP + #[no_mangle] + pub unsafe fn sym_static() { diff --git a/meta/recipes-devtools/rust/rust-source.inc b/meta/recipes-devtools/rust/rust-source.inc index e1942db93d..cd6999c8f2 100644 --- a/meta/recipes-devtools/rust/rust-source.inc +++ b/meta/recipes-devtools/rust/rust-source.inc @@ -9,6 +9,7 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n file://0001-Update-call-llvm-intrinsics-test.patch;patchdir=${RUSTSRC} \ file://0001-Fix-flaky-assertions-in-oneshot-tests.patch;patchdir=${RUSTSRC} \ file://0001-Update-amdgpu-data-layout.patch;patchdir=${RUSTSRC} \ + file://0001-Adjust-loongarch-assembly-test.patch;patchdir=${RUSTSRC} \ " SRC_URI[rust.sha256sum] = "0b53ae34f5c0c3612cfe1de139f9167a018cd5737bc2205664fd69ba9b25f600"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#234027): https://lists.openembedded.org/g/openembedded-core/message/234027 Mute This Topic: https://lists.openembedded.org/mt/118520132/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
