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.

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

Rollup of 10 pull requests #137796

Merged
merged 27 commits into from
Mar 1, 2025
Merged

Rollup of 10 pull requests #137796

merged 27 commits into from
Mar 1, 2025

Conversation

jieyouxu
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Shunpoco and others added 27 commits January 4, 2025 12:53
From rust-lang#123067, this test should ensure that there is no duplicated basic block against or-patterns.

Signed-off-by: Shunpoco <[email protected]>
minicore makes it much easier to add new language items to all of the
existing `no_core` tests.
If we use a С/С++ compiler as linker, then Posix-style escaping should be used.
instead, we can just import the intrinsics from core
…DianQK

Add FileCheck annotations to mir-opt/issues

This resolves a part of rust-lang#116971 .

The directory `tests/mir-opt/issues` has only one test issue_75439.rs which should add FileCheck annotations.

Originally it was introduced in rust-lang#75580 to confirm that there were duplicated basic blocks against or-patterns, but in rust-lang#123067 the duplication was resolved. So FileCheck should ensure that there is no such duplication any more.
…li-obk

Don't error when adding a staticlib with bitcode files compiled by newer LLVM

cc rust-lang#128955 (comment)
Update some comparison codegen tests now that they pass in LLVM20

Fixes rust-lang#106107

Needed one tweak to the default `PartialOrd::le` to get the test to pass.  Everything but the derived 2-field `le` test passes even without the change to the defaults in the trait.
…directives, r=notriddle

Fix (more) test directives that were accidentally ignored

Continuation of rust-lang#137099 , caught by rust-lang#137103 (and needed to unblock that one).
These test directives were accidentally using the old (`// ```@`)``` syntax
… r=RalfJung

import `simd_` intrinsics

In most cases, we can import the simd intrinsics rather than redeclare them. Apparently, most of these tests were written before `std::intrinsics::simd` existed.

There are a couple of exceptions where we can't yet import:

- the intrinsics are not declared as `const fn` in the standard library, causing issues in the `const-eval` tests
- the `simd_shuffle_generic` function is not exposed from `std::intrinsics`
- the `simd_fpow` and `simd_fpowi` functions are not exposed from `std::intrinsics` (removed in rust-lang#137595)
- some tests use `no_core`, and therefore cannot use `std::intrinsics`

r? ```@RalfJung```

cc ```@workingjubilee``` do you have context on why some intrinsics are not exposed?
…youxu

tests: use minicore more

minicore makes it much easier to add new language items to all of the existing `no_core` tests.

Most of the remaining tests that *could* use minicore either fail because..

1. LLVM IR output changes and doesn't pass the test as written. I didn't look into these further.
2. The test has revisions w/ different compilation flags, expecting some to fail, and when using minicore, minicore is compiled with those flags and fails in the expected way because of the flags rather than the test, and that's considered a failure.

But these tests can be changed and make adding new language items a lot easier.

r? ```@jieyouxu```
…lnay

Fix Windows `Command` search path bug

Currently `Command::new` on Windows works differently depending on whether any environment variable is set. For example,

```rust
// Searches for "myapp" in the application and system paths first (aka Windows native behaviour).
Command::new("myapp").spawn();

// Search for "myapp" in `PATH` first
Command::new("myapp").env("a", "b").spawn();
```

This is a bug because the search path should only change if `PATH` is changed for the child (i.e. `.env("PATH", "...")`).

This was discussed in a libs-api meeting where the exact semantics of `Command::new` was not decided but there seemed to be broad agreement that this particular thing is just a bug that can be fixed.

r? libs-api
linker: Fix escaping style for response files on Windows

If we use a С/С++ compiler as linker, then Posix-style escaping should be used.

Also temporarily fixup rustbuild to not fail at least in common scenarios, until the bootstrap compiler is updated.

Fixes rust-lang#137498
…,GuillaumeGomez

Re-enable `--generate-link-to-defintion` for tools internal rustdoc

~~These were removed because they used to break the build: rust-lang#122066 (comment), but testing locally it seems to work now.~~

This was re enabled in rust-lang#136589, but only for rustc, not tools.

The FIXME that prompted removing this is still present. Do we have an issue with an MCVE for this? CC ```@GuillaumeGomez```

https://github.com/rust-lang/rust/blob/ac91805f3179fc2225c60e8ccf5a1daa09d43f3d/src/librustdoc/html/render/span_map.rs#L178-L182

try-job: aarch64-apple
…d-crit, r=oli-obk

Fix sized constraint for unsafe binder

Fixes rust-lang#137705
r? oli-obk
@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 O-windows Operating system: Windows labels Feb 28, 2025
@rustbot rustbot added PG-exploit-mitigations Project group: Exploit mitigations 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Feb 28, 2025
@jieyouxu
Copy link
Member Author

@bors r+ rollup=never p=5

@rustbot rustbot added the rollup A PR which is a rollup label Feb 28, 2025
@bors
Copy link
Contributor

bors commented Feb 28, 2025

📌 Commit 0cb9827 has been approved by jieyouxu

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 Feb 28, 2025
@bors
Copy link
Contributor

bors commented Mar 1, 2025

⌛ Testing commit 0cb9827 with merge 30508fa...

@bors
Copy link
Contributor

bors commented Mar 1, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 1, 2025
@bors bors merged commit 30508fa into rust-lang:master Mar 1, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 1, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#134943 Add FileCheck annotations to mir-opt/issues c1e09a304b5324552532b55ba6ac09e28c18af23 (link)
#137017 Don't error when adding a staticlib with bitcode files comp… 3992114f667ba0b6bd89420aa4497ce2f57a7e8d (link)
#137197 Update some comparison codegen tests now that they pass in … e916e24397812c30df0d4cb8a0418e5930282864 (link)
#137540 Fix (more) test directives that were accidentally ignored 782f129029425d53a858b44c14aa22e97eb17eff (link)
#137551 import simd_ intrinsics 3439361cb92a75a5c0600aa40c61b96e189e261a (link)
#137599 tests: use minicore more c2b88f6f8ac00eb4125102a5c7a95cffdf67b8cb (link)
#137673 Fix Windows Command search path bug 6980dcada1807d2471521c8b63ead88b668bdeef (link)
#137676 linker: Fix escaping style for response files on Windows 8d210b59a09760b0653d8b7a307df539055c2386 (link)
#137693 Re-enable --generate-link-to-defintion for tools internal… 6e6b74869c1a589f2107dd919df895d6b094607e (link)
#137770 Fix sized constraint for unsafe binder f4002dc46b2c7d1813d4107dbc1ae33b6a2dd1f0 (link)

previous master: aa3c2d73ef

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (30508fa): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
0.3% [0.1%, 0.4%] 9
Regressions ❌
(secondary)
0.3% [0.2%, 0.5%] 8
Improvements ✅
(primary)
-0.6% [-0.9%, -0.2%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.1% [-0.9%, 0.4%] 11

Max RSS (memory usage)

Results (primary 0.5%, secondary -1.5%)

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.5% [1.4%, 5.3%] 4
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.5% [-4.8%, -2.7%] 3
Improvements ✅
(secondary)
-1.5% [-1.5%, -1.5%] 1
All ❌✅ (primary) 0.5% [-4.8%, 5.3%] 7

Cycles

Results (primary -1.0%, secondary 2.7%)

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)
2.7% [2.7%, 2.7%] 1
Improvements ✅
(primary)
-1.0% [-1.0%, -1.0%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.0% [-1.0%, -1.0%] 1

Binary size

Results (primary 0.0%)

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.1% [0.0%, 0.4%] 31
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.7%, -0.0%] 13
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [-0.7%, 0.4%] 44

Bootstrap: 770.727s -> 771.704s (0.13%)
Artifact size: 361.98 MiB -> 361.99 MiB (0.00%)

@rustbot rustbot added the perf-regression Performance regression. label Mar 1, 2025
@jieyouxu jieyouxu deleted the rollup-qt9yr1g branch March 1, 2025 09:03
@scottmcm
Copy link
Member

scottmcm commented Mar 3, 2025

Hopefully #137904 (comment) will undo some of those perf regressions.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. O-windows Operating system: Windows perf-regression Performance regression. PG-exploit-mitigations Project group: Exploit mitigations rollup A PR which is a rollup 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.
Projects
None yet
Development

Successfully merging this pull request may close these issues.