[pypy-commit] pypy jit-targets: centralize target token counter

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-targets
Changeset: r49062:915eabbf8e27
Date: 2011-11-09 21:00 +0100
http://bitbucket.org/pypy/pypy/changeset/915eabbf8e27/

Log:	centralize target token counter

diff --git a/pypy/jit/metainterp/test/support.py b/pypy/jit/metainterp/test/support.py
--- a/pypy/jit/metainterp/test/support.py
+++ b/pypy/jit/metainterp/test/support.py
@@ -171,6 +171,10 @@
     def check_jitcell_token_count(self, count):
         assert len(get_stats().jitcell_tokens) == count
 
+    def check_target_token_count(self, count):
+        n = sum([len(t.target_tokens) for t in get_stats().jitcell_tokens])
+        assert n == count
+
     def check_enter_count(self, count):
         assert get_stats().enter_count == count
     def check_enter_count_at_most(self, count):
diff --git a/pypy/jit/metainterp/test/test_ajit.py b/pypy/jit/metainterp/test/test_ajit.py
--- a/pypy/jit/metainterp/test/test_ajit.py
+++ b/pypy/jit/metainterp/test/test_ajit.py
@@ -2599,10 +2599,10 @@
             return sa
         assert self.meta_interp(f, [20, 2]) == f(20, 2)
         self.check_jitcell_token_count(1)
-        assert len(list(get_stats().jitcell_tokens)[0].target_tokens) == 4
+        self.check_target_token_count(4)
         assert self.meta_interp(f, [20, 3]) == f(20, 3)
         self.check_jitcell_token_count(1)
-        assert len(list(get_stats().jitcell_tokens)[0].target_tokens) == 5
+        self.check_target_token_count(5)
         
     def test_max_retrace_guards(self):
         myjitdriver = JitDriver(greens = [], reds = ['n', 'i', 'sa', 'a'])
@@ -2620,10 +2620,10 @@
             return sa
         assert self.meta_interp(f, [20, 1]) == f(20, 1)
         self.check_jitcell_token_count(1)
-        assert len(list(get_stats().jitcell_tokens)[0].target_tokens) == 2
+        self.check_target_token_count(2)
         assert self.meta_interp(f, [20, 10]) == f(20, 10)
         self.check_jitcell_token_count(1)
-        assert len(list(get_stats().jitcell_tokens)[0].target_tokens) == 5
+        self.check_target_token_count(5)
 
     def test_retrace_limit_with_extra_guards(self):
         myjitdriver = JitDriver(greens = [], reds = ['n', 'i', 'sa', 'a',
@@ -2644,10 +2644,10 @@
             return sa
         assert self.meta_interp(f, [20, 2]) == f(20, 2)
         self.check_jitcell_token_count(1)
-        assert len(list(get_stats().jitcell_tokens)[0].target_tokens) == 4
+        self.check_target_token_count(4)
         assert self.meta_interp(f, [20, 3]) == f(20, 3)
         self.check_jitcell_token_count(1)
-        assert len(list(get_stats().jitcell_tokens)[0].target_tokens) == 5
+        self.check_target_token_count(5)
 
     def test_retrace_ending_up_retracing_another_loop(self):