Remove parts of py2llvm that are implemented in the new compiler.

m-labs · Aug 10, 2015 · 200330a · 200330a
1 parent 62e6f8a
commit 200330a
Showing 23 changed files with 169 additions and 2,746 deletions.
diff --git a/artiq/py2llvm_old/__init__.py b/artiq/py2llvm_old/__init__.py
diff --git a/artiq/py2llvm_old/ast_body.py b/artiq/py2llvm_old/ast_body.py
diff --git a/artiq/py2llvm_old/base_types.py b/artiq/py2llvm_old/base_types.py
diff --git a/artiq/py2llvm_old/infer_types.py b/artiq/py2llvm_old/infer_types.py
diff --git a/artiq/py2llvm_old/iterators.py b/artiq/py2llvm_old/iterators.py
diff --git a/artiq/py2llvm_old/lists.py b/artiq/py2llvm_old/lists.py
diff --git a/artiq/py2llvm_old/module.py b/artiq/py2llvm_old/module.py
diff --git a/artiq/py2llvm_old/test/py2llvm.py b/artiq/py2llvm_old/test/py2llvm.py
@@ -0,0 +1,169 @@
+import unittest
+from pythonparser import parse, ast
+import inspect
+from fractions import Fraction
+from ctypes import CFUNCTYPE, c_int, c_int32, c_int64, c_double
+import struct
+
+import llvmlite_or1k.binding as llvm
+
+from artiq.language.core import int64
+from artiq.py2llvm.infer_types import infer_function_types
+from artiq.py2llvm import base_types, lists
+from artiq.py2llvm.module import Module
+
+def simplify_encode(a, b):
+    f = Fraction(a, b)
+    return f.numerator*1000 + f.denominator
+
+
+def frac_arith_encode(op, a, b, c, d):
+    if op == 0:
+        f = Fraction(a, b) - Fraction(c, d)
+    elif op == 1:
+        f = Fraction(a, b) + Fraction(c, d)
+    elif op == 2:
+        f = Fraction(a, b) * Fraction(c, d)
+    else:
+        f = Fraction(a, b) / Fraction(c, d)
+    return f.numerator*1000 + f.denominator
+
+
+def frac_arith_encode_int(op, a, b, x):
+    if op == 0:
+        f = Fraction(a, b) - x
+    elif op == 1:
+        f = Fraction(a, b) + x
+    elif op == 2:
+        f = Fraction(a, b) * x
+    else:
+        f = Fraction(a, b) / x
+    return f.numerator*1000 + f.denominator
+
+
+def frac_arith_encode_int_rev(op, a, b, x):
+    if op == 0:
+        f = x - Fraction(a, b)
+    elif op == 1:
+        f = x + Fraction(a, b)
+    elif op == 2:
+        f = x * Fraction(a, b)
+    else:
+        f = x / Fraction(a, b)
+    return f.numerator*1000 + f.denominator
+
+
+def frac_arith_float(op, a, b, x):
+    if op == 0:
+        return Fraction(a, b) - x
+    elif op == 1:
+        return Fraction(a, b) + x
+    elif op == 2:
+        return Fraction(a, b) * x
+    else:
+        return Fraction(a, b) / x
+
+
+def frac_arith_float_rev(op, a, b, x):
+    if op == 0:
+        return x - Fraction(a, b)
+    elif op == 1:
+        return x + Fraction(a, b)
+    elif op == 2:
+        return x * Fraction(a, b)
+    else:
+        return x / Fraction(a, b)
+
+
+class CodeGenCase(unittest.TestCase):
+    def test_frac_simplify(self):
+        simplify_encode_c = CompiledFunction(
+            simplify_encode, {"a": base_types.VInt(), "b": base_types.VInt()})
+        for a in _test_range():
+            for b in _test_range():
+                self.assertEqual(
+                    simplify_encode_c(a, b), simplify_encode(a, b))
+
+    def _test_frac_arith(self, op):
+        frac_arith_encode_c = CompiledFunction(
+            frac_arith_encode, {
+                "op": base_types.VInt(),
+                "a": base_types.VInt(), "b": base_types.VInt(),
+                "c": base_types.VInt(), "d": base_types.VInt()})
+        for a in _test_range():
+            for b in _test_range():
+                for c in _test_range():
+                    for d in _test_range():
+                        self.assertEqual(
+                            frac_arith_encode_c(op, a, b, c, d),
+                            frac_arith_encode(op, a, b, c, d))
+
+    def test_frac_add(self):
+        self._test_frac_arith(0)
+
+    def test_frac_sub(self):
+        self._test_frac_arith(1)
+
+    def test_frac_mul(self):
+        self._test_frac_arith(2)
+
+    def test_frac_div(self):
+        self._test_frac_arith(3)
+
+    def _test_frac_arith_int(self, op, rev):
+        f = frac_arith_encode_int_rev if rev else frac_arith_encode_int
+        f_c = CompiledFunction(f, {
+            "op": base_types.VInt(),
+            "a": base_types.VInt(), "b": base_types.VInt(),
+            "x": base_types.VInt()})
+        for a in _test_range():
+            for b in _test_range():
+                for x in _test_range():
+                    self.assertEqual(
+                        f_c(op, a, b, x),
+                        f(op, a, b, x))
+
+    def test_frac_add_int(self):
+        self._test_frac_arith_int(0, False)
+        self._test_frac_arith_int(0, True)
+
+    def test_frac_sub_int(self):
+        self._test_frac_arith_int(1, False)
+        self._test_frac_arith_int(1, True)
+
+    def test_frac_mul_int(self):
+        self._test_frac_arith_int(2, False)
+        self._test_frac_arith_int(2, True)
+
+    def test_frac_div_int(self):
+        self._test_frac_arith_int(3, False)
+        self._test_frac_arith_int(3, True)
+
+    def _test_frac_arith_float(self, op, rev):
+        f = frac_arith_float_rev if rev else frac_arith_float
+        f_c = CompiledFunction(f, {
+            "op": base_types.VInt(),
+            "a": base_types.VInt(), "b": base_types.VInt(),
+            "x": base_types.VFloat()})
+        for a in _test_range():
+            for b in _test_range():
+                for x in _test_range():
+                    self.assertAlmostEqual(
+                        f_c(op, a, b, x/2),
+                        f(op, a, b, x/2))
+
+    def test_frac_add_float(self):
+        self._test_frac_arith_float(0, False)
+        self._test_frac_arith_float(0, True)
+
+    def test_frac_sub_float(self):
+        self._test_frac_arith_float(1, False)
+        self._test_frac_arith_float(1, True)
+
+    def test_frac_mul_float(self):
+        self._test_frac_arith_float(2, False)
+        self._test_frac_arith_float(2, True)
+
+    def test_frac_div_float(self):
+        self._test_frac_arith_float(3, False)
+        self._test_frac_arith_float(3, True)
diff --git a/artiq/py2llvm_old/tools.py b/artiq/py2llvm_old/tools.py
diff --git a/artiq/transforms/inline.py → artiq/py2llvm_old/transforms/inline.py b/artiq/transforms/inline.py → artiq/py2llvm_old/transforms/inline.py
diff --git a/artiq/transforms/interleave.py → artiq/py2llvm_old/transforms/interleave.py b/artiq/transforms/interleave.py → artiq/py2llvm_old/transforms/interleave.py
diff --git a/artiq/transforms/lower_time.py → artiq/py2llvm_old/transforms/lower_time.py b/artiq/transforms/lower_time.py → artiq/py2llvm_old/transforms/lower_time.py
diff --git a/artiq/transforms/quantize_time.py → ...q/py2llvm_old/transforms/quantize_time.py b/artiq/transforms/quantize_time.py → ...q/py2llvm_old/transforms/quantize_time.py
diff --git a/artiq/transforms/unroll_loops.py → artiq/py2llvm_old/transforms/unroll_loops.py b/artiq/transforms/unroll_loops.py → artiq/py2llvm_old/transforms/unroll_loops.py
diff --git a/artiq/py2llvm_old/values.py b/artiq/py2llvm_old/values.py
diff --git a/artiq/test/py2llvm.py b/artiq/test/py2llvm.py
diff --git a/artiq/test/transforms.py b/artiq/test/transforms.py
diff --git a/artiq/transforms/__init__.py b/artiq/transforms/__init__.py
diff --git a/artiq/transforms/fold_constants.py b/artiq/transforms/fold_constants.py
diff --git a/artiq/transforms/remove_dead_code.py b/artiq/transforms/remove_dead_code.py
diff --git a/artiq/transforms/remove_inter_assigns.py b/artiq/transforms/remove_inter_assigns.py
diff --git a/artiq/transforms/tools.py b/artiq/transforms/tools.py
diff --git a/artiq/transforms/unparse.py b/artiq/transforms/unparse.py