Author: Maciej Fijalkowski <[email protected]>
Branch: share-guard-info
Changeset: r79877:29317cd667c5
Date: 2015-09-28 09:16 +0200
http://bitbucket.org/pypy/pypy/changeset/29317cd667c5/
Log: fix tests
diff --git a/rpython/jit/metainterp/optimizeopt/rewrite.py
b/rpython/jit/metainterp/optimizeopt/rewrite.py
--- a/rpython/jit/metainterp/optimizeopt/rewrite.py
+++ b/rpython/jit/metainterp/optimizeopt/rewrite.py
@@ -411,7 +411,6 @@
# not put in short preambles guard_xxx and guard_value
# on the same box.
self.optimizer.replace_guard(op, info)
- descr.make_a_counter_per_value(op)
# to be safe
info.reset_last_guard_pos()
return op
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
@@ -1479,7 +1479,7 @@
return x
res = self.meta_interp(f, [299], listops=True)
assert res == f(299)
- self.check_resops(guard_class=6, guard_value=6)
+ self.check_resops(guard_class=0, guard_value=6)
def test_merge_guardnonnull_guardclass(self):
myjitdriver = JitDriver(greens = [], reds = ['x', 'l'])
@@ -1534,7 +1534,7 @@
return x
res = self.meta_interp(f, [299], listops=True)
assert res == f(299)
- self.check_resops(guard_value=4, guard_class=0, guard_nonnull=6,
+ self.check_resops(guard_value=4, guard_class=0, guard_nonnull=4,
guard_nonnull_class=0, guard_isnull=2)
@@ -1562,7 +1562,7 @@
return x
res = self.meta_interp(f, [299], listops=True)
assert res == f(299)
- self.check_resops(guard_value=4, guard_class=0, guard_nonnull=6,
+ self.check_resops(guard_value=4, guard_class=0, guard_nonnull=4,
guard_nonnull_class=0, guard_isnull=2)
@@ -1594,7 +1594,7 @@
res = self.meta_interp(f, [399], listops=True)
assert res == f(399)
self.check_resops(guard_class=0, guard_nonnull=6, guard_value=6,
- guard_nonnull_class=4, guard_isnull=2)
+ guard_nonnull_class=0, guard_isnull=2)
def test_residual_call_doesnt_lose_info(self):
@@ -2072,7 +2072,7 @@
assert res == 7068153
self.check_trace_count(6)
self.check_resops(guard_true=8, guard_class=2, int_mul=3,
- int_add=3, guard_false=3)
+ int_add=3, guard_false=4)
def test_dont_trace_every_iteration(self):
myjitdriver = JitDriver(greens = [], reds = ['a', 'b', 'i', 'sa'])
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
