Author: Richard Plangger <planri...@gmail.com> Branch: new-jit-log Changeset: r85810:0823f6a05604 Date: 2016-07-22 10:58 +0200 http://bitbucket.org/pypy/pypy/changeset/0823f6a05604/
Log: rename imports to redirect to the right module diff --git a/pypy/module/pypyjit/interp_jit.py b/pypy/module/pypyjit/interp_jit.py --- a/pypy/module/pypyjit/interp_jit.py +++ b/pypy/module/pypyjit/interp_jit.py @@ -5,7 +5,8 @@ from rpython.rlib.rarithmetic import r_uint, intmask from rpython.rlib.jit import JitDriver, hint, we_are_jitted, dont_look_inside -from rpython.rlib import jit, jit_hooks, jitlog as jl +from rpython.rlib import jit, jit_hooks +from rpython.rlib.rjitlog import rjitlog as jl from rpython.rlib.jit import current_trace_length, unroll_parameters,\ JitHookInterface from rpython.rtyper.annlowlevel import cast_instance_to_gcref diff --git a/rpython/jit/backend/llsupport/test/ztranslation_test.py b/rpython/jit/backend/llsupport/test/ztranslation_test.py --- a/rpython/jit/backend/llsupport/test/ztranslation_test.py +++ b/rpython/jit/backend/llsupport/test/ztranslation_test.py @@ -3,7 +3,7 @@ from rpython.rlib.jit import JitDriver, unroll_parameters, set_param from rpython.rlib.jit import PARAMETERS, dont_look_inside from rpython.rlib.jit import promote, _get_virtualizable_token -from rpython.rlib import jit_hooks, rposix, jitlog +from rpython.rlib import jit_hooks, rposix from rpython.rlib.objectmodel import keepalive_until_here from rpython.rlib.rthread import ThreadLocalReference, ThreadLocalField from rpython.jit.backend.detect_cpu import getcpuclass @@ -12,7 +12,7 @@ from rpython.config.config import ConfigError from rpython.translator.tool.cbuild import ExternalCompilationInfo from rpython.rtyper.lltypesystem import lltype, rffi -from rpython.rlib import jitlog +from rpython.rlib.rjitlog import rjitlog as jl class TranslationTest(CCompiledMixin): @@ -49,9 +49,9 @@ lltype.Float, macro=True, releasegil=True, compilation_info=eci) - @jitlog.returns(jitlog.MP_FILENAME, - jitlog.MP_LINENO, - jitlog.MP_INDEX) + @jl.returns(jl.MP_FILENAME, + jl.MP_LINENO, + jl.MP_INDEX) def get_location(): return ("/home.py",0,0) @@ -253,7 +253,7 @@ def main(): jit_hooks.stats_set_debug(None, True) f() - jitlog.stats_flush_trace_counts(None) + jl.stats_flush_trace_counts(None) return 0 res = self.meta_interp(main, []) diff --git a/rpython/jit/backend/x86/test/test_jitlog.py b/rpython/jit/backend/x86/test/test_jitlog.py --- a/rpython/jit/backend/x86/test/test_jitlog.py +++ b/rpython/jit/backend/x86/test/test_jitlog.py @@ -5,7 +5,7 @@ from rpython.jit.metainterp import logger from rpython.jit.metainterp.typesystem import llhelper from rpython.rlib.jitlog import JITLOG_VERSION_16BIT_LE -from rpython.rlib import jitlog as jl +from rpython.rlib.rjitlog import rjitlog as jl from StringIO import StringIO from rpython.jit.metainterp.optimizeopt.util import equaloplists from rpython.jit.metainterp.history import AbstractDescr, JitCellToken, BasicFailDescr, BasicFinalDescr diff --git a/rpython/jit/metainterp/optimizeopt/test/test_util.py b/rpython/jit/metainterp/optimizeopt/test/test_util.py --- a/rpython/jit/metainterp/optimizeopt/test/test_util.py +++ b/rpython/jit/metainterp/optimizeopt/test/test_util.py @@ -21,7 +21,7 @@ from rpython.jit.metainterp.resoperation import (rop, ResOperation, InputArgRef, AbstractValue, OpHelpers) from rpython.jit.metainterp.optimizeopt.util import args_dict -from rpython.rlib import jitlog as jl +from rpython.rlib.rjitlog import rjitlog as jl def test_sort_descrs(): @@ -485,7 +485,7 @@ self.options = Fake() self.globaldata = Fake() self.config = get_combined_translation_config(translating=True) - self.jitlog = jl.VMProfJitLogger() + self.jitlog = jl.JitLogger() class logger_noopt: @classmethod diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py --- a/rpython/jit/metainterp/pyjitpl.py +++ b/rpython/jit/metainterp/pyjitpl.py @@ -13,7 +13,7 @@ from rpython.jit.metainterp.logger import Logger from rpython.jit.metainterp.optimizeopt.util import args_dict from rpython.jit.metainterp.resoperation import rop, OpHelpers, GuardResOp -from rpython.rlib import jitlog as jl +from rpython.rlib.rjitlog import rjitlog as jl from rpython.rlib import nonconst, rstack from rpython.rlib.debug import debug_start, debug_stop, debug_print from rpython.rlib.debug import have_debug_prints, make_sure_not_resized @@ -1761,7 +1761,7 @@ self.cpu = cpu self.stats = self.cpu.stats self.options = options - self.jitlog = jl.VMProfJitLogger(self.cpu) + self.jitlog = jl.JitLogger(self.cpu) self.logger_noopt = Logger(self) self.logger_ops = Logger(self, guard_number=True) # legacy loggers 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 @@ -4,7 +4,7 @@ from rpython.jit.metainterp.compile import compile_loop from rpython.jit.metainterp.compile import compile_tmp_callback from rpython.jit.metainterp import jitexc -from rpython.rlib import jitlog as jl +from rpython.rlib.rjitlog import rjitlog as jl from rpython.jit.metainterp import jitprof, typesystem, compile from rpython.jit.metainterp.optimizeopt.test.test_util import LLtypeMixin from rpython.jit.tool.oparser import parse, convert_loop_to_trace @@ -59,7 +59,7 @@ logger_noopt = FakeLogger() logger_ops = FakeLogger() config = get_combined_translation_config(translating=True) - jitlog = jl.VMProfJitLogger() + jitlog = jl.JitLogger() stats = Stats(None) profiler = jitprof.EmptyProfiler() @@ -80,7 +80,7 @@ cpu = FakeCPU() staticdata = FakeMetaInterpStaticData() staticdata.cpu = cpu - staticdata.jitlog = jl.VMProfJitLogger(cpu) + staticdata.jitlog = jl.JitLogger(cpu) staticdata.jitlog.trace_id = 1 # loop = parse(''' diff --git a/rpython/jit/metainterp/warmspot.py b/rpython/jit/metainterp/warmspot.py --- a/rpython/jit/metainterp/warmspot.py +++ b/rpython/jit/metainterp/warmspot.py @@ -589,7 +589,7 @@ assert hasattr(jd.jitdriver.get_location, '_loc_types'), """ You must decorate your get_location function: - from rpython.rlib import jitlog as jl + from rpython.rlib.rjitlog import rjitlog as jl @jl.returns(jl.MP_FILENAME, jl.MP_XXX, ...) def get_loc(your, green, keys): name = "x.txt" # extract it from your green keys diff --git a/rpython/jit/metainterp/warmstate.py b/rpython/jit/metainterp/warmstate.py --- a/rpython/jit/metainterp/warmstate.py +++ b/rpython/jit/metainterp/warmstate.py @@ -6,7 +6,7 @@ from rpython.rlib.debug import debug_start, debug_stop, debug_print from rpython.rlib.debug import have_debug_prints_for from rpython.rlib.jit import PARAMETERS -from rpython.rlib import jitlog as jl +from rpython.rlib.rjitlog import rjitlog as jl from rpython.rlib.nonconst import NonConstant from rpython.rlib.objectmodel import specialize, we_are_translated, r_dict from rpython.rlib.rarithmetic import intmask, r_uint 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 @@ -60,11 +60,10 @@ @jit.dont_look_inside def enable_jitlog(fileno): # initialize the jit log - from rpython.rlib import jitlog as jl p_error = jitlog_init(fileno) if p_error: raise JitlogError(rffi.charp2str(p_error)) - blob = jl.assemble_header() + blob = assemble_header() jitlog_write_marked(jl.MARK_JITLOG_HEADER + blob, len(blob) + 1) def disable_jitlog(): _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit