[pypy-commit] pypy result-in-resops: fix some imports
fijal
noreply at buildbot.pypy.org
Mon Sep 17 20:13:28 CEST 2012
Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: result-in-resops
Changeset: r57369:531375c392b9
Date: 2012-09-14 20:44 +0200
http://bitbucket.org/pypy/pypy/changeset/531375c392b9/
Log: fix some imports
diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -9,9 +9,9 @@
from pypy.jit.metainterp.resoperation import rop, create_resop, ConstInt,\
ConstPtr
-from pypy.jit.metainterp.history import TreeLoop, Box, JitCellToken, TargetToken
-from pypy.jit.metainterp.history import AbstractFailDescr, BoxInt
-from pypy.jit.metainterp.history import BoxPtr, BoxFloat
+from pypy.jit.metainterp.history import TreeLoop, JitCellToken, TargetToken
+from pypy.jit.metainterp.history import AbstractFailDescr
+from pypy.jit.metainterp.resoperation import BoxPtr, BoxFloat, Box, BoxInt
from pypy.jit.metainterp import history, resoperation
from pypy.jit.metainterp.optimize import InvalidLoop
from pypy.jit.metainterp.inliner import Inliner
diff --git a/pypy/jit/metainterp/optimizeopt/intutils.py b/pypy/jit/metainterp/optimizeopt/intutils.py
--- a/pypy/jit/metainterp/optimizeopt/intutils.py
+++ b/pypy/jit/metainterp/optimizeopt/intutils.py
@@ -1,7 +1,6 @@
from pypy.rlib.rarithmetic import ovfcheck, LONG_BIT, maxint, is_valid_int
from pypy.rlib.objectmodel import we_are_translated
from pypy.jit.metainterp.resoperation import rop, create_resop, ConstInt
-from pypy.jit.metainterp.history import BoxInt
MAXINT = maxint
MININT = -maxint - 1
diff --git a/pypy/jit/metainterp/optimizeopt/optimizer.py b/pypy/jit/metainterp/optimizeopt/optimizer.py
--- a/pypy/jit/metainterp/optimizeopt/optimizer.py
+++ b/pypy/jit/metainterp/optimizeopt/optimizer.py
@@ -1,12 +1,12 @@
from pypy.jit.metainterp import jitprof, resume, compile
from pypy.jit.metainterp.executor import execute_nonspec
-from pypy.jit.metainterp.history import BoxInt, BoxFloat, REF
+from pypy.jit.metainterp.resoperation import BoxInt, BoxFloat, REF
from pypy.jit.metainterp.optimizeopt.intutils import IntBound, IntUnbounded, \
ImmutableIntUnbounded, \
IntLowerBound, MININT, MAXINT
from pypy.jit.metainterp.optimizeopt.util import make_dispatcher_method
from pypy.jit.metainterp.resoperation import rop, AbstractResOp, opgroups,\
- Const, ConstInt
+ Const, ConstInt, ConstFloat
from pypy.jit.metainterp.typesystem import llhelper, oohelper
from pypy.tool.pairtype import extendabletype
from pypy.rlib.objectmodel import specialize
@@ -245,9 +245,9 @@
CONST_0 = ConstInt(0)
CONST_1 = ConstInt(1)
CVAL_ZERO = ConstantValue(CONST_0)
-CVAL_ZERO_FLOAT = ConstantValue(Const._new(0.0))
+CVAL_ZERO_FLOAT = ConstantValue(ConstFloat(0.0))
llhelper.CVAL_NULLREF = ConstantValue(llhelper.CONST_NULL)
-oohelper.CVAL_NULLREF = ConstantValue(oohelper.CONST_NULL)
+#oohelper.CVAL_NULLREF = ConstantValue(oohelper.CONST_NULL)
REMOVED = AbstractResOp()
diff --git a/pypy/jit/metainterp/optimizeopt/pure.py b/pypy/jit/metainterp/optimizeopt/pure.py
--- a/pypy/jit/metainterp/optimizeopt/pure.py
+++ b/pypy/jit/metainterp/optimizeopt/pure.py
@@ -1,7 +1,6 @@
from pypy.jit.metainterp.optimizeopt.optimizer import Optimization, REMOVED
from pypy.jit.metainterp.resoperation import rop, create_resop_2
-from pypy.jit.metainterp.optimizeopt.util import (make_dispatcher_method,
- args_dict)
+from pypy.jit.metainterp.optimizeopt.util import make_dispatcher_method
class OptPure(Optimization):
def __init__(self):
diff --git a/pypy/jit/metainterp/optimizeopt/test/test_util.py b/pypy/jit/metainterp/optimizeopt/test/test_util.py
--- a/pypy/jit/metainterp/optimizeopt/test/test_util.py
+++ b/pypy/jit/metainterp/optimizeopt/test/test_util.py
@@ -5,7 +5,7 @@
from pypy.rpython.rclass import FieldListAccessor, IR_QUASIIMMUTABLE
from pypy.jit.backend.llgraph import runner
-from pypy.jit.metainterp.history import (BoxPtr, TreeLoop, AbstractDescr,
+from pypy.jit.metainterp.history import (TreeLoop, AbstractDescr,
JitCellToken, TargetToken)
from pypy.jit.metainterp.optimizeopt.util import sort_descrs, equaloplists
from pypy.jit.codewriter.effectinfo import EffectInfo
@@ -15,7 +15,7 @@
from pypy.jit.metainterp import compile, resume, history
from pypy.jit.metainterp.jitprof import EmptyProfiler
from pypy.config.pypyoption import get_pypy_config
-from pypy.jit.metainterp.resoperation import rop, create_resop
+from pypy.jit.metainterp.resoperation import rop, create_resop, BoxPtr
from pypy.jit.metainterp.optimizeopt.unroll import Inliner
def test_sort_descrs():
diff --git a/pypy/jit/metainterp/optimizeopt/util.py b/pypy/jit/metainterp/optimizeopt/util.py
--- a/pypy/jit/metainterp/optimizeopt/util.py
+++ b/pypy/jit/metainterp/optimizeopt/util.py
@@ -85,18 +85,31 @@
# ____________________________________________________________
-BUCKET_SIZE = 1000
+BUCKET_SIZE = 1024
class ArgsDict(object):
""" An imprecise dict. If you look it up and it's there, it's correct,
however we don't care about collisions, so a colliding element can
kick someone else out
"""
- def __init__(self):
- self.buckets = [None] * BUCKET_SIZE
+ def __init__(self, bucket_size=BUCKET_SIZE):
+ self.buckets = [None] * bucket_size
+ self.bucket_size = bucket_size
def get(self, op):
- hash = op.get_hash()
+ hash = op._get_hash_() & self.bucket_size
+ candidate = self.buckets[hash]
+ if candidate is None:
+ return None
+ if candidate.__class__ != op.__class__:
+ return None # collision
+ if op.eq(candidate):
+ return candidate
+ return None
+
+ def setitem(self, op):
+ hash = op._get_hash_() & self.bucket_size
+ self.buckets[hash] = op # don't care about collisions
# def args_eq(args1, args2):
# make_sure_not_resized(args1)
diff --git a/pypy/jit/metainterp/optimizeopt/virtualize.py b/pypy/jit/metainterp/optimizeopt/virtualize.py
--- a/pypy/jit/metainterp/optimizeopt/virtualize.py
+++ b/pypy/jit/metainterp/optimizeopt/virtualize.py
@@ -1,10 +1,9 @@
from pypy.jit.codewriter.heaptracker import vtable2descr
from pypy.jit.metainterp.executor import execute
-from pypy.jit.metainterp.history import BoxInt
from pypy.jit.metainterp.optimizeopt import optimizer
from pypy.jit.metainterp.optimizeopt.util import (make_dispatcher_method,
descrlist_dict, sort_descrs)
-from pypy.jit.metainterp.resoperation import rop, Const, ConstInt
+from pypy.jit.metainterp.resoperation import rop, Const, ConstInt, BoxInt
from pypy.rlib.objectmodel import we_are_translated
from pypy.jit.metainterp.optimizeopt.optimizer import OptValue
diff --git a/pypy/jit/metainterp/optimizeopt/virtualstate.py b/pypy/jit/metainterp/optimizeopt/virtualstate.py
--- a/pypy/jit/metainterp/optimizeopt/virtualstate.py
+++ b/pypy/jit/metainterp/optimizeopt/virtualstate.py
@@ -4,10 +4,10 @@
LEVEL_KNOWNCLASS, \
LEVEL_NONNULL, \
LEVEL_UNKNOWN
-from pypy.jit.metainterp.history import BoxInt, BoxPtr
from pypy.jit.metainterp.optimize import InvalidLoop
from pypy.jit.metainterp.optimizeopt.intutils import IntUnbounded
-from pypy.jit.metainterp.resoperation import rop, Const, ConstInt
+from pypy.jit.metainterp.resoperation import rop, Const, ConstInt, BoxInt,\
+ BoxPtr
from pypy.rlib.objectmodel import we_are_translated
from pypy.rlib.debug import debug_start, debug_stop, debug_print
diff --git a/pypy/jit/metainterp/optimizeopt/vstring.py b/pypy/jit/metainterp/optimizeopt/vstring.py
--- a/pypy/jit/metainterp/optimizeopt/vstring.py
+++ b/pypy/jit/metainterp/optimizeopt/vstring.py
@@ -1,11 +1,12 @@
from pypy.jit.codewriter.effectinfo import EffectInfo
-from pypy.jit.metainterp.history import (BoxInt,
- get_const_ptr_for_string, get_const_ptr_for_unicode, BoxPtr, REF, INT)
+from pypy.jit.metainterp.history import (get_const_ptr_for_string,
+ get_const_ptr_for_unicode)
from pypy.jit.metainterp.optimizeopt import optimizer, virtualize
from pypy.jit.metainterp.optimizeopt.optimizer import CONST_0, CONST_1
from pypy.jit.metainterp.optimizeopt.optimizer import llhelper, REMOVED
from pypy.jit.metainterp.optimizeopt.util import make_dispatcher_method
-from pypy.jit.metainterp.resoperation import rop, Const, ConstInt, ConstPtr
+from pypy.jit.metainterp.resoperation import rop, Const, ConstInt, ConstPtr,\
+ BoxInt, BoxPtr, REF, INT
from pypy.rlib.objectmodel import specialize, we_are_translated
from pypy.rlib.unroll import unrolling_iterable
from pypy.rpython import annlowlevel
diff --git a/pypy/jit/metainterp/resume.py b/pypy/jit/metainterp/resume.py
--- a/pypy/jit/metainterp/resume.py
+++ b/pypy/jit/metainterp/resume.py
@@ -1,5 +1,5 @@
from pypy.jit.metainterp.resoperation import Const, ConstInt, getkind
-from pypy.jit.metainterp.history import BoxInt, BoxPtr, BoxFloat, Box
+from pypy.jit.metainterp.resoperation import BoxInt, BoxPtr, BoxFloat, Box
from pypy.jit.metainterp.resoperation import INT, REF, FLOAT
from pypy.jit.metainterp.history import AbstractDescr
from pypy.jit.metainterp.resoperation import rop
diff --git a/pypy/jit/metainterp/typesystem.py b/pypy/jit/metainterp/typesystem.py
--- a/pypy/jit/metainterp/typesystem.py
+++ b/pypy/jit/metainterp/typesystem.py
@@ -3,7 +3,7 @@
from pypy.rpython.annlowlevel import cast_base_ptr_to_instance, llstr, oostr
from pypy.rpython.annlowlevel import cast_instance_to_base_ptr
from pypy.rpython.annlowlevel import cast_instance_to_base_obj
-from pypy.jit.metainterp import history, resoperation
+from pypy.jit.metainterp import resoperation
from pypy.jit.codewriter import heaptracker
from pypy.rlib.objectmodel import r_dict, specialize
@@ -43,7 +43,7 @@
nullptr = staticmethod(lltype.nullptr)
cast_instance_to_base_ref = staticmethod(cast_instance_to_base_ptr)
BASETYPE = llmemory.GCREF
- BoxRef = history.BoxPtr
+ BoxRef = resoperation.BoxPtr
ConstRef = resoperation.ConstPtr
loops_done_with_this_frame_ref = None # patched by compile.py
NULLREF = resoperation.ConstPtr.value
@@ -87,7 +87,7 @@
return resoperation.ConstInt(etype)
def get_exc_value_box(self, evalue):
- return history.BoxPtr(evalue)
+ return resoperation.BoxPtr(evalue)
def get_exception_obj(self, evaluebox):
# only works when translated
@@ -152,11 +152,11 @@
nullptr = staticmethod(ootype.null)
cast_instance_to_base_ref = staticmethod(cast_instance_to_base_obj)
BASETYPE = ootype.Object
- BoxRef = history.BoxObj
- ConstRef = resoperation.ConstObj
+ #BoxRef = resoperation.BoxObj
+ #ConstRef = resoperation.ConstObj
loops_done_with_this_frame_ref = None # patched by compile.py
- NULLREF = resoperation.ConstObj.value
- CONST_NULL = resoperation.ConstObj(NULLREF)
+ #$NULLREF = resoperation.ConstObj.value
+ #CONST_NULL = resoperation.ConstObj(NULLREF)
CVAL_NULLREF = None # patched by optimizeopt.py
def new_ConstRef(self, x):
@@ -194,7 +194,7 @@
return resoperation.ConstObj(etype)
def get_exc_value_box(self, evalue):
- return history.BoxObj(evalue)
+ return resoperation.BoxObj(evalue)
def get_exception_obj(self, evaluebox):
# only works when translated
diff --git a/pypy/jit/tool/oparser_model.py b/pypy/jit/tool/oparser_model.py
--- a/pypy/jit/tool/oparser_model.py
+++ b/pypy/jit/tool/oparser_model.py
@@ -4,8 +4,9 @@
def get_real_model():
class LoopModel(object):
from pypy.jit.metainterp.history import TreeLoop, JitCellToken
- from pypy.jit.metainterp.history import Box, BoxInt, BoxFloat
- from pypy.jit.metainterp.resoperation import ConstInt, ConstObj, ConstPtr, ConstFloat
+ from pypy.jit.metainterp.resoperation import Box, BoxInt, BoxFloat
+ from pypy.jit.metainterp.resoperation import ConstInt,\
+ ConstPtr, ConstFloat
from pypy.jit.metainterp.history import BasicFailDescr, TargetToken
from pypy.jit.metainterp.typesystem import llhelper
More information about the pypy-commit
mailing list