Rollup of 9 pull requests #109097

matthiaskrgr · 2023-03-13T20:55:40Z

Successful merges:

Stabilize atomic_as_ptr #108419 (Stabilize atomic_as_ptr)
use as_ptr to determine the address of atomics #108507 (use as_ptr to determine the address of atomics)
Don't use fd-lock on Solaris in bootstrap #108607 (Don't use fd-lock on Solaris in bootstrap)
Treat projections with infer as placeholder during fast reject in new solver #108830 (Treat projections with infer as placeholder during fast reject in new solver)
create config::tests::detect_src_and_out test for bootstrap #109055 (create config::tests::detect_src_and_out test for bootstrap)
Document BinOp::is_checkable #109058 (Document BinOp::is_checkable)
simd-wide-sum test: adapt for LLVM 17 codegen change #109081 (simd-wide-sum test: adapt for LLVM 17 codegen change)
Update books #109083 (Update books)
Gracefully handle #[target_feature] on statics #109088 (Gracefully handle #[target_feature] on statics)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Signed-off-by: ozkanonur <[email protected]>

After llvm/llvm-project@0d4a709 LLVM becomes more clever and turns `@wider_reduce_loop` into an alias: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/17806#0186da6b-582c-46bf-a227-1565fa0859ac/743-766 This adapts the test to prevent this.

… solver

...as Solaris is missing flock() fixes rust-lang#103630

The was careful around not calling `fn_sig` on not-functions but well, it wasn't careful enough. This commit makes it a little more careful and also adds tests for a bunch more item kinds.

Stabilize `atomic_as_ptr` Fixes rust-lang#66893 This stabilizes the `as_ptr` methods for atomics. The stabilization feature gate used here is `atomic_as_ptr` which supersedes `atomic_mut_ptr` to match the change in rust-lang#107736. This needs FCP. New stable API: ```rust impl AtomicBool { pub const fn as_ptr(&self) -> *mut bool; } impl AtomicI32 { pub const fn as_ptr(&self) -> *mut i32; } // Includes all other atomic types impl<T> AtomicPtr<T> { pub const fn as_ptr(&self) -> *mut *mut T; } ``` r? libs-api ``@rustbot`` label +needs-fcp

use `as_ptr` to determine the address of atomics The PR rust-lang#107736 renamed atomic `as_mut_ptr` to `as_ptr`. Consequently, the futex implementation of the tier-3 platform `RutyHermit` has to use this new interface. In addition, this PR removes also an unused import.

…p, r=albertlarsan68 Don't use fd-lock on Solaris in bootstrap ...as Solaris is missing flock() fixes rust-lang#103630

…ject-faster, r=lcnr Treat projections with infer as placeholder during fast reject in new solver r? ``@lcnr`` Kind of a shame that we need to change all of the call sites for `for_each_relevant_impl`, etc. to pass an extra parameter. I guess I could have the "default" fn which calls a configurable fn?

…bertlarsan68 create `config::tests::detect_src_and_out` test for bootstrap Resolves one of the `FIXME` in bootstrap

Document BinOp::is_checkable

…r=nikic simd-wide-sum test: adapt for LLVM 17 codegen change After llvm/llvm-project@0d4a709 LLVM becomes more clever and turns ```@wider_reduce_loop``` into an alias: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/17806#0186da6b-582c-46bf-a227-1565fa0859ac/743-766 This adapts the test to prevent this.

Update books ## rust-lang/nomicon 1 commits in 79b53665a7c61d171fb8c5ad0b73b371f9ee6ba7..1f3e4cd4fd88b5b5d45feb86a11b6d2f93e5a974 2023-03-12 21:51:29 UTC to 2023-03-12 21:51:29 UTC - Change incorrect reference to "above" in ffi.md (rust-lang/nomicon#404) ## rust-lang/reference 4 commits in a9afb04b47a84a6753e4dc657348c324c876102c..24c87f6663aed55b05d2cc286878f28f21918825 2023-03-11 13:53:24 UTC to 2023-02-28 16:07:20 UTC - Document movbe target feature (rust-lang/reference#1336) - fix typo (rust-lang/reference#1339) - fix: Typo/reference (rust-lang/reference#1338) - Document `cmpxchg16b` target feature (rust-lang/reference#1331) ## rust-lang/rustc-dev-guide 13 commits in b06dab84083390e0ee1e998f466545a8a1a76a9f..b1b6d693cd1461e53de4132c1b183ace31cd36e5 2023-03-13 02:42:00 UTC to 2023-03-03 11:12:51 UTC - Rename `config.toml.example` to `config.example.toml` (rust-lang/rustc-dev-guide#1641) - fix typo `SubstRef` to `SubstsRef` (rust-lang/rustc-dev-guide#1642) - tracing log along diff crates (rust-lang/rustc-dev-guide#1640) - Fix Rust Analyzer settings location (rust-lang/rustc-dev-guide#1637) - Reflect the changes in rust-lang#67000 (rust-lang/rustc-dev-guide#1632) - improve capacity note (rust-lang/rustc-dev-guide#1634) - Remove mention to lexer/parser refactoring (rust-lang/rustc-dev-guide#1629) - Update date reference about infer context variables (rust-lang/rustc-dev-guide#1630) - Update explnation about `Body.basic_blocks` (rust-lang/rustc-dev-guide#1631) - Add detail to contributing guide (rust-lang/rustc-dev-guide#1628) - Making the sentence more clear (rust-lang/rustc-dev-guide#1624) - Fixed typing error (rust-lang/rustc-dev-guide#1623) - update error code docs to reflect recent changes (rust-lang/rustc-dev-guide#1625)

…s-when, r=compiler-errors Gracefully handle `#[target_feature]` on statics The was careful around not calling `fn_sig` on not-functions but well, it wasn't careful enough. This commit makes it a little more careful and also adds tests for a bunch more item kinds. I was sadly not able to fully bless the test locally because I'm on an aarch64 machine but I hope some manual editing made it work 😅 Fix rust-lang#109079

matthiaskrgr · 2023-03-13T20:56:28Z

@bors r+ rollup=never p=9

bors · 2023-03-13T20:56:30Z

📌 Commit 30cd4b3 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-03-14T00:01:34Z

💔 Test failed - checks-actions

matthiaskrgr · 2023-03-14T00:04:10Z

@bors retry #108227

bors · 2023-03-14T00:30:49Z

⌛ Testing commit 30cd4b3 with merge c54af45...

bors · 2023-03-14T03:38:34Z

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

rust-timer · 2023-03-14T03:41:07Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#109088	86f368b01f09cf8544507a3d728c5eba0f4b98a4
#109083	b7b7d2e8d14aac8a4476864f2d595898d837f748
#109081	421a4f90570ca80025c74a15f9c80eececaef0a7
#109058	56b63aff5b090e77194eb29cfa9f11c6e48e4f78
#109055	4b2a1e02cfa808185daab268f295588f423e162d
#108830	a90b93eb7160924c7c580735e32d9c374e5eb729
#108607	ecde5378fd0e228622a7d40c3594d5cac2242b7f
#108507	c403780b19b773be9908671a957b081bedb524da
#108419	99955a6165470c21d29be23d3b6e74776765ddb8

previous master: 22f247c6f3

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 · 2023-03-14T05:38:38Z

Finished benchmarking commit (c54af45): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

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

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.9%	[0.3%, 2.7%]	17
Regressions ❌ (secondary)	3.6%	[0.6%, 11.4%]	17
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.3%	[-0.4%, -0.3%]	2
All ❌✅ (primary)	0.9%	[0.3%, 2.7%]	17

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)	2.0%	[1.8%, 2.3%]	3
Regressions ❌ (secondary)	4.9%	[2.1%, 12.9%]	8
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.0%	[1.8%, 2.3%]	3

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)	2.0%	[1.1%, 2.8%]	3
Regressions ❌ (secondary)	3.7%	[1.6%, 9.8%]	13
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.0%	[1.1%, 2.8%]	3

nnethercote · 2023-03-14T10:36:17Z

#108830 seems the most likely cause of the regressions.

@rust-timer build a90b93eb7160924c7c580735e32d9c374e5eb729

rust-timer · 2023-03-14T12:51:00Z

Finished benchmarking commit (a90b93eb7160924c7c580735e32d9c374e5eb729): comparison URL.

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.9%	[0.3%, 2.4%]	15
Regressions ❌ (secondary)	3.6%	[0.6%, 11.3%]	17
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.4%	[-0.4%, -0.3%]	3
All ❌✅ (primary)	0.9%	[0.3%, 2.4%]	15

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)	2.1%	[1.9%, 2.2%]	3
Regressions ❌ (secondary)	5.8%	[2.2%, 12.7%]	6
Improvements ✅ (primary)	-3.0%	[-3.0%, -3.0%]	1
Improvements ✅ (secondary)	-3.4%	[-3.4%, -3.4%]	1
All ❌✅ (primary)	0.8%	[-3.0%, 2.2%]	4

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)	1.9%	[1.1%, 3.0%]	4
Regressions ❌ (secondary)	3.5%	[0.6%, 9.7%]	14
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.9%	[1.1%, 3.0%]	4

Mark-Simulacrum · 2023-03-14T13:34:24Z

Moving untriaged perf-regression to #108830.

tgross35 and others added 21 commits February 23, 2023 23:29

Stabilize atomic_as_ptr

318be2b

remove unused imports

daf31a1

use as_ptr to determine the address of atomics

ae27762

Document BinOp::is_checkable

b16d6cc

create config::tests::detect_src_and_out test for bootstrap

58c7b67

Signed-off-by: ozkanonur <[email protected]>

Treat projections with infer as placeholder during fast reject in new…

c32527f

… solver

Add a test that used to take forever to compile

868aa42

Better names?

84d254e

Don't use fd-lock on Solaris in bootstrap

04dfedb

...as Solaris is missing flock() fixes rust-lang#103630

Update books

f044156

Gracefully handle #[target_feature] on statics

34be05e

The was careful around not calling `fn_sig` on not-functions but well, it wasn't careful enough. This commit makes it a little more careful and also adds tests for a bunch more item kinds.

Rollup merge of rust-lang#108607 - psumbera:solaris-no-flock-bootstra…

b4c7fc4

…p, r=albertlarsan68 Don't use fd-lock on Solaris in bootstrap ...as Solaris is missing flock() fixes rust-lang#103630

Rollup merge of rust-lang#109055 - ozkanonur:detect_src_and_out, r=al…

f33292f

…bertlarsan68 create `config::tests::detect_src_and_out` test for bootstrap Resolves one of the `FIXME` in bootstrap

Rollup merge of rust-lang#109058 - tmiasko:is-checkable, r=jackh726

9fc8de0

Document BinOp::is_checkable

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 14, 2023

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 Mar 14, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 14, 2023

bors merged commit c54af45 into rust-lang:master Mar 14, 2023

rustbot added this to the 1.70.0 milestone Mar 14, 2023

This was referenced Mar 14, 2023

Migrate x to using clap #108083

Closed

Display pid of process holding lock #108107

Closed

Validate ignore and only compiletest directive, and add human-readable ignore reasons #108905

Merged

rustbot added the perf-regression Performance regression. label Mar 14, 2023

This comment has been minimized.

Sign in to view

Mark-Simulacrum mentioned this pull request Mar 14, 2023

Treat projections with infer as placeholder during fast reject in new solver #108830

Merged

This was referenced Mar 14, 2023

Inline simplify_type #109126

Closed

use adt_const_params to make simplify_type faster #109127

Closed

matthiaskrgr mentioned this pull request Nov 7, 2023

ice: const_trait_impl: async functions cannot be const fn #117629

Open

matthiaskrgr deleted the rollup-6ydc4ri branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #109097

Rollup of 9 pull requests #109097

matthiaskrgr commented Mar 13, 2023

matthiaskrgr commented Mar 13, 2023

bors commented Mar 13, 2023

bors commented Mar 14, 2023

matthiaskrgr commented Mar 14, 2023

bors commented Mar 14, 2023

bors commented Mar 14, 2023

rust-timer commented Mar 14, 2023

rust-timer commented Mar 14, 2023

nnethercote commented Mar 14, 2023

This comment has been minimized.

rust-timer commented Mar 14, 2023

Mark-Simulacrum commented Mar 14, 2023

Rollup of 9 pull requests #109097

Rollup of 9 pull requests #109097

Conversation

matthiaskrgr commented Mar 13, 2023

matthiaskrgr commented Mar 13, 2023

bors commented Mar 13, 2023

bors commented Mar 14, 2023

matthiaskrgr commented Mar 14, 2023

bors commented Mar 14, 2023

bors commented Mar 14, 2023

rust-timer commented Mar 14, 2023

rust-timer commented Mar 14, 2023

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

nnethercote commented Mar 14, 2023

This comment has been minimized.

rust-timer commented Mar 14, 2023

Overall result: ❌ regressions - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Mark-Simulacrum commented Mar 14, 2023