Migrate `run-make/pgo-branch-weights` to `rmake` #125165

Oneirical · 2024-05-15T20:01:22Z

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

This is a scary one and I expect things to break. Set as draft, because this isn't ready.

There is this comment here, which suggests the test is excluded from the testing process due to a platform specific issue? I can't see anything here that would cause this test to not run...

// FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works
// properly. Since we only have GCC on the CI ignore the test for now."

EDIT: This is specific to Windows-gnu.

The Makefile has this line:

ifneq (,$(findstring x86,$(TARGET)))
COMMON_FLAGS=-Clink-args=-fuse-ld=gold

I honestly can't tell whether this is checking if the target IS x86, or IS NOT. EDIT: It's checking if it IS x86.

I don't know why the Makefile was trying to pass an argument directly in the Makefile instead of setting that "aaaaaaaaaaaa2bbbbbbbbbbbb2bbbbbbbbbbbbbbbbcc" input as a variable in the Rust program directly. I changed that, let me know if that was wrong.
Trying to rewrite cat "$(TMPDIR)/interesting.ll" | "$(LLVM_FILECHECK)" filecheck-patterns.txt resulted in some butchery. For starters, in tools.mk, LLVM_FILECHECK corrects its own backslashes on Windows distributions, but there is no further mention of it, so I assume this is a preset environment variable... but is it really? Then, the command itself uses a Standard Input and a passed input file as an argument simultaneously, according to the documentation.

try-job: aarch64-gnu

rustbot · 2024-05-15T20:01:30Z

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

lqd · 2024-05-15T20:15:29Z

There is this comment here, which suggests the test is excluded from the testing process due to a platform specific issue? I can't see anything here that would cause this test to not run...

// FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works
// properly. Since we only have GCC on the CI ignore the test for now."

it's the # ignore-windows-gnu in the makefile, which is where this mingw gcc bug is expected to happen, according to the comment

jieyouxu · 2024-05-15T20:19:16Z

Yeah, run-make Makefiles have # <directive-name> directives. What's funny about them like the old-format // <directive-name> directive in Rust code is that you can sneak in a directive in a comment block, e.g.

# This is a comment block that has a starting line,
# ignore-windows in the middle of the sentence,
# and hello world in the end of the sentence.

Here # ignore-windows is a (Makefile) directive.

Oneirical · 2024-05-15T20:23:54Z

Ah, I was wondering if that comment meant the test did not run at all... I am equally soothed that my work on this one was not wasted, and worried that this means it will have to be fully understood to proceed...

It does use features found in other tests, though, so this should make the other tests using LLVM instrumentation much easier to port.

EDIT: That does mean that the LLVM_FILECHECK part that fixes Windows path to use slashes won't have to be ported over in this test, since Windows is already getting ignored. Not sure if that mattered in the first place.

EDIT 2: Not Windows, Windows-gnu.

lqd · 2024-05-15T20:35:18Z

since Windows is already getting ignored

To clarify, windows-gnu is ignored, not windows-msvc (the main windows target), or the other windows targets.

tests/run-make/pgo-branch-weights/rmake.rs

tests/run-make/pgo-branch-weights/main.rs

jieyouxu · 2024-05-16T19:43:55Z

I'll take a closer took tomorrow

src/tools/run-make-support/src/run.rs

tests/run-make/pgo-branch-weights/rmake.rs

jieyouxu · 2024-05-18T00:04:27Z

Feel free to ping me if you need any PR CI runs (i.e. try jobs) for various platforms.

Oneirical · 2024-05-21T16:44:21Z

Feel free to ping me if you need any PR CI runs (i.e. try jobs) for various platforms.

@jieyouxu I might need some try jobs for windows-gnu (once CI is green). The description has been changed already.

Oneirical · 2024-06-11T19:35:19Z

@bors try

bors · 2024-06-11T19:36:29Z

⌛ Trying commit 0bb84af with merge 55dde6a...

Migrate `run-make/pgo-branch-weights` to `rmake` 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). This is a scary one and I expect things to break. Set as draft, because this isn't ready. - [x] There is this comment here, which suggests the test is excluded from the testing process due to a platform specific issue? I can't see anything here that would cause this test to not run... > // FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works // properly. Since we only have GCC on the CI ignore the test for now." EDIT: This is specific to Windows-gnu. - [x] The Makefile has this line: ``` ifneq (,$(findstring x86,$(TARGET))) COMMON_FLAGS=-Clink-args=-fuse-ld=gold ``` I honestly can't tell whether this is checking if the target IS x86, or IS NOT. EDIT: It's checking if it IS x86. - [x] I don't know why the Makefile was trying to pass an argument directly in the Makefile instead of setting that "aaaaaaaaaaaa2bbbbbbbbbbbb2bbbbbbbbbbbbbbbbcc" input as a variable in the Rust program directly. I changed that, let me know if that was wrong. - [x] Trying to rewrite `cat "$(TMPDIR)/interesting.ll" | "$(LLVM_FILECHECK)" filecheck-patterns.txt` resulted in some butchery. For starters, in `tools.mk`, LLVM_FILECHECK corrects its own backslashes on Windows distributions, but there is no further mention of it, so I assume this is a preset environment variable... but is it really? Then, the command itself uses a Standard Input and a passed input file as an argument simultaneously, according to the [documentation](https://llvm.org/docs/CommandGuide/FileCheck.html#synopsis). try-job: aarch64-gnu

bors · 2024-06-11T21:12:36Z

☀️ Try build successful - checks-actions
Build commit: 55dde6a (55dde6a6ff40e83623f3ce7ae7f38dc65332cb17)

jieyouxu

Left some minor nits, but otherwise looks good

src/tools/run-make-support/src/llvm.rs

tests/run-make/pgo-branch-weights/rmake.rs

Oneirical · 2024-06-12T13:42:06Z

Changes implemented. I'm slightly worried that the bors try success was not real and was caused by the CI outage of yesterday, but I suppose we're about to find out.

jieyouxu · 2024-06-12T14:33:07Z

We'll see in full CI.
@bors rollup=iffy

jieyouxu · 2024-06-12T14:33:22Z

@bors delegate+ (r=me after CI is green)

bors · 2024-06-12T14:33:24Z

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

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

Oneirical · 2024-06-12T14:47:21Z

@bors r=@jieyouxu

bors · 2024-06-12T14:47:24Z

📌 Commit 17b0771 has been approved by jieyouxu

It is now in the queue for this repository.

…eyouxu Migrate `run-make/pgo-branch-weights` to `rmake` 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). This is a scary one and I expect things to break. Set as draft, because this isn't ready. - [x] There is this comment here, which suggests the test is excluded from the testing process due to a platform specific issue? I can't see anything here that would cause this test to not run... > // FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works // properly. Since we only have GCC on the CI ignore the test for now." EDIT: This is specific to Windows-gnu. - [x] The Makefile has this line: ``` ifneq (,$(findstring x86,$(TARGET))) COMMON_FLAGS=-Clink-args=-fuse-ld=gold ``` I honestly can't tell whether this is checking if the target IS x86, or IS NOT. EDIT: It's checking if it IS x86. - [x] I don't know why the Makefile was trying to pass an argument directly in the Makefile instead of setting that "aaaaaaaaaaaa2bbbbbbbbbbbb2bbbbbbbbbbbbbbbbcc" input as a variable in the Rust program directly. I changed that, let me know if that was wrong. - [x] Trying to rewrite `cat "$(TMPDIR)/interesting.ll" | "$(LLVM_FILECHECK)" filecheck-patterns.txt` resulted in some butchery. For starters, in `tools.mk`, LLVM_FILECHECK corrects its own backslashes on Windows distributions, but there is no further mention of it, so I assume this is a preset environment variable... but is it really? Then, the command itself uses a Standard Input and a passed input file as an argument simultaneously, according to the [documentation](https://llvm.org/docs/CommandGuide/FileCheck.html#synopsis). try-job: aarch64-gnu

…kingjubilee Rollup of 11 pull requests Successful merges: - rust-lang#125165 (Migrate `run-make/pgo-branch-weights` to `rmake`) - rust-lang#125674 (Rewrite `symlinked-extern`, `symlinked-rlib` and `symlinked-libraries` `run-make` tests in `rmake.rs` format) - rust-lang#125688 (Walk into alias-eq nested goals even if normalization fails) - rust-lang#126142 (Harmonize using root or leaf obligation in trait error reporting) - rust-lang#126303 (Urls to docs in rust_hir) - rust-lang#126328 (Add Option::is_none_or) - rust-lang#126337 (Add test for walking order dependent opaque type behaviour) - rust-lang#126351 (std::unix::fs::link using direct linkat call for Solaris.) - rust-lang#126353 (Move `MatchAgainstFreshVars` to old solver) - rust-lang#126356 (docs(rustc): Improve discoverable of Cargo docs) - rust-lang#126362 (Make `try_from_target_usize` method public) r? `@ghost` `@rustbot` modify labels: rollup

bors · 2024-06-13T02:46:26Z

⌛ Testing commit 17b0771 with merge f6b4b71...

bors · 2024-06-13T04:59:05Z

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing f6b4b71 to master...

rust-timer · 2024-06-13T06:12:55Z

Finished benchmarking commit (f6b4b71): 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 (primary 1.9%)

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)	3.2%	[2.3%, 4.7%]	3
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.3%	[-2.3%, -2.3%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.9%	[-2.3%, 4.7%]	4

Cycles

Results (secondary -2.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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 672.648s -> 671.891s (-0.11%)
Artifact size: 320.29 MiB -> 320.29 MiB (0.00%)

… r=jieyouxu Remove unused `llvm_readobj.rs` in `run-make-support` `llvm_readobj.rs` seems unused from the migration to `llvm.rs` in rust-lang#125165. Also, `llvm.rs` was missing the drop bombs (rust-lang#125752) in `llvm_readobj.rs`. Part of rust-lang#121876. r? `@jieyouxu`

Rollup merge of rust-lang#126536 - Rejyr:remove-unused-run-make-file, r=jieyouxu Remove unused `llvm_readobj.rs` in `run-make-support` `llvm_readobj.rs` seems unused from the migration to `llvm.rs` in rust-lang#125165. Also, `llvm.rs` was missing the drop bombs (rust-lang#125752) in `llvm_readobj.rs`. Part of rust-lang#121876. r? `@jieyouxu`

rustbot assigned jieyouxu May 15, 2024

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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 15, 2024

This comment has been minimized.

Sign in to view

jieyouxu reviewed May 15, 2024

View reviewed changes

This comment has been minimized.

Sign in to view

Oneirical force-pushed the pgo-branch-weights branch from 586d556 to 8fc4a0d Compare May 17, 2024 14:36

Oneirical mentioned this pull request May 17, 2024

Migrate run-make/issue-53964 to rmake #125224

Merged

jieyouxu reviewed May 18, 2024

View reviewed changes

jieyouxu mentioned this pull request May 20, 2024

Tracking Issue for porting run-make tests to use Rust #121876

Open

This comment has been minimized.

Sign in to view

jieyouxu approved these changes Jun 11, 2024

View reviewed changes

src/tools/run-make-support/src/llvm.rs Show resolved Hide resolved

src/tools/run-make-support/src/llvm.rs Show resolved Hide resolved

tests/run-make/pgo-branch-weights/rmake.rs Outdated Show resolved Hide resolved

tests/run-make/pgo-branch-weights/rmake.rs Outdated Show resolved Hide resolved

rewrite pgo-branch-weights to rmake

17b0771

Oneirical force-pushed the pgo-branch-weights branch from 0bb84af to 17b0771 Compare June 12, 2024 13:40

jieyouxu approved these changes Jun 12, 2024

View reviewed changes

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 12, 2024

workingjubilee mentioned this pull request Jun 13, 2024

Rollup of 11 pull requests #126369

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 13, 2024

bors merged commit f6b4b71 into rust-lang:master Jun 13, 2024
7 checks passed

rustbot added this to the 1.81.0 milestone Jun 13, 2024

bors mentioned this pull request Jun 13, 2024

Don't build a broken/untested profiler runtime on mingw targets #122613

Merged

Oneirical deleted the pgo-branch-weights branch June 13, 2024 13:41

Rejyr mentioned this pull request Jun 16, 2024

Remove unused llvm_readobj.rs in run-make-support #126536

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate `run-make/pgo-branch-weights` to `rmake` #125165

Migrate `run-make/pgo-branch-weights` to `rmake` #125165

Oneirical commented May 15, 2024 •

edited

Loading

rustbot commented May 15, 2024

This comment has been minimized.

lqd commented May 15, 2024

jieyouxu commented May 15, 2024

Oneirical commented May 15, 2024 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

lqd commented May 15, 2024 •

edited

Loading

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.

jieyouxu commented May 16, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

jieyouxu commented May 18, 2024

This comment has been minimized.

Oneirical commented May 21, 2024 •

edited

Loading

This comment has been minimized.

Oneirical commented Jun 11, 2024

bors commented Jun 11, 2024

bors commented Jun 11, 2024

jieyouxu left a comment

Oneirical commented Jun 12, 2024

jieyouxu commented Jun 12, 2024

jieyouxu commented Jun 12, 2024

bors commented Jun 12, 2024

Oneirical commented Jun 12, 2024

bors commented Jun 12, 2024

bors commented Jun 13, 2024

bors commented Jun 13, 2024

rust-timer commented Jun 13, 2024

Migrate run-make/pgo-branch-weights to rmake #125165

Migrate run-make/pgo-branch-weights to rmake #125165

Conversation

Oneirical commented May 15, 2024 • edited Loading

rustbot commented May 15, 2024

This comment has been minimized.

lqd commented May 15, 2024

jieyouxu commented May 15, 2024

Oneirical commented May 15, 2024 • edited Loading

This comment has been minimized.

This comment has been minimized.

lqd commented May 15, 2024 • edited Loading

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.

jieyouxu commented May 16, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

jieyouxu commented May 18, 2024

This comment has been minimized.

Oneirical commented May 21, 2024 • edited Loading

This comment has been minimized.

Oneirical commented Jun 11, 2024

bors commented Jun 11, 2024

bors commented Jun 11, 2024

jieyouxu left a comment

Choose a reason for hiding this comment

Oneirical commented Jun 12, 2024

jieyouxu commented Jun 12, 2024

jieyouxu commented Jun 12, 2024

bors commented Jun 12, 2024

Oneirical commented Jun 12, 2024

bors commented Jun 12, 2024

bors commented Jun 13, 2024

bors commented Jun 13, 2024

rust-timer commented Jun 13, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Migrate `run-make/pgo-branch-weights` to `rmake` #125165

Migrate `run-make/pgo-branch-weights` to `rmake` #125165

Oneirical commented May 15, 2024 •

edited

Loading

Oneirical commented May 15, 2024 •

edited

Loading

lqd commented May 15, 2024 •

edited

Loading

Oneirical commented May 21, 2024 •

edited

Loading