Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move term eval to new module #197

Merged
merged 2 commits into from
Jun 23, 2024
Merged

Move term eval to new module #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d67a711
move term eval to new module
alex-ozdemir Jun 23, 2024
ac04e45
fmt
alex-ozdemir Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/ir/opt/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mod visit;

use super::term::*;

use log::{debug, trace};
use log::{debug, info, trace};

#[derive(Clone, Debug)]
/// An optimization pass
Expand Down Expand Up @@ -63,6 +63,9 @@ pub enum Opt {
pub fn opt<I: IntoIterator<Item = Opt>>(mut cs: Computations, optimizations: I) -> Computations {
for c in cs.comps.values() {
trace!("Before all opts: {}", text::serialize_computation(c));
info!("Before all opts: {} terms", c.stats().main.n_terms);
debug!("Before all opts: {:#?}", c.stats());
debug!("Before all opts: {:#?}", c.detailed_stats());
}
for i in optimizations {
debug!("Applying: {:?}", i);
Expand Down Expand Up @@ -162,10 +165,9 @@ pub fn opt<I: IntoIterator<Item = Opt>>(mut cs: Computations, optimizations: I)
fits_in_bits_ip::fits_in_bits_ip(c);
}
}
debug!("After {:?}: {} outputs", i, c.outputs.len());
info!("After {:?}: {} terms", i, c.stats().main.n_terms);
debug!("After {:?}: {:#?}", i, c.stats());
trace!("After {:?}: {}", i, text::serialize_computation(c));
//debug!("After {:?}: {}", i, Letified(cs.outputs[0].clone()));
debug!("After {:?}: {} terms", i, c.terms());
#[cfg(debug_assertions)]
c.precomputes.check_topo_orderable();
}
Expand Down
8 changes: 6 additions & 2 deletions src/ir/opt/sha.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ use std::collections::HashSet;

/// Detects common C-language SHA patterns and rewrites them.
pub fn sha_rewrites(term_: &Term) -> Term {
let mut ch_count = 0;
let mut maj_count = 0;
// what does a term rewrite to?
let mut cache = TermMap::<Term>::default();
for t in PostOrderIter::new(term_.clone()) {
Expand Down Expand Up @@ -54,7 +56,7 @@ pub fn sha_rewrites(term_: &Term) -> Term {
});
if let Some((c, t, f)) = opt_match {
if let Sort::BitVector(w) = check(t) {
debug!("SHA CH");
ch_count += 1;
Some(term(
BV_CONCAT,
(0..w)
Expand Down Expand Up @@ -93,7 +95,7 @@ pub fn sha_rewrites(term_: &Term) -> Term {
&& s1.intersection(&s2).count() == 1
&& s2.intersection(&s0).count() == 1
{
debug!("SHA MAJ");
maj_count += 1;
let items = s0.union(&s1).collect::<Vec<_>>();
let w = check(c0).as_bv();
Some(term(
Expand Down Expand Up @@ -131,6 +133,8 @@ pub fn sha_rewrites(term_: &Term) -> Term {
});
cache.insert(t, new_t);
}
debug!("SHA MAJ count: {}", maj_count);
debug!("SHA CH count: {}", ch_count);
cache.get(term_).unwrap().clone()
}

Expand Down
Loading
Loading