pr feedback - take the instruction count bump out of Dockerfile

This commit is contained in:
James Barford-Evans
2025-04-25 07:45:53 +01:00
committed by Amanieu d'Antras
parent c65583c2b3
commit 45ee41c13a
2 changed files with 9 additions and 4 deletions
@@ -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(),
);