IR: replace `.g` with a lazy built `.graph`, avoiding the need of `gen_graph`

13 files changed, 145 insertions, 200 deletions

diff --git a/example/disasm/full.py b/example/disasm/full.py
index d939d430..33b2f41f 100644
--- a/example/disasm/full.py
+++ b/example/disasm/full.py
@@ -194,13 +194,11 @@ if args.gen_ir:
     log.info("Print blocs (with analyse)")
     for label, bloc in ir_arch_a.blocs.iteritems():
         print bloc
-    ir_arch.gen_graph()
-    ir_arch_a.gen_graph()
 
     if args.simplify:
         ir_arch_a.dead_simp()
 
-    out = ir_arch_a.graph()
+    out = ir_arch_a.graph.dot()
     open('graph_irflow.dot', 'w').write(out)
-    out = ir_arch.graph()
+    out = ir_arch.graph.dot()
     open('graph_irflow_raw.dot', 'w').write(out)
diff --git a/example/expression/asm_to_ir.py b/example/expression/asm_to_ir.py
index 3ed59ffe..2f8999a4 100644
--- a/example/expression/asm_to_ir.py
+++ b/example/expression/asm_to_ir.py
@@ -45,13 +45,10 @@ for lbl, b in ir_arch.blocs.items():
     print b
 
 # Dead propagation
-ir_arch.gen_graph()
-out = ir_arch.graph()
-open('graph.dot', 'w').write(out)
+open('graph.dot', 'w').write(ir_arch.graph.dot())
 print '*' * 80
 ir_arch.dead_simp()
-out2 = ir_arch.graph()
-open('graph2.dot', 'w').write(out2)
+open('graph2.dot', 'w').write(ir_arch.graph.dot())
 
 # Display new IR
 print 'new ir blocs'
diff --git a/example/expression/get_read_write.py b/example/expression/get_read_write.py
index f0f48015..d98b461a 100644
--- a/example/expression/get_read_write.py
+++ b/example/expression/get_read_write.py
@@ -21,6 +21,5 @@ for lbl, b in ir_arch.blocs.items():
         print 'read:   ', [str(x) for x in o_r]
         print 'written:', [str(x) for x in o_w]
         print
-ir_arch.gen_graph()
-g = ir_arch.graph()
-open('graph_instr.dot', 'w').write(g)
+
+open('graph_instr.dot', 'w').write(ir_arch.graph.dot())
diff --git a/example/expression/graph_dataflow.py b/example/expression/graph_dataflow.py
index e263a40e..64801e52 100644
--- a/example/expression/graph_dataflow.py
+++ b/example/expression/graph_dataflow.py
@@ -114,7 +114,6 @@ def gen_bloc_data_flow_graph(ir_arch, ad, block_flow_cb):
     for irbloc in ir_arch.blocs.values():
         print irbloc
 
-    ir_arch.gen_graph()
     ir_arch.dead_simp()
 
     irbloc_0 = None
diff --git a/example/ida/depgraph.py b/example/ida/depgraph.py
index 03eea3d5..406f7200 100644
--- a/example/ida/depgraph.py
+++ b/example/ida/depgraph.py
@@ -136,9 +136,6 @@ for irb in ir_arch.blocs.values():
         for i, expr in enumerate(irs):
             irs[i] = m2_expr.ExprAff(expr_simp(expr.dst), expr_simp(expr.src))
 
-# Build the IRA Graph
-ir_arch.gen_graph()
-
 # Get settings
 settings = depGraphSettingsForm(ir_arch)
 settings.Execute()
diff --git a/example/ida/graph_ir.py b/example/ida/graph_ir.py
index ba5b29c4..b181f72a 100644
--- a/example/ida/graph_ir.py
+++ b/example/ida/graph_ir.py
@@ -138,8 +138,7 @@ for irb in ir_arch.blocs.values():
         for i, expr in enumerate(irs):
             irs[i] = ExprAff(expr_simp(expr.dst), expr_simp(expr.src))
 
-ir_arch.gen_graph()
-out = ir_arch.graph()
+out = ir_arch.graph.dot()
 open(os.path.join(tempfile.gettempdir(), 'graph.dot'), 'wb').write(out)
 
 
@@ -197,7 +196,6 @@ def get_modified_symbols(sb):
 def gen_bloc_data_flow_graph(ir_arch, in_str, ad):  # arch, attrib, pool_bin, bloc, symbol_pool):
     out_str = ""
 
-    ir_arch.gen_graph()
     # ir_arch.dead_simp()
 
     irbloc_0 = None
diff --git a/example/symbol_exec/depgraph.py b/example/symbol_exec/depgraph.py
index 6aa9cf81..a870b275 100644
--- a/example/symbol_exec/depgraph.py
+++ b/example/symbol_exec/depgraph.py
@@ -61,9 +61,6 @@ blocks = mdis.dis_multibloc(int(args.func_addr, 0))
 for block in blocks:
     ir_arch.add_bloc(block)
 
-# Build the IRA Graph
-ir_arch.gen_graph()
-
 # Get the instance
 dg = DependencyGraph(ir_arch, implicit=args.implicit,
 		     apply_simp=not(args.do_not_simplify),
diff --git a/miasm2/analysis/data_analysis.py b/miasm2/analysis/data_analysis.py
index 8462f150..9451a407 100644
--- a/miasm2/analysis/data_analysis.py
+++ b/miasm2/analysis/data_analysis.py
@@ -150,7 +150,7 @@ def inter_bloc_flow_link(ir_arch, flow_graph, todo, link_exec_to_data):
     x_nodes = tuple(sorted(list(irb.dst.get_r())))
 
     todo = set()
-    for lbl_dst in ir_arch.g.successors(irb.label):
+    for lbl_dst in ir_arch.graph.successors(irb.label):
         todo.add((lbl_dst, tuple(current_nodes.items()), x_nodes))
 
     # pp(('OUT', lbl, [(str(x[0]), str(x[1])) for x in current_nodes.items()]))
@@ -166,7 +166,7 @@ def create_implicit_flow(ir_arch, flow_graph):
     while todo:
         lbl = todo.pop()
         irb = ir_arch.blocs[lbl]
-        for lbl_son in ir_arch.g.successors(irb.label):
+        for lbl_son in ir_arch.graph.successors(irb.label):
             if not lbl_son in ir_arch.blocs:
                 print "cannot find bloc!!", lbl
                 continue
@@ -189,7 +189,7 @@ def create_implicit_flow(ir_arch, flow_graph):
                     irb.in_nodes[n_r] = irb.label, 0, n_r
                 node_n_r = irb.in_nodes[n_r]
                 # print "###", node_n_r
-                for lbl_p in ir_arch.g.predecessors(irb.label):
+                for lbl_p in ir_arch.graph.predecessors(irb.label):
                     todo.add(lbl_p)
 
                 flow_graph.add_uniq_edge(node_n_r, node_n_w)
diff --git a/miasm2/analysis/depgraph.py b/miasm2/analysis/depgraph.py
index 838183bf..0a5d38aa 100644
--- a/miasm2/analysis/depgraph.py
+++ b/miasm2/analysis/depgraph.py
@@ -686,7 +686,6 @@ class DependencyGraph(object):
     def __init__(self, ira, implicit=False, apply_simp=True, follow_mem=True,
                  follow_call=True):
         """Create a DependencyGraph linked to @ira
-        The IRA graph must have been computed
 
         @ira: IRAnalysis instance
         @implicit: (optional) Imply implicit dependencies
@@ -702,9 +701,6 @@ class DependencyGraph(object):
         self._step_counter = itertools.count()
         self._current_step = next(self._step_counter)
 
-        # The IRA graph must be computed
-        assert hasattr(self._ira, 'g')
-
         # Create callback filters. The order is relevant.
         self._cb_follow = []
         if apply_simp:
@@ -892,7 +888,7 @@ class DependencyGraph(object):
     def _get_previousblocks(self, label):
         """Return an iterator on predecessors blocks of @label, with their
         lengths"""
-        preds = self._ira.g.predecessors_iter(label)
+        preds = self._ira.graph.predecessors_iter(label)
         for pred_label in preds:
             length = len(self._get_irs(pred_label))
             yield (pred_label, length)
diff --git a/miasm2/ir/analysis.py b/miasm2/ir/analysis.py
index 9844f58f..40a3bf64 100644
--- a/miasm2/ir/analysis.py
+++ b/miasm2/ir/analysis.py
@@ -61,12 +61,12 @@ class ira(ir):
 
         useful = set()
 
-        for node in self.g.nodes():
+        for node in self.graph.nodes():
             if node not in self.blocs:
                 continue
 
             block = self.blocs[node]
-            successors = self.g.successors(node)
+            successors = self.graph.successors(node)
             has_son = bool(successors)
             for p_son in successors:
                 if p_son not in self.blocs:
@@ -186,7 +186,7 @@ class ira(ir):
                       for key, value in irb.cur_reach[0].iteritems()}
 
         # Compute reach from predecessors
-        for n_pred in self.g.predecessors(irb.label):
+        for n_pred in self.graph.predecessors(irb.label):
             p_block = self.blocs[n_pred]
 
             # Handle each register definition
@@ -225,7 +225,7 @@ class ira(ir):
         analysis"""
 
         fixed = True
-        for node in self.g.nodes():
+        for node in self.graph.nodes():
             if node in self.blocs:
                 irb = self.blocs[node]
                 if (irb.cur_reach != irb.prev_reach or
@@ -241,13 +241,11 @@ class ira(ir):
 
         Source : Kennedy, K. (1979). A survey of data flow analysis techniques.
         IBM Thomas J. Watson Research Division, page 43
-
-        PRE: gen_graph()
         """
         fixed_point = False
         log.debug('iteration...')
         while not fixed_point:
-            for node in self.g.nodes():
+            for node in self.graph.nodes():
                 if node in self.blocs:
                     self.compute_reach_block(self.blocs[node])
             fixed_point = self._test_kill_reach_fix()
@@ -259,8 +257,6 @@ class ira(ir):
 
         Source : Kennedy, K. (1979). A survey of data flow analysis techniques.
         IBM Thomas J. Watson Research Division, page 43
-
-        PRE: gen_graph()
         """
         # Update r/w variables for all irblocs
         self.get_rw(self.ira_regs_ids())
diff --git a/miasm2/ir/ir.py b/miasm2/ir/ir.py
index c2bc96b6..eec24ba0 100644
--- a/miasm2/ir/ir.py
+++ b/miasm2/ir/ir.py
@@ -172,6 +172,8 @@ class ir(object):
         self.sp = arch.getsp(attrib)
         self.arch = arch
         self.attrib = attrib
+        # Lazy structure
+        self._graph = None
 
     def instr2ir(self, l):
         ir_bloc_cur, ir_blocs_extra = self.get_ir(l)
@@ -421,14 +423,14 @@ class ir(object):
 
         return done
 
-    def gen_graph(self, link_all = True):
+    def _gen_graph(self, link_all = True):
         """
         Gen irbloc digraph
         @link_all: also gen edges to non present irblocs
         """
-        self.g = DiGraphIR(self.blocs)
+        self._graph = DiGraphIR(self.blocs)
         for lbl, b in self.blocs.items():
-            self.g.add_node(lbl)
+            self._graph.add_node(lbl)
             dst = self.dst_trackback(b)
             for d in dst:
                 if isinstance(d, m2_expr.ExprInt):
@@ -436,8 +438,12 @@ class ir(object):
                         self.symbol_pool.getby_offset_create(int(d.arg)))
                 if asmbloc.expr_is_label(d):
                     if d.name in self.blocs or link_all is True:
-                        self.g.add_edge(lbl, d.name)
+                        self._graph.add_edge(lbl, d.name)
 
+    @property
     def graph(self):
-        """Output the graphviz script"""
-        return self.g.dot()
+        """Get a DiGraph representation of current IR instance.
+        Lazy property, building the graph on-demand"""
+        if self._graph is None:
+            self._gen_graph()
+        return self._graph
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)