[pypy-svn] r25864 - pypy/dist/pypy/translator/backendopt

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sat Apr 15 19:02:40 2006
New Revision: 25864

Modified:
   pypy/dist/pypy/translator/backendopt/all.py
   pypy/dist/pypy/translator/backendopt/propagate.py
Log:
enable the more sensible propagate optimizations by default


Modified: pypy/dist/pypy/translator/backendopt/all.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/all.py	(original)
+++ pypy/dist/pypy/translator/backendopt/all.py	Sat Apr 15 19:02:40 2006
@@ -18,7 +18,7 @@
                                       mallocs=True,
                                       ssa_form=True,
                                       merge_if_blocks_to_switch=True,
-                                      propagate=False,
+                                      propagate=True,
                                       heap2stack=False,
                                       clever_malloc_removal=False):
 

Modified: pypy/dist/pypy/translator/backendopt/propagate.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/propagate.py	(original)
+++ pypy/dist/pypy/translator/backendopt/propagate.py	Sat Apr 15 19:02:40 2006
@@ -243,8 +243,8 @@
             else:
                 assert 0, "this should not occur"
             unchanged = link.target == nextblock and link.args == newargs
-            if not unchanged:
-                print "doing partial folding in graph", graph.name
+#            if not unchanged:
+#                print "doing partial folding in graph", graph.name
             link.target = nextblock
             link.args = newargs
             checkgraph(graph)
@@ -362,10 +362,10 @@
         changed = False
         changed = rewire_links(graph) or changed
         changed = propagate_consts(graph) or changed
-        changed = coalesce_links(graph) or changed
-        changed = do_atmost(100, constant_folding, graph,
-                                       translator) or changed
-        changed = partial_folding(graph, translator) or changed
+#        changed = coalesce_links(graph) or changed
+#        changed = do_atmost(100, constant_folding, graph,
+#                                       translator) or changed
+#        changed = partial_folding(graph, translator) or changed
         changed = remove_all_getfields(graph, translator) or changed
         checkgraph(graph)
         return changed