[pypy-svn] r76790 - pypy/branch/better-map-instances/pypy/config

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sun Aug 29 17:16:01 2010
New Revision: 76790

Modified:
   pypy/branch/better-map-instances/pypy/config/pypyoption.py
Log:
make mapdict no longer the default, but -Ojit enables it


Modified: pypy/branch/better-map-instances/pypy/config/pypyoption.py
==============================================================================
--- pypy/branch/better-map-instances/pypy/config/pypyoption.py	(original)
+++ pypy/branch/better-map-instances/pypy/config/pypyoption.py	Sun Aug 29 17:16:01 2010
@@ -240,7 +240,7 @@
 
         BoolOption("withmapdict",
                    "make instances really small but slow without the JIT",
-                   default=True,
+                   default=False,
                    requires=[("objspace.std.withshadowtracking", False),
                              ("objspace.std.withinlineddict", False),
                              ("objspace.std.withsharingdict", False),
@@ -327,6 +327,9 @@
     # all the good optimizations for PyPy should be listed here
     if level in ['2', '3']:
         config.objspace.opcodes.suggest(CALL_LIKELY_BUILTIN=True)
+        config.objspace.std.suggest(withinlineddict=True)
+        if type_system != 'ootype':
+            config.objspace.std.suggest(withsharingdict=True)
     if level in ['2', '3', 'jit']:
         config.objspace.opcodes.suggest(CALL_METHOD=True)
         config.objspace.std.suggest(withrangelist=True)
@@ -336,9 +339,6 @@
         config.objspace.std.suggest(optimized_list_getitem=True)
         config.objspace.std.suggest(getattributeshortcut=True)
         config.objspace.std.suggest(newshortcut=True)        
-        if type_system != 'ootype':
-            config.objspace.std.suggest(withsharingdict=True)
-        config.objspace.std.suggest(withinlineddict=True)
 
     # extra costly optimizations only go in level 3
     if level == '3':
@@ -367,6 +367,7 @@
     # extra optimizations with the JIT
     if level == 'jit':
         config.objspace.std.suggest(withcelldict=True)
+        config.objspace.std.suggest(withmapdict=True)
 
 
 def enable_allworkingmodules(config):