Skip to content
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

Jump to bottom

Re-enable rustc_codegen_gcc tests in CI #118463

Merged
merged 2 commits into from Dec 7, 2023
Merged

Re-enable rustc_codegen_gcc tests in CI #118463

merged 2 commits into from Dec 7, 2023

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Nov 29, 2023

When #117947 dropped llvm-15 from CI, we neglected to copy #117313's changes to enable rustc_codegen_gcc testing to the new base llvm-16. This is now restored, as well as copying the setup to llvm-17 as well so we hopefully won't miss it next time.

In addition, due to case mismatch in $extra_env updates in docker/run.sh, I think it wasn't actually getting enabled before, but this should now be fixed. I also avoided the linker hack for libgccjit.so that was present before, because that's not needed if the version matches the base gcc used for linking.

r? GuillaumeGomez

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Nov 29, 2023
@cuviper cuviper mentioned this pull request Nov 29, 2023
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@cuviper
Copy link
Member Author

cuviper commented Nov 29, 2023

... at least we know the tests really did run this time! 😅

@GuillaumeGomez
Copy link
Member

Ah. Well, I'll try to fix it tomorrow. 😅

cuviper
cuviper commented Nov 30, 2023
View reviewed changes
src/ci/docker/run.sh Outdated Show resolved Hide resolved
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member

CI passed so since we know it works, we can now check if the ln command is actually necessary.

@GuillaumeGomez
Copy link
Member

It was unneeded, great!

@cuviper
Copy link
Member Author

cuviper commented Nov 30, 2023

Thanks for the collaboration! Let's roll for a neutral reviewer...

r? infra-ci

@rustbot rustbot assigned Kobzol and unassigned GuillaumeGomez Nov 30, 2023
@GuillaumeGomez
Copy link
Member

Seems like they're a bit underwater. Well in this case I think it's fine since we reviewed each other's code already.

@bors r=cuviper,GuillaumeGomez

@bors
Copy link
Contributor

bors commented Dec 7, 2023

📌 Commit dc20566 has been approved by cuviper,GuillaumeGomez

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 7, 2023
@bors
Copy link
Contributor

bors commented Dec 7, 2023

⌛ Testing commit dc20566 with merge b9540b7...

@bors
Copy link
Contributor

bors commented Dec 7, 2023

☀️ Test successful - checks-actions
Approved by: cuviper,GuillaumeGomez
Pushing b9540b7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 7, 2023
@bors bors merged commit b9540b7 into rust-lang:master Dec 7, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 7, 2023
@GuillaumeGomez GuillaumeGomez mentioned this pull request Dec 7, 2023
Merged
@GuillaumeGomez GuillaumeGomez mentioned this pull request Dec 7, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 7, 2023
@bors
Auto merge of rust-lang#118706 - Urgau:update-rccg-gcc-libc, r=Guilla…
f16c81f 
…umeGomez

Fix `rustc_codegen_gcc` build and tests failure in CI

rust-lang#118463 seems to have broke the PR CI, more specificaly the `x86_64-gnu-llvm-16` builder which [fail with](https://github.com/rust-lang/rust/actions/runs/7128709674/job/19411205695?pr=118705#step:26:1668):

```
Building stage1 codegen backend gcc (x86_64-unknown-linux-gnu)
     Compiling libc v0.2.147
     Compiling rustix v0.38.8
     Compiling memchr v2.5.0
     Compiling bitflags v2.4.0
     Compiling linux-raw-sys v0.4.5
     Compiling fastrand v2.0.0
     Compiling smallvec v1.10.0
error: invalid `--check-cfg` argument: `values(freebsd10)` (expected `cfg(name, values("value1", "value2", ... "valueN"))`)

error: could not compile `libc` (lib) due to previous error
```

Updating to `libc` version 0.2.150 fixes the build issue since it includes the support for the new check-cfg syntax.

Then it [failed](https://github.com/rust-lang/rust/actions/runs/7129280743/job/19413025132?pr=118706#step:26:2218) with a missing `#![allow(internal_features)]` in one of the example.

r? `@GuillaumeGomez`
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b9540b7): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.8% [0.5%, 1.4%] 3
Regressions ❌
(secondary)		 3.2% [3.2%, 3.2%] 1
Improvements ✅
(primary)		 -4.0% [-4.0%, -4.0%] 1
Improvements ✅
(secondary)		 -2.5% [-2.5%, -2.5%] 1
All ❌✅ (primary) -0.4% [-4.0%, 1.4%] 4

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.5% [0.5%, 0.5%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.5% [0.5%, 0.5%] 2

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 675.32s -> 674.699s (-0.09%)
Artifact size: 314.18 MiB -> 314.20 MiB (0.01%)

@cuviper cuviper deleted the restore-cg_gcc-ci branch December 8, 2023 00:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@antoyo antoyo antoyo left review comments

@GuillaumeGomez GuillaumeGomez GuillaumeGomez left review comments

Assignees

@Kobzol Kobzol

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.76.0
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@cuviper @rust-log-analyzer @GuillaumeGomez @bors @rust-timer @antoyo @Kobzol @rustbot