From 2314f3b8751b61ce5a00a2b49cfde461b3d7cfe5 Mon Sep 17 00:00:00 2001 From: Milo <50248166+Milo123459@users.noreply.github.com> Date: Wed, 20 Jul 2022 20:42:11 +0000 Subject: [PATCH 1/4] test stage-1 in ci --- .github/workflows/ci.yml | 3 ++ .../x86_64-gnu-llvm-12-stage1/Dockerfile | 53 +++++++++++++++++++ src/ci/github-actions/ci.yml | 3 ++ 3 files changed, 59 insertions(+) create mode 100644 src/ci/docker/host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6d9e249ee44ef..2e16a8d894cfd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,6 +46,9 @@ jobs: - name: x86_64-gnu-llvm-12 os: ubuntu-20.04-xl env: {} + - name: x86_64-gnu-llvm-12-stage1 + os: ubuntu-20.04-xl + env: {} - name: x86_64-gnu-tools env: CI_ONLY_WHEN_SUBMODULES_CHANGED: 1 diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile new file mode 100644 index 0000000000000..dd2aa56db44cc --- /dev/null +++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile @@ -0,0 +1,53 @@ +FROM ubuntu:20.04 + +ARG DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y --no-install-recommends \ + g++ \ + gcc-multilib \ + make \ + ninja-build \ + file \ + curl \ + ca-certificates \ + python2.7 \ + git \ + cmake \ + sudo \ + gdb \ + llvm-12-tools \ + llvm-12-dev \ + libedit-dev \ + libssl-dev \ + pkg-config \ + zlib1g-dev \ + xz-utils \ + nodejs + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +# using llvm-link-shared due to libffi issues -- see #34486 +ENV RUST_CONFIGURE_ARGS \ + --build=x86_64-unknown-linux-gnu \ + --llvm-root=/usr/lib/llvm-12 \ + --enable-llvm-link-shared \ + --set rust.thin-lto-import-instr-limit=10 + +ENV SCRIPT python2.7 ../x.py --stage 1 test --exclude src/tools/tidy && \ + # Run the `mir-opt` tests again but this time for a 32-bit target. + # This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have + # both 32-bit and 64-bit outputs updated by the PR author, before + # the PR is approved and tested for merging. + # It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`, + # despite having different output on 32-bit vs 64-bit targets. + python2.7 ../x.py --stage 1 test src/test/mir-opt \ + --host='' --target=i686-unknown-linux-gnu && \ + # Run the UI test suite again, but in `--pass=check` mode + # + # This is intended to make sure that both `--pass=check` continues to + # work. + # + python2.7 ../x.py --stage 1 test src/test/ui --pass=check \ + --host='' --target=i686-unknown-linux-gnu && \ + # Run tidy at the very end, after all the other tests. + python2.7 ../x.py --stage 1 test src/tools/tidy diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index f92e46b0a97f6..0dd4fc65792c9 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -287,6 +287,9 @@ jobs: - name: x86_64-gnu-llvm-12 <<: *job-linux-xl + - name: x86_64-gnu-llvm-12-stage1 + <<: *job-linux-xl + - name: x86_64-gnu-tools env: CI_ONLY_WHEN_SUBMODULES_CHANGED: 1 From b86c5fa14abcc0a211a24d308693aecc20338575 Mon Sep 17 00:00:00 2001 From: Milo <50248166+Milo123459@users.noreply.github.com> Date: Wed, 20 Jul 2022 20:56:28 +0000 Subject: [PATCH 2/4] skip some tests --- .../host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile index dd2aa56db44cc..c2f3a16d273b0 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12-stage1/Dockerfile @@ -41,13 +41,4 @@ ENV SCRIPT python2.7 ../x.py --stage 1 test --exclude src/tools/tidy && \ # It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`, # despite having different output on 32-bit vs 64-bit targets. python2.7 ../x.py --stage 1 test src/test/mir-opt \ - --host='' --target=i686-unknown-linux-gnu && \ - # Run the UI test suite again, but in `--pass=check` mode - # - # This is intended to make sure that both `--pass=check` continues to - # work. - # - python2.7 ../x.py --stage 1 test src/test/ui --pass=check \ - --host='' --target=i686-unknown-linux-gnu && \ - # Run tidy at the very end, after all the other tests. - python2.7 ../x.py --stage 1 test src/tools/tidy + --host='' --target=i686-unknown-linux-gnu \ No newline at end of file From 0f121d728831961606168da902dad946e4b2aa7e Mon Sep 17 00:00:00 2001 From: Milo <50248166+Milo123459@users.noreply.github.com> Date: Sat, 30 Jul 2022 21:56:53 +0000 Subject: [PATCH 3/4] add to full test-suite --- .github/workflows/ci.yml | 4 ++++ src/ci/github-actions/ci.yml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e16a8d894cfd..5dfc3f0b5b495 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -281,6 +281,10 @@ jobs: env: RUST_BACKTRACE: 1 os: ubuntu-20.04-xl + - name: x86_64-gnu-llvm-12-stage1 + env: + RUST_BACKTRACE: 1 + os: ubuntu-20.04-xl - name: x86_64-gnu-nopt os: ubuntu-20.04-xl env: {} diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 0dd4fc65792c9..97688e1e5d4c5 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -439,6 +439,11 @@ jobs: RUST_BACKTRACE: 1 <<: *job-linux-xl + - name: x86_64-gnu-llvm-12-stage1 + env: + RUST_BACKTRACE: 1 + <<: *job-linux-xl + - name: x86_64-gnu-nopt <<: *job-linux-xl From 1f7b6552bb67ac7e4c844776863988a1264c5ee0 Mon Sep 17 00:00:00 2001 From: Milo <50248166+Milo123459@users.noreply.github.com> Date: Sat, 30 Jul 2022 22:10:26 +0000 Subject: [PATCH 4/4] dont run stage1 tests in pr --- .github/workflows/ci.yml | 3 --- src/ci/github-actions/ci.yml | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5dfc3f0b5b495..1f95c1bcab4a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,9 +46,6 @@ jobs: - name: x86_64-gnu-llvm-12 os: ubuntu-20.04-xl env: {} - - name: x86_64-gnu-llvm-12-stage1 - os: ubuntu-20.04-xl - env: {} - name: x86_64-gnu-tools env: CI_ONLY_WHEN_SUBMODULES_CHANGED: 1 diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 97688e1e5d4c5..cb660881b075f 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -286,10 +286,7 @@ jobs: - name: x86_64-gnu-llvm-12 <<: *job-linux-xl - - - name: x86_64-gnu-llvm-12-stage1 - <<: *job-linux-xl - + - name: x86_64-gnu-tools env: CI_ONLY_WHEN_SUBMODULES_CHANGED: 1