Skip to content

Rollup of 6 pull requests#116569

Merged
bors merged 98 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ni0jdd6
Oct 9, 2023
Merged

Rollup of 6 pull requests#116569
bors merged 98 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ni0jdd6

Conversation

@matthiaskrgr
Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

eduardosm and others added 30 commits September 5, 2023 20:06
Those were removed from stdarch in rust-lang/stdarch#1463 (`<*mut _>::write_unaligned` is used instead)
…ediate intrinsics

Those were removed from stdarch in rust-lang/stdarch#1463 (`simd_shl` and `simd_shr` are used instead)
…dtwco,bjorn3

Update stdarch submodule and remove special handling in cranelift codegen for some AVX and SSE2 LLVM intrinsics

rust-lang/stdarch#1463 reimplemented some x86 intrinsics to avoid using some x86-specific LLVM intrinsics:

* Store unaligned (`_mm*_storeu_*`) use `<*mut _>::write_unaligned` instead of `llvm.x86.*.storeu.*`.
* Shift by immediate (`_mm*_s{ll,rl,ra}i_epi*`) use `if` (srl, sll) or `min` (sra) to simulate the behaviour when the RHS is out of range. RHS is constant, so the `if`/`min` will be optimized away.

This PR updates the stdarch submodule to pull these changes and removes special handling for those LLVM intrinsics from cranelift codegen. I left gcc codegen untouched because there are some autogenerated lists.
…orn3

Sync rustc_codegen_cranelift

Not much changed this time. Mostly doing this sync to make it easier to run the entire test suite on the in-tree version.

r? `@ghost`

`@rustbot` label +A-codegen +A-cranelift +T-compiler
Use `Freeze` for `SourceFile`

This uses the `Freeze` type in `SourceFile` to let accessing `external_src` and `lines` be lock-free.

Behavior of `add_external_src` is changed to set `ExternalSourceKind::AbsentErr` on a hash mismatch which matches the documentation. `ExternalSourceKind::Unneeded` was removed as it's unused.

Based on rust-lang#115401.
Remove `verbose_generic_activity_with_arg`

This removes `verbose_generic_activity_with_arg` and changes users to `generic_activity_with_arg`. This keeps the output of `-Z time` readable while these repeated events are still available with the self profiling mechanism.
…iser

add helper method for finding the one non-1-ZST field
organize import sections with rustfmt `group_imports`
also share the code that emits the actual error
…i-obk

Simplify some mir passes by using let chains
…bjorn3

Sync rustc_codegen_cranelift

The highlights this time are improved simd and inline asm support, `is_x86_feature_detected!()` returning the actual cpu features when inline asm support is enabled and a couple of bug fixes.

r? ```@ghost```

```@rustbot``` label +A-codegen +A-cranelift +T-compiler +subtree-sync
…rrors

Add a test for fixed ICE

Addresses rust-lang#115517 (comment)

Closes rust-lang#115517

r? ``@compiler-errors``
@rustbot 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 9, 2023
@matthiaskrgr
Copy link
Copy Markdown
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Copy Markdown
Collaborator

bors commented Oct 9, 2023

📌 Commit 27a5146 has been approved by matthiaskrgr

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 Oct 9, 2023
@bors
Copy link
Copy Markdown
Collaborator

bors commented Oct 9, 2023

⌛ Testing commit 27a5146 with merge 317783a...

@bors
Copy link
Copy Markdown
Collaborator

bors commented Oct 9, 2023

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 317783a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 9, 2023
@bors bors merged commit 317783a into rust-lang:master Oct 9, 2023
@rustbot rustbot added this to the 1.75.0 milestone Oct 9, 2023
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#115736 Remove verbose_generic_activity_with_arg ❌ conflicts merging '4f6e9fd8d3' into previous master ❌
#115798 add helper method for finding the one non-1-ZST field ❌ conflicts merging '72fb4b8f31' into previous master ❌
#115882 improve the suggestion of generic_bound_failure aecd90318931e6b666f48c8ef70f258deffc0027 (link)
#115972 rename mir::Constant -> mir::ConstOperand, mir::ConstKind -… ❌ conflicts merging '0e02cab8ba' into previous master ❌
#116223 Fix misuses of a vs an ❌ conflicts merging 'f61b14dfc2' into previous master ❌
#116277 dont call mir.post_mono_checks in codegen ❌ conflicts merging 'ffa2d3ab63' into previous master ❌
#116537 Fix suggestion span involving wrongly placed generic arg on… 36c1ac51d69a6df9bd29e08ac5e741584865cd55 (link)
#116543 In smir find_crates returns Vec<Crate> instead of `Opti… 07e1b89d12b1a419d2c59f2bdee6e405ce51c807 (link)
#116549 Simplify some mir passes by using let chains 4f267ed7f511ac28fea77ea9a3a48e6c3ff730bc (link)
#116556 Sync rustc_codegen_cranelift 217ed1da73c2073f95bc629a972153d5921f4752 (link)
#116561 Add a test for fixed ICE f4ce46409fd7b617be6b5b38ac58d78d50eb30d1 (link)

previous master: be581d9f82

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
Copy Markdown
Collaborator

Finished benchmarking commit (317783a): 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

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

Cycles

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)
- - 0
Regressions ❌
(secondary)
2.0% [1.6%, 2.3%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.5% [-3.2%, -2.1%] 6
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 624.675s -> 627.404s (0.44%)
Artifact size: 270.86 MiB -> 270.83 MiB (-0.01%)

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

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.