Run part of `rustc_codegen_gcc`'s tests in CI #117313

GuillaumeGomez · 2023-10-28T10:33:10Z

Thanks to #112701 and @bjorn3, it made this much easier.

Also cc @antoyo.

r? @bjorn3

rustbot · 2023-10-28T10:33:22Z

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

src/ci/run.sh

src/bootstrap/src/core/build_steps/test.rs

bjorn3 · 2023-10-28T10:48:39Z

At least the x86_64-gnu-llvm-15 runner doesn't have libgccjit installed.

src/bootstrap/src/core/build_steps/test.rs

bjorn3 · 2023-10-28T17:01:33Z

2023-10-28T16:54:08.4668438Z   = note: /usr/bin/ld: /checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools/cg_gcc/arbitrary_self_types_pointers_and_wrappers.arbitrary_self_types_pointers_and_wrappers.4f746435a173466d-cgu.0.rcgu.o: in function `<i32 as core::fmt::Debug>::fmt':
2023-10-28T16:54:08.4669301Z           fake.c:(.text._RNvXs1g_NtNtCseVSX39tBz28_4core3fmt3numlNtB8_5Debug3fmtCs6OVZ8sMh4wz_42arbitrary_self_types_pointers_and_wrappers+0x5f): undefined reference to `core::fmt::num::__LT_impl_u20_core__fmt__LowerHex_u20_for_u20_i32_GT_::fmt'
2023-10-28T16:54:08.4670212Z           /usr/bin/ld: fake.c:(.text._RNvXs1g_NtNtCseVSX39tBz28_4core3fmt3numlNtB8_5Debug3fmtCs6OVZ8sMh4wz_42arbitrary_self_types_pointers_and_wrappers+0x81): undefined reference to `core::fmt::num::imp::__LT_impl_u20_core__fmt__Display_u20_for_u20_i32_GT_::fmt'
2023-10-28T16:54:08.4671109Z           /usr/bin/ld: fake.c:(.text._RNvXs1g_NtNtCseVSX39tBz28_4core3fmt3numlNtB8_5Debug3fmtCs6OVZ8sMh4wz_42arbitrary_self_types_pointers_and_wrappers+0xa3): undefined reference to `core::fmt::num::__LT_impl_u20_core__fmt__UpperHex_u20_for_u20_i32_GT_::fmt'
2023-10-28T16:54:08.4671270Z           collect2: error: ld returned 1 exit status

I presume it is trying to use a standard library compiled without -Csymbol-mangling-version=v0? By the way should cg_gcc maybe error out on -Csymbol-mangling-version=legacy?

GuillaumeGomez · 2023-10-28T17:35:37Z

I presume it is trying to use a standard library compiled without -Csymbol-mangling-version=v0?

Yes, but I don't understand how it's possible. The RUSTC_SYSROOT env variable is set and the -Zcodegen-backend=gcc flag is passed so I suppose it'll use this one. Maybe I'm missing something.

By the way should cg_gcc maybe error out on -Csymbol-mangling-version=legacy?

I'll let @antoyo decide on that.

bors · 2023-10-28T18:02:27Z

☔ The latest upstream changes (presumably #81746) made this pull request unmergeable. Please resolve the merge conflicts.

antoyo · 2023-10-28T18:34:20Z

By the way should cg_gcc maybe error out on -Csymbol-mangling-version=legacy?

I'll let @antoyo decide on that.

I don't mind keeping it available since it partly works.

GuillaumeGomez · 2023-11-03T00:22:18Z

cg_gcc tests passed again by modifying where we set the environment variables so time to give it another try.

@bors r=onur-ozkan

bors · 2023-11-03T00:22:21Z

📌 Commit c890dd6 has been approved by onur-ozkan

It is now in the queue for this repository.

bors · 2023-11-03T02:05:10Z

⌛ Testing commit c890dd6 with merge 6b9d6de...

bors · 2023-11-03T04:06:35Z

☀️ Test successful - checks-actions
Approved by: onur-ozkan
Pushing 6b9d6de to master...

rust-timer · 2023-11-03T05:30:28Z

Finished benchmarking commit (6b9d6de): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.3%	[0.3%, 0.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.2%	[-0.2%, -0.2%]	1
All ❌✅ (primary)	0.3%	[0.3%, 0.3%]	1

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)	1.1%	[1.1%, 1.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-4.7%	[-4.7%, -4.7%]	1
Improvements ✅ (secondary)	-2.2%	[-2.2%, -2.2%]	1
All ❌✅ (primary)	-1.8%	[-4.7%, 1.1%]	2

Cycles

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

Binary size

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

Bootstrap: 636.745s -> 636.637s (-0.02%)
Artifact size: 304.48 MiB -> 304.47 MiB (-0.00%)

82: Automated pull from upstream `master` r=tshepang a=github-actions[bot] This PR pulls the following changes from the upstream repository: * rust-lang/rust#117313 * rust-lang/rust#117131 * rust-lang/rust#117134 * rust-lang/rust#117471 * rust-lang/rust#117521 * rust-lang/rust#117513 * rust-lang/rust#117512 * rust-lang/rust#117509 * rust-lang/rust#117495 * rust-lang/rust#117394 * rust-lang/rust#117466 * rust-lang/rust#117204 * rust-lang/rust#117386 * rust-lang/rust#117506 Co-authored-by: Nicholas Nethercote <n.nethercote@gmail.com> Co-authored-by: roblabla <unfiltered@roblab.la> Co-authored-by: Michael Goulet <michael@errs.io> Co-authored-by: massivebird <gdrakemail@gmail.com> Co-authored-by: bors <bors@rust-lang.org> Co-authored-by: Zalathar <Zalathar@users.noreply.github.com> Co-authored-by: lcnr <rust@lcnr.de> Co-authored-by: Joshua Liebow-Feeser <joshlf@users.noreply.github.com> Co-authored-by: Matthias Krüger <matthias.krueger@famsik.de>

GuillaumeGomez · 2023-11-03T09:52:10Z

It finally passed! \o/

…,GuillaumeGomez Re-enable `rustc_codegen_gcc` tests in CI When rust-lang#117947 dropped llvm-15 from CI, we neglected to copy rust-lang#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 assigned bjorn3 Oct 28, 2023

This comment has been minimized.

# to view

bjorn3 reviewed Oct 28, 2023

View reviewed changes

src/ci/run.sh Outdated Show resolved Hide resolved

bjorn3 reviewed Oct 28, 2023

View reviewed changes

src/bootstrap/src/core/build_steps/test.rs Outdated Show resolved Hide resolved

bjorn3 reviewed Oct 28, 2023

View reviewed changes

src/bootstrap/src/core/build_steps/test.rs Outdated Show resolved Hide resolved

lqd reviewed Oct 28, 2023

View reviewed changes

src/bootstrap/src/core/build_steps/test.rs Outdated Show resolved Hide resolved

lqd reviewed Oct 28, 2023

View reviewed changes

src/bootstrap/src/core/build_steps/test.rs Show resolved Hide resolved

GuillaumeGomez force-pushed the cg_gcc-tests branch from dbdece8 to eca1d3a Compare October 28, 2023 13:53

This comment has been minimized.

# to view

GuillaumeGomez force-pushed the cg_gcc-tests branch from eca1d3a to d36445a Compare October 28, 2023 14:03

This comment has been minimized.

# to view

bjorn3 reviewed Oct 28, 2023

View reviewed changes

src/bootstrap/src/core/build_steps/test.rs Outdated Show resolved Hide resolved

bjorn3 reviewed Oct 28, 2023

View reviewed changes

src/bootstrap/src/core/build_steps/test.rs Outdated Show resolved Hide resolved

bjorn3 reviewed Oct 28, 2023

View reviewed changes

src/bootstrap/src/core/build_steps/test.rs Show resolved Hide resolved

This comment has been minimized.

# to view

GuillaumeGomez force-pushed the cg_gcc-tests branch from 3c4b25b to 246fff7 Compare October 28, 2023 18:35

This comment has been minimized.

# to view

GuillaumeGomez force-pushed the cg_gcc-tests branch from 9f22445 to d5b40b0 Compare November 2, 2023 20:49

This comment has been minimized.

# to view

GuillaumeGomez force-pushed the cg_gcc-tests branch 2 times, most recently from 66a290b to 9fe0228 Compare November 2, 2023 21:38

This comment has been minimized.

# to view

GuillaumeGomez force-pushed the cg_gcc-tests branch from 9fe0228 to 8d85c03 Compare November 2, 2023 22:04

This comment has been minimized.

# to view

GuillaumeGomez force-pushed the cg_gcc-tests branch from 8d85c03 to cf09ebb Compare November 2, 2023 22:40

This comment has been minimized.

# to view

Set some environment variables value only if ENABLE_GCC_CODEGEN is set

c890dd6

GuillaumeGomez force-pushed the cg_gcc-tests branch from b34593c to c890dd6 Compare November 2, 2023 23:05

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 Nov 3, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 3, 2023

bors merged commit 6b9d6de into rust-lang:master Nov 3, 2023

rustbot added this to the 1.75.0 milestone Nov 3, 2023

bors mentioned this pull request Nov 3, 2023

Dummy PR to test coverage test changes in CI #114917

Draft

github-actions bot mentioned this pull request Nov 3, 2023

Automated pull from upstream master ferrocene/ferrocene#82

Merged

GuillaumeGomez deleted the cg_gcc-tests branch November 3, 2023 09:52

GuillaumeGomez mentioned this pull request Nov 4, 2023

Add explanations on how to run rustc_codegen_gcc tests rust-lang/rustc-dev-guide#1821

Merged

klensy mentioned this pull request Nov 28, 2023

Update the minimum external LLVM to 16. #117947

Merged

cuviper mentioned this pull request Nov 29, 2023

Re-enable rustc_codegen_gcc tests in CI #118463

Merged

Run part of rustc_codegen_gcc's tests in CI #117313

Run part of rustc_codegen_gcc's tests in CI #117313

Uh oh!

Conversation

GuillaumeGomez commented Oct 28, 2023

Uh oh!

rustbot commented Oct 28, 2023

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

bjorn3 commented Oct 28, 2023

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

bjorn3 commented Oct 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

GuillaumeGomez commented Oct 28, 2023

Uh oh!

bors commented Oct 28, 2023

Uh oh!

antoyo commented Oct 28, 2023

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

GuillaumeGomez commented Nov 3, 2023

Uh oh!

bors commented Nov 3, 2023

Uh oh!

bors commented Nov 3, 2023

Uh oh!

bors commented Nov 3, 2023

Uh oh!

rust-timer commented Nov 3, 2023

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

GuillaumeGomez commented Nov 3, 2023

Uh oh!

Uh oh!

Run part of `rustc_codegen_gcc`'s tests in CI #117313

Run part of `rustc_codegen_gcc`'s tests in CI #117313

bjorn3 commented Oct 28, 2023 •

edited

Loading