Skip to content

Commit 6509896

Browse files
committed
pr feedback - take the instruction count bump out of Dockerfile
1 parent 7c2a6f5 commit 6509896

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

ci/docker/aarch64_be-unknown-linux-gnu/Dockerfile

-3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,3 @@ ENV CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_LINKER="${AARCH64_BE_TOOLCHAIN}/bi
2828
ENV CARGO_TARGET_AARCH64_BE_UNKNOWN_LINUX_GNU_RUNNER="qemu-aarch64_be -cpu max -L ${AARCH64_BE_LIBC}"
2929
ENV OBJDUMP="${AARCH64_BE_TOOLCHAIN}/bin/aarch64_be-none-linux-gnu-objdump"
3030
ENV STDARCH_TEST_SKIP_FEATURE=tme
31-
# The table instructions, while correct, generate some rev64 instructions which
32-
# increases the number of instructions generated
33-
ENV STDARCH_ASSERT_INSTR_LIMIT=32

crates/stdarch-test/src/lib.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,15 @@ pub fn assert(shim_addr: usize, fnname: &str, expected: &str) {
164164
// Original limit was 20 instructions, but ARM DSP Intrinsics
165165
// are exactly 20 instructions long. So, bump the limit to 22
166166
// instead of adding here a long list of exceptions.
167-
_ => 22,
167+
_ => {
168+
// aarch64_be may add reverse instructions which increases
169+
// the number of instructions generated.
170+
if cfg!(all(target_endian = "big", target_arch = "aarch64")) {
171+
32
172+
} else {
173+
22
174+
}
175+
}
168176
},
169177
|v| v.parse().unwrap(),
170178
);

0 commit comments

Comments
 (0)