Auto merge of #134124 - MarcoIeni:split-llvm-jobs, r= · rust-lang/rust@786e8ac (original) (raw)

4 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -60,4 +60,5 @@ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
60 60 RUN /scripts/build-gccjit.sh /scripts
61 61
62 62 COPY scripts/x86_64-gnu-llvm.sh /tmp/script.sh
63 -ENV SCRIPT /tmp/script.sh
63 +ARG SCRIPT_ARG
64 +ENV SCRIPT="/tmp/script.sh && ${SCRIPT_ARG}"
Original file line number Diff line number Diff line change
@@ -60,4 +60,5 @@ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
60 60 RUN /scripts/build-gccjit.sh /scripts
61 61
62 62 COPY scripts/x86_64-gnu-llvm.sh /tmp/script.sh
63 -ENV SCRIPT /tmp/script.sh
63 +ARG SCRIPT_ARG
64 +ENV SCRIPT="/tmp/script.sh && ${SCRIPT_ARG}"
Original file line number Diff line number Diff line change
@@ -39,9 +39,6 @@ if [[ -z "${PR_CI_JOB}" ]]; then
39 39 library/std library/alloc library/core
40 40 fi
41 41
42 -# NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
43 -../x.py --stage 2 test --skip src/tools/tidy
44 -
45 42 # Run the `mir-opt` tests again but this time for a 32-bit target.
46 43 # This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
47 44 # both 32-bit and 64-bit outputs updated by the PR author, before
Original file line number Diff line number Diff line change
@@ -117,6 +117,7 @@ pr:
117 117 ENABLE_GCC_CODEGEN: "1"
118 118 # We are adding (temporarily) a dummy commit on the compiler
119 119 READ_ONLY_SRC: "0"
120 +DOCKER_SCRIPT: python3 ../x.py --stage 2 test --skip src/tools/tidy
120 121 <<: *job-linux-16c
121 122 - image: x86_64-gnu-tools
122 123 <<: *job-linux-16c
@@ -312,16 +313,41 @@ auto:
312 313 - image: x86_64-gnu-distcheck
313 314 <<: *job-linux-8c
314 315
315 - - image: x86_64-gnu-llvm-19
316 +# The x86_64-gnu-llvm-19 job is split into multiple jobs to run tests in parallel.
317 +# x86_64-gnu-llvm-19-1 skips tests that run in x86_64-gnu-llvm-19-2.
318 + - image: x86_64-gnu-llvm-19-1
316 319 env:
317 320 RUST_BACKTRACE: 1
318 -<<: *job-linux-8c
321 +IMAGE: x86_64-gnu-llvm-19
322 +<<: *stage_2_test_set1
323 +<<: *job-linux-4c
319 324
320 - - image: x86_64-gnu-llvm-18
325 +# Skip tests that run in x86_64-gnu-llvm-19-2
326 + - image: x86_64-gnu-llvm-19-2
327 +env:
328 +RUST_BACKTRACE: 1
329 +IMAGE: x86_64-gnu-llvm-19
330 +<<: *stage_2_test_set2
331 +<<: *job-linux-4c
332 +
333 +# The x86_64-gnu-llvm-18 job is split into multiple jobs to run tests in parallel.
334 +# x86_64-gnu-llvm-18-1 skips tests that run in x86_64-gnu-llvm-18-2.
335 + - image: x86_64-gnu-llvm-18-1
321 336 env:
322 337 RUST_BACKTRACE: 1
323 338 READ_ONLY_SRC: "0"
324 -<<: *job-linux-8c
339 +IMAGE: x86_64-gnu-llvm-18
340 +<<: *stage_2_test_set1
341 +<<: *job-linux-4c
342 +
343 +# Skip tests that run in x86_64-gnu-llvm-18-2
344 + - image: x86_64-gnu-llvm-18-2
345 +env:
346 +RUST_BACKTRACE: 1
347 +READ_ONLY_SRC: "0"
348 +IMAGE: x86_64-gnu-llvm-18
349 +<<: *stage_2_test_set2
350 +<<: *job-linux-4c
325 351
326 352 - image: x86_64-gnu-nopt
327 353 <<: *job-linux-4c