bump parking_lot to 0.12 #114418

klensy · 2023-08-03T14:03:07Z

Bumps parking_lot to 0.12, replaces few explicit uses of parking_lot with rustc_data_structures::sync ones.

~~cc @oli-obk this touches recent #114283~~
cc @SparrowLii i've checked that this builds with parallel-compiler

measureme's bump rust-lang/measureme#209

rust/compiler/rustc_data_structures/src/sync.rs

Lines 18 to 34 in fcf3006

    
           //! 
        
           //! | Type                    | Serial version      | Parallel version                | 
        
           //! | ----------------------- | ------------------- | ------------------------------- | 
        
           //! | `Lrc<T>`                | `rc::Rc<T>`         | `sync::Arc<T>`                  | 
        
           //! |` Weak<T>`               | `rc::Weak<T>`       | `sync::Weak<T>`                 | 
        
           //! |                         |                     |                                 | 
        
           //! | `AtomicBool`            | `Cell<bool>`        | `atomic::AtomicBool`            | 
        
           //! | `AtomicU32`             | `Cell<u32>`         | `atomic::AtomicU32`             | 
        
           //! | `AtomicU64`             | `Cell<u64>`         | `atomic::AtomicU64`             | 
        
           //! | `AtomicUsize`           | `Cell<usize>`       | `atomic::AtomicUsize`           | 
        
           //! |                         |                     |                                 | 
        
           //! | `Lock<T>`               | `RefCell<T>`        | `parking_lot::Mutex<T>`         | 
        
           //! | `RwLock<T>`             | `RefCell<T>`        | `parking_lot::RwLock<T>`        | 
        
           //! | `MTLock<T>`        [^1] | `T`                 | `Lock<T>`                       | 
        
           //! | `MTLockRef<'a, T>` [^2] | `&'a mut MTLock<T>` | `&'a MTLock<T>`                 | 
        
           //! |                         |                     |                                 | 
        
           //! | `ParallelIterator`      | `Iterator`          | `rayon::iter::ParallelIterator` |

rustbot · 2023-08-03T14:03:18Z

r? @compiler-errors

(rustbot has picked a reviewer for you, use r? to override)

rustbot · 2023-08-03T14:03:21Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

klensy · 2023-08-03T14:04:55Z

compiler/rustc_query_system/src/dep_graph/graph.rs

-    processed_side_effects: Mutex<FxHashSet<DepNodeIndex>>,
+    processed_side_effects: Lock<FxHashSet<DepNodeIndex>>,


This should became cheaper

compiler/rustc_data_structures/src/sync/vec.rs

oli-obk · 2023-08-03T14:49:48Z

r? @oli-obk

@bors try @rust-timer queue

bors · 2023-08-03T14:49:58Z

⌛ Trying commit a833750e40e425b5d80102ebac24be6684c4acf2 with merge 09d3f46d72bf73da1371cc5f80882d9a0f8fa53d...

klensy · 2023-08-03T14:58:37Z

Looking at changelog https://github.com/Amanieu/parking_lot/blob/0.12.1/CHANGELOG.md, most interesting thing probably Amanieu/parking_lot#344?

bors · 2023-08-03T16:01:29Z

☀️ Try build successful - checks-actions
Build commit: 09d3f46d72bf73da1371cc5f80882d9a0f8fa53d (09d3f46d72bf73da1371cc5f80882d9a0f8fa53d)

compiler/rustc_query_system/src/query/job.rs

rust-timer · 2023-08-04T01:44:48Z

Finished benchmarking commit (09d3f46d72bf73da1371cc5f80882d9a0f8fa53d): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

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

Max RSS (memory usage)

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

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)	3.9%	[3.0%, 4.8%]	6
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-3.2%	[-3.2%, -3.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.9%	[-3.2%, 4.8%]	7

Binary size

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

Bootstrap: 649.462s -> 649.252s (-0.03%)

…ync onces

oli-obk · 2023-08-04T15:45:17Z

@bors r+ rollup

thanks for bearing with us through our odd requests

bors · 2023-08-04T15:45:18Z

📌 Commit e370095 has been approved by oli-obk

It is now in the queue for this repository.

…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#113945 (Fix wrong span for trait selection failure error reporting) - rust-lang#114351 ([rustc_span][perf] Remove unnecessary string joins and allocs.) - rust-lang#114418 (bump parking_lot to 0.12) - rust-lang#114434 (Improve spans for indexing expressions) - rust-lang#114450 (Fix ICE failed to get layout for ReferencesError) - rust-lang#114461 (Fix unwrap on None) - rust-lang#114462 (interpret: add mplace_to_ref helper method) - rust-lang#114472 (Reword `confusable_idents` lint) - rust-lang#114477 (Account for `Rc` and `Arc` when suggesting to clone) r? `@ghost` `@rustbot` modify labels: rollup

bump parking_lot 0.11 to 0.12

383b715

rustbot assigned compiler-errors Aug 3, 2023

klensy commented Aug 3, 2023

View reviewed changes

compiler/rustc_data_structures/src/sync/vec.rs Outdated Show resolved Hide resolved

klensy mentioned this pull request Aug 3, 2023

bump parking_lot to 0.12 to sync with rustc rust-lang/measureme#209

Merged

klensy force-pushed the parking_lot branch from 29a96b6 to a833750 Compare August 3, 2023 14:25

This comment has been minimized.

Sign in to view

rustbot assigned oli-obk and unassigned compiler-errors Aug 3, 2023

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Aug 3, 2023

This comment has been minimized.

Sign in to view

SparrowLii reviewed Aug 4, 2023

View reviewed changes

compiler/rustc_query_system/src/query/job.rs Outdated Show resolved Hide resolved

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Aug 4, 2023

replace few explicit use of parking_lot with rustc_data_structures::s…

e370095

…ync onces

klensy force-pushed the parking_lot branch from a833750 to e370095 Compare August 4, 2023 15:43

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 Aug 4, 2023

matthiaskrgr mentioned this pull request Aug 4, 2023

Rollup of 9 pull requests #114481

Merged

bors merged commit 4669905 into rust-lang:master Aug 4, 2023

rustbot added this to the 1.73.0 milestone Aug 4, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bump parking_lot to 0.12 #114418

bump parking_lot to 0.12 #114418

klensy commented Aug 3, 2023 •

edited

Loading

rustbot commented Aug 3, 2023

rustbot commented Aug 3, 2023

klensy Aug 3, 2023

oli-obk commented Aug 3, 2023

This comment has been minimized.

bors commented Aug 3, 2023

klensy commented Aug 3, 2023

bors commented Aug 3, 2023

This comment has been minimized.

rust-timer commented Aug 4, 2023

oli-obk commented Aug 4, 2023

bors commented Aug 4, 2023

	//!
	//! \| Type \| Serial version \| Parallel version \|
	//! \| ----------------------- \| ------------------- \| ------------------------------- \|
	//! \| `Lrc<T>` \| `rc::Rc<T>` \| `sync::Arc<T>` \|
	//! \|` Weak<T>` \| `rc::Weak<T>` \| `sync::Weak<T>` \|
	//! \| \| \| \|
	//! \| `AtomicBool` \| `Cell<bool>` \| `atomic::AtomicBool` \|
	//! \| `AtomicU32` \| `Cell<u32>` \| `atomic::AtomicU32` \|
	//! \| `AtomicU64` \| `Cell<u64>` \| `atomic::AtomicU64` \|
	//! \| `AtomicUsize` \| `Cell<usize>` \| `atomic::AtomicUsize` \|
	//! \| \| \| \|
	//! \| `Lock<T>` \| `RefCell<T>` \| `parking_lot::Mutex<T>` \|
	//! \| `RwLock<T>` \| `RefCell<T>` \| `parking_lot::RwLock<T>` \|
	//! \| `MTLock<T>` [^1] \| `T` \| `Lock<T>` \|
	//! \| `MTLockRef<'a, T>` [^2] \| `&'a mut MTLock<T>` \| `&'a MTLock<T>` \|
	//! \| \| \| \|
	//! \| `ParallelIterator` \| `Iterator` \| `rayon::iter::ParallelIterator` \|

		processed_side_effects: Mutex<FxHashSet<DepNodeIndex>>,
		processed_side_effects: Lock<FxHashSet<DepNodeIndex>>,

bump parking_lot to 0.12 #114418

bump parking_lot to 0.12 #114418

Conversation

klensy commented Aug 3, 2023 • edited Loading

rustbot commented Aug 3, 2023

rustbot commented Aug 3, 2023

klensy Aug 3, 2023

Choose a reason for hiding this comment

oli-obk commented Aug 3, 2023

This comment has been minimized.

bors commented Aug 3, 2023

klensy commented Aug 3, 2023

bors commented Aug 3, 2023

This comment has been minimized.

rust-timer commented Aug 4, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

oli-obk commented Aug 4, 2023

bors commented Aug 4, 2023

klensy commented Aug 3, 2023 •

edited

Loading