Mercurial > lcfOS
diff test/testgraph.py @ 296:9417caea2eb3
Directorized some backend files
| author | Windel Bouwman |
|---|---|
| date | Sun, 01 Dec 2013 13:36:58 +0100 |
| parents | 7b38782ed496 |
| children | 6753763d3bec |
line wrap: on
line diff
--- a/test/testgraph.py Thu Nov 28 21:10:32 2013 +0100 +++ b/test/testgraph.py Sun Dec 01 13:36:58 2013 +0100 @@ -1,9 +1,9 @@ #!/usr/bin/python import unittest -import graph -import interferencegraph -import flowgraph +from codegen.graph import Graph, Node +from codegen.interferencegraph import InterferenceGraph +from codegen.flowgraph import FlowGraph import ir from irmach import AbstractInstruction as AI from target import Nop @@ -11,10 +11,10 @@ class GraphTestCase(unittest.TestCase): def testEdge(self): - g = graph.Graph() - n1 = graph.Node(g) + g = Graph() + n1 = Node(g) g.addNode(n1) - n2 = graph.Node(g) + n2 = Node(g) g.addNode(n2) g.addEdge(n1, n2) self.assertTrue(g.hasEdge(n2, n1)) @@ -23,12 +23,12 @@ g.delNode(n2) def testDegree(self): - g = graph.Graph() - n1 = graph.Node(g) + g = Graph() + n1 = Node(g) g.addNode(n1) - n2 = graph.Node(g) + n2 = Node(g) g.addNode(n2) - n3 = graph.Node(g) + n3 = Node(g) g.addNode(n3) g.addEdge(n1, n2) g.addEdge(n1, n3) @@ -54,8 +54,8 @@ instrs.append(AI(Nop, dst=[t1])) instrs.append(AI(Nop, dst=[t2])) instrs.append(AI(Nop, dst=[t3])) - cfg = flowgraph.FlowGraph(instrs) - ig = interferencegraph.InterferenceGraph(cfg) + cfg = FlowGraph(instrs) + ig = InterferenceGraph(cfg) def testCombine(self): t1 = ir.Temp('t1') @@ -70,8 +70,8 @@ instrs.append(AI(Nop, src=[t4])) instrs.append(AI(Nop, src=[t1])) instrs.append(AI(Nop, src=[t2])) - cfg = flowgraph.FlowGraph(instrs) - ig = interferencegraph.InterferenceGraph(cfg) + cfg = FlowGraph(instrs) + ig = InterferenceGraph(cfg) ig.Combine(ig.getNode(t4), ig.getNode(t3)) self.assertIs(ig.getNode(t4), ig.getNode(t3))