Author: Richard Plangger <planri...@gmail.com>
Branch: new-jit-log
Changeset: r85303:4566282be496
Date: 2016-06-21 15:32 +0200
http://bitbucket.org/pypy/pypy/changeset/4566282be496/
Log: fixing tests
diff --git a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
--- a/pypy/module/pypyjit/test_pypy_c/test_00_model.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_00_model.py
@@ -57,7 +57,10 @@
cmdline.append(str(self.filepath))
#
env = os.environ.copy()
+ # TODO old logging system
env['PYPYLOG'] = self.log_string + ':' + str(logfile)
+ jitlogfile = str(logfile) + '.jlog'
+ env['JITLOG'] = str(jitlogfile)
pipe = subprocess.Popen(cmdline,
env=env,
stdout=subprocess.PIPE,
@@ -84,6 +87,7 @@
log = Log(rawtraces)
log.result = eval(stdout)
log.logfile = str(logfile)
+ log.jitlogfile = jitlogfile
#
summaries = logparser.extract_category(rawlog, 'jit-summary')
if len(summaries) > 0:
diff --git a/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py
b/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py
--- a/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_jitlogparser.py
@@ -8,6 +8,7 @@
mangle_descr)
from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
+class TestIntegrationJitLog(BaseTestPyPyC):
class TestLogParser(BaseTestPyPyC):
log_string = 'jit-log-opt,jit-backend'
diff --git a/rpython/jit/backend/llsupport/assembler.py
b/rpython/jit/backend/llsupport/assembler.py
--- a/rpython/jit/backend/llsupport/assembler.py
+++ b/rpython/jit/backend/llsupport/assembler.py
@@ -335,13 +335,8 @@
@specialize.argtype(1)
def _inject_debugging_code(self, looptoken, operations, tp, number):
if self._debug:
- s = 0
- for op in operations:
- s += op.getopnum()
-
newoperations = []
- self._append_debugging_code(newoperations, tp, number,
- None)
+ self._append_debugging_code(newoperations, tp, number, None)
for op in operations:
newoperations.append(op)
if op.getopnum() == rop.LABEL:
@@ -371,7 +366,7 @@
LOOP_RUN_COUNTERS.append(struct)
return struct
- def finish_once(self, jitlog):
+ def finish_once(self):
if self._debug:
# TODO remove the old logging system when jitlog is complete
debug_start('jit-backend-counts')
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
@@ -113,7 +113,7 @@
unique_id=0, log=True, name='', logger=None):
return self.assembler.assemble_loop(jd_id, unique_id, logger, name,
inputargs, operations,
- looptoken, log=log)
+ looptoken, log)
def stitch_bridge(self, faildescr, target):
self.assembler.stitch_bridge(faildescr, target)
diff --git a/rpython/jit/backend/x86/runner.py
b/rpython/jit/backend/x86/runner.py
--- a/rpython/jit/backend/x86/runner.py
+++ b/rpython/jit/backend/x86/runner.py
@@ -66,8 +66,8 @@
self.assembler.setup_once()
@rgc.no_release_gil
- def finish_once(self, jitlog=None):
- self.assembler.finish_once(jitlog)
+ def finish_once(self):
+ self.assembler.finish_once()
self.profile_agent.shutdown()
def dump_loop_token(self, looptoken):
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
@@ -30,7 +30,7 @@
assert os.path.exists(file.strpath)
with file.open('rb') as f:
# check the file header
- assert f.read(3) == chr(jl.MARK_JITLOG_HEADER) +
JITLOG_VERSION_16BIT_LE
+ assert f.read(3) == jl.MARK_JITLOG_HEADER + JITLOG_VERSION_16BIT_LE
assert len(f.read()) > 0
def test_env(self, monkeypatch, tmpdir):
@@ -41,7 +41,7 @@
assert os.path.exists(file.strpath)
with file.open('rb') as fd:
# check the file header
- assert fd.read(3) == chr(jl.MARK_JITLOG_HEADER) +
JITLOG_VERSION_16BIT_LE
+ assert fd.read(3) == jl.MARK_JITLOG_HEADER +
JITLOG_VERSION_16BIT_LE
assert len(fd.read()) > 0
def test_version(self, monkeypatch, tmpdir):
@@ -53,7 +53,7 @@
assert os.path.exists(file.strpath)
with file.open('rb') as fd:
# check the file header
- assert fd.read(3) == chr(jl.MARK_JITLOG_HEADER) + '\xff\xfe'
+ assert fd.read(3) == jl.MARK_JITLOG_HEADER + '\xff\xfe'
assert len(fd.read()) > 0
def test_version(self, monkeypatch, tmpdir):
@@ -65,7 +65,7 @@
assert os.path.exists(file.strpath)
with file.open('rb') as fd:
# check the file header
- assert fd.read(3) == chr(jl.MARK_JITLOG_HEADER) + '\xff\xfe'
+ assert fd.read(3) == jl.MARK_JITLOG_HEADER + '\xff\xfe'
assert len(fd.read()) > 0
def run_sample_loop(self, func, myjitdriver = None):
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
@@ -1070,8 +1070,7 @@
def finish():
if self.metainterp_sd.profiler.initialized:
self.metainterp_sd.profiler.finish()
- jitlog = self.metainterp_sd.jitlog
- self.metainterp_sd.cpu.finish_once(jitlog)
+ self.metainterp_sd.cpu.finish_once()
if self.cpu.translate_support_code:
call_final_function(self.translator, finish,
diff --git a/rpython/rlib/jitlog.py b/rpython/rlib/jitlog.py
--- a/rpython/rlib/jitlog.py
+++ b/rpython/rlib/jitlog.py
@@ -269,6 +269,8 @@
self._write_marked(MARK_START_TRACE, ''.join(content))
def trace_aborted(self):
+ if not self.cintf.jitlog_enabled():
+ return
self._write_marked(MARK_ABORT_TRACE, encode_le_64bit(self.trace_id))
def _write_marked(self, mark, line):
@@ -283,7 +285,6 @@
if not self.cintf.jitlog_enabled():
return EMPTY_TRACE_LOG
assert self.metainterp_sd is not None
- assert isinstance(tag, int)
if memo is None:
memo = {}
return LogTrace(tag, memo, self.metainterp_sd, mc, self)
diff --git a/rpython/rlib/test/test_jitlog.py b/rpython/rlib/test/test_jitlog.py
--- a/rpython/rlib/test/test_jitlog.py
+++ b/rpython/rlib/test/test_jitlog.py
@@ -12,7 +12,7 @@
self.values = []
def _write_marked(self, id, text):
- self.values.append(chr(id) + text)
+ self.values.append(id + text)
def _get_location(greenkey_list):
assert len(greenkey_list) == 0
@@ -56,12 +56,12 @@
fd.close()
logger.finish()
binary = file.read()
- assert binary == chr(jl.MARK_START_TRACE) + jl.encode_le_addr(0) + \
+ assert binary == (jl.MARK_START_TRACE) + jl.encode_le_addr(0) + \
jl.encode_str('loop') + jl.encode_le_addr(0) + \
- chr(jl.MARK_TRACE) + jl.encode_le_addr(0) + \
- chr(jl.MARK_INPUT_ARGS) + jl.encode_str('') + \
- chr(jl.MARK_INIT_MERGE_POINT) +
b'\x05\x00\x01s\x00i\x08s\x00i\x10s' + \
- chr(jl.MARK_MERGE_POINT) + \
+ (jl.MARK_TRACE) + jl.encode_le_addr(0) + \
+ (jl.MARK_INPUT_ARGS) + jl.encode_str('') + \
+ (jl.MARK_INIT_MERGE_POINT) +
b'\x05\x00\x01s\x00i\x08s\x00i\x10s' + \
+ (jl.MARK_MERGE_POINT) + \
b'\xff' + encode_str('/home/pypy/jit.py') + \
b'\x00' + encode_le_64bit(0) + \
b'\xff' + encode_str('enclosed') + \
@@ -78,12 +78,12 @@
#
result = jl.encode_merge_point(fakelog, compressor,
[jl.StringValue(0x0,'s','hello')])
assert result == b"\xef"
- assert fakelog.values == [chr(jl.MARK_COMMON_PREFIX) +
"\x00\x05\x00\x00\x00hello"]
+ assert fakelog.values == [(jl.MARK_COMMON_PREFIX) +
"\x00\x05\x00\x00\x00hello"]
#
fakelog.values = []
result = jl.encode_merge_point(fakelog, compressor,
[jl.StringValue(0x0,'s','heiter')])
assert result == b"\x00\x04\x00\x00\x00iter"
- assert fakelog.values == [chr(jl.MARK_COMMON_PREFIX) +
"\x00\x02\x00\x00\x00he"]
+ assert fakelog.values == [(jl.MARK_COMMON_PREFIX) +
"\x00\x02\x00\x00\x00he"]
#
fakelog.values = []
result = jl.encode_merge_point(fakelog, compressor,
[jl.StringValue(0x0,'s','heute')])
@@ -98,7 +98,7 @@
fakelog.values = []
result = jl.encode_merge_point(fakelog, compressor,
[jl.StringValue(0x0,'s','welle')])
assert result == b"\x00\x02\x00\x00\x00le"
- assert fakelog.values == [chr(jl.MARK_COMMON_PREFIX) +
"\x00\x03\x00\x00\x00wel"]
+ assert fakelog.values == [(jl.MARK_COMMON_PREFIX) +
"\x00\x03\x00\x00\x00wel"]
def test_common_prefix_func(self):
assert jl.commonprefix("","") == ""
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
