diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/analysis/depgraph.py | 102 | ||||
| -rwxr-xr-x | test/ir/analysis.py | 170 |
2 files changed, 117 insertions, 155 deletions
diff --git a/test/analysis/depgraph.py b/test/analysis/depgraph.py index 3f9b1a92..b532080b 100644 --- a/test/analysis/depgraph.py +++ b/test/analysis/depgraph.py @@ -206,8 +206,8 @@ G1_IRB0 = gen_irbloc(LBL0, [[ExprAff(C, CST1)]]) G1_IRB1 = gen_irbloc(LBL1, [[ExprAff(B, C)]]) G1_IRB2 = gen_irbloc(LBL2, [[ExprAff(A, B)]]) -G1_IRA.g.add_uniq_edge(G1_IRB0.label, G1_IRB1.label) -G1_IRA.g.add_uniq_edge(G1_IRB1.label, G1_IRB2.label) +G1_IRA.graph.add_uniq_edge(G1_IRB0.label, G1_IRB1.label) +G1_IRA.graph.add_uniq_edge(G1_IRB1.label, G1_IRB2.label) G1_IRA.blocs = dict([(irb.label, irb) for irb in [G1_IRB0, G1_IRB1, G1_IRB2]]) @@ -220,8 +220,8 @@ G2_IRB0 = gen_irbloc(LBL0, [[ExprAff(C, CST1)]]) G2_IRB1 = gen_irbloc(LBL1, [[ExprAff(B, CST2)]]) G2_IRB2 = gen_irbloc(LBL2, [[ExprAff(A, B + C)]]) -G2_IRA.g.add_uniq_edge(G2_IRB0.label, G2_IRB1.label) -G2_IRA.g.add_uniq_edge(G2_IRB1.label, G2_IRB2.label) +G2_IRA.graph.add_uniq_edge(G2_IRB0.label, G2_IRB1.label) +G2_IRA.graph.add_uniq_edge(G2_IRB1.label, G2_IRB2.label) G2_IRA.blocs = dict([(irb.label, irb) for irb in [G2_IRB0, G2_IRB1, G2_IRB2]]) @@ -236,10 +236,10 @@ G3_IRB1 = gen_irbloc(LBL1, [[ExprAff(B, CST2)]]) G3_IRB2 = gen_irbloc(LBL2, [[ExprAff(B, CST3)]]) G3_IRB3 = gen_irbloc(LBL3, [[ExprAff(A, B + C)]]) -G3_IRA.g.add_uniq_edge(G3_IRB0.label, G3_IRB1.label) -G3_IRA.g.add_uniq_edge(G3_IRB0.label, G3_IRB2.label) -G3_IRA.g.add_uniq_edge(G3_IRB1.label, G3_IRB3.label) -G3_IRA.g.add_uniq_edge(G3_IRB2.label, G3_IRB3.label) +G3_IRA.graph.add_uniq_edge(G3_IRB0.label, G3_IRB1.label) +G3_IRA.graph.add_uniq_edge(G3_IRB0.label, G3_IRB2.label) +G3_IRA.graph.add_uniq_edge(G3_IRB1.label, G3_IRB3.label) +G3_IRA.graph.add_uniq_edge(G3_IRB2.label, G3_IRB3.label) G3_IRA.blocs = dict([(irb.label, irb) for irb in [G3_IRB0, G3_IRB1, G3_IRB2, G3_IRB3]]) @@ -257,9 +257,9 @@ G4_IRB1 = gen_irbloc(LBL1, [[ExprAff(C, C + CST2)], G4_IRB2 = gen_irbloc(LBL2, [[ExprAff(A, B)]]) -G4_IRA.g.add_uniq_edge(G4_IRB0.label, G4_IRB1.label) -G4_IRA.g.add_uniq_edge(G4_IRB1.label, G4_IRB2.label) -G4_IRA.g.add_uniq_edge(G4_IRB1.label, G4_IRB1.label) +G4_IRA.graph.add_uniq_edge(G4_IRB0.label, G4_IRB1.label) +G4_IRA.graph.add_uniq_edge(G4_IRB1.label, G4_IRB2.label) +G4_IRA.graph.add_uniq_edge(G4_IRB1.label, G4_IRB1.label) G4_IRA.blocs = dict([(irb.label, irb) for irb in [G4_IRB0, G4_IRB1, G4_IRB2]]) @@ -277,9 +277,9 @@ G5_IRB1 = gen_irbloc(LBL1, [[ExprAff(B, B + CST2)], G5_IRB2 = gen_irbloc(LBL2, [[ExprAff(A, B)]]) -G5_IRA.g.add_uniq_edge(G5_IRB0.label, G5_IRB1.label) -G5_IRA.g.add_uniq_edge(G5_IRB1.label, G5_IRB2.label) -G5_IRA.g.add_uniq_edge(G5_IRB1.label, G5_IRB1.label) +G5_IRA.graph.add_uniq_edge(G5_IRB0.label, G5_IRB1.label) +G5_IRA.graph.add_uniq_edge(G5_IRB1.label, G5_IRB2.label) +G5_IRA.graph.add_uniq_edge(G5_IRB1.label, G5_IRB1.label) G5_IRA.blocs = dict([(irb.label, irb) for irb in [G5_IRB0, G5_IRB1, G5_IRB2]]) @@ -291,8 +291,8 @@ G6_IRA.g = GraphTest(G6_IRA) G6_IRB0 = gen_irbloc(LBL0, [[ExprAff(B, CST1)]]) G6_IRB1 = gen_irbloc(LBL1, [[ExprAff(A, B)]]) -G6_IRA.g.add_uniq_edge(G6_IRB0.label, G6_IRB1.label) -G6_IRA.g.add_uniq_edge(G6_IRB1.label, G6_IRB1.label) +G6_IRA.graph.add_uniq_edge(G6_IRB0.label, G6_IRB1.label) +G6_IRA.graph.add_uniq_edge(G6_IRB1.label, G6_IRB1.label) G6_IRA.blocs = dict([(irb.label, irb) for irb in [G6_IRB0, G6_IRB1]]) @@ -305,9 +305,9 @@ G7_IRB0 = gen_irbloc(LBL0, [[ExprAff(C, CST1)]]) G7_IRB1 = gen_irbloc(LBL1, [[ExprAff(B, C)], [ExprAff(A, B)]]) G7_IRB2 = gen_irbloc(LBL2, [[ExprAff(D, A)]]) -G7_IRA.g.add_uniq_edge(G7_IRB0.label, G7_IRB1.label) -G7_IRA.g.add_uniq_edge(G7_IRB1.label, G7_IRB1.label) -G7_IRA.g.add_uniq_edge(G7_IRB1.label, G7_IRB2.label) +G7_IRA.graph.add_uniq_edge(G7_IRB0.label, G7_IRB1.label) +G7_IRA.graph.add_uniq_edge(G7_IRB1.label, G7_IRB1.label) +G7_IRA.graph.add_uniq_edge(G7_IRB1.label, G7_IRB2.label) G7_IRA.blocs = dict([(irb.label, irb) for irb in [G7_IRB0, G7_IRB1, G7_IRB2]]) @@ -320,9 +320,9 @@ G8_IRB0 = gen_irbloc(LBL0, [[ExprAff(C, CST1)]]) G8_IRB1 = gen_irbloc(LBL1, [[ExprAff(B, C)], [ExprAff(C, D)]]) G8_IRB2 = gen_irbloc(LBL2, [[ExprAff(A, B)]]) -G8_IRA.g.add_uniq_edge(G8_IRB0.label, G8_IRB1.label) -G8_IRA.g.add_uniq_edge(G8_IRB1.label, G8_IRB1.label) -G8_IRA.g.add_uniq_edge(G8_IRB1.label, G8_IRB2.label) +G8_IRA.graph.add_uniq_edge(G8_IRB0.label, G8_IRB1.label) +G8_IRA.graph.add_uniq_edge(G8_IRB1.label, G8_IRB1.label) +G8_IRA.graph.add_uniq_edge(G8_IRB1.label, G8_IRB2.label) G8_IRA.blocs = dict([(irb.label, irb) for irb in [G8_IRB0, G8_IRB1, G8_IRB2]]) @@ -336,8 +336,8 @@ G10_IRA.g = GraphTest(G10_IRA) G10_IRB1 = gen_irbloc(LBL1, [[ExprAff(B, B + CST2)]]) G10_IRB2 = gen_irbloc(LBL2, [[ExprAff(A, B)]]) -G10_IRA.g.add_uniq_edge(G10_IRB1.label, G10_IRB2.label) -G10_IRA.g.add_uniq_edge(G10_IRB1.label, G10_IRB1.label) +G10_IRA.graph.add_uniq_edge(G10_IRB1.label, G10_IRB2.label) +G10_IRA.graph.add_uniq_edge(G10_IRB1.label, G10_IRB1.label) G10_IRA.blocs = dict([(irb.label, irb) for irb in [G10_IRB1, G10_IRB2]]) @@ -352,8 +352,8 @@ G11_IRB1 = gen_irbloc(LBL1, [[ExprAff(A, B), ExprAff(B, A)]]) G11_IRB2 = gen_irbloc(LBL2, [[ExprAff(A, A - B)]]) -G11_IRA.g.add_uniq_edge(G11_IRB0.label, G11_IRB1.label) -G11_IRA.g.add_uniq_edge(G11_IRB1.label, G11_IRB2.label) +G11_IRA.graph.add_uniq_edge(G11_IRB0.label, G11_IRB1.label) +G11_IRA.graph.add_uniq_edge(G11_IRB1.label, G11_IRB2.label) G11_IRA.blocs = dict([(irb.label, irb) for irb in [G11_IRB0, G11_IRB1, G11_IRB2]]) @@ -367,9 +367,9 @@ G12_IRB0 = gen_irbloc(LBL0, [[ExprAff(B, CST1)]]) G12_IRB1 = gen_irbloc(LBL1, [[ExprAff(A, B)], [ExprAff(B, B + CST2)]]) G12_IRB2 = gen_irbloc(LBL2, [[ExprAff(B, A)]]) -G12_IRA.g.add_uniq_edge(G12_IRB0.label, G12_IRB1.label) -G12_IRA.g.add_uniq_edge(G12_IRB1.label, G12_IRB2.label) -G12_IRA.g.add_uniq_edge(G12_IRB1.label, G12_IRB1.label) +G12_IRA.graph.add_uniq_edge(G12_IRB0.label, G12_IRB1.label) +G12_IRA.graph.add_uniq_edge(G12_IRB1.label, G12_IRB2.label) +G12_IRA.graph.add_uniq_edge(G12_IRB1.label, G12_IRB1.label) G12_IRA.blocs = dict([(irb.label, irb) for irb in [G12_IRB0, G12_IRB1, G12_IRB2]]) @@ -396,10 +396,10 @@ G13_IRB2 = gen_irbloc(LBL2, [[ExprAff(B, A + CST3)], [ExprAff(A, B + CST3)], G13_IRB3 = gen_irbloc(LBL3, [[ExprAff(R, C)]]) -G13_IRA.g.add_uniq_edge(G13_IRB0.label, G13_IRB1.label) -G13_IRA.g.add_uniq_edge(G13_IRB1.label, G13_IRB2.label) -G13_IRA.g.add_uniq_edge(G13_IRB2.label, G13_IRB1.label) -G13_IRA.g.add_uniq_edge(G13_IRB1.label, G13_IRB3.label) +G13_IRA.graph.add_uniq_edge(G13_IRB0.label, G13_IRB1.label) +G13_IRA.graph.add_uniq_edge(G13_IRB1.label, G13_IRB2.label) +G13_IRA.graph.add_uniq_edge(G13_IRB2.label, G13_IRB1.label) +G13_IRA.graph.add_uniq_edge(G13_IRB1.label, G13_IRB3.label) G13_IRA.blocs = dict([(irb.label, irb) for irb in [G13_IRB0, G13_IRB1, G13_IRB2, G13_IRB3]]) @@ -427,10 +427,10 @@ G14_IRB2 = gen_irbloc(LBL2, [[ExprAff(D, A)], G14_IRB3 = gen_irbloc(LBL3, [[ExprAff(R, D + B)]]) -G14_IRA.g.add_uniq_edge(G14_IRB0.label, G14_IRB1.label) -G14_IRA.g.add_uniq_edge(G14_IRB1.label, G14_IRB2.label) -G14_IRA.g.add_uniq_edge(G14_IRB2.label, G14_IRB1.label) -G14_IRA.g.add_uniq_edge(G14_IRB1.label, G14_IRB3.label) +G14_IRA.graph.add_uniq_edge(G14_IRB0.label, G14_IRB1.label) +G14_IRA.graph.add_uniq_edge(G14_IRB1.label, G14_IRB2.label) +G14_IRA.graph.add_uniq_edge(G14_IRB2.label, G14_IRB1.label) +G14_IRA.graph.add_uniq_edge(G14_IRB1.label, G14_IRB3.label) G14_IRA.blocs = dict([(irb.label, irb) for irb in [G14_IRB0, G14_IRB1, G14_IRB2, G14_IRB3]]) @@ -446,9 +446,9 @@ G15_IRB1 = gen_irbloc(LBL1, [[ExprAff(D, A + B)], [ExprAff(B, C)]]) G15_IRB2 = gen_irbloc(LBL2, [[ExprAff(R, B)]]) -G15_IRA.g.add_uniq_edge(G15_IRB0.label, G15_IRB1.label) -G15_IRA.g.add_uniq_edge(G15_IRB1.label, G15_IRB2.label) -G15_IRA.g.add_uniq_edge(G15_IRB1.label, G15_IRB1.label) +G15_IRA.graph.add_uniq_edge(G15_IRB0.label, G15_IRB1.label) +G15_IRA.graph.add_uniq_edge(G15_IRB1.label, G15_IRB2.label) +G15_IRA.graph.add_uniq_edge(G15_IRB1.label, G15_IRB1.label) G15_IRA.blocs = dict([(irb.label, irb) for irb in [G15_IRB0, G15_IRB1, G15_IRB2]]) @@ -465,14 +465,14 @@ G16_IRB3 = gen_irbloc(LBL3, [[ExprAff(R, D)]]) G16_IRB4 = gen_irbloc(LBL4, [[ExprAff(R, A)]]) G16_IRB5 = gen_irbloc(LBL5, [[ExprAff(R, A)]]) -G16_IRA.g.add_uniq_edge(G16_IRB0.label, G16_IRB1.label) -G16_IRA.g.add_uniq_edge(G16_IRB1.label, G16_IRB2.label) -G16_IRA.g.add_uniq_edge(G16_IRB2.label, G16_IRB1.label) -G16_IRA.g.add_uniq_edge(G16_IRB1.label, G16_IRB3.label) -G16_IRA.g.add_uniq_edge(G16_IRB3.label, G16_IRB1.label) -G16_IRA.g.add_uniq_edge(G16_IRB1.label, G16_IRB4.label) -G16_IRA.g.add_uniq_edge(G16_IRB4.label, G16_IRB1.label) -G16_IRA.g.add_uniq_edge(G16_IRB1.label, G16_IRB5.label) +G16_IRA.graph.add_uniq_edge(G16_IRB0.label, G16_IRB1.label) +G16_IRA.graph.add_uniq_edge(G16_IRB1.label, G16_IRB2.label) +G16_IRA.graph.add_uniq_edge(G16_IRB2.label, G16_IRB1.label) +G16_IRA.graph.add_uniq_edge(G16_IRB1.label, G16_IRB3.label) +G16_IRA.graph.add_uniq_edge(G16_IRB3.label, G16_IRB1.label) +G16_IRA.graph.add_uniq_edge(G16_IRB1.label, G16_IRB4.label) +G16_IRA.graph.add_uniq_edge(G16_IRB4.label, G16_IRB1.label) +G16_IRA.graph.add_uniq_edge(G16_IRB1.label, G16_IRB5.label) G16_IRA.blocs = dict([(irb.label, irb) for irb in [G16_IRB0, G16_IRB1, G16_IRB2, G16_IRB3, @@ -489,8 +489,8 @@ G17_IRB1 = gen_irbloc(LBL1, [[ExprAff(A, D), ExprAff(B, D)]]) G17_IRB2 = gen_irbloc(LBL2, [[ExprAff(A, A - B)]]) -G17_IRA.g.add_uniq_edge(G17_IRB0.label, G17_IRB1.label) -G17_IRA.g.add_uniq_edge(G17_IRB1.label, G17_IRB2.label) +G17_IRA.graph.add_uniq_edge(G17_IRB0.label, G17_IRB1.label) +G17_IRA.graph.add_uniq_edge(G17_IRB1.label, G17_IRB2.label) G17_IRA.blocs = dict([(irb.label, irb) for irb in [G17_IRB0, G17_IRB1, G17_IRB2]]) @@ -1116,7 +1116,7 @@ for test_nb, test in enumerate([(G1_IRA, G1_INPUT, G1_OUTPUT), print "[+] Test", test_nb + 1 g_ira, (depnodes, heads), g_test_output = test - open("graph_%02d.dot" % (test_nb + 1), "w").write(g_ira.g.dot()) + open("graph_%02d.dot" % (test_nb + 1), "w").write(g_ira.graph.dot()) # Different options suffix_key_list = ["", "_nosimp", "_nomem", "_nocall", diff --git a/test/ir/analysis.py b/test/ir/analysis.py index b18d1633..49daa70e 100755 --- a/test/ir/analysis.py +++ b/test/ir/analysis.py @@ -73,10 +73,8 @@ G1_IRB0 = gen_irbloc(LBL0, [[ExprAff(a, CST1)], [ExprAff(b, CST2)]]) G1_IRB1 = gen_irbloc(LBL1, [[ExprAff(a, b)]]) G1_IRB2 = gen_irbloc(LBL2, [[ExprAff(r, a)]]) -G1_IRA.gen_graph() - -G1_IRA.g.add_uniq_edge(G1_IRB0.label, G1_IRB1.label) -G1_IRA.g.add_uniq_edge(G1_IRB1.label, G1_IRB2.label) +G1_IRA.graph.add_uniq_edge(G1_IRB0.label, G1_IRB1.label) +G1_IRA.graph.add_uniq_edge(G1_IRB1.label, G1_IRB2.label) G1_IRA.blocs = {irb.label : irb for irb in [G1_IRB0, G1_IRB1, G1_IRB2]} @@ -98,11 +96,9 @@ G2_IRB0 = gen_irbloc(LBL0, [[ExprAff(a, CST1)], [ExprAff(r, CST1)]]) G2_IRB1 = gen_irbloc(LBL1, [[ExprAff(a, a+CST1)]]) G2_IRB2 = gen_irbloc(LBL2, [[ExprAff(a, r)]]) -G2_IRA.gen_graph() - -G2_IRA.g.add_uniq_edge(G2_IRB0.label, G2_IRB1.label) -G2_IRA.g.add_uniq_edge(G2_IRB1.label, G2_IRB2.label) -G2_IRA.g.add_uniq_edge(G2_IRB1.label, G2_IRB1.label) +G2_IRA.graph.add_uniq_edge(G2_IRB0.label, G2_IRB1.label) +G2_IRA.graph.add_uniq_edge(G2_IRB1.label, G2_IRB2.label) +G2_IRA.graph.add_uniq_edge(G2_IRB1.label, G2_IRB1.label) G2_IRA.blocs = {irb.label : irb for irb in [G2_IRB0, G2_IRB1, G2_IRB2]} @@ -124,11 +120,9 @@ G3_IRB0 = gen_irbloc(LBL0, [[ExprAff(a, CST1)]]) G3_IRB1 = gen_irbloc(LBL1, [[ExprAff(a, a+CST1)]]) G3_IRB2 = gen_irbloc(LBL2, [[ExprAff(r, a)]]) -G3_IRA.gen_graph() - -G3_IRA.g.add_uniq_edge(G3_IRB0.label, G3_IRB1.label) -G3_IRA.g.add_uniq_edge(G3_IRB1.label, G3_IRB2.label) -G3_IRA.g.add_uniq_edge(G3_IRB1.label, G3_IRB1.label) +G3_IRA.graph.add_uniq_edge(G3_IRB0.label, G3_IRB1.label) +G3_IRA.graph.add_uniq_edge(G3_IRB1.label, G3_IRB2.label) +G3_IRA.graph.add_uniq_edge(G3_IRB1.label, G3_IRB1.label) G3_IRA.blocs = {irb.label : irb for irb in [G3_IRB0, G3_IRB1, G3_IRB2]} @@ -151,12 +145,10 @@ G4_IRB1 = gen_irbloc(LBL1, [[ExprAff(a, a+CST1)]]) G4_IRB2 = gen_irbloc(LBL2, [[ExprAff(a, a+CST2)]]) G4_IRB3 = gen_irbloc(LBL3, [[ExprAff(a, CST3)], [ExprAff(r, a)]]) -G4_IRA.gen_graph() - -G4_IRA.g.add_uniq_edge(G4_IRB0.label, G4_IRB1.label) -G4_IRA.g.add_uniq_edge(G4_IRB0.label, G4_IRB2.label) -G4_IRA.g.add_uniq_edge(G4_IRB1.label, G4_IRB3.label) -G4_IRA.g.add_uniq_edge(G4_IRB2.label, G4_IRB3.label) +G4_IRA.graph.add_uniq_edge(G4_IRB0.label, G4_IRB1.label) +G4_IRA.graph.add_uniq_edge(G4_IRB0.label, G4_IRB2.label) +G4_IRA.graph.add_uniq_edge(G4_IRB1.label, G4_IRB3.label) +G4_IRA.graph.add_uniq_edge(G4_IRB2.label, G4_IRB3.label) G4_IRA.blocs = {irb.label : irb for irb in [G4_IRB0, G4_IRB1, G4_IRB2, G4_IRB3]} @@ -169,8 +161,6 @@ G4_EXP_IRB1 = gen_irbloc(LBL1, [[]]) G4_EXP_IRB2 = gen_irbloc(LBL2, [[]]) G4_EXP_IRB3 = gen_irbloc(LBL3, [[ExprAff(a, CST3)], [ExprAff(r, a)]]) -G4_EXP_IRA.gen_graph() - G4_EXP_IRA.blocs = {irb.label : irb for irb in [G4_EXP_IRB0, G4_EXP_IRB1, G4_EXP_IRB2, G4_EXP_IRB3]} @@ -185,15 +175,13 @@ G5_IRB3 = gen_irbloc(LBL3, [[ExprAff(a, a+CST3)]]) G5_IRB4 = gen_irbloc(LBL4, [[ExprAff(a, a+CST1)]]) G5_IRB5 = gen_irbloc(LBL5, [[ExprAff(a, r)]]) -G5_IRA.gen_graph() - -G5_IRA.g.add_uniq_edge(G5_IRB0.label, G5_IRB1.label) -G5_IRA.g.add_uniq_edge(G5_IRB1.label, G5_IRB2.label) -G5_IRA.g.add_uniq_edge(G5_IRB1.label, G5_IRB3.label) -G5_IRA.g.add_uniq_edge(G5_IRB2.label, G5_IRB4.label) -G5_IRA.g.add_uniq_edge(G5_IRB3.label, G5_IRB4.label) -G5_IRA.g.add_uniq_edge(G5_IRB4.label, G5_IRB5.label) -G5_IRA.g.add_uniq_edge(G5_IRB4.label, G5_IRB1.label) +G5_IRA.graph.add_uniq_edge(G5_IRB0.label, G5_IRB1.label) +G5_IRA.graph.add_uniq_edge(G5_IRB1.label, G5_IRB2.label) +G5_IRA.graph.add_uniq_edge(G5_IRB1.label, G5_IRB3.label) +G5_IRA.graph.add_uniq_edge(G5_IRB2.label, G5_IRB4.label) +G5_IRA.graph.add_uniq_edge(G5_IRB3.label, G5_IRB4.label) +G5_IRA.graph.add_uniq_edge(G5_IRB4.label, G5_IRB5.label) +G5_IRA.graph.add_uniq_edge(G5_IRB4.label, G5_IRB1.label) G5_IRA.blocs = {irb.label : irb for irb in [G5_IRB0, G5_IRB1, G5_IRB2, G5_IRB3, G5_IRB4, G5_IRB5]} @@ -208,8 +196,6 @@ G5_EXP_IRB3 = gen_irbloc(LBL3, [[]]) G5_EXP_IRB4 = gen_irbloc(LBL4, [[]]) G5_EXP_IRB5 = gen_irbloc(LBL5, [[]]) -G5_EXP_IRA.gen_graph() - G5_EXP_IRA.blocs = {irb.label : irb for irb in [G5_EXP_IRB0, G5_EXP_IRB1, G5_EXP_IRB2, G5_EXP_IRB3, G5_EXP_IRB4, G5_EXP_IRB5]} @@ -225,12 +211,10 @@ G6_IRB2 = gen_irbloc(LBL2, [[ExprAff(a, b)]]) G6_IRB3 = gen_irbloc(LBL3, [[ExprAff(r, CST2)]]) -G6_IRA.gen_graph() - -G6_IRA.g.add_uniq_edge(G6_IRB0.label, G6_IRB1.label) -G6_IRA.g.add_uniq_edge(G6_IRB1.label, G6_IRB2.label) -G6_IRA.g.add_uniq_edge(G6_IRB2.label, G6_IRB1.label) -G6_IRA.g.add_uniq_edge(G6_IRB2.label, G6_IRB3.label) +G6_IRA.graph.add_uniq_edge(G6_IRB0.label, G6_IRB1.label) +G6_IRA.graph.add_uniq_edge(G6_IRB1.label, G6_IRB2.label) +G6_IRA.graph.add_uniq_edge(G6_IRB2.label, G6_IRB1.label) +G6_IRA.graph.add_uniq_edge(G6_IRB2.label, G6_IRB3.label) G6_IRA.blocs = {irb.label : irb for irb in [G6_IRB0, G6_IRB1, G6_IRB2, G6_IRB3]} @@ -256,13 +240,11 @@ G7_IRB2 = gen_irbloc(LBL2, [[ExprAff(a, a+CST2)]]) G7_IRB3 = gen_irbloc(LBL3, [[ExprAff(a, r)]]) -G7_IRA.gen_graph() - -G7_IRA.g.add_uniq_edge(G7_IRB0.label, G7_IRB1.label) -G7_IRA.g.add_uniq_edge(G7_IRB1.label, G7_IRB2.label) -G7_IRA.g.add_uniq_edge(G7_IRB2.label, G7_IRB1.label) -G7_IRA.g.add_uniq_edge(G7_IRB2.label, G7_IRB3.label) -G7_IRA.g.add_uniq_edge(G7_IRB0.label, G7_IRB2.label) +G7_IRA.graph.add_uniq_edge(G7_IRB0.label, G7_IRB1.label) +G7_IRA.graph.add_uniq_edge(G7_IRB1.label, G7_IRB2.label) +G7_IRA.graph.add_uniq_edge(G7_IRB2.label, G7_IRB1.label) +G7_IRA.graph.add_uniq_edge(G7_IRB2.label, G7_IRB3.label) +G7_IRA.graph.add_uniq_edge(G7_IRB0.label, G7_IRB2.label) G7_IRA.blocs = {irb.label : irb for irb in [G7_IRB0, G7_IRB1, G7_IRB2, @@ -289,13 +271,11 @@ G8_IRB2 = gen_irbloc(LBL2, [[ExprAff(b, b+CST2)]]) G8_IRB3 = gen_irbloc(LBL3, [[ExprAff(a, b)]]) -G8_IRA.gen_graph() - -G8_IRA.g.add_uniq_edge(G8_IRB0.label, G8_IRB1.label) -G8_IRA.g.add_uniq_edge(G8_IRB1.label, G8_IRB2.label) -G8_IRA.g.add_uniq_edge(G8_IRB2.label, G8_IRB1.label) -G8_IRA.g.add_uniq_edge(G8_IRB2.label, G8_IRB3.label) -G8_IRA.g.add_uniq_edge(G8_IRB3.label, G8_IRB2.label) +G8_IRA.graph.add_uniq_edge(G8_IRB0.label, G8_IRB1.label) +G8_IRA.graph.add_uniq_edge(G8_IRB1.label, G8_IRB2.label) +G8_IRA.graph.add_uniq_edge(G8_IRB2.label, G8_IRB1.label) +G8_IRA.graph.add_uniq_edge(G8_IRB2.label, G8_IRB3.label) +G8_IRA.graph.add_uniq_edge(G8_IRB3.label, G8_IRB2.label) G8_IRA.blocs = {irb.label : irb for irb in [G8_IRB0, G8_IRB1, G8_IRB2, @@ -324,16 +304,14 @@ G9_IRB3 = gen_irbloc(LBL3, [[ExprAff(a, b)]]) G9_IRB4 = gen_irbloc(LBL4, [[ExprAff(r, a)], [ExprAff(r, b)]]) -G9_IRA.gen_graph() - -G9_IRA.g.add_uniq_edge(G9_IRB0.label, G9_IRB4.label) -G9_IRA.g.add_uniq_edge(G9_IRB0.label, G9_IRB1.label) -G9_IRA.g.add_uniq_edge(G9_IRB1.label, G9_IRB0.label) -G9_IRA.g.add_uniq_edge(G9_IRB1.label, G9_IRB4.label) -G9_IRA.g.add_uniq_edge(G9_IRB1.label, G9_IRB2.label) -G9_IRA.g.add_uniq_edge(G9_IRB2.label, G9_IRB0.label) -G9_IRA.g.add_uniq_edge(G9_IRB2.label, G9_IRB3.label) -G9_IRA.g.add_uniq_edge(G9_IRB3.label, G9_IRB4.label) +G9_IRA.graph.add_uniq_edge(G9_IRB0.label, G9_IRB4.label) +G9_IRA.graph.add_uniq_edge(G9_IRB0.label, G9_IRB1.label) +G9_IRA.graph.add_uniq_edge(G9_IRB1.label, G9_IRB0.label) +G9_IRA.graph.add_uniq_edge(G9_IRB1.label, G9_IRB4.label) +G9_IRA.graph.add_uniq_edge(G9_IRB1.label, G9_IRB2.label) +G9_IRA.graph.add_uniq_edge(G9_IRB2.label, G9_IRB0.label) +G9_IRA.graph.add_uniq_edge(G9_IRB2.label, G9_IRB3.label) +G9_IRA.graph.add_uniq_edge(G9_IRB3.label, G9_IRB4.label) G9_IRA.blocs = {irb.label : irb for irb in [G9_IRB0, G9_IRB1, G9_IRB2, @@ -364,12 +342,10 @@ G10_IRB2 = gen_irbloc(LBL2, [[ExprAff(a, b)]]) G10_IRB3 = gen_irbloc(LBL3, [[ExprAff(r, CST1)]]) -G10_IRA.gen_graph() - -G10_IRA.g.add_uniq_edge(G10_IRB0.label, G10_IRB1.label) -G10_IRA.g.add_uniq_edge(G10_IRB1.label, G10_IRB2.label) -G10_IRA.g.add_uniq_edge(G10_IRB2.label, G10_IRB1.label) -G10_IRA.g.add_uniq_edge(G10_IRB2.label, G10_IRB3.label) +G10_IRA.graph.add_uniq_edge(G10_IRB0.label, G10_IRB1.label) +G10_IRA.graph.add_uniq_edge(G10_IRB1.label, G10_IRB2.label) +G10_IRA.graph.add_uniq_edge(G10_IRB2.label, G10_IRB1.label) +G10_IRA.graph.add_uniq_edge(G10_IRB2.label, G10_IRB3.label) G10_IRA.blocs = {irb.label : irb for irb in [G10_IRB0, G10_IRB1, G10_IRB2, G10_IRB3]} @@ -396,13 +372,11 @@ G11_IRB3 = gen_irbloc(LBL3, [[ExprAff(a, a+CST1)]]) G11_IRB4 = gen_irbloc(LBL4, [[ExprAff(b, b+CST1)]]) -G11_IRA.gen_graph() - -G11_IRA.g.add_uniq_edge(G11_IRB0.label, G11_IRB1.label) -#G11_IRA.g.add_uniq_edge(G11_IRB3.label, G11_IRB1.label) -G11_IRA.g.add_uniq_edge(G11_IRB1.label, G11_IRB0.label) -#G11_IRA.g.add_uniq_edge(G11_IRB4.label, G11_IRB0.label) -G11_IRA.g.add_uniq_edge(G11_IRB1.label, G11_IRB2.label) +G11_IRA.graph.add_uniq_edge(G11_IRB0.label, G11_IRB1.label) +#G11_IRA.graph.add_uniq_edge(G11_IRB3.label, G11_IRB1.label) +G11_IRA.graph.add_uniq_edge(G11_IRB1.label, G11_IRB0.label) +#G11_IRA.graph.add_uniq_edge(G11_IRB4.label, G11_IRB0.label) +G11_IRA.graph.add_uniq_edge(G11_IRB1.label, G11_IRB2.label) G11_IRA.blocs = {irb.label : irb for irb in [G11_IRB0, G11_IRB1, G11_IRB2]} @@ -430,13 +404,11 @@ G12_IRB3 = gen_irbloc(LBL3, [[ExprAff(r, CST3)]]) G12_IRB4 = gen_irbloc(LBL4, [[ExprAff(r, CST2)]]) G12_IRB5 = gen_irbloc(LBL5, [[ExprAff(r, b)]]) -G12_IRA.gen_graph() - -G12_IRA.g.add_uniq_edge(G12_IRB0.label, G12_IRB1.label) -G12_IRA.g.add_uniq_edge(G12_IRB0.label, G12_IRB2.label) -G12_IRA.g.add_uniq_edge(G12_IRB2.label, G12_IRB3.label) -G12_IRA.g.add_uniq_edge(G12_IRB2.label, G12_IRB4.label) -G12_IRA.g.add_uniq_edge(G12_IRB4.label, G12_IRB5.label) +G12_IRA.graph.add_uniq_edge(G12_IRB0.label, G12_IRB1.label) +G12_IRA.graph.add_uniq_edge(G12_IRB0.label, G12_IRB2.label) +G12_IRA.graph.add_uniq_edge(G12_IRB2.label, G12_IRB3.label) +G12_IRA.graph.add_uniq_edge(G12_IRB2.label, G12_IRB4.label) +G12_IRA.graph.add_uniq_edge(G12_IRB4.label, G12_IRB5.label) G12_IRA.blocs = {irb.label : irb for irb in [G12_IRB0, G12_IRB1, G12_IRB2, G12_IRB3, G12_IRB4, G12_IRB5]} @@ -467,12 +439,10 @@ G13_IRB2 = gen_irbloc(LBL2, [[ExprAff(d, CST2)], [ExprAff(a, b+CST1), G13_IRB3 = gen_irbloc(LBL3, [[]]) # lost son G13_IRB4 = gen_irbloc(LBL4, [[ExprAff(b, CST2)]]) -G13_IRA.gen_graph() - -G13_IRA.g.add_uniq_edge(G13_IRB0.label, G13_IRB1.label) -G13_IRA.g.add_uniq_edge(G13_IRB0.label, G13_IRB4.label) -G13_IRA.g.add_uniq_edge(G13_IRB2.label, G13_IRB3.label) -G13_IRA.g.add_uniq_edge(G13_IRB4.label, G13_IRB2.label) +G13_IRA.graph.add_uniq_edge(G13_IRB0.label, G13_IRB1.label) +G13_IRA.graph.add_uniq_edge(G13_IRB0.label, G13_IRB4.label) +G13_IRA.graph.add_uniq_edge(G13_IRB2.label, G13_IRB3.label) +G13_IRA.graph.add_uniq_edge(G13_IRB4.label, G13_IRB2.label) G13_IRA.blocs = {irb.label : irb for irb in [G13_IRB0, G13_IRB1, G13_IRB2, G13_IRB4]} @@ -501,9 +471,7 @@ G14_IRB0 = gen_irbloc(LBL0, [[ExprAff(a, CST1)], [ExprAff(c, a)], [ExprAff(a, CST2)]]) G14_IRB1 = gen_irbloc(LBL1, [[ExprAff(r, a+c)]]) -G14_IRA.gen_graph() - -G14_IRA.g.add_uniq_edge(G14_IRB0.label, G14_IRB1.label) +G14_IRA.graph.add_uniq_edge(G14_IRB0.label, G14_IRB1.label) G14_IRA.blocs = {irb.label : irb for irb in [G14_IRB0, G14_IRB1]} @@ -526,9 +494,7 @@ G15_IRB0 = gen_irbloc(LBL0, [[ExprAff(a, CST2)], [ExprAff(a, CST1), ExprAff(c, CST1)]]) G15_IRB1 = gen_irbloc(LBL1, [[ExprAff(r, a)]]) -G15_IRA.gen_graph() - -G15_IRA.g.add_uniq_edge(G15_IRB0.label, G15_IRB1.label) +G15_IRA.graph.add_uniq_edge(G15_IRB0.label, G15_IRB1.label) G15_IRA.blocs = {irb.label : irb for irb in [G15_IRB0, G15_IRB1]} @@ -550,10 +516,8 @@ G16_IRB0 = gen_irbloc(LBL0, [[ExprAff(a, CST1), ExprAff(b, CST2), G16_IRB1 = gen_irbloc(LBL1, [[ExprAff(r, a+b)], [ExprAff(r, c+r)]]) G16_IRB2 = gen_irbloc(LBL2, [[]]) -G16_IRA.gen_graph() - -G16_IRA.g.add_uniq_edge(G16_IRB0.label, G16_IRB1.label) -G16_IRA.g.add_uniq_edge(G16_IRB1.label, G16_IRB2.label) +G16_IRA.graph.add_uniq_edge(G16_IRB0.label, G16_IRB1.label) +G16_IRA.graph.add_uniq_edge(G16_IRB1.label, G16_IRB2.label) G16_IRA.blocs = {irb.label : irb for irb in [G16_IRB0, G16_IRB1]} @@ -624,11 +588,9 @@ G17_IRB0 = gen_irbloc(LBL0, [[ExprAff(a, a*b), ]) -G17_IRA.gen_graph() - G17_IRA.blocs = {irb.label : irb for irb in [G17_IRB0]} -G17_IRA.g.add_node(G17_IRB0.label) +G17_IRA.graph.add_node(G17_IRB0.label) # Expected output for graph 17 G17_EXP_IRA = IRATest() @@ -696,13 +658,13 @@ for test_nb, test in enumerate([(G1_IRA, G1_EXP_IRA), print "[+] Test", test_nb+1 # Print initial graph, for debug - open("graph_%02d.dot" % (test_nb+1), "w").write(g_ira.graph()) + open("graph_%02d.dot" % (test_nb+1), "w").write(g_ira.graph.dot()) # Simplify graph g_ira.dead_simp() # Print simplified graph, for debug - open("simp_graph_%02d.dot" % (test_nb+1), "w").write(g_ira.graph()) + open("simp_graph_%02d.dot" % (test_nb+1), "w").write(g_ira.graph.dot()) # Same number of blocks assert len(g_ira.blocs) == len(g_exp_ira.blocs) |