Author: Maciej Fijalkowski <fij...@gmail.com>
Branch: optresult-unroll
Changeset: r79256:ca17931ca6a5
Date: 2015-08-27 14:30 +0200
http://bitbucket.org/pypy/pypy/changeset/ca17931ca6a5/
Log: fix some tests
diff --git a/rpython/jit/metainterp/test/test_virtual.py
b/rpython/jit/metainterp/test/test_virtual.py
--- a/rpython/jit/metainterp/test/test_virtual.py
+++ b/rpython/jit/metainterp/test/test_virtual.py
@@ -33,7 +33,7 @@
assert res == 55 * 10
self.check_trace_count(1)
self.check_resops(new_with_vtable=0, setfield_gc=0,
- getfield_gc=2, new=0)
+ getfield_gc_i=2, new=0)
def test_virtualized2(self):
myjitdriver = JitDriver(greens=[], reds=['n', 'node1', 'node2'])
@@ -54,7 +54,7 @@
n -= 1
return node1.value * node2.value
assert f(10) == self.meta_interp(f, [10])
- self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc=2,
+ self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc_i=2,
new=0)
def test_virtualized_circular1(self):
@@ -80,8 +80,8 @@
res = self.meta_interp(f, [10])
assert res == 55 * 10
self.check_trace_count(1)
- self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc=3,
- new=0)
+ self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc_i=2,
+ getfield_gc_r=1, new=0)
def test_virtualized_float(self):
myjitdriver = JitDriver(greens=[], reds=['n', 'node'])
@@ -140,7 +140,7 @@
res = self.meta_interp(f, [10])
assert res == 55 * 30
self.check_trace_count(1)
- self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc=2,
+ self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc_i=2,
new=0)
def test_nonvirtual_obj_delays_loop(self):
@@ -161,7 +161,7 @@
res = self.meta_interp(f, [500])
assert res == 640
self.check_trace_count(1)
- self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc=1,
+ self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc_i=1,
new=0)
def test_two_loops_with_virtual(self):
@@ -185,7 +185,7 @@
res = self.meta_interp(f, [18])
assert res == f(18)
self.check_trace_count(2)
- self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc=2,
+ self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc_i=2,
new=0)
def test_two_loops_with_escaping_virtual(self):
@@ -308,7 +308,7 @@
res = self.meta_interp(f, [10, 1, 0], listops=True)
assert res == 0
- self.check_resops(getfield_gc=0)
+ self.check_resops(getfield_gc_i=0)
def test_escapes(self):
myjitdriver = JitDriver(greens=[], reds=['n', 'parent'])
@@ -1149,7 +1149,7 @@
res = self.meta_interp(f, [16])
assert res == f(16)
- self.check_resops(getfield_gc=7)
+ self.check_resops(getfield_gc_i=7)
def test_raw_malloc(self):
mydriver = JitDriver(greens=[], reds='auto')
@@ -1214,7 +1214,7 @@
assert res == 45
# make sure that the raw buffer is *not* virtualized because we do not
# support virtualstate
- self.check_resops(getarrayitem_raw=2, raw_store=2)
+ self.check_resops(getarrayitem_raw_i=2, raw_store=2)
def test_raw_malloc_only_chars(self):
mydriver = JitDriver(greens=[], reds='auto')
@@ -1276,7 +1276,7 @@
res = self.meta_interp(f, [10])
assert res == 20
self.check_trace_count(1)
- self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc=0,
+ self.check_resops(new_with_vtable=0, setfield_gc=0, getfield_gc_i=0,
new=0)
# ____________________________________________________________
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
