Remove useless normalization steps from PM pipeline

serge-sans-paille · Mar 21, 2017 · b8a8a11 · b8a8a11
1 parent 80e2327
commit b8a8a11
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/pythran/middlend.py b/pythran/middlend.py
@@ -27,18 +27,15 @@ def refine(pm, node, optimizations):
     pm.apply(ListCompToMap, node)
     pm.apply(GenExpToImap, node)
 
-    pm.apply(NormalizeTuples, node)
     pm.apply(RemoveLambdas, node)
-    pm.apply(NormalizeCompare, node)
     pm.apply(RemoveNestedFunctions, node)
+    pm.apply(NormalizeCompare, node)
     pm.gather(ExtendedSyntaxCheck, node)
     pm.apply(ListCompToGenexp, node)
     pm.apply(RemoveComprehension, node)
     pm.apply(RemoveNamedArguments, node)
 
     # sanitize input
-    pm.apply(NormalizeTuples, node)
-    pm.apply(RemoveNestedFunctions, node)
     pm.apply(NormalizeReturn, node)
     pm.apply(UnshadowParameters, node)
     pm.apply(FalsePolymorphism, node)

diff --git a/pythran/optimizations/gen_exp_to_imap.py b/pythran/optimizations/gen_exp_to_imap.py
@@ -2,7 +2,7 @@
 
 from pythran.analyses import OptimizableComprehension
 from pythran.passmanager import Transformation
-from pythran.transformations import NormalizeTuples
+from pythran.transformations.normalize_tuples import ConvertToTuple
 from pythran.conversion import mangle
 
 import gast as ast
@@ -34,8 +34,7 @@ class GenExpToImap(Transformation):
     '''
 
     def __init__(self):
-        Transformation.__init__(self, NormalizeTuples,
-                                OptimizableComprehension)
+        Transformation.__init__(self, OptimizableComprehension)
 
     def visit_Module(self, node):
         self.generic_visit(node)
@@ -80,8 +79,11 @@ def visit_GeneratorExp(self, node):
                                    annotation=None),
                     attr='product', ctx=ast.Load())
 
+                varid = variables[0].id  # retarget this id, it's free
+                renamings = {v.id: (i,) for i, v in enumerate(variables)}
+                node.elt = ConvertToTuple(varid, renamings).visit(node.elt)
                 iterAST = ast.Call(prodName, iters, [])
-                varAST = ast.arguments([ast.Tuple(variables, ast.Store())],
+                varAST = ast.arguments([ast.Name(varid, ast.Param(), None)],
                                        None, [], [], None, [])
 
             imapName = ast.Attribute(

diff --git a/pythran/optimizations/list_comp_to_genexp.py b/pythran/optimizations/list_comp_to_genexp.py
@@ -2,7 +2,6 @@
 
 from pythran.analyses import PotentialIterator
 from pythran.passmanager import Transformation
-from pythran.transformations import NormalizeTuples
 
 import gast as ast
 
@@ -27,8 +26,7 @@ def bar(n):
         return foo((x for x in __builtin__.range(n)))
     '''
     def __init__(self):
-        Transformation.__init__(self, NormalizeTuples,
-                                PotentialIterator)
+        Transformation.__init__(self, PotentialIterator)
 
     def visit_ListComp(self, node):
         self.generic_visit(node)

diff --git a/pythran/optimizations/list_comp_to_map.py b/pythran/optimizations/list_comp_to_map.py
@@ -2,7 +2,7 @@
 
 from pythran.analyses import OptimizableComprehension
 from pythran.passmanager import Transformation
-from pythran.transformations import NormalizeTuples
+from pythran.transformations.normalize_tuples import ConvertToTuple
 from pythran.conversion import mangle
 
 
@@ -32,8 +32,7 @@ class ListCompToMap(Transformation):
     '''
 
     def __init__(self):
-        Transformation.__init__(self, NormalizeTuples,
-                                OptimizableComprehension)
+        Transformation.__init__(self, OptimizableComprehension)
 
     def visit_Module(self, node):
         self.use_itertools = False
@@ -87,8 +86,11 @@ def visit_ListComp(self, node):
                                    annotation=None),
                     attr='product', ctx=ast.Load())
 
+                varid = varList[0].id  # retarget this id, it's free
+                renamings = {v.id: (i,) for i, v in enumerate(varList)}
+                node.elt = ConvertToTuple(varid, renamings).visit(node.elt)
                 iterAST = ast.Call(prodName, iterList, [])
-                varAST = ast.arguments([ast.Tuple(varList, ast.Store())],
+                varAST = ast.arguments([ast.Name(varid, ast.Param(), None)],
                                        None, [], [], None, [])
 
             mapName = ast.Attribute(

diff --git a/pythran/transformations/normalize_tuples.py b/pythran/transformations/normalize_tuples.py
@@ -8,7 +8,7 @@
 from collections import OrderedDict
 
 
-class _ConvertToTuple(ast.NodeTransformer):
+class ConvertToTuple(ast.NodeTransformer):
     def __init__(self, tuple_id, renamings):
         self.tuple_id = tuple_id
         self.renamings = renamings
@@ -74,6 +74,7 @@ def traverse_tuples(self, node, state, renamings):
             raise NotImplementedError
 
     def visit_comprehension(self, node):
+        node = self.generic_visit(node)
         renamings = OrderedDict()
         self.traverse_tuples(node.target, (), renamings)
         if renamings:
@@ -93,7 +94,7 @@ def visit_AnyComp(self, node, *fields):
                 nnode.generators[i].target = ast.Name(
                     gtarget,
                     nnode.generators[i].target.ctx, None)
-                nnode = _ConvertToTuple(gtarget, g[1]).visit(nnode)
+                nnode = ConvertToTuple(gtarget, g[1]).visit(nnode)
                 self.update = True
         for field in fields:
             setattr(node, field, getattr(nnode, field))
@@ -120,7 +121,7 @@ def visit_Lambda(self, node):
             if renamings:
                 nname = self.get_new_id()
                 node.args.args[i] = ast.Name(nname, ast.Param(), None)
-                node.body = _ConvertToTuple(nname, renamings).visit(node.body)
+                node.body = ConvertToTuple(nname, renamings).visit(node.body)
         return node
 
     def visit_Assign(self, node):