Add warmup_critical_function to more handlers

Author: 3tty0n

pypy/interpreter/baseobjspace.py

@@ -236,6 +236,7 @@ def _cpyext_attach_pyobj(self, space, py_obj):
 
     # -------------------------------------------------------------------
 
+    @jit.warmup_critical_function
     def is_w(self, space, w_other):
         return self is w_other
 

pypy/interpreter/function.py

@@ -82,6 +82,7 @@ def getcode(self):
             return jit.promote(self.code)
         return self.code
 
+    @jit.warmup_critical_function
     def funccall(self, *args_w): # speed hack
         from pypy.interpreter import gateway
         from pypy.interpreter.pycode import PyCode
@@ -461,6 +462,7 @@ def fget_func_closure(self, space):
         return w_res
 
 
+@jit.warmup_critical_function
 def descr_function_get(space, w_function, w_obj, w_cls=None):
     """functionobject.__get__(obj[, type]) -> method"""
     # this is not defined as a method on Function because it's generally

pypy/module/__builtin__/interp_classobj.py

@@ -90,6 +90,7 @@ def is_subclass_of(self, other):
         return False
 
     @jit.unroll_safe
+    @jit.warmup_critical_function
     def lookup(self, space, attr):
         # returns w_value or interplevel None
         w_result = space.finditem_str(self.w_dict, attr)
@@ -313,6 +314,7 @@ def set_oldstyle_class(self, space, w_class):
             raise oefmt(space.w_TypeError, "__class__ must be set to a class")
         self.w_class = w_class
 
+    @jit.warmup_critical_function
     def getattr_from_class(self, space, name):
         # Look up w_name in the class dict, and call its __get__.
         # This method ignores the instance dict and the __getattr__.
@@ -326,6 +328,7 @@ def getattr_from_class(self, space, name):
             return w_value
         return space.call_function(w_descr_get, w_value, self, self.w_class)
 
+    @jit.warmup_critical_function
     def getattr(self, space, name, exc=True):
         # Normal getattr rules: look up w_name in the instance dict,
         # in the class dict, and then via a call to __getatttr__.
@@ -353,6 +356,7 @@ def getattr(self, space, name, exc=True):
             return None
 
     @unwrap_spec(name='text')
+    @jit.warmup_critical_function
     def descr_getattribute(self, space, name):
         if len(name) >= 8 and name[0] == '_':
             if name == "__dict__":

pypy/objspace/descroperation.py

@@ -160,6 +160,7 @@ def get_and_call_args(space, w_descr, w_obj, args):
             w_impl = space.get(w_descr, w_obj)
             return space.call_args(w_impl, args)
 
+    @jit.warmup_critical_function
     def get_and_call_function(space, w_descr, w_obj, *args_w):
         typ = type(w_descr)
         # a special case for performance and to avoid infinite recursion
@@ -221,7 +222,7 @@ def getattr(space, w_obj, w_name):
         w_descr = space.lookup(w_obj, '__getattribute__')
         return space._handle_getattribute(w_descr, w_obj, w_name)
 
-    #@jit.warmup_critical_function
+    @jit.warmup_critical_function
     def _handle_getattribute(space, w_descr, w_obj, w_name):
         try:
             if w_descr is None:   # obscure case
@@ -235,6 +236,7 @@ def _handle_getattribute(space, w_descr, w_obj, w_name):
                 raise
             return space.get_and_call_function(w_descr, w_obj, w_name)
 
+    @jit.warmup_critical_function
     def setattr(space, w_obj, w_name, w_val):
         # overridden in StdObjSpace
         w_descr = space.lookup(w_obj, '__setattr__')

pypy/objspace/std/mapdict.py

@@ -60,6 +60,7 @@ def read(self, obj, name, attrkind):
         else:
             return attr._direct_read(obj)
 
+    @jit.warmup_critical_function
     def write(self, obj, name, attrkind, w_value):
         attr = self.find_map_attr(name, attrkind)
         if attr is None:
@@ -800,6 +801,7 @@ def _obj_setdict(self, space, w_dict):
     assert flag
 
 class MapdictStorageMixin(object):
+    @jit.warmup_critical_function
     def _get_mapdict_map(self):
         return jit.promote(self.map)
     def _set_mapdict_map(self, map):
@@ -810,6 +812,7 @@ def _mapdict_init_empty(self, map):
         self._set_mapdict_map(map)
         self.storage = None
 
+    @jit.warmup_critical_function
     def _mapdict_read_storage(self, storageindex):
         assert storageindex >= 0
         return self.storage[storageindex]
@@ -872,6 +875,7 @@ def _make_storage_mixin_size_n(n=SUBCLASSES_NUM_FIELDS):
     rangenmin1 = unroll.unrolling_iterable(range(nmin1))
     valnmin1 = "_value%s" % nmin1
     class subcls(object):
+        @jit.warmup_critical_function
         def _get_mapdict_map(self):
             return jit.promote(self.map)
         def _set_mapdict_map(self, map):
@@ -892,7 +896,7 @@ def _mapdict_get_storage_list(self):
             erased = getattr(self, valnmin1)
             return unerase_list(erased)
 
-        #@jit.warmup_critical_function
+        @jit.warmup_critical_function
         def _mapdict_read_storage(self, storageindex):
             assert storageindex >= 0
             if storageindex < nmin1: