Fix for #141 (#142)

* Add Atom and Literal base classes to CDSL Ast. Change substitution() and copy() on Def/Apply/Rtl to support substituting Var->Union[Var, Literal]. Check in Apply() constructor kinds of passed in Literals respect instruction signature

* Change verify_semantics to check all possible instantiations of enumerated immediates (needed to descrive icmp). Add all bitvector comparison primitives and bvite; Change set_semantics to optionally accept XForms; Add semantics for icmp; Fix typing errors in semantics/{smtlib, elaborate, __init__}.py after the change of VarMap->VarAtomMap

* Forgot macros.py

* Nit obscured by testing with mypy enabled present.

* Typo

lib/cretonne/meta/semantics/elaborate.py

@@ -10,7 +10,7 @@ from cdsl.ast import Var
 try:
     from typing import TYPE_CHECKING, Dict, Union, List, Set, Tuple # noqa
     from cdsl.xform import XForm # noqa
-    from cdsl.ast import Def, VarMap # noqa
+    from cdsl.ast import Def, VarAtomMap # noqa
     from cdsl.ti import VarTyping # noqa
 except ImportError:
     TYPE_CHECKING = False
@@ -34,7 +34,13 @@ def find_matching_xform(d):
         if (subst is None):
             continue
 
-        if x.ti.permits({subst[v]: tv for (v, tv) in typing.items()}):
+        inner_typing = {}  # type: VarTyping
+        for (v, tv) in typing.items():
+            inner_v = subst[v]
+            assert isinstance(inner_v, Var)
+            inner_typing[inner_v] = tv
+
+        if x.ti.permits(inner_typing):
             res.append(x)
 
     assert len(res) == 1, "Couldn't find semantic transform for {}".format(d)
@@ -60,7 +66,7 @@ def cleanup_semantics(r, outputs):
         ...
     """
     new_defs = []  # type: List[Def]
-    subst_m = {v: v for v in r.vars()}  # type: VarMap
+    subst_m = {v: v for v in r.vars()}  # type: VarAtomMap
     definition = {}  # type: Dict[Var, Def]
     prim_to_bv_map = {}  # type: Dict[Var, Def]