egraph-based midend: draw the rest of the owl (productionized). (#4953)
* 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>
This commit is contained in:
Chris Fallin
@@ -177,9 +177,19 @@ fn get_isle_compilations(
|
||||
) -> Result<IsleCompilations, std::io::Error> {
|
||||
let cur_dir = std::env::current_dir()?;
|
||||
|
||||
let clif_isle = out_dir.join("clif.isle");
|
||||
// Preludes.
|
||||
let clif_lower_isle = out_dir.join("clif_lower.isle");
|
||||
let clif_opt_isle = out_dir.join("clif_opt.isle");
|
||||
let prelude_isle =
|
||||
make_isle_source_path_relative(&cur_dir, crate_dir.join("src").join("prelude.isle"));
|
||||
let prelude_opt_isle =
|
||||
make_isle_source_path_relative(&cur_dir, crate_dir.join("src").join("prelude_opt.isle"));
|
||||
let prelude_lower_isle =
|
||||
make_isle_source_path_relative(&cur_dir, crate_dir.join("src").join("prelude_lower.isle"));
|
||||
|
||||
// Directory for mid-end optimizations.
|
||||
let src_opts = make_isle_source_path_relative(&cur_dir, crate_dir.join("src").join("opts"));
|
||||
// Directories for lowering backends.
|
||||
let src_isa_x64 =
|
||||
make_isle_source_path_relative(&cur_dir, crate_dir.join("src").join("isa").join("x64"));
|
||||
let src_isa_aarch64 =
|
||||
@@ -204,47 +214,62 @@ fn get_isle_compilations(
|
||||
// `cranelift/codegen/src/isa/*/lower/isle/generated_code.rs`!
|
||||
Ok(IsleCompilations {
|
||||
items: vec![
|
||||
// The mid-end optimization rules.
|
||||
IsleCompilation {
|
||||
output: out_dir.join("isle_opt.rs"),
|
||||
inputs: vec![
|
||||
prelude_isle.clone(),
|
||||
prelude_opt_isle.clone(),
|
||||
src_opts.join("algebraic.isle"),
|
||||
src_opts.join("cprop.isle"),
|
||||
],
|
||||
untracked_inputs: vec![clif_opt_isle.clone()],
|
||||
},
|
||||
// The x86-64 instruction selector.
|
||||
IsleCompilation {
|
||||
output: out_dir.join("isle_x64.rs"),
|
||||
inputs: vec![
|
||||
prelude_isle.clone(),
|
||||
prelude_lower_isle.clone(),
|
||||
src_isa_x64.join("inst.isle"),
|
||||
src_isa_x64.join("lower.isle"),
|
||||
],
|
||||
untracked_inputs: vec![clif_isle.clone()],
|
||||
untracked_inputs: vec![clif_lower_isle.clone()],
|
||||
},
|
||||
// The aarch64 instruction selector.
|
||||
IsleCompilation {
|
||||
output: out_dir.join("isle_aarch64.rs"),
|
||||
inputs: vec![
|
||||
prelude_isle.clone(),
|
||||
prelude_lower_isle.clone(),
|
||||
src_isa_aarch64.join("inst.isle"),
|
||||
src_isa_aarch64.join("inst_neon.isle"),
|
||||
src_isa_aarch64.join("lower.isle"),
|
||||
src_isa_aarch64.join("lower_dynamic_neon.isle"),
|
||||
],
|
||||
untracked_inputs: vec![clif_isle.clone()],
|
||||
untracked_inputs: vec![clif_lower_isle.clone()],
|
||||
},
|
||||
// The s390x instruction selector.
|
||||
IsleCompilation {
|
||||
output: out_dir.join("isle_s390x.rs"),
|
||||
inputs: vec![
|
||||
prelude_isle.clone(),
|
||||
prelude_lower_isle.clone(),
|
||||
src_isa_s390x.join("inst.isle"),
|
||||
src_isa_s390x.join("lower.isle"),
|
||||
],
|
||||
untracked_inputs: vec![clif_isle.clone()],
|
||||
untracked_inputs: vec![clif_lower_isle.clone()],
|
||||
},
|
||||
// The risc-v instruction selector.
|
||||
IsleCompilation {
|
||||
output: out_dir.join("isle_riscv64.rs"),
|
||||
inputs: vec![
|
||||
prelude_isle.clone(),
|
||||
prelude_lower_isle.clone(),
|
||||
src_isa_risc_v.join("inst.isle"),
|
||||
src_isa_risc_v.join("lower.isle"),
|
||||
],
|
||||
untracked_inputs: vec![clif_isle.clone()],
|
||||
untracked_inputs: vec![clif_lower_isle.clone()],
|
||||
},
|
||||
],
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user