Store liveness in interval sets for region inference #90637
+491
−17
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -3965,6 +3965,7 @@ dependencies = [ | ||
| "arrayvec", | ||
| "rustc_macros", | ||
| "rustc_serialize", | ||
| "smallvec", | ||
| ] | ||
|
|
||
| [[package]] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,269 @@ | ||
| use std::iter::Step; | ||
| use std::marker::PhantomData; | ||
| use std::ops::Bound; | ||
| use std::ops::RangeBounds; | ||
|
|
||
| use crate::vec::Idx; | ||
| use crate::vec::IndexVec; | ||
| use smallvec::SmallVec; | ||
|
|
||
| #[cfg(test)] | ||
| mod tests; | ||
|
|
||
| /// Stores a set of intervals on the indices. | ||
| #[derive(Debug, Clone)] | ||
| pub struct IntervalSet<I> { | ||
| // Start, end | ||
| map: SmallVec<[(u32, u32); 4]>, | ||
| domain: usize, | ||
| _data: PhantomData<I>, | ||
| } | ||
|
|
||
| #[inline] | ||
| fn inclusive_start<T: Idx>(range: impl RangeBounds<T>) -> u32 { | ||
| match range.start_bound() { | ||
| Bound::Included(start) => start.index() as u32, | ||
| Bound::Excluded(start) => start.index() as u32 + 1, | ||
| Bound::Unbounded => 0, | ||
| } | ||
| } | ||
|
|
||
| #[inline] | ||
| fn inclusive_end<T: Idx>(domain: usize, range: impl RangeBounds<T>) -> Option<u32> { | ||
| let end = match range.end_bound() { | ||
| Bound::Included(end) => end.index() as u32, | ||
| Bound::Excluded(end) => end.index().checked_sub(1)? as u32, | ||
| Bound::Unbounded => domain.checked_sub(1)? as u32, | ||
| }; | ||
| Some(end) | ||
| } | ||
|
|
||
| impl<I: Idx> IntervalSet<I> { | ||
| pub fn new(domain: usize) -> IntervalSet<I> { | ||
| IntervalSet { map: SmallVec::new(), domain, _data: PhantomData } | ||
| } | ||
|
|
||
| pub fn clear(&mut self) { | ||
| self.map.clear(); | ||
| } | ||
|
|
||
| pub fn iter(&self) -> impl Iterator<Item = I> + '_ | ||
| where | ||
| I: Step, | ||
| { | ||
| self.iter_intervals().flatten() | ||
| } | ||
|
|
||
| /// Iterates through intervals stored in the set, in order. | ||
| pub fn iter_intervals(&self) -> impl Iterator<Item = std::ops::Range<I>> + '_ | ||
| where | ||
| I: Step, | ||
| { | ||
| self.map.iter().map(|&(start, end)| I::new(start as usize)..I::new(end as usize + 1)) | ||
| } | ||
|
|
||
| /// Returns true if we increased the number of elements present. | ||
| pub fn insert(&mut self, point: I) -> bool { | ||
| self.insert_range(point..=point) | ||
| } | ||
|
|
||
| /// Returns true if we increased the number of elements present. | ||
| pub fn insert_range(&mut self, range: impl RangeBounds<I> + Clone) -> bool { | ||
| let start = inclusive_start(range.clone()); | ||
| let Some(mut end) = inclusive_end(self.domain, range) else { | ||
| // empty range | ||
| return false; | ||
| }; | ||
| if start > end { | ||
| return false; | ||
| } | ||
|
|
||
| loop { | ||
| // This condition looks a bit weird, but actually makes sense. | ||
| // | ||
| // if r.0 == end + 1, then we're actually adjacent, so we want to | ||
| // continue to the next range. We're looking here for the first | ||
| // range which starts *non-adjacently* to our end. | ||
| let next = self.map.partition_point(|r| r.0 <= end + 1); | ||
| if let Some(last) = next.checked_sub(1) { | ||
| let (prev_start, prev_end) = &mut self.map[last]; | ||
| if *prev_end + 1 >= start { | ||
| // If the start for the inserted range is adjacent to the | ||
| // end of the previous, we can extend the previous range. | ||
| if start < *prev_start { | ||
| // Our range starts before the one we found. We'll need | ||
| // to *remove* it, and then try again. | ||
| // | ||
| // FIXME: This is not so efficient; we may need to | ||
| // recurse a bunch of times here. Instead, it's probably | ||
| // better to do something like drain_filter(...) on the | ||
| // map to be able to delete or modify all the ranges in | ||
| // start..=end and then potentially re-insert a new | ||
| // range. | ||
| end = std::cmp::max(end, *prev_end); | ||
| self.map.remove(last); | ||
| } else { | ||
| // We overlap with the previous range, increase it to | ||
| // include us. | ||
| // | ||
| // Make sure we're actually going to *increase* it though -- | ||
| // it may be that end is just inside the previously existing | ||
| // set. | ||
| return if end > *prev_end { | ||
| *prev_end = end; | ||
| true | ||
| } else { | ||
| false | ||
| }; | ||
| } | ||
| } else { | ||
| // Otherwise, we don't overlap, so just insert | ||
| self.map.insert(last + 1, (start, end)); | ||
| return true; | ||
| } | ||
| } else { | ||
| if self.map.is_empty() { | ||
| // Quite common in practice, and expensive to call memcpy | ||
| // with length zero. | ||
| self.map.push((start, end)); | ||
| } else { | ||
| self.map.insert(next, (start, end)); | ||
| } | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| pub fn contains(&self, needle: I) -> bool { | ||
| let needle = needle.index() as u32; | ||
| let last = match self.map.partition_point(|r| r.0 <= needle).checked_sub(1) { | ||
| Some(idx) => idx, | ||
| None => { | ||
| // All ranges in the map start after the new range's end | ||
| return false; | ||
| } | ||
| }; | ||
| let (_, prev_end) = &self.map[last]; | ||
| needle <= *prev_end | ||
| } | ||
|
|
||
| pub fn superset(&self, other: &IntervalSet<I>) -> bool | ||
| where | ||
| I: Step, | ||
| { | ||
| // FIXME: Performance here is probably not great. We will be doing a lot | ||
| // of pointless tree traversals. | ||
| other.iter().all(|elem| self.contains(elem)) | ||
| } | ||
|
|
||
| pub fn is_empty(&self) -> bool { | ||
| self.map.is_empty() | ||
| } | ||
|
|
||
| /// Returns the maximum (last) element present in the set from `range`. | ||
| pub fn last_set_in(&self, range: impl RangeBounds<I> + Clone) -> Option<I> { | ||
| let start = inclusive_start(range.clone()); | ||
| let Some(end) = inclusive_end(self.domain, range) else { | ||
| // empty range | ||
| return None; | ||
| }; | ||
| if start > end { | ||
| return None; | ||
| } | ||
| let last = match self.map.partition_point(|r| r.0 <= end).checked_sub(1) { | ||
| Some(idx) => idx, | ||
| None => { | ||
| // All ranges in the map start after the new range's end | ||
| return None; | ||
| } | ||
| }; | ||
| let (_, prev_end) = &self.map[last]; | ||
| if start <= *prev_end { Some(I::new(std::cmp::min(*prev_end, end) as usize)) } else { None } | ||
| } | ||
|
|
||
| pub fn insert_all(&mut self) { | ||
| self.clear(); | ||
| self.map.push((0, self.domain.try_into().unwrap())); | ||
| } | ||
|
|
||
| pub fn union(&mut self, other: &IntervalSet<I>) -> bool | ||
| where | ||
| I: Step, | ||
| { | ||
| assert_eq!(self.domain, other.domain); | ||
| let mut did_insert = false; | ||
| for range in other.iter_intervals() { | ||
| did_insert |= self.insert_range(range); | ||
| } | ||
| did_insert | ||
| } | ||
| } | ||
|
|
||
| /// This data structure optimizes for cases where the stored bits in each row | ||
| /// are expected to be highly contiguous (long ranges of 1s or 0s), in contrast | ||
| /// to BitMatrix and SparseBitMatrix which are optimized for | ||
| /// "random"/non-contiguous bits and cheap(er) point queries at the expense of | ||
| /// memory usage. | ||
| #[derive(Clone)] | ||
| pub struct SparseIntervalMatrix<R, C> | ||
| where | ||
| R: Idx, | ||
| C: Idx, | ||
| { | ||
| rows: IndexVec<R, IntervalSet<C>>, | ||
| column_size: usize, | ||
| } | ||
|
|
||
| impl<R: Idx, C: Step + Idx> SparseIntervalMatrix<R, C> { | ||
| pub fn new(column_size: usize) -> SparseIntervalMatrix<R, C> { | ||
| SparseIntervalMatrix { rows: IndexVec::new(), column_size } | ||
| } | ||
|
|
||
| pub fn rows(&self) -> impl Iterator<Item = R> { | ||
| self.rows.indices() | ||
| } | ||
|
|
||
| pub fn row(&self, row: R) -> Option<&IntervalSet<C>> { | ||
| self.rows.get(row) | ||
| } | ||
|
|
||
| fn ensure_row(&mut self, row: R) -> &mut IntervalSet<C> { | ||
| self.rows.ensure_contains_elem(row, || IntervalSet::new(self.column_size)); | ||
| &mut self.rows[row] | ||
| } | ||
|
|
||
| pub fn union_row(&mut self, row: R, from: &IntervalSet<C>) -> bool | ||
| where | ||
| C: Step, | ||
| { | ||
| self.ensure_row(row).union(from) | ||
| } | ||
|
|
||
| pub fn union_rows(&mut self, read: R, write: R) -> bool | ||
| where | ||
| C: Step, | ||
| { | ||
| if read == write || self.rows.get(read).is_none() { | ||
| return false; | ||
| } | ||
| self.ensure_row(write); | ||
| let (read_row, write_row) = self.rows.pick2_mut(read, write); | ||
| write_row.union(read_row) | ||
| } | ||
|
|
||
| pub fn insert_all_into_row(&mut self, row: R) { | ||
| self.ensure_row(row).insert_all(); | ||
| } | ||
|
|
||
| pub fn insert_range(&mut self, row: R, range: impl RangeBounds<C> + Clone) { | ||
| self.ensure_row(row).insert_range(range); | ||
| } | ||
|
|
||
| pub fn insert(&mut self, row: R, point: C) -> bool { | ||
| self.ensure_row(row).insert(point) | ||
| } | ||
|
|
||
| pub fn contains(&self, row: R, point: C) -> bool { | ||
| self.row(row).map_or(false, |r| r.contains(point)) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,199 @@ | ||
| use super::*; | ||
|
There was a problem hiding this comment. It could be nice to also have a couple tests for There was a problem hiding this comment. SparseIntervalMatrix doesn't really need tests IMO -- at least currently it's a pretty thin wrapper around IntervalSet so there's not much surface area to test. IntervalSet::union I think currently doesn't really merit testing -- it's a tiny wrapper around inserting all the ranges from a different set -- so I'm inclined to leave it as-is for now. If it becomes hot in some future perf assessment we may wish to optimize it by interleaving range iteration from the current and the other set (similar to a merge sort's merge operation), but that seems likely to be an obvious "we should add tests" moment), and depending on implementation would likely expose easier knobs to test -- right now it would end up pretty opaque I suspect. |
||
|
|
||
| #[test] | ||
| fn insert_collapses() { | ||
| let mut set = IntervalSet::<u32>::new(3000); | ||
| set.insert_range(9831..=9837); | ||
| set.insert_range(43..=9830); | ||
| assert_eq!(set.iter_intervals().collect::<Vec<_>>(), [43..9838]); | ||
| } | ||
|
|
||
| #[test] | ||
| fn contains() { | ||
| let mut set = IntervalSet::new(300); | ||
| set.insert(0u32); | ||
| assert!(set.contains(0)); | ||
| set.insert_range(0..10); | ||
| assert!(set.contains(9)); | ||
| assert!(!set.contains(10)); | ||
| set.insert_range(10..11); | ||
| assert!(set.contains(10)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn insert() { | ||
| for i in 0..30usize { | ||
| let mut set = IntervalSet::new(300); | ||
| for j in i..30usize { | ||
| set.insert(j); | ||
| for k in i..j { | ||
| assert!(set.contains(k)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| let mut set = IntervalSet::new(300); | ||
| set.insert_range(0..1u32); | ||
| assert!(set.contains(0), "{:?}", set.map); | ||
| assert!(!set.contains(1)); | ||
| set.insert_range(1..1); | ||
| assert!(set.contains(0)); | ||
| assert!(!set.contains(1)); | ||
|
|
||
| let mut set = IntervalSet::new(300); | ||
| set.insert_range(4..5u32); | ||
| set.insert_range(5..10); | ||
| assert_eq!(set.iter().collect::<Vec<_>>(), [4, 5, 6, 7, 8, 9]); | ||
| set.insert_range(3..7); | ||
| assert_eq!(set.iter().collect::<Vec<_>>(), [3, 4, 5, 6, 7, 8, 9]); | ||
|
|
||
| let mut set = IntervalSet::new(300); | ||
| set.insert_range(0..10u32); | ||
| set.insert_range(3..5); | ||
| assert_eq!(set.iter().collect::<Vec<_>>(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]); | ||
|
|
||
| let mut set = IntervalSet::new(300); | ||
| set.insert_range(0..10u32); | ||
| set.insert_range(0..3); | ||
| assert_eq!(set.iter().collect::<Vec<_>>(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]); | ||
|
|
||
| let mut set = IntervalSet::new(300); | ||
| set.insert_range(0..10u32); | ||
| set.insert_range(0..10); | ||
| assert_eq!(set.iter().collect::<Vec<_>>(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]); | ||
|
|
||
| let mut set = IntervalSet::new(300); | ||
| set.insert_range(0..10u32); | ||
| set.insert_range(5..10); | ||
| assert_eq!(set.iter().collect::<Vec<_>>(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]); | ||
|
|
||
| let mut set = IntervalSet::new(300); | ||
| set.insert_range(0..10u32); | ||
| set.insert_range(5..13); | ||
| assert_eq!(set.iter().collect::<Vec<_>>(), [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]); | ||
| } | ||
|
|
||
| #[test] | ||
| fn insert_range() { | ||
| #[track_caller] | ||
| fn check<R>(range: R) | ||
| where | ||
| R: RangeBounds<usize> + Clone + IntoIterator<Item = usize> + std::fmt::Debug, | ||
| { | ||
| let mut set = IntervalSet::new(300); | ||
| set.insert_range(range.clone()); | ||
| for i in set.iter() { | ||
| assert!(range.contains(&i)); | ||
| } | ||
| for i in range.clone() { | ||
| assert!(set.contains(i), "A: {} in {:?}, inserted {:?}", i, set, range); | ||
| } | ||
| set.insert_range(range.clone()); | ||
| for i in set.iter() { | ||
| assert!(range.contains(&i), "{} in {:?}", i, set); | ||
| } | ||
| for i in range.clone() { | ||
| assert!(set.contains(i), "B: {} in {:?}, inserted {:?}", i, set, range); | ||
| } | ||
| } | ||
| check(10..10); | ||
| check(10..100); | ||
| check(10..30); | ||
| check(0..5); | ||
| check(0..250); | ||
| check(200..250); | ||
|
|
||
| check(10..=10); | ||
| check(10..=100); | ||
| check(10..=30); | ||
| check(0..=5); | ||
| check(0..=250); | ||
| check(200..=250); | ||
|
|
||
| for i in 0..30 { | ||
| for j in i..30 { | ||
| check(i..j); | ||
| check(i..=j); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn insert_range_dual() { | ||
| let mut set = IntervalSet::<u32>::new(300); | ||
| set.insert_range(0..3); | ||
| assert_eq!(set.iter().collect::<Vec<_>>(), [0, 1, 2]); | ||
| set.insert_range(5..7); | ||
| assert_eq!(set.iter().collect::<Vec<_>>(), [0, 1, 2, 5, 6]); | ||
| set.insert_range(3..4); | ||
| assert_eq!(set.iter().collect::<Vec<_>>(), [0, 1, 2, 3, 5, 6]); | ||
| set.insert_range(3..5); | ||
| assert_eq!(set.iter().collect::<Vec<_>>(), [0, 1, 2, 3, 4, 5, 6]); | ||
| } | ||
|
|
||
| #[test] | ||
| fn last_set_before_adjacent() { | ||
| let mut set = IntervalSet::<u32>::new(300); | ||
| set.insert_range(0..3); | ||
| set.insert_range(3..5); | ||
| assert_eq!(set.last_set_in(0..3), Some(2)); | ||
| assert_eq!(set.last_set_in(0..5), Some(4)); | ||
| assert_eq!(set.last_set_in(3..5), Some(4)); | ||
| set.insert_range(2..5); | ||
| assert_eq!(set.last_set_in(0..3), Some(2)); | ||
| assert_eq!(set.last_set_in(0..5), Some(4)); | ||
| assert_eq!(set.last_set_in(3..5), Some(4)); | ||
| } | ||
|
|
||
| #[test] | ||
| fn last_set_in() { | ||
| fn easy(set: &IntervalSet<usize>, needle: impl RangeBounds<usize>) -> Option<usize> { | ||
| let mut last_leq = None; | ||
| for e in set.iter() { | ||
| if needle.contains(&e) { | ||
| last_leq = Some(e); | ||
| } | ||
| } | ||
| last_leq | ||
| } | ||
|
|
||
| #[track_caller] | ||
| fn cmp(set: &IntervalSet<usize>, needle: impl RangeBounds<usize> + Clone + std::fmt::Debug) { | ||
| assert_eq!( | ||
| set.last_set_in(needle.clone()), | ||
| easy(set, needle.clone()), | ||
| "{:?} in {:?}", | ||
| needle, | ||
| set | ||
| ); | ||
| } | ||
| let mut set = IntervalSet::new(300); | ||
| cmp(&set, 50..=50); | ||
| set.insert(64); | ||
| cmp(&set, 64..=64); | ||
| set.insert(64 - 1); | ||
| cmp(&set, 0..=64 - 1); | ||
| cmp(&set, 0..=5); | ||
| cmp(&set, 10..100); | ||
| set.insert(100); | ||
| cmp(&set, 100..110); | ||
| cmp(&set, 99..100); | ||
| cmp(&set, 99..=100); | ||
|
|
||
| for i in 0..=30 { | ||
| for j in i..=30 { | ||
| for k in 0..30 { | ||
| let mut set = IntervalSet::new(100); | ||
| cmp(&set, ..j); | ||
| cmp(&set, i..); | ||
| cmp(&set, i..j); | ||
| cmp(&set, i..=j); | ||
| set.insert(k); | ||
| cmp(&set, ..j); | ||
| cmp(&set, i..); | ||
| cmp(&set, i..j); | ||
| cmp(&set, i..=j); | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.