From 9d77dea374a08cafb0b0e4a0c1102671bf8f6f8b Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 3 Oct 2021 19:40:14 +0200 Subject: Improve native compilation on emba * test/infra/Dockerfile.emba (emacs-native-comp) (emacs-native-comp-speed1, emacs-native-comp-speed2): New stages. (emacs-native-comp-speed0): Adapt. * test/infra/gitlab-ci.yml (.build-template): Add 'needs: []'. (.native-comp-template): Use 'only:' instead of 'rules:'. (build-native-comp-speed0): Rename from 'build-native-bootstrap-speed0'. (build-native-comp-speed1, build-native-comp-speed2) (test-native-comp-speed0): New jobs. --- test/infra/Dockerfile.emba | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'test/infra/Dockerfile.emba') diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba index 71b4e76865f..c129bc8be87 100644 --- a/test/infra/Dockerfile.emba +++ b/test/infra/Dockerfile.emba @@ -72,14 +72,14 @@ RUN ./autogen.sh autoconf RUN ./configure --with-ns RUN make bootstrap -FROM emacs-base as emacs-native-comp-speed0 +FROM emacs-base as emacs-native-comp RUN apt-get update && \ apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \ libgccjit-6-dev \ && rm -rf /var/lib/apt/lists/* -ARG make_bootstrap_params="" +FROM emacs-native-comp as emacs-native-comp-speed0 COPY . /checkout WORKDIR /checkout @@ -87,3 +87,19 @@ RUN ./autogen.sh autoconf RUN ./configure --with-native-compilation RUN make bootstrap -j2 \ NATIVE_FULL_AOT=1 BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 0)"' + +FROM emacs-native-comp as emacs-native-comp-speed1 + +COPY . /checkout +WORKDIR /checkout +RUN ./autogen.sh autoconf +RUN ./configure --with-native-compilation +RUN make bootstrap -j2 BYTE_COMPILE_EXTRA_FLAGS='--eval "(setq comp-speed 1)"' + +FROM emacs-native-comp as emacs-native-comp-speed2 + +COPY . /checkout +WORKDIR /checkout +RUN ./autogen.sh autoconf +RUN ./configure --with-native-compilation +RUN make bootstrap -j2 -- cgit v1.2.3