* egraph-based midend: draw the rest of the owl. * Rename `egg` submodule of cranelift-codegen to `egraph`. * Apply some feedback from @jsharp during code walkthrough. * Remove recursion from find_best_node by doing a single pass. Rather than recursively computing the lowest-cost node for a given eclass and memoizing the answer at each eclass node, we can do a single forward pass; because every eclass node refers only to earlier nodes, this is sufficient. The behavior may slightly differ from the earlier behavior because we cannot short-circuit costs to zero once a node is elaborated; but in practice this should not matter. * Make elaboration non-recursive. Use an explicit stack instead (with `ElabStackEntry` entries, alongside a result stack). * Make elaboration traversal of the domtree non-recursive/stack-safe. * Work analysis logic in Cranelift-side egraph glue into a general analysis framework in cranelift-egraph. * Apply static recursion limit to rule application. * Fix aarch64 wrt dynamic-vector support -- broken rebase. * Topo-sort cranelift-egraph before cranelift-codegen in publish script, like the comment instructs me to! * Fix multi-result call testcase. * Include `cranelift-egraph` in `PUBLISHED_CRATES`. * Fix atomic_rmw: not really a load. * Remove now-unnecessary PartialOrd/Ord derivations. * Address some code-review comments. * Review feedback. * Review feedback. * No overlap in mid-end rules, because we are defining a multi-constructor. * rustfmt * Review feedback. * Review feedback. * Review feedback. * Review feedback. * Remove redundant `mut`. * Add comment noting what rules can do. * Review feedback. * Clarify comment wording. * Update `has_memory_fence_semantics`. * Apply @jameysharp's improved loop-level computation. Co-authored-by: Jamey Sharp <jamey@minilop.net> * Fix suggestion commit. * Fix off-by-one in new loop-nest analysis. * Review feedback. * Review feedback. * Review feedback. * Use `Default`, not `std::default::Default`, as per @fitzgen Co-authored-by: Nick Fitzgerald <fitzgen@gmail.com> * Apply @fitzgen's comment elaboration to a doc-comment. Co-authored-by: Nick Fitzgerald <fitzgen@gmail.com> * Add stat for hitting the rewrite-depth limit. * Some code motion in split prelude to make the diff a little clearer wrt `main`. * Take @jameysharp's suggested `try_into()` usage for blockparam indices. Co-authored-by: Jamey Sharp <jamey@minilop.net> * Take @jameysharp's suggestion to avoid double-match on load op. Co-authored-by: Jamey Sharp <jamey@minilop.net> * Fix suggestion (add import). * Review feedback. * Fix stack_load handling. * Remove redundant can_store case. * Take @jameysharp's suggested improvement to FuncEGraph::build() logic Co-authored-by: Jamey Sharp <jamey@minilop.net> * Tweaks to FuncEGraph::build() on top of suggestion. * Take @jameysharp's suggested clarified condition Co-authored-by: Jamey Sharp <jamey@minilop.net> * Clean up after suggestion (unused variable). * Fix loop analysis. * loop level asserts * Revert constant-space loop analysis -- edge cases were incorrect, so let's go with the simple thing for now. * Take @jameysharp's suggestion re: result_tys Co-authored-by: Jamey Sharp <jamey@minilop.net> * Fix up after suggestion * Take @jameysharp's suggestion to use fold rather than reduce Co-authored-by: Jamey Sharp <jamey@minilop.net> * Fixup after suggestion * Take @jameysharp's suggestion to remove elaborate_eclass_use's return value. * Clarifying comment in terminator insts. Co-authored-by: Jamey Sharp <jamey@minilop.net> Co-authored-by: Nick Fitzgerald <fitzgen@gmail.com>
86 lines
2.7 KiB
Rust
86 lines
2.7 KiB
Rust
//! Simple union-find data structure.
|
|
|
|
use crate::{trace, Id};
|
|
use cranelift_entity::SecondaryMap;
|
|
use std::hash::{Hash, Hasher};
|
|
|
|
/// A union-find data structure. The data structure can allocate
|
|
/// `Id`s, indicating eclasses, and can merge eclasses together.
|
|
#[derive(Clone, Debug)]
|
|
pub struct UnionFind {
|
|
parent: SecondaryMap<Id, Id>,
|
|
}
|
|
|
|
impl UnionFind {
|
|
/// Create a new `UnionFind`.
|
|
pub fn new() -> Self {
|
|
UnionFind {
|
|
parent: SecondaryMap::new(),
|
|
}
|
|
}
|
|
|
|
/// Create a new `UnionFind` with the given capacity.
|
|
pub fn with_capacity(cap: usize) -> Self {
|
|
UnionFind {
|
|
parent: SecondaryMap::with_capacity(cap),
|
|
}
|
|
}
|
|
|
|
/// Add an `Id` to the `UnionFind`, with its own equivalence class
|
|
/// initially. All `Id`s must be added before being queried or
|
|
/// unioned.
|
|
pub fn add(&mut self, id: Id) {
|
|
self.parent[id] = id;
|
|
}
|
|
|
|
/// Find the canonical `Id` of a given `Id`.
|
|
pub fn find(&self, mut node: Id) -> Id {
|
|
while node != self.parent[node] {
|
|
node = self.parent[node];
|
|
}
|
|
node
|
|
}
|
|
|
|
/// Find the canonical `Id` of a given `Id`, updating the data
|
|
/// structure in the process so that future queries for this `Id`
|
|
/// (and others in its chain up to the root of the equivalence
|
|
/// class) will be faster.
|
|
pub fn find_and_update(&mut self, mut node: Id) -> Id {
|
|
// "Path splitting" mutating find (Tarjan and Van Leeuwen).
|
|
let orig = node;
|
|
while node != self.parent[node] {
|
|
let next = self.parent[self.parent[node]];
|
|
self.parent[node] = next;
|
|
node = next;
|
|
}
|
|
trace!("find_and_update: {} -> {}", orig, node);
|
|
node
|
|
}
|
|
|
|
/// Merge the equivalence classes of the two `Id`s.
|
|
pub fn union(&mut self, a: Id, b: Id) {
|
|
let a = self.find_and_update(a);
|
|
let b = self.find_and_update(b);
|
|
let (a, b) = (std::cmp::min(a, b), std::cmp::max(a, b));
|
|
if a != b {
|
|
// Always canonicalize toward lower IDs.
|
|
self.parent[b] = a;
|
|
trace!("union: {}, {}", a, b);
|
|
}
|
|
}
|
|
|
|
/// Determine if two `Id`s are equivalent, after
|
|
/// canonicalizing. Update union-find data structure during our
|
|
/// canonicalization to make future lookups faster.
|
|
pub fn equiv_id_mut(&mut self, a: Id, b: Id) -> bool {
|
|
self.find_and_update(a) == self.find_and_update(b)
|
|
}
|
|
|
|
/// Hash an `Id` after canonicalizing it. Update union-find data
|
|
/// structure to make future lookups/hashing faster.
|
|
pub fn hash_id_mut<H: Hasher>(&mut self, hash: &mut H, id: Id) {
|
|
let id = self.find_and_update(id);
|
|
id.hash(hash);
|
|
}
|
|
}
|