lit: Remove VarOrLit trait

YosysHQ · Oct 4, 2024 · ed3e5e9 · ed3e5e9
1 parent 26e213a
commit ed3e5e9
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 221 deletions.
diff --git a/ir/src/env.rs b/ir/src/env.rs
@@ -5,10 +5,7 @@ use imctk_ids::{id_vec::IdVec, Id, Id32};
 use imctk_transparent::{NewtypeCast, SubtypeCast};
 use imctk_util::give_take::Take;
 
-use crate::{
-    index::{DefsIndex, UsesIndex},
-    var::VarOrLit,
-};
+use crate::index::{DefsIndex, UsesIndex};
 
 use super::{
     index::{DynamicIndex, StructuralHashIndex},

diff --git a/ir/src/env/node_builders.rs b/ir/src/env/node_builders.rs
@@ -236,8 +236,8 @@ impl RawEnvNodes {
             .find_term(&self.0.nodes, &term)
         {
             if def_mode.is_when_acyclic() {
-                let output_var =
-                    <T::Output>::process_var_or_lit(output, |var| var, |lit| lit.var());
+                let output_var = output.into().var();
+
                 let encoded_var_repr = &self.0.var_defs.var_defs[output_var];
 
                 let old_level_bound = encoded_var_repr.level_bound();
@@ -257,7 +257,7 @@ impl RawEnvNodes {
         }
 
         let (new_var, _) = self.0.var_defs.var_defs.push(EncodedVarDef::default());
-        let output = <T::Output>::build_var_or_lit(new_var, |var| var, |var| var.as_lit());
+        let output = T::Output::from(new_var);
 
         let (node_id, _) = self.insert_unique_irreducible_node(def_mode, TermNode { output, term });
 
@@ -483,12 +483,16 @@ impl NodeBuilder for Env {
         let pol = term.apply_var_map(|var| self.var_defs.update_lit_repr(var.as_lit()));
 
         if let Some(output) = term.reduce(self) {
-            return output ^ pol;
+            return T::Output::try_from(output.into() ^ pol).unwrap();
         }
 
-        self.raw_nodes()
-            .insert_irreducible_term(DefMode::WhenMissing, term)
-            ^ pol
+        T::Output::try_from(
+            self.raw_nodes()
+                .insert_irreducible_term(DefMode::WhenMissing, term)
+                .into()
+                ^ pol,
+        )
+        .unwrap()
     }
 
     fn node<T: Node>(&mut self, mut node: T) {
@@ -571,13 +575,17 @@ impl NodeBuilder for DefBuilder {
         let pol = term.apply_var_map(|var| self.0.var_defs.update_lit_repr(var.as_lit()));
 
         if let Some(output) = term.reduce(self) {
-            return output ^ pol;
+            return T::Output::try_from(output.into() ^ pol).unwrap();
         }
 
-        self.0
-            .raw_nodes()
-            .insert_irreducible_term(DefMode::WhenAcyclic, term)
-            ^ pol
+        T::Output::try_from(
+            self.0
+                .raw_nodes()
+                .insert_irreducible_term(DefMode::WhenAcyclic, term)
+                .into()
+                ^ pol,
+        )
+        .unwrap()
     }
 
     fn node<T: Node>(&mut self, mut node: T) {

diff --git a/ir/src/node/builder.rs b/ir/src/node/builder.rs
@@ -1,6 +1,6 @@
 //! Generic interface for adding equivalences, nodes and terms.
 
-use crate::var::{Lit, VarOrLit};
+use crate::var::Lit;
 use imctk_util::give_take::{give, Take};
 
 use super::generic::{DynNode, DynTerm, Node, Term};
@@ -14,7 +14,7 @@ pub trait NodeBuilder: NodeBuilderDyn {
     /// variable or literal.
     fn term<T: Term>(&mut self, term: T) -> T::Output {
         give!(term: DynTerm = term);
-        <T::Output as VarOrLit>::build_var_or_lit(self.dyn_term(term), |lit| lit.var(), |lit| lit)
+        self.dyn_term(term).try_into().unwrap()
     }
     /// Ensure the presence of the given node.
     fn node<T: Node>(&mut self, node: T) {
@@ -62,7 +62,7 @@ impl NodeBuilder for DynNodeBuilder {
 
         let lit = self.dyn_term(term);
 
-        <T::Output as VarOrLit>::build_var_or_lit(lit, |lit| lit.var(), |lit| lit)
+        T::Output::try_from(lit).unwrap()
     }
 
     fn node<T: Node>(&mut self, node: T) {

diff --git a/ir/src/node/collections/buf.rs b/ir/src/node/collections/buf.rs
@@ -14,7 +14,7 @@ use crate::{
         vtables::{DynNodeType, DynTermType, GenericNodeType, GenericTermType},
         NodeId,
     },
-    var::{Lit, Var, VarOrLit},
+    var::{Lit, Var},
 };
 
 #[derive(Clone, Copy, Debug)]
@@ -120,7 +120,7 @@ impl NodeBuilder for NodeBuf {
             self.nodes.insert(TermWrapper { term }).0,
         ));
 
-        <T::Output as VarOrLit>::build_var_or_lit(lit, |lit| lit.var(), |lit| lit)
+        T::Output::try_from(lit).unwrap()
     }
 
     fn node<T: Node>(&mut self, node: T) {

diff --git a/ir/src/node/fine/circuit.rs b/ir/src/node/fine/circuit.rs
@@ -129,10 +129,7 @@ impl Term for Xor {
         self.inputs.into_iter()
     }
 
-    fn apply_var_map(
-        &mut self,
-        mut var_map: impl FnMut(Var) -> Lit,
-    ) -> <Self::Output as crate::var::VarOrLit>::Pol {
+    fn apply_var_map(&mut self, mut var_map: impl FnMut(Var) -> Lit) -> Pol {
         let mut composed_pol = Pol::Pos;
         self.inputs = self.inputs.map(|var| {
             let mapped = var_map(var);

diff --git a/ir/src/node/generic.rs b/ir/src/node/generic.rs
@@ -10,7 +10,7 @@ use zwohash::ZwoHasher;
 
 use crate::{
     env::Env,
-    var::{Lit, Pol, Var, VarOrLit},
+    var::{Lit, Pol, Var},
 };
 
 use super::{
@@ -298,7 +298,15 @@ impl DynNode {
 /// Everything that is object-safe is part of the [`TermDyn`] supertrait.
 pub trait Term: Debug + Clone + Eq + Hash + TermDyn + 'static {
     /// Whether the output can be represented as a variable or can require a literal.
-    type Output: VarOrLit + 'static;
+    type Output: Into<Lit>
+        + From<Var>
+        + TryFrom<Lit, Error: Debug>
+        + Copy
+        + Ord
+        + Hash
+        + Debug
+        + Default
+        + 'static;
 
     /// A short name identifying the operation.
     const NAME: &'static str;
@@ -319,8 +327,7 @@ pub trait Term: Debug + Clone + Eq + Hash + TermDyn + 'static {
 
     /// Rewrites all variables in the term using a given mapping.
     #[must_use]
-    fn apply_var_map(&mut self, var_map: impl FnMut(Var) -> Lit)
-        -> <Self::Output as VarOrLit>::Pol;
+    fn apply_var_map(&mut self, var_map: impl FnMut(Var) -> Lit) -> Pol;
 
     /// Returns whether two [`Term`]s define the same value.
     ///
@@ -383,9 +390,7 @@ pub fn default_reduce_node<T: Term>(
     };
 
     if new_output != output {
-        builder.equiv(
-            [output, new_output].map(|x| x.process_var_or_lit(|var| var.as_lit(), |lit| lit)),
-        );
+        builder.equiv([output, new_output].map(|x| x.into()));
     }
 
     true
@@ -545,13 +550,11 @@ impl<T: Term> TermDynAuto for T {
 
     #[must_use]
     fn dyn_apply_var_map(&mut self, var_repr: &mut dyn FnMut(Var) -> Lit) -> Pol {
-        <T::Output as VarOrLit>::process_pol(self.apply_var_map(var_repr), || Pol::Pos, |pol| pol)
+        self.apply_var_map(var_repr)
     }
 
     fn dyn_reduce_into_buf(&mut self, buf: &mut NodeBuf) -> Option<Lit> {
-        self.reduce(buf).map(|output| {
-            <T::Output as VarOrLit>::process_var_or_lit(output, |var| var.as_lit(), |lit| lit)
-        })
+        self.reduce(buf).map(|output| output.into())
     }
 
     fn dyn_add_to_buf_with_var_map(
@@ -560,14 +563,8 @@ impl<T: Term> TermDynAuto for T {
         var_map: &mut dyn FnMut(Var) -> Lit,
     ) -> Lit {
         let mut clone = self.clone();
-        let pol = <<Self as Term>::Output>::process_pol(
-            clone.apply_var_map(var_map),
-            || Pol::Pos,
-            |pol| pol,
-        );
-        buf.term(clone)
-            .process_var_or_lit(|var| var.as_lit(), |lit| lit)
-            ^ pol
+        let pol = clone.apply_var_map(var_map);
+        buf.term(clone).into() ^ pol
     }
 
     fn dyn_add_to_env_with_var_map(
@@ -576,15 +573,9 @@ impl<T: Term> TermDynAuto for T {
         var_map: &mut dyn FnMut(Var) -> Lit,
     ) -> Lit {
         let mut clone = self.clone();
-        let pol = <<Self as Term>::Output>::process_pol(
-            clone.apply_var_map(var_map),
-            || Pol::Pos,
-            |pol| pol,
-        );
+        let pol = clone.apply_var_map(var_map);
 
-        env.term(clone)
-            .process_var_or_lit(|var| var.as_lit(), |lit| lit)
-            ^ pol
+        env.term(clone).into() ^ pol
     }
 }
 
@@ -733,26 +724,14 @@ impl<T: Term> Node for TermNode<T> {
     }
 
     fn apply_var_map(&mut self, mut var_map: impl FnMut(Var) -> Lit) {
-        let mut new_output_lit = self
-            .output
-            .process_var_or_lit(|var| var.as_lit(), |lit| lit)
-            .lookup(&mut var_map);
+        let mut new_output_lit = self.output.into().lookup(&mut var_map);
 
         let term_pol = self.term.apply_var_map(var_map);
 
-        new_output_lit ^= term_pol.into();
+        new_output_lit ^= term_pol;
 
-        let new_output = <T::Output>::build_var_or_lit(
-            new_output_lit,
-            |lit| {
-                assert!(
-                    lit.is_pos(),
-                    "Term output of non-Boolean type mapped to negative literal"
-                );
-                lit.var()
-            },
-            |lit| lit,
-        );
+        let new_output = T::Output::try_from(new_output_lit)
+            .expect("Term output of non-Boolean type mapped to negative literal");
 
         self.output = new_output
     }
@@ -772,20 +751,15 @@ impl<T: Term> NodeDyn for TermNode<T> {
     }
 
     fn output_var(&self) -> Option<Var> {
-        Some(self.output.process_var_or_lit(|var| var, |lit| lit.var()))
+        Some(self.output.into().var())
     }
 
     fn output_lit(&self) -> Option<Lit> {
-        Some(
-            self.output
-                .process_var_or_lit(|var| var.as_lit(), |lit| lit),
-        )
+        Some(self.output.into())
     }
 
     fn max_var(&self) -> Var {
-        self.output
-            .process_var_or_lit(|var| var, |lit| lit.var())
-            .max(self.term.max_var())
+        self.output.into().var().max(self.term.max_var())
     }
 
     fn dyn_term(&self) -> Option<&DynTerm> {
@@ -811,10 +785,8 @@ mod tests {
             [].into_iter()
         }
 
-        fn apply_var_map(
-            &mut self,
-            _var_map: impl FnMut(Var) -> Lit,
-        ) -> <Self::Output as VarOrLit>::Pol {
+        fn apply_var_map(&mut self, _var_map: impl FnMut(Var) -> Lit) -> Pol {
+            Pol::Pos
         }
     }
 
@@ -832,13 +804,11 @@ mod tests {
             [self.0].into_iter()
         }
 
-        fn apply_var_map(
-            &mut self,
-            mut var_map: impl FnMut(Var) -> Lit,
-        ) -> <Self::Output as VarOrLit>::Pol {
+        fn apply_var_map(&mut self, mut var_map: impl FnMut(Var) -> Lit) -> Pol {
             let var = var_map(self.0);
             assert!(var.is_pos());
             self.0 = var.var();
+            Pol::Pos
         }
     }
 

diff --git a/ir/src/node/vtables.rs b/ir/src/node/vtables.rs
@@ -6,10 +6,7 @@ use std::{
     ops::Deref,
 };
 
-use crate::{
-    var::{Lit, VarOrLit},
-    wide_ptr::WidePtr,
-};
+use crate::{var::Lit, wide_ptr::WidePtr};
 
 use super::{
     collections::nodes::Nodes,
@@ -177,7 +174,7 @@ impl TermTypeVTable {
                 |output: Lit, term_ptr: *mut u8, callback: &mut dyn FnMut(*mut u8)| {
                     let term_ptr = term_ptr as *mut T;
                     let mut term_node = ManuallyDrop::new(TermNode {
-                        output: VarOrLit::build_var_or_lit(output, |lit| lit.var(), |lit| lit),
+                        output: output.try_into().unwrap(),
                         term: term_ptr.read(),
                     });
                     callback(&mut term_node as *mut ManuallyDrop<TermNode<T>> as *mut u8);

diff --git a/ir/src/var.rs b/ir/src/var.rs
@@ -1,4 +1,2 @@
 //! Numeric identifiers for variables and Boolean literals
 pub use imctk_lit::{lit::Lit, pol::Pol, var::Var};
-
-pub use imctk_lit::var_or_lit::VarOrLit;