rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Work around CI failures for the ARM target"

Browse Source 
This reverts commit 5a748ec5fabcaee29351ac3c90eee4f3e16964e7.
This commit is contained in:
Amanieu d'Antras
2023-11-30 07:56:47 +00:00
parent 86cb5730ae
commit 3ac4ba6670
3 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/stdarch/ci/run.sh
View File

@@ -85,9 +85,8 @@ cargo_test() {
cmd="$cmd --skip test_vec_lde_u16 --skip test_vec_lde_u32 --skip test_vec_expte"
;;
# Miscompilation: https://github.com/rust-lang/rust/issues/112460
# Also LLVM bug: https://github.com/rust-lang/stdarch/issues/1217
arm*)
cmd="$cmd --skip vld"
cmd="$cmd --skip vld2q_dup_f32"
;;
esac

20
library/stdarch/crates/intrinsic-test/missing_arm.txt
View File

@@ -213,23 +213,3 @@ vrndxq_f32
#vrshrn_n_u64
#vshrq_n_u64
#vshr_n_u64
# Seems to be miscompiled.
vtbl2_p8
vtbl2_s8
vtbl2_u8
vtbl3_p8
vtbl3_s8
vtbl3_u8
vtbl4_p8
vtbl4_s8
vtbl4_u8
vtbx2_p8
vtbx2_s8
vtbx2_u8
vtbx3_p8
vtbx3_s8
vtbx3_u8
vtbx4_p8
vtbx4_s8
vtbx4_u8

29
library/stdarch/crates/stdarch-test/src/lib.rs
View File

@@ -124,14 +124,29 @@ pub fn assert(shim_addr: usize, fnname: &str, expected: &str) {
// Intrinsics using `cvtpi2ps` are typically "composites" and
// in some cases exceed the limit.
"cvtpi2ps" => 25,
// vfmaq_n_f32_vfma : #instructions = 26 >= 22 (limit)
"vfma" | "vfms" => 27,
// core_arch/src/arm_shared/simd32
"usad8" | "qadd8" | "qsub8" | "sadd8" | "sel" | "shadd8" | "shsub8" | "usub8"
| "ssub8" => 29,
// core_arch/src/arm_shared/neon
_ if fnname.contains("_vld") => 50,
_ if fnname.contains("_vst") => 50,
// vfmaq_n_f32_vfma : #instructions = 26 >= 22 (limit)
"usad8" | "vfma" | "vfms" => 27,
"qadd8" | "qsub8" | "sadd8" | "sel" | "shadd8" | "shsub8" | "usub8" | "ssub8" => 29,
// core_arch/src/arm_shared/simd32
// vst1q_s64_x4_vst1 : #instructions = 27 >= 22 (limit)
"vld3" => 28,
// core_arch/src/arm_shared/simd32
// vld4q_lane_u32_vld4 : #instructions = 36 >= 22 (limit)
"vld4" => 37,
// core_arch/src/arm_shared/simd32
// vst1q_s64_x4_vst1 : #instructions = 40 >= 22 (limit)
"vst1" => 41,
// core_arch/src/arm_shared/simd32
// vst3q_u32_vst3 : #instructions = 25 >= 22 (limit)
"vst3" => 26,
// core_arch/src/arm_shared/simd32
// vst4q_u32_vst4 : #instructions = 33 >= 22 (limit)
"vst4" => 34,
// core_arch/src/arm_shared/simd32
// vst1q_p64_x4_nop : #instructions = 33 >= 22 (limit)
"nop" if fnname.contains("vst1q_p64") => 34,
// Original limit was 20 instructions, but ARM DSP Intrinsics
// are exactly 20 instructions long. So, bump the limit to 22