Author: Ronan Lamy <[email protected]>
Branch: jit-cleanup
Changeset: r96393:dc730d4211f1
Date: 2019-03-31 20:28 +0100
http://bitbucket.org/pypy/pypy/changeset/dc730d4211f1/
Log: Move ts attribute to AbstractCPU
diff --git a/rpython/jit/backend/llgraph/runner.py
b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -36,7 +36,7 @@
# front-end will mutate them under our feet again. We also
# need to make sure things get freed.
_cache={}
-
+
def mapping(box):
if isinstance(box, Const) or box is None:
return box
@@ -208,7 +208,7 @@
class ArrayDescr(AbstractDescr):
all_interiorfielddescrs = None
-
+
def __init__(self, A, runner):
self.A = self.OUTERA = A
self._is_pure = A._immutable_field(None)
@@ -322,7 +322,6 @@
class LLGraphCPU(model.AbstractCPU):
- from rpython.jit.metainterp.typesystem import llhelper as ts
supports_floats = True
supports_longlong = r_uint is not r_ulonglong
supports_singlefloats = True
@@ -735,7 +734,7 @@
return rffi.LONGLONG
else:
raise NotImplementedError(size)
-
+
def bh_gc_load_indexed_i(self, struct, index, scale, base_ofs, bytes):
T = self._get_int_type_from_size(bytes)
x = llop.gc_load_indexed(T, struct, index, scale, base_ofs)
@@ -1089,7 +1088,7 @@
if box.datatype == INT:
for i,a in enumerate(arg):
if isinstance(a, bool):
- arg[i] = int(a)
+ arg[i] = int(a)
assert all([lltype.typeOf(a) == lltype.Signed for a in arg])
elif box.datatype == FLOAT:
assert all([lltype.typeOf(a) == longlong.FLOATSTORAGE or \
diff --git a/rpython/jit/backend/llsupport/llmodel.py
b/rpython/jit/backend/llsupport/llmodel.py
--- a/rpython/jit/backend/llsupport/llmodel.py
+++ b/rpython/jit/backend/llsupport/llmodel.py
@@ -23,8 +23,6 @@
class AbstractLLCPU(AbstractCPU):
- from rpython.jit.metainterp.typesystem import llhelper as ts
-
HAS_CODEMAP = False
done_with_this_frame_descr_int = None # overridden by pyjitpl.py
diff --git a/rpython/jit/backend/model.py b/rpython/jit/backend/model.py
--- a/rpython/jit/backend/model.py
+++ b/rpython/jit/backend/model.py
@@ -9,6 +9,8 @@
total_freed_bridges = 0
class AbstractCPU(object):
+ from rpython.jit.metainterp.typesystem import llhelper as ts
+
supports_floats = False
supports_longlong = False
# ^^^ This is only useful on 32-bit platforms. If True,
diff --git a/rpython/jit/metainterp/compile.py
b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -730,7 +730,7 @@
else:
from rpython.jit.metainterp.blackhole import resume_in_blackhole
if isinstance(self, ResumeGuardCopiedDescr):
- resume_in_blackhole(metainterp_sd, jitdriver_sd, self.prev,
deadframe)
+ resume_in_blackhole(metainterp_sd, jitdriver_sd, self.prev,
deadframe)
else:
assert isinstance(self, ResumeGuardDescr)
resume_in_blackhole(metainterp_sd, jitdriver_sd, self,
deadframe)
@@ -921,7 +921,7 @@
cloned.copy_all_attributes_from(self)
return cloned
-class AllVirtuals:
+class AllVirtuals(object):
llopaque = True
cache = None
diff --git a/rpython/jit/metainterp/logger.py b/rpython/jit/metainterp/logger.py
--- a/rpython/jit/metainterp/logger.py
+++ b/rpython/jit/metainterp/logger.py
@@ -1,4 +1,4 @@
-from rpython.jit.metainterp.history import ConstInt, ConstFloat
+from rpython.jit.metainterp.history import ConstInt, ConstFloat, ConstPtr
from rpython.jit.metainterp.resoperation import rop, AbstractInputArg
from rpython.rlib.debug import (have_debug_prints, debug_start, debug_stop,
debug_print)
@@ -135,7 +135,6 @@
"""
def __init__(self, metainterp_sd, guard_number, memo):
self.metainterp_sd = metainterp_sd
- self.ts = metainterp_sd.cpu.ts
self.guard_number = guard_number
if memo is None:
memo = {}
@@ -157,7 +156,7 @@
if name:
return 'ConstClass(' + name + ')'
return str(arg.value)
- elif isinstance(arg, self.ts.ConstRef):
+ elif isinstance(arg, ConstPtr):
if arg.value:
return 'ConstPtr(ptr' + str(mv) + ')'
return 'ConstPtr(null)'
diff --git a/rpython/jit/metainterp/test/test_compile.py
b/rpython/jit/metainterp/test/test_compile.py
--- a/rpython/jit/metainterp/test/test_compile.py
+++ b/rpython/jit/metainterp/test/test_compile.py
@@ -12,16 +12,17 @@
class FakeCPU(object):
supports_guard_gc_type = True
-
+
class Storage:
pass
-
+
class tracker:
pass
ts = typesystem.llhelper
def __init__(self):
self.seen = []
+
def compile_loop(self, inputargs, operations, token, jd_id=0,
unique_id=0, log=True, name='',
logger=None):
diff --git a/rpython/jit/metainterp/test/test_logger.py
b/rpython/jit/metainterp/test/test_logger.py
--- a/rpython/jit/metainterp/test/test_logger.py
+++ b/rpython/jit/metainterp/test/test_logger.py
@@ -1,12 +1,11 @@
-
import re
+from StringIO import StringIO
from rpython.rlib import debug
from rpython.jit.tool.oparser import pure_parse
from rpython.jit.metainterp import logger
-from rpython.jit.metainterp.typesystem import llhelper
-from StringIO import StringIO
from rpython.jit.metainterp.optimizeopt.util import equaloplists
-from rpython.jit.metainterp.history import AbstractDescr, JitCellToken,
BasicFailDescr, BasicFinalDescr
+from rpython.jit.metainterp.history import (
+ AbstractDescr, JitCellToken, BasicFailDescr, BasicFinalDescr)
from rpython.jit.backend.model import AbstractCPU
@@ -50,8 +49,6 @@
return logops
class TestLogger(object):
- ts = llhelper
-
def make_metainterp_sd(self):
class FakeJitDriver(object):
class warmstate(object):
@@ -59,7 +56,6 @@
class FakeMetaInterpSd:
cpu = AbstractCPU()
- cpu.ts = self.ts
jitdrivers_sd = [FakeJitDriver()]
def get_name_from_address(self, addr):
return 'Name'
diff --git a/rpython/rlib/rjitlog/rjitlog.py b/rpython/rlib/rjitlog/rjitlog.py
--- a/rpython/rlib/rjitlog/rjitlog.py
+++ b/rpython/rlib/rjitlog/rjitlog.py
@@ -11,7 +11,7 @@
from rpython.translator.tool.cbuild import ExternalCompilationInfo
from rpython.jit.metainterp import resoperation as resoperations
from rpython.jit.metainterp.resoperation import rop
-from rpython.jit.metainterp.history import ConstInt, ConstFloat
+from rpython.jit.metainterp.history import ConstInt, ConstFloat, ConstPtr
from rpython.rlib.objectmodel import we_are_translated
from rpython.rlib.rarithmetic import r_longlong
from rpython.rtyper.lltypesystem import lltype, llmemory, rffi
@@ -455,9 +455,6 @@
def __init__(self, tag, memo, metainterp_sd, mc, logger):
self.memo = memo
self.metainterp_sd = metainterp_sd
- self.ts = None
- if self.metainterp_sd is not None:
- self.ts = metainterp_sd.cpu.ts
self.tag = tag
self.mc = mc
self.logger = logger
@@ -625,7 +622,7 @@
if name:
return 'ConstClass(' + name + ')'
return str(arg.value)
- elif self.ts is not None and isinstance(arg, self.ts.ConstRef):
+ elif isinstance(arg, ConstPtr):
if arg.value:
return 'ConstPtr(ptr' + str(mv) + ')'
return 'ConstPtr(null)'
diff --git a/rpython/rlib/rjitlog/test/test_jitlog.py
b/rpython/rlib/rjitlog/test/test_jitlog.py
--- a/rpython/rlib/rjitlog/test/test_jitlog.py
+++ b/rpython/rlib/rjitlog/test/test_jitlog.py
@@ -42,7 +42,6 @@
class FakeMetaInterpSd:
cpu = AbstractCPU()
- cpu.ts = None
jitdrivers_sd = [FakeJitDriver()]
def get_name_from_address(self, addr):
return 'Name'
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
