Refactored the test suite

numba · Aug 2, 2023 · adeeacf · adeeacf
1 parent a1f1316
commit adeeacf
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 53 deletions.
diff --git a/numba_rvsdg/tests/test_byteflow.py b/numba_rvsdg/tests/test_byteflow.py
@@ -114,29 +114,29 @@ def test_constructor(self):
             name=name_gen.new_block_name(block_names.PYTHON_BYTECODE),
             begin=0,
             end=8,
-            _jump_targets=(),
-            backedges=(),
+            _jump_targets=[],
+            backedges=[],
         )
         self.assertEqual(block.name, "python_bytecode_block_0")
         self.assertEqual(block.begin, 0)
         self.assertEqual(block.end, 8)
         self.assertFalse(block.fallthrough)
         self.assertTrue(block.is_exiting)
-        self.assertEqual(block.jump_targets, ())
-        self.assertEqual(block.backedges, ())
+        self.assertEqual(block.jump_targets, [])
+        self.assertEqual(block.backedges, [])
 
     def test_is_jump_target(self):
         name_gen = NameGenerator()
         block = PythonBytecodeBlock(
             name=name_gen.new_block_name(block_names.PYTHON_BYTECODE),
             begin=0,
             end=8,
-            _jump_targets=(
+            _jump_targets=[
                 name_gen.new_block_name(block_names.PYTHON_BYTECODE),
-            ),
-            backedges=(),
+            ],
+            backedges=[],
         )
-        self.assertEqual(block.jump_targets, ("python_bytecode_block_1",))
+        self.assertEqual(block.jump_targets, ["python_bytecode_block_1"])
         self.assertFalse(block.is_exiting)
 
     def test_get_instructions(self):
@@ -145,8 +145,8 @@ def test_get_instructions(self):
             name=name_gen.new_block_name(block_names.PYTHON_BYTECODE),
             begin=0,
             end=8,
-            _jump_targets=(),
-            backedges=(),
+            _jump_targets=[],
+            backedges=[],
         )
         expected = [
             Instruction(
@@ -242,8 +242,8 @@ def test_build_basic_blocks(self):
                     name=new_name,
                     begin=0,
                     end=10,
-                    _jump_targets=(),
-                    backedges=(),
+                    _jump_targets=[],
+                    backedges=[],
                 )
             }
         )
@@ -266,8 +266,8 @@ def test_from_bytecode(self):
                     name=new_name,
                     begin=0,
                     end=10,
-                    _jump_targets=(),
-                    backedges=(),
+                    _jump_targets=[],
+                    backedges=[],
                 )
             }
         )

diff --git a/numba_rvsdg/tests/test_figures.py b/numba_rvsdg/tests/test_figures.py
@@ -440,7 +440,7 @@ def test_figure_3(self):
         flow = FlowInfo.from_bytecode(bc)
         scfg = flow.build_basicblocks()
         byteflow = ByteFlow(bc=bc, scfg=scfg)
-        byteflow = byteflow.restructure()
+        byteflow.restructure()
 
         x, _ = SCFG.from_yaml(fig_3_yaml)
         self.assertSCFGEqual(x, byteflow.scfg)
@@ -473,7 +473,7 @@ def test_figure_4(self):
         flow = FlowInfo.from_bytecode(bc)
         scfg = flow.build_basicblocks()
         byteflow = ByteFlow(bc=bc, scfg=scfg)
-        byteflow = byteflow.restructure()
+        byteflow.restructure()
 
         x, _ = SCFG.from_yaml(fig_4_yaml)
         self.assertSCFGEqual(x, byteflow.scfg)
diff --git a/numba_rvsdg/tests/test_scfg.py b/numba_rvsdg/tests/test_scfg.py
@@ -160,7 +160,7 @@ def test_scfg_iter(self):
         block_0 = name_gen.new_block_name(block_names.BASIC)
         block_1 = name_gen.new_block_name(block_names.BASIC)
         expected = [
-            (block_0, BasicBlock(name=block_0, _jump_targets=(block_1,))),
+            (block_0, BasicBlock(name=block_0, _jump_targets=[block_1])),
             (block_1, BasicBlock(name=block_1)),
         ]
         scfg, _ = SCFG.from_yaml(
@@ -192,17 +192,14 @@ def foo(n):
 
     def test_concealed_region_view_iter(self):
         flow = ByteFlow.from_bytecode(self.foo)
-        restructured = flow._restructure_loop()
+        flow._restructure_loop()
         expected = [
             ("python_bytecode_block_0", PythonBytecodeBlock),
             ("loop_region_0", RegionBlock),
             ("python_bytecode_block_3", PythonBytecodeBlock),
         ]
         received = list(
-            (
-                (k, type(v))
-                for k, v in restructured.scfg.concealed_region_view.items()
-            )
+            ((k, type(v)) for k, v in flow.scfg.concealed_region_view.items())
         )
         self.assertEqual(expected, received)
 

diff --git a/numba_rvsdg/tests/test_simulate.py b/numba_rvsdg/tests/test_simulate.py
@@ -2,29 +2,6 @@
 from numba_rvsdg.tests.simulator import Simulator
 import unittest
 
-#    flow = ByteFlow.from_bytecode(foo)
-#    #pprint(flow.scfg)
-#    flow = flow.restructure()
-#    #pprint(flow.scfg)
-#    # pprint(rtsflow.scfg)
-#    ByteFlowRenderer().render_byteflow(flow).view()
-#    print(dis(foo))
-#
-#    sim = Simulator(flow, foo.__globals__)
-#    ret = sim.run(dict(x=1))
-#    assert ret == foo(x=1)
-#
-#    #sim = Simulator(flow, foo.__globals__)
-#    #ret = sim.run(dict(x=100))
-#    #assert ret == foo(x=100)
-
-# You can use the following snipppet to visually debug the restructured
-# byteflow:
-#
-#    ByteFlowRenderer().render_byteflow(flow).view()
-#
-#
-
 
 class SimulatorTest(unittest.TestCase):
     def _run(self, func, flow, kwargs):
@@ -42,7 +19,7 @@ def foo(x):
             return c
 
         flow = ByteFlow.from_bytecode(foo)
-        flow = flow.restructure()
+        flow.restructure()
 
         # if case
         self._run(foo, flow, {"x": 1})
@@ -57,7 +34,7 @@ def foo(x):
             return c
 
         flow = ByteFlow.from_bytecode(foo)
-        flow = flow.restructure()
+        flow.restructure()
 
         # loop bypass case
         self._run(foo, flow, {"x": 0})
@@ -76,7 +53,7 @@ def foo(x):
             return c
 
         flow = ByteFlow.from_bytecode(foo)
-        flow = flow.restructure()
+        flow.restructure()
 
         # loop bypass case
         self._run(foo, flow, {"x": 0})
@@ -95,7 +72,7 @@ def foo(x):
             return c
 
         flow = ByteFlow.from_bytecode(foo)
-        flow = flow.restructure()
+        flow.restructure()
 
         # loop bypass case
         self._run(foo, flow, {"x": 0})
@@ -119,7 +96,7 @@ def foo(x):
             return c
 
         flow = ByteFlow.from_bytecode(foo)
-        flow = flow.restructure()
+        flow.restructure()
 
         # no loop
         self._run(foo, flow, {"x": 0})
@@ -143,7 +120,7 @@ def foo(x):
             return c
 
         flow = ByteFlow.from_bytecode(foo)
-        flow = flow.restructure()
+        flow.restructure()
 
         # loop bypass
         self._run(foo, flow, {"x": 0})
@@ -159,7 +136,7 @@ def foo(x, y):
             return (x > 0 and x < 10) or (y > 0 and y < 10)
 
         flow = ByteFlow.from_bytecode(foo)
-        flow = flow.restructure()
+        flow.restructure()
 
         self._run(foo, flow, {"x": 5, "y": 5})
 
@@ -173,7 +150,7 @@ def foo(s, e):
             return c
 
         flow = ByteFlow.from_bytecode(foo)
-        flow = flow.restructure()
+        flow.restructure()
 
         # no looping
         self._run(foo, flow, {"s": 0, "e": 0})