Author: Maciej Fijalkowski <[email protected]>
Branch: optresult-unroll
Changeset: r79457:dff81b8e230a
Date: 2015-09-05 12:58 +0200
http://bitbucket.org/pypy/pypy/changeset/dff81b8e230a/
Log: hack differently
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
@@ -469,8 +469,8 @@
def do_compile_loop(jd_id, unique_id, metainterp_sd, inputargs, operations,
looptoken, log=True, name='', memo=None):
- metainterp_sd.logger_ops.log_loop(inputargs, operations, number=-2,
- type='compiling', name=name, memo=memo)
+ metainterp_sd.logger_ops.log_loop(inputargs, operations, -2,
+ 'compiling', None, name, memo)
return metainterp_sd.cpu.compile_loop(inputargs,
operations, looptoken,
jd_id=jd_id, unique_id=unique_id,
diff --git a/rpython/jit/metainterp/test/test_ajit.py
b/rpython/jit/metainterp/test/test_ajit.py
--- a/rpython/jit/metainterp/test/test_ajit.py
+++ b/rpython/jit/metainterp/test/test_ajit.py
@@ -2767,7 +2767,7 @@
return i
#
seen = []
- def my_optimize_trace(metainterp_sd, jitdriver_sd, data):
+ def my_optimize_trace(metainterp_sd, jitdriver_sd, data, memo=None):
seen.append('unroll' in data.enable_opts)
raise InvalidLoop
old_optimize_trace = optimizeopt.optimize_trace
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
@@ -26,7 +26,7 @@
self.seen.append((inputargs, operations, token))
class FakeLogger(object):
- def log_loop(self, inputargs, operations, number=0, type=None,
ops_offset=None, name=''):
+ def log_loop(self, inputargs, operations, number=0, type=None,
ops_offset=None, name='', memo=None):
pass
def repr_of_resop(self, op):
@@ -62,6 +62,7 @@
class FakeMetaInterp:
call_pure_results = {}
+ box_names_memo = {}
class jitdriver_sd:
index = 0
warmstate = FakeState()
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
@@ -38,14 +38,14 @@
loop.inputargs, loop.operations,
ops_offset=ops_offset,
name=name)
- def _make_log_operations(self1):
+ def _make_log_operations(self1, memo):
class LogOperations(logger.LogOperations):
def repr_of_descr(self, descr):
for k, v in self1.namespace.items():
if v == descr:
return k
return descr.repr_of_descr()
- logops = LogOperations(self1.metainterp_sd, self1.guard_number)
+ logops = LogOperations(self1.metainterp_sd, self1.guard_number, memo)
self1.logops = logops
return logops
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
