mirror of
https://github.com/rust-lang/rust.git
synced 2026-04-27 18:57:42 +03:00
pr feedback - take the instruction count bump out of Dockerfile
This commit is contained in:
committed by
Amanieu d'Antras
parent
c65583c2b3
commit
45ee41c13a
@@ -28,6 +28,3 @@ ENV CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_LINKER="${AARCH64_BE_TOOLCHAIN}/bi
|
||||
ENV CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64_be -cpu max -L ${AARCH64_BE_LIBC}"
|
||||
ENV OBJDUMP="${AARCH64_BE_TOOLCHAIN}/bin/aarch64_be-none-linux-gnu-objdump"
|
||||
ENV STDARCH_TEST_SKIP_FEATURE=tme
|
||||
# The table instructions, while correct, generate some rev64 instructions which
|
||||
# increases the number of instructions generated
|
||||
ENV STDARCH_ASSERT_INSTR_LIMIT=32
|
||||
|
||||
@@ -164,7 +164,15 @@ pub fn assert(shim_addr: usize, fnname: &str, expected: &str) {
|
||||
// Original limit was 20 instructions, but ARM DSP Intrinsics
|
||||
// are exactly 20 instructions long. So, bump the limit to 22
|
||||
// instead of adding here a long list of exceptions.
|
||||
_ => 22,
|
||||
_ => {
|
||||
// aarch64_be may add reverse instructions which increases
|
||||
// the number of instructions generated.
|
||||
if cfg!(all(target_endian = "big", target_arch = "aarch64")) {
|
||||
32
|
||||
} else {
|
||||
22
|
||||
}
|
||||
}
|
||||
},
|
||||
|v| v.parse().unwrap(),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user