Author: Hakan Ardo <ha...@debian.org> Branch: jit-refactor-tests Changeset: r48948:280c132cc8a4 Date: 2011-11-08 15:52 +0100 http://bitbucket.org/pypy/pypy/changeset/280c132cc8a4/
Log: converted test diff --git a/pypy/jit/metainterp/test/test_virtualizable.py b/pypy/jit/metainterp/test/test_virtualizable.py --- a/pypy/jit/metainterp/test/test_virtualizable.py +++ b/pypy/jit/metainterp/test/test_virtualizable.py @@ -77,7 +77,7 @@ return xy.inst_x res = self.meta_interp(f, [20]) assert res == 30 - self.check_loops(getfield_gc=0, setfield_gc=0) + self.check_resops(setfield_gc=0, getfield_gc=0) def test_preexisting_access_2(self): myjitdriver = JitDriver(greens = [], reds = ['n', 'xy'], @@ -102,7 +102,7 @@ assert f(5) == 185 res = self.meta_interp(f, [5]) assert res == 185 - self.check_loops(getfield_gc=0, setfield_gc=0) + self.check_resops(setfield_gc=0, getfield_gc=0) def test_two_paths_access(self): myjitdriver = JitDriver(greens = [], reds = ['n', 'xy'], @@ -124,7 +124,7 @@ return xy.inst_x res = self.meta_interp(f, [18]) assert res == 10118 - self.check_loops(getfield_gc=0, setfield_gc=0) + self.check_resops(setfield_gc=0, getfield_gc=0) def test_synchronize_in_return(self): myjitdriver = JitDriver(greens = [], reds = ['n', 'xy'], @@ -146,7 +146,7 @@ return xy.inst_x res = self.meta_interp(f, [18]) assert res == 10180 - self.check_loops(getfield_gc=0, setfield_gc=0) + self.check_resops(setfield_gc=0, getfield_gc=0) def test_virtualizable_and_greens(self): myjitdriver = JitDriver(greens = ['m'], reds = ['n', 'xy'], @@ -174,7 +174,7 @@ return res res = self.meta_interp(f, [40]) assert res == 50 * 4 - self.check_loops(getfield_gc=0, setfield_gc=0) + self.check_resops(setfield_gc=0, getfield_gc=0) def test_double_frame(self): myjitdriver = JitDriver(greens = [], reds = ['n', 'xy', 'other'], @@ -197,8 +197,7 @@ return xy.inst_x res = self.meta_interp(f, [20]) assert res == 134 - self.check_loops(getfield_gc=0, setfield_gc=1) - self.check_loops(getfield_gc=1, setfield_gc=2, everywhere=True) + self.check_resops(setfield_gc=2, getfield_gc=1) # ------------------------------ @@ -248,8 +247,8 @@ return xy2.inst_l1[2] res = self.meta_interp(f, [16]) assert res == 3001 + 16 * 80 - self.check_loops(getfield_gc=0, setfield_gc=0, - getarrayitem_gc=0, setarrayitem_gc=0) + self.check_resops(setarrayitem_gc=0, setfield_gc=0, + getarrayitem_gc=0, getfield_gc=0) def test_synchronize_arrays_in_return(self): myjitdriver = JitDriver(greens = [], reds = ['n', 'xy2'], @@ -279,8 +278,7 @@ assert f(18) == 10360 res = self.meta_interp(f, [18]) assert res == 10360 - self.check_loops(getfield_gc=0, setfield_gc=0, - getarrayitem_gc=0) + self.check_resops(setfield_gc=0, getarrayitem_gc=0, getfield_gc=0) def test_array_length(self): myjitdriver = JitDriver(greens = [], reds = ['n', 'xy2'], @@ -306,8 +304,8 @@ return xy2.inst_l1[1] res = self.meta_interp(f, [18]) assert res == 2941309 + 18 - self.check_loops(getfield_gc=0, setfield_gc=0, - getarrayitem_gc=0, arraylen_gc=0) + self.check_resops(setfield_gc=0, getarrayitem_gc=0, + arraylen_gc=0, getfield_gc=0) def test_residual_function(self): myjitdriver = JitDriver(greens = [], reds = ['n', 'xy2'], @@ -340,8 +338,8 @@ return xy2.inst_l1[1] res = self.meta_interp(f, [18]) assert res == 2941309 + 18 - self.check_loops(getfield_gc=0, setfield_gc=0, - getarrayitem_gc=0, arraylen_gc=1, call=1) + self.check_resops(call=2, setfield_gc=0, getarrayitem_gc=0, + arraylen_gc=2, getfield_gc=0) def test_double_frame_array(self): myjitdriver = JitDriver(greens = [], reds = ['n', 'xy2', 'other'], @@ -377,8 +375,8 @@ expected = f(20) res = self.meta_interp(f, [20], enable_opts='') assert res == expected - self.check_loops(getfield_gc=1, setfield_gc=0, - arraylen_gc=1, getarrayitem_gc=1, setarrayitem_gc=1) + self.check_resops(setarrayitem_gc=1, setfield_gc=0, + getarrayitem_gc=1, arraylen_gc=1, getfield_gc=1) # ------------------------------ @@ -425,8 +423,7 @@ assert f(18) == 10360 res = self.meta_interp(f, [18]) assert res == 10360 - self.check_loops(getfield_gc=0, setfield_gc=0, - getarrayitem_gc=0) + self.check_resops(setfield_gc=0, getarrayitem_gc=0, getfield_gc=0) # ------------------------------ @@ -460,8 +457,7 @@ res = self.meta_interp(f, [10]) assert res == 55 - self.check_loops(getfield_gc=0, setfield_gc=0) - + self.check_resops(setfield_gc=0, getfield_gc=0) def test_virtualizable_with_array(self): myjitdriver = JitDriver(greens = [], reds = ['n', 'x', 'frame'], @@ -495,8 +491,7 @@ res = self.meta_interp(f, [10, 1], listops=True) assert res == f(10, 1) - self.check_loops(getarrayitem_gc=0) - + self.check_resops(getarrayitem_gc=0) def test_subclass_of_virtualizable(self): myjitdriver = JitDriver(greens = [], reds = ['frame'], @@ -524,8 +519,7 @@ res = self.meta_interp(f, [10]) assert res == 55 - self.check_loops(getfield_gc=0, setfield_gc=0) - + self.check_resops(setfield_gc=0, getfield_gc=0) def test_external_pass(self): jitdriver = JitDriver(greens = [], reds = ['n', 'z', 'frame'], @@ -1011,8 +1005,8 @@ res = self.meta_interp(f, [70], listops=True) assert res == intmask(42 ** 70) - self.check_loops(int_add=0, - int_sub=1) # for 'n -= 1' only + self.check_resops(int_add=0, + int_sub=2) # for 'n -= 1' only def test_simple_access_directly(self): myjitdriver = JitDriver(greens = [], reds = ['frame'], @@ -1043,7 +1037,7 @@ res = self.meta_interp(f, [10]) assert res == 55 - self.check_loops(getfield_gc=0, setfield_gc=0) + self.check_resops(setfield_gc=0, getfield_gc=0) from pypy.jit.backend.test.support import BaseCompiledMixin if isinstance(self, BaseCompiledMixin): @@ -1098,7 +1092,7 @@ res = self.meta_interp(f, [10]) assert res == 55 - self.check_loops(new_with_vtable=0) + self.check_resops(new_with_vtable=0) def test_check_for_nonstandardness_only_once(self): myjitdriver = JitDriver(greens = [], reds = ['frame'], @@ -1132,7 +1126,7 @@ res = self.meta_interp(f, [10]) assert res == 55 - self.check_loops(new_with_vtable=0, ptr_eq=1, everywhere=True) + self.check_resops(new_with_vtable=0, ptr_eq=1) self.check_history(ptr_eq=2) def test_virtual_child_frame_with_arrays(self): @@ -1165,7 +1159,7 @@ res = self.meta_interp(f, [10], listops=True) assert res == 55 - self.check_loops(new_with_vtable=0) + self.check_resops(new_with_vtable=0) def test_blackhole_should_not_pay_attention(self): myjitdriver = JitDriver(greens = [], reds = ['frame'], @@ -1203,7 +1197,7 @@ res = self.meta_interp(f, [10]) assert res == 155 - self.check_loops(getfield_gc=0, setfield_gc=0) + self.check_resops(setfield_gc=0, getfield_gc=0) def test_blackhole_should_synchronize(self): myjitdriver = JitDriver(greens = [], reds = ['frame'], @@ -1239,7 +1233,7 @@ res = self.meta_interp(f, [10]) assert res == 155 - self.check_loops(getfield_gc=0, setfield_gc=0) + self.check_resops(setfield_gc=0, getfield_gc=0) def test_blackhole_should_not_reenter(self): if not self.basic: _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit