Skip to content

Use jemalloc to compile dist on CI (x86_64-linux) #122047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Use jemalloc to compile dist on CI (x86_64-linux) #122047

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
112999b
Use jemalloc to compile dist on CI
blyxyas Mar 5, 2024
30e01c2
Move that LD_PRELOAD line to later in the file
blyxyas Mar 5, 2024
f6093dc
Move the ENV even more
blyxyas Mar 5, 2024
9780abb
Update src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
blyxyas Mar 6, 2024
ccadda5
Move LD_PRELOAD to the correct place, this time
blyxyas Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ RUN yum upgrade -y && \
xz \
zlib-devel.i686 \
zlib-devel.x86_64 \
jemalloc-devel \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need -devel -- the base package includes a jemalloc.sh wrapper script that will set LD_PRELOAD for you.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delay, do you know where this jemalloc.sh script is located?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's /usr/bin/jemalloc.sh, so that's even in the PATH.

&& yum clean all

RUN mkdir -p /rustroot/bin
Expand Down Expand Up @@ -89,7 +90,7 @@ ENV RUST_CONFIGURE_ARGS \
--set rust.codegen-units=1

ENV SCRIPT python3 ../x.py build --set rust.debug=true opt-dist && \
./build/$HOSTS/stage0-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
LD_PRELOAD=`jemalloc-config --libdir`/libjemalloc.so.`jemalloc-config --revision` ./build/$HOSTS/stage0-tools-bin/opt-dist linux-ci -- python3 ../x.py dist \
--host $HOSTS --target $HOSTS \
--include-default-paths \
build-manifest bootstrap
Expand Down