forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Auto merge of rust-lang#117253 - antoyo:subtree-update_cg_gcc_2023-10…
…-25, r=bjorn3,GuillaumeGomez subtree update cg_gcc 2023/10/25
- Loading branch information
Showing
48 changed files
with
2,759 additions
and
557 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
129 changes: 129 additions & 0 deletions
129
compiler/rustc_codegen_gcc/.github/workflows/failures.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| # TODO: refactor to avoid duplication with the ci.yml file. | ||
| name: Failures | ||
|
|
||
| on: | ||
| - pull_request | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| env: | ||
| # Enable backtraces for easier debugging | ||
| RUST_BACKTRACE: 1 | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-22.04 | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| libgccjit_version: | ||
| - gcc: "libgccjit.so" | ||
| artifacts_branch: "master" | ||
| - gcc: "libgccjit_without_int128.so" | ||
| artifacts_branch: "master-without-128bit-integers" | ||
| - gcc: "libgccjit12.so" | ||
| artifacts_branch: "gcc12" | ||
| extra: "--no-default-features" | ||
| # FIXME(antoyo): we need to set GCC_EXEC_PREFIX so that the linker can find the linker plugin. | ||
| # Not sure why it's not found otherwise. | ||
| env_extra: "TEST_FLAGS='-Cpanic=abort -Zpanic-abort-tests' GCC_EXEC_PREFIX=/usr/lib/gcc/" | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Install packages | ||
| run: sudo apt-get install ninja-build ripgrep | ||
|
|
||
| - name: Install libgccjit12 | ||
| if: matrix.libgccjit_version.gcc == 'libgccjit12.so' | ||
| run: sudo apt-get install libgccjit-12-dev | ||
|
|
||
| - name: Setup path to libgccjit | ||
| if: matrix.libgccjit_version.gcc == 'libgccjit12.so' | ||
| run: echo /usr/lib/gcc/x86_64-linux-gnu/12 > gcc_path | ||
|
|
||
| - name: Download artifact | ||
| if: matrix.libgccjit_version.gcc != 'libgccjit12.so' | ||
| uses: dawidd6/action-download-artifact@v2 | ||
| with: | ||
| workflow: main.yml | ||
| name: gcc-13 | ||
| path: gcc-13 | ||
| repo: antoyo/gcc | ||
| branch: ${{ matrix.libgccjit_version.artifacts_branch }} | ||
| event: push | ||
| search_artifacts: true # Because, instead, the action only check the last job ran and that won't work since we want multiple artifacts. | ||
|
|
||
| - name: Setup path to libgccjit | ||
| if: matrix.libgccjit_version.gcc != 'libgccjit12.so' | ||
| run: | | ||
| sudo dpkg --force-overwrite -i gcc-13/gcc-13.deb | ||
| echo /usr/lib/ > gcc_path | ||
| - name: Set env | ||
| run: | | ||
| echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV | ||
| echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV | ||
| echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV | ||
| - name: Cache cargo installed crates | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.cargo/bin | ||
| key: cargo-installed-crates2-ubuntu-latest | ||
|
|
||
| - name: Cache cargo registry | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.cargo/registry | ||
| key: ${{ runner.os }}-cargo-registry2-${{ hashFiles('**/Cargo.lock') }} | ||
|
|
||
| - name: Cache cargo index | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.cargo/git | ||
| key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} | ||
|
|
||
| - name: Cache cargo target dir | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: target | ||
| key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain') }} | ||
|
|
||
| #- name: Cache rust repository | ||
| #uses: actions/cache@v3 | ||
| #id: cache-rust-repository | ||
| #with: | ||
| #path: rust | ||
| #key: ${{ runner.os }}-packages-${{ hashFiles('rust/.git/HEAD') }} | ||
|
|
||
| - name: Git config | ||
| run: | | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "User" | ||
| - name: Prepare dependencies | ||
| if: matrix.libgccjit_version.gcc == 'libgccjit12.so' | ||
| run: ./y.sh prepare --libgccjit12-patches | ||
|
|
||
| - name: Prepare dependencies | ||
| if: matrix.libgccjit_version.gcc != 'libgccjit12.so' | ||
| run: ./y.sh prepare | ||
|
|
||
| # Compile is a separate step, as the actions-rs/cargo action supports error annotations | ||
| - name: Compile | ||
| uses: actions-rs/[email protected] | ||
| with: | ||
| command: build | ||
| args: --release | ||
|
|
||
| - name: Add more failing tests because the sysroot is not compiled with LTO | ||
| run: cat failing-non-lto-tests.txt >> failing-ui-tests.txt | ||
|
|
||
| - name: Run tests | ||
| id: tests | ||
| run: | | ||
| ${{ matrix.libgccjit_version.env_extra }} ./test.sh --release --clean --build-sysroot --test-failing-rustc ${{ matrix.libgccjit_version.extra }} | tee output_log | ||
| rg --text "test result" output_log >> $GITHUB_STEP_SUMMARY |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| name: CI libgccjit 12 | ||
|
|
||
| on: | ||
| - push | ||
| - pull_request | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| env: | ||
| # Enable backtraces for easier debugging | ||
| RUST_BACKTRACE: 1 | ||
| TEST_FLAGS: "-Cpanic=abort -Zpanic-abort-tests" | ||
| # FIXME(antoyo): we need to set GCC_EXEC_PREFIX so that the linker can find the linker plugin. | ||
| # Not sure why it's not found otherwise. | ||
| GCC_EXEC_PREFIX: /usr/lib/gcc/ | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-22.04 | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| commands: [ | ||
| "--mini-tests", | ||
| "--std-tests", | ||
| # FIXME: re-enable asm tests when GCC can emit in the right syntax. | ||
| # "--asm-tests", | ||
| "--test-libcore", | ||
| "--extended-rand-tests", | ||
| "--extended-regex-example-tests", | ||
| "--extended-regex-tests", | ||
| "--test-successful-rustc --nb-parts 2 --current-part 0", | ||
| "--test-successful-rustc --nb-parts 2 --current-part 1", | ||
| ] | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Install packages | ||
| # `llvm-14-tools` is needed to install the `FileCheck` binary which is used for asm tests. | ||
| run: sudo apt-get install ninja-build ripgrep llvm-14-tools libgccjit-12-dev | ||
|
|
||
| - name: Setup path to libgccjit | ||
| run: echo /usr/lib/gcc/x86_64-linux-gnu/12 > gcc_path | ||
|
|
||
| - name: Set env | ||
| run: | | ||
| echo "LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV | ||
| echo "LD_LIBRARY_PATH=$(cat gcc_path)" >> $GITHUB_ENV | ||
| echo "workspace="$GITHUB_WORKSPACE >> $GITHUB_ENV | ||
| - name: Cache cargo installed crates | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.cargo/bin | ||
| key: cargo-installed-crates2-ubuntu-latest | ||
|
|
||
| - name: Cache cargo registry | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.cargo/registry | ||
| key: ${{ runner.os }}-cargo-registry2-${{ hashFiles('**/Cargo.lock') }} | ||
|
|
||
| - name: Cache cargo index | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: ~/.cargo/git | ||
| key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }} | ||
|
|
||
| - name: Cache cargo target dir | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: target | ||
| key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('rust-toolchain') }} | ||
|
|
||
| #- name: Cache rust repository | ||
| ## We only clone the rust repository for rustc tests | ||
| #if: ${{ contains(matrix.commands, 'rustc') }} | ||
| #uses: actions/cache@v3 | ||
| #id: cache-rust-repository | ||
| #with: | ||
| #path: rust | ||
| #key: ${{ runner.os }}-packages-${{ hashFiles('rust/.git/HEAD') }} | ||
|
|
||
| - name: Build | ||
| run: | | ||
| ./y.sh prepare --only-libcore --libgccjit12-patches | ||
| ./y.sh build --no-default-features --sysroot-panic-abort | ||
| cargo test --no-default-features | ||
| ./clean_all.sh | ||
| - name: Prepare dependencies | ||
| run: | | ||
| git config --global user.email "[email protected]" | ||
| git config --global user.name "User" | ||
| ./y.sh prepare --libgccjit12-patches | ||
| # Compile is a separate step, as the actions-rs/cargo action supports error annotations | ||
| - name: Compile | ||
| uses: actions-rs/[email protected] | ||
| with: | ||
| command: build | ||
| args: --release | ||
|
|
||
| - name: Add more failing tests for GCC 12 | ||
| run: cat failing-ui-tests12.txt >> failing-ui-tests.txt | ||
|
|
||
| - name: Add more failing tests because the sysroot is not compiled with LTO | ||
| run: cat failing-non-lto-tests.txt >> failing-ui-tests.txt | ||
|
|
||
| - name: Run tests | ||
| run: | | ||
| ./test.sh --release --clean --build-sysroot ${{ matrix.commands }} --no-default-features |
Oops, something went wrong.