Skip to content

Commit 4060725

Browse files
committed
Remove ppc64le and s390x support from npb-is image
The npb-is image was failing to build on ppc64le with relocation overflow: relocation truncated to fit: R_PPC64_TOC16_HA against symbol 'key_array' Remove ppc64le and s390x from supported architectures: - The IS benchmark with CLASS=D has ~8GB data arrays that require special compiler flags for non-x86 architectures - ppc64le and s390x builds are difficult to test and maintain - Keep amd64 and arm64 which are the primary node performance test targets I don't think these arch(es) ever worked! Signed-off-by: Davanum Srinivas <davanum@gmail.com>
1 parent a427292 commit 4060725

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
linux/amd64=debian:bookworm-slim
22
linux/arm64=arm64v8/debian:bookworm-slim
3-
linux/ppc64le=ppc64le/debian:bookworm-slim
4-
linux/s390x=s390x/debian:bookworm-slim

test/images/node-perf/npb-is/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,11 @@ RUN sed -i '1i#!/bin/sh' sys/print_header sys/print_instructions
3131

3232
# Create build config based on the architecture and build the workload.
3333
# arm64 requires special flags to avoid relocation overflow with large binaries:
34-
# -mcmodel=large: use large code model for > 4GB address space
34+
# -mcmodel=large: use large code model for address space beyond default limits
3535
# -fno-PIE: disable position-independent executable (incompatible with large model)
3636
# -mno-outline-atomics: inline atomics to avoid linker issues
3737
RUN if [ $(arch) = "aarch64" ]; then \
3838
sed 's/-mcmodel=medium/-mcmodel=large -fno-PIE -mno-outline-atomics/g' config/NAS.samples/make.def.gcc_x86 > config/make.def; \
39-
elif [ $(arch) != "x86_64" ]; then \
40-
sed s/-mcmodel=medium//g config/NAS.samples/make.def.gcc_x86 > config/make.def; \
4139
else \
4240
cp config/NAS.samples/make.def.gcc_x86 config/make.def; \
4341
fi
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.0
1+
1.7.0

0 commit comments

Comments
 (0)