Remove -Zinline-in-all-cgus and clean up tests/codegen-units/ #133929

saethlin · 2024-12-05T17:52:21Z

Implementation of rust-lang/compiler-team#814

I've taken some liberties with cleaning up the CGU partitioning tests, because that's the only place this flag was used and also mattered. I've often fought a lot with the contents of tests/codegen-units and it has never been clear to me when a test failure indicates a problem with my changes as opposed to a test just needing to be manually blessed. Hopefully the combination of the new README, new comments, and using -Zprint-mono-items=lazy in the partitioning tests improves that.

I've also deleted some of the tests/run-make/sepcomp tests. I think all the "sepcomp" tests have been obviated for years by better-designed (less flaky, clearer failures) test suites, but here I'm just deleting the ones I'm confident in.

rustbot · 2025-01-05T18:33:26Z

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

jieyouxu

I can only comment on the compiler/ changes and the run-make test removal, which LGTM. The actual codegen-units test diffs is probably better suited for @nnethercote to review after their vacation.

jieyouxu · 2025-01-05T18:36:32Z

tests/codegen-units/partitioning/README.md

Thanks for adding these docss 💙

jieyouxu · 2025-01-05T18:37:40Z

tests/codegen-units/partitioning/README.md

+```
+MONO_ITEM <item> @@ <cgu name>[<linkage>] <other cgu name>[<linkage in other cgu>]
+```
+DO NOT add tests to this suite that use `-Zprint-mono-items=eager`, that flag changes the way that MonoItem collection works in rather fundamental ways that are otherwise only used by `-Clink-dead-code`, and thus the MonoItems collected and their linkage under `-Zprint-mono-items=eager` does not correlate very well with normal compilation behavior.


Remark: almost makes me think this should be a separate codegen-units-partitioning suite, which bans -Zprint-mono-items=eager in compile-flags, but anyway.

RalfJung · 2025-01-20T18:38:40Z

I've often fought a lot with the contents of tests/codegen-units and it has never been clear to me when a test failure indicates a problem with my changes as opposed to a test just needing to be manually blessed.

I just ran into this as well. The README you added is only for the partitioning tests; is there anything useful to say about codegen-units tests more broadly? A top-level README telling contributors what to do when they see a failure in that folder could be useful.

@jieyouxu you unassigned yourself without picking a new reviewer. Was that deliberate? Someone should be in charge of the PR...

r? compiler

saethlin · 2025-01-20T18:41:53Z

Just to avoid reviewer hot-potato:
r? nnethercote

rustbot · 2025-01-20T18:41:55Z

Could not assign reviewer from: nnethercote.
User(s) nnethercote are either the PR author, already assigned, or on vacation, and there are no other candidates.
Use r? to specify someone else to assign.

saethlin · 2025-01-20T19:40:37Z

The README you added is only for the partitioning tests; is there anything useful to say about codegen-units tests more broadly?

They are all based on -Zprint-mono-items, but other than that no. The codegen-units tests are for checking that items are assigned to the right CGU, and the item-collection tests are for checking that items were collected at all. Some of the item-collection tests also check which CGU an item was assigned to and with what linkage. I think those cases come from contributors not realizing that they can just say // MONO_ITEM <item name> @@ to ignore the CGU partitioning.

I want to work on the item-collection tests separately, because they are mostly but not all based on -Zprint-mono-iteam=eager, which primarily exists to collect MonoItems from dead code, but most of the tests also have #![deny(dead_code)].

jieyouxu · 2025-01-21T00:13:18Z

@jieyouxu you unassigned yourself without picking a new reviewer. Was that deliberate? Someone should be in charge of the PR...

No, I thought nnethercote was already assigned...

bors · 2025-01-21T23:06:10Z

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

tests/codegen-units/partitioning/README.md

nnethercote · 2025-01-27T23:04:08Z

tests/codegen-units/partitioning/README.md

+# codegen-units/partitioning tests
+
+This test suite is designed to test that codegen unit partitioning works as intended.
+Note that it does not evaluate whether CGU partitioning is *good*, that is the job of the compiler benchmark suite.


This sentence has a comma splice which you don't need to fix but lots of people don't know about them so I thought I'd mention it for educational purposes :) (I'd change the comma to a period to fix it.)

nnethercote · 2025-01-27T23:04:45Z

tests/codegen-units/partitioning/README.md

+```
+MONO_ITEM <item> @@ <cgu name>[<linkage>] <other cgu name>[<linkage in other cgu>]
+```
+DO NOT add tests to this suite that use `-Zprint-mono-items=eager`, that flag changes the way that MonoItem collection works in rather fundamental ways that are otherwise only used by `-Clink-dead-code`, and thus the MonoItems collected and their linkage under `-Zprint-mono-items=eager` does not correlate very well with normal compilation behavior.


The first comma is another comma splice, lol

nnethercote · 2025-01-27T23:07:10Z

Removes a crusty old -Z flag, removes low-value tests, adds documentation? Yes please!

r=me, I'll let you fix the tiny English flaws, only the "of" one matters at all.

saethlin · 2025-01-28T00:23:49Z

I'll let you fix the tiny English flaws, only the "of" one matters at all.

I fixed all of them, surely this PR is flawless now :)

saethlin · 2025-01-28T00:24:04Z

@bors r=nnethercore rollup

bors · 2025-01-28T00:24:06Z

📌 Commit a721dd6 has been approved by nnethercore

It is now in the queue for this repository.

…, r=nnethercore Remove -Zinline-in-all-cgus and clean up tests/codegen-units/ Implementation of rust-lang/compiler-team#814 I've taken some liberties with cleaning up the CGU partitioning tests, because that's the only place this flag was used and also mattered. I've often fought a lot with the contents of `tests/codegen-units` and it has never been clear to me when a test failure indicates a problem with my changes as opposed to a test just needing to be manually blessed. Hopefully the combination of the new README, new comments, and using `-Zprint-mono-items=lazy` in the partitioning tests improves that. I've also deleted some of the `tests/run-make/sepcomp` tests. I think all the "sepcomp" tests have been obviated for years by better-designed (less flaky, clearer failures) test suites, but here I'm just deleting the ones I'm confident in.

rustbot added A-run-make Area: port run-make Makefiles to rmake.rs S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 5, 2024

This comment has been minimized.

Sign in to view

saethlin force-pushed the remove-inline-in-all-cgus branch from 9827f7e to b2b3983 Compare December 29, 2024 17:16

This comment has been minimized.

Sign in to view

saethlin force-pushed the remove-inline-in-all-cgus branch from b2b3983 to 5dd9c96 Compare December 29, 2024 20:21

saethlin changed the title ~~Remove -Zinline-in-all-cgus~~ Remove -Zinline-in-all-cgus and clean up tests/codegen-units/ Dec 31, 2024

saethlin force-pushed the remove-inline-in-all-cgus branch from 5dd9c96 to 3db04a3 Compare January 4, 2025 03:04

saethlin marked this pull request as ready for review January 5, 2025 18:33

jieyouxu self-assigned this Jan 5, 2025

jieyouxu reviewed Jan 5, 2025

View reviewed changes

jieyouxu removed their assignment Jan 5, 2025

jieyouxu added the A-testsuite Area: The testsuite used to check the correctness of rustc label Jan 5, 2025

rustbot assigned chenyukang Jan 20, 2025

saethlin assigned nnethercote and unassigned chenyukang Jan 20, 2025

saethlin force-pushed the remove-inline-in-all-cgus branch from 3db04a3 to 512b3e3 Compare January 21, 2025 23:20

nnethercote reviewed Jan 27, 2025

View reviewed changes

tests/codegen-units/partitioning/README.md Outdated Show resolved Hide resolved

nnethercote reviewed Jan 27, 2025

View reviewed changes

Remove -Zinline-in-all-cgus and clean up CGU partitioning tests

a721dd6

saethlin force-pushed the remove-inline-in-all-cgus branch from 512b3e3 to a721dd6 Compare January 28, 2025 00:23

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 Jan 28, 2025

Zalathar mentioned this pull request Jan 28, 2025

Rollup of 9 pull requests #136165

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove -Zinline-in-all-cgus and clean up tests/codegen-units/ #133929

Remove -Zinline-in-all-cgus and clean up tests/codegen-units/ #133929

saethlin commented Dec 5, 2024 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rustbot commented Jan 5, 2025

jieyouxu left a comment

jieyouxu Jan 5, 2025

jieyouxu Jan 5, 2025

RalfJung commented Jan 20, 2025 •

edited

Loading

saethlin commented Jan 20, 2025

rustbot commented Jan 20, 2025

saethlin commented Jan 20, 2025

jieyouxu commented Jan 21, 2025

bors commented Jan 21, 2025

nnethercote Jan 27, 2025

nnethercote Jan 27, 2025

nnethercote commented Jan 27, 2025

saethlin commented Jan 28, 2025

saethlin commented Jan 28, 2025

bors commented Jan 28, 2025

Remove -Zinline-in-all-cgus and clean up tests/codegen-units/ #133929

Are you sure you want to change the base?

Remove -Zinline-in-all-cgus and clean up tests/codegen-units/ #133929

Conversation

saethlin commented Dec 5, 2024 • edited Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rustbot commented Jan 5, 2025

jieyouxu left a comment

Choose a reason for hiding this comment

jieyouxu Jan 5, 2025

Choose a reason for hiding this comment

jieyouxu Jan 5, 2025

Choose a reason for hiding this comment

RalfJung commented Jan 20, 2025 • edited Loading

saethlin commented Jan 20, 2025

rustbot commented Jan 20, 2025

saethlin commented Jan 20, 2025

jieyouxu commented Jan 21, 2025

bors commented Jan 21, 2025

nnethercote Jan 27, 2025

Choose a reason for hiding this comment

nnethercote Jan 27, 2025

Choose a reason for hiding this comment

nnethercote commented Jan 27, 2025

saethlin commented Jan 28, 2025

saethlin commented Jan 28, 2025

bors commented Jan 28, 2025

saethlin commented Dec 5, 2024 •

edited

Loading

RalfJung commented Jan 20, 2025 •

edited

Loading