[pypy-svn] r21555 - in pypy/dist/pypy/translator: backendopt goal

[ericvrp at codespeak.net]

Author: ericvrp
Date: Fri Dec 23 16:40:53 2005
New Revision: 21555

Modified:
   pypy/dist/pypy/translator/backendopt/all.py
   pypy/dist/pypy/translator/goal/driver.py
   pypy/dist/pypy/translator/goal/translate_pypy.py
Log:
Enable merge_if_block transformation 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	Fri Dec 23 16:40:53 2005
@@ -10,7 +10,7 @@
 def backend_optimizations(translator, inline_threshold=1,
                                       mallocs=True,
                                       ssa_form=True,
-                                      merge_if_blocks_to_switch=False,
+                                      merge_if_blocks_to_switch=True,
                                       propagate=False):
     # remove obvious no-ops
     for graph in translator.graphs:

Modified: pypy/dist/pypy/translator/goal/driver.py
==============================================================================
--- pypy/dist/pypy/translator/goal/driver.py	(original)
+++ pypy/dist/pypy/translator/goal/driver.py	Fri Dec 23 16:40:53 2005
@@ -25,7 +25,7 @@
   'backend': 'c',
   'lowmem': False,
   'fork_before': None,
-  'merge_if_blocks': False
+  'merge_if_blocks': True
 })
 
 def taskdef(taskfunc, deps, title, new_state=None, expected_states=[], idemp=False):

Modified: pypy/dist/pypy/translator/goal/translate_pypy.py
==============================================================================
--- pypy/dist/pypy/translator/goal/translate_pypy.py	(original)
+++ pypy/dist/pypy/translator/goal/translate_pypy.py	Fri Dec 23 16:40:53 2005
@@ -50,7 +50,7 @@
 
     '2_gc': [OPT(('--gc',), "Garbage collector", ['boehm', 'ref', 'none'])],
     '3_stackless': [OPT(('--stackless',), "Stackless code generation", True)],
-    '4_merge_if_blocks': [OPT(('--merge_if_blocks',), "Merge if ... elif ... chains and use a switch statement for them.", True)],
+    '4_merge_if_blocks': [OPT(('--merge_if_blocks',), "Merge if ... elif ... chains and use a switch statement for them.", False)],
     },
 
 
@@ -102,7 +102,7 @@
     'gc': 'boehm',
     'backend': 'c',
     'stackless': False,
-    'merge_if_blocks': False,
+    'merge_if_blocks': True,
     
     'batch': False,
     'text': False,