Handle non-ssa Vars and Enumerator constants in Rtl substitutions

lib/cretonne/meta/cdsl/test_xform.py

@@ -1,7 +1,8 @@
 from __future__ import absolute_import
 from unittest import TestCase
 from doctest import DocTestSuite
-from base.instructions import iadd, iadd_imm, iconst
+from base.instructions import iadd, iadd_imm, iconst, icmp
+from base.immediates import intcc
 from . import xform
 from .ast import Var
 from .xform import Rtl, XForm
@@ -14,9 +15,15 @@ def load_tests(loader, tests, ignore):
 
 x = Var('x')
 y = Var('y')
+z = Var('z')
+u = Var('u')
 a = Var('a')
+b = Var('b')
 c = Var('c')
 
+CC1 = Var('CC1')
+CC2 = Var('CC2')
+
 
 class TestXForm(TestCase):
     def test_macro_pattern(self):
@@ -57,3 +64,31 @@ class TestXForm(TestCase):
         dst = Rtl(a << iadd(x, y))
         with self.assertRaisesRegexp(AssertionError, "'a' multiply defined"):
             XForm(src, dst)
+
+    def test_subst_imm(self):
+        src = Rtl(a << iconst(x))
+        dst = Rtl(c << iconst(y))
+        assert src.substitution(dst, {}) == {a: c, x: y}
+
+    def test_subst_enum_var(self):
+        src = Rtl(a << icmp(CC1, x, y))
+        dst = Rtl(b << icmp(CC2, z, u))
+        assert src.substitution(dst, {}) == {a: b, CC1: CC2, x: z, y: u}
+
+    def test_subst_enum_const(self):
+        src = Rtl(a << icmp(intcc.eq, x, y))
+        dst = Rtl(b << icmp(intcc.eq, z, u))
+        assert src.substitution(dst, {}) == {a: b, x: z, y: u}
+
+    def test_subst_enum_bad(self):
+        src = Rtl(a << icmp(CC1, x, y))
+        dst = Rtl(b << icmp(intcc.eq, z, u))
+        assert src.substitution(dst, {}) is None
+
+        src = Rtl(a << icmp(intcc.eq, x, y))
+        dst = Rtl(b << icmp(CC1, z, u))
+        assert src.substitution(dst, {}) is None
+
+        src = Rtl(a << icmp(intcc.eq, x, y))
+        dst = Rtl(b << icmp(intcc.sge, z, u))
+        assert src.substitution(dst, {}) is None