diff options
| author | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-02-10 00:47:48 +1100 |
|---|---|---|
| committer | Nicholas Nethercote <n.nethercote@gmail.com> | 2022-02-23 10:18:49 +1100 |
| commit | 36b495f3cf23a1f235482ce7f81f0f4be614bb85 (patch) | |
| tree | bb651118e987cbe7467f088e84811ae93a676954 /compiler/rustc_data_structures/src | |
| parent | 523a1b1d388bfe82a5d0540b876d9428b6dccc9c (diff) | |
| download | rust-36b495f3cf23a1f235482ce7f81f0f4be614bb85.tar.gz rust-36b495f3cf23a1f235482ce7f81f0f4be614bb85.zip | |
Introduce `ChunkedBitSet` and use it for some dataflow analyses.
This reduces peak memory usage significantly for some programs with very large functions, such as: - `keccak`, `unicode_normalization`, and `match-stress-enum`, from the `rustc-perf` benchmark suite; - `http-0.2.6` from crates.io. The new type is used in the analyses where the bitsets can get huge (e.g. 10s of thousands of bits): `MaybeInitializedPlaces`, `MaybeUninitializedPlaces`, and `EverInitializedPlaces`. Some refactoring was required in `rustc_mir_dataflow`. All existing analysis domains are either `BitSet` or a trivial wrapper around `BitSet`, and access in a few places is done via `Borrow<BitSet>` or `BorrowMut<BitSet>`. Now that some of these domains are `ClusterBitSet`, that no longer works. So this commit replaces the `Borrow`/`BorrowMut` usage with a new trait `BitSetExt` containing the needed bitset operations. The impls just forward these to the underlying bitset type. This required fiddling with trait bounds in a few places. The commit also: - Moves `static_assert_size` from `rustc_data_structures` to `rustc_index` so it can be used in the latter; the former now re-exports it so existing users are unaffected. - Factors out some common "clear excess bits in the final word" functionality in `bit_set.rs`. - Uses `fill` in a few places instead of loops.
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/lib.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_data_structures/src/macros.rs | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/compiler/rustc_data_structures/src/lib.rs b/compiler/rustc_data_structures/src/lib.rs index ea02a73c422..3e93fe9a11f 100644 --- a/compiler/rustc_data_structures/src/lib.rs +++ b/compiler/rustc_data_structures/src/lib.rs @@ -37,6 +37,8 @@ extern crate cfg_if; #[macro_use] extern crate rustc_macros; +pub use rustc_index::static_assert_size; + #[inline(never)] #[cold] pub fn cold_path<F: FnOnce() -> R, R>(f: F) -> R { diff --git a/compiler/rustc_data_structures/src/macros.rs b/compiler/rustc_data_structures/src/macros.rs index 48dfbba7504..e05491f6ff6 100644 --- a/compiler/rustc_data_structures/src/macros.rs +++ b/compiler/rustc_data_structures/src/macros.rs @@ -1,11 +1,3 @@ -/// Type size assertion. The first argument is a type and the second argument is its expected size. -#[macro_export] -macro_rules! static_assert_size { - ($ty:ty, $size:expr) => { - const _: [(); $size] = [(); ::std::mem::size_of::<$ty>()]; - }; -} - #[macro_export] macro_rules! enum_from_u32 { ($(#[$attr:meta])* pub enum $name:ident { |
