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

Migrate pgo-gen, pgo-use and profile run-make tests to rmake.rs #126957

Merged
merged 4 commits into from
Jul 5, 2024
Merged

Migrate pgo-gen, pgo-use and profile run-make tests to rmake.rs #126957

merged 4 commits into from
Jul 5, 2024

Conversation

Oneirical
Copy link
Contributor

@Oneirical Oneirical commented Jun 25, 2024 •
edited by jieyouxu
Loading

Part of #121876 and the associated Google Summer of Code project.

try-job: aarch64-apple
try-job: x86_64-msvc

@rustbot
Copy link
Collaborator

rustbot commented Jun 25, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 25, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 25, 2024

The run-make-support library was changed

cc @jieyouxu

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol Kobzol mentioned this pull request Jun 25, 2024
Open
@Oneirical
Copy link
Contributor Author

error[E0463]: can't find crate for profiler_builtins

Strange. It worked locally.

Going to try to add -C instrument-coverage because of what I read here.

@Oneirical Oneirical mentioned this pull request Jun 25, 2024
Merged
@rust-log-analyzer

This comment has been minimized.

Sign in to view
Kobzol
Kobzol reviewed Jun 27, 2024
View reviewed changes
tests/run-make/pgo-use/rmake.rs Outdated Show resolved Hide resolved
src/tools/run-make-support/src/lib.rs Outdated Show resolved Hide resolved
Kobzol
Kobzol approved these changes Jun 27, 2024
View reviewed changes
Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left one nit, otherwise LGTM.

@Kobzol
Copy link
Contributor

Kobzol commented Jun 27, 2024

@bors delegate+

You can r=me.

@bors
Copy link
Contributor

bors commented Jun 27, 2024

✌️ @Oneirical, you can now approve this pull request!

If @Kobzol told you to "r=me" after making some further change, please make that change, then do @bors r=@Kobzol

Kobzol
Kobzol reviewed Jun 27, 2024
View reviewed changes
Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, found a few more issues.

tests/run-make/pgo-use/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/pgo-use/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/pgo-gen/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/pgo-gen/rmake.rs Outdated Show resolved Hide resolved
@Kobzol
Copy link
Contributor

Kobzol commented Jun 27, 2024

r? @Kobzol

@rustbot rustbot assigned Kobzol and unassigned jieyouxu Jun 27, 2024
@Oneirical
Copy link
Contributor Author

Some quite glaring mistakes there... these tests were getting ignored locally due to //@ needs-profiler-support. Fixed, thank you for your keen eye.

@Kobzol
Copy link
Contributor

Kobzol commented Jun 27, 2024

Thanks!

You can r=me once CI is green.

@bors rollup=iffy

@Oneirical
Copy link
Contributor Author

@bors r=@Kobzol

@bors
Copy link
Contributor

bors commented Jun 27, 2024

📌 Commit a70955a has been approved by Kobzol

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 Jun 27, 2024
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 3, 2024
jieyouxu
jieyouxu approved these changes Jul 3, 2024
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool, going to run try jobs one last time, r=Kobzol and I if it comes back green.

@jieyouxu
Copy link
Member

jieyouxu commented Jul 3, 2024

@bors try

@bors
Copy link
Contributor

bors commented Jul 3, 2024

⌛ Trying commit a5a35d6 with merge fe6c204...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 3, 2024
@bors
Auto merge of rust-lang#126957 - Oneirical:artestic-inspiration, r=<try>
fe6c204 
Migrate `pgo-gen`, `pgo-use` and `profile` `run-make` tests to rmake.rs

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

try-job: aarch64-apple
try-job: x86_64-msvc
@bors
Copy link
Contributor

bors commented Jul 3, 2024

☀️ Try build successful - checks-actions
Build commit: fe6c204 (fe6c20477987f81b3e51f58aba51e6daa666c4b0)

@Oneirical
Copy link
Contributor Author

It may be wise to wait for #126709 before proceeding, as I placed shallow_find_files in multiple PRs and it's no use to merge all of them at once considering it will just cause a lot of conflicts.

@jieyouxu
Copy link
Member

jieyouxu commented Jul 3, 2024

Sure, that sounds good.
@rustbot blocked

@rustbot rustbot added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 3, 2024
@Oneirical Oneirical force-pushed the artestic-inspiration branch 2 times, most recently from 85fbc51 to d54c6f5 Compare July 5, 2024 14:24
@Oneirical
Copy link
Contributor Author

@bors r=jieyouxu,kobzol

@bors
Copy link
Contributor

bors commented Jul 5, 2024

📌 Commit c9be69f has been approved by jieyouxu,kobzol

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-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jul 5, 2024
@bors
Copy link
Contributor

bors commented Jul 5, 2024

⌛ Testing commit c9be69f with merge 6e27807...

@bors
Copy link
Contributor

bors commented Jul 5, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu,kobzol
Pushing 6e27807 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 5, 2024
@bors bors merged commit 6e27807 into rust-lang:master Jul 5, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 5, 2024
@Oneirical Oneirical deleted the artestic-inspiration branch July 5, 2024 20:01
@bors bors mentioned this pull request Jul 5, 2024
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6e27807): 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 (secondary -0.1%)

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
Regressions ❌
(secondary)		 1.5% [1.2%, 1.9%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -1.7% [-2.2%, -1.2%] 2
All ❌✅ (primary) - - 0

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: 699.651s -> 700.69s (0.15%)
Artifact size: 328.26 MiB -> 328.26 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kobzol Kobzol Kobzol approved these changes

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@Kobzol Kobzol

Labels
A-run-make Area: port run-make Makefiles to rmake.rs 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
Oxidizing run-make tests
Status: Done
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.
7 participants
@Oneirical @rustbot @rust-log-analyzer @Kobzol @bors @jieyouxu @rust-timer