[pypy-commit] pypy vecopt-merge: switching from llgraph to x86 backend for zjit

[plan_rich]

Author: Richard Plangger <planrichi at gmail.com>
Branch: vecopt-merge
Changeset: r79882:5f2180dc8e34
Date: 2015-09-28 16:32 +0200
http://bitbucket.org/pypy/pypy/changeset/5f2180dc8e34/

Log:	switching from llgraph to x86 backend for zjit

diff --git a/pypy/module/micronumpy/test/test_zjit.py b/pypy/module/micronumpy/test/test_zjit.py
--- a/pypy/module/micronumpy/test/test_zjit.py
+++ b/pypy/module/micronumpy/test/test_zjit.py
@@ -18,13 +18,7 @@
     from rpython.jit.metainterp import pyjitpl
     return pyjitpl._warmrunnerdesc.metainterp_sd.profiler
 
-class TestNumPyLL(LLJitMixin):
-    llgraph = True
-
-class TestNumPyX86(Jit386Mixin):
-    llgraph = False
-
-class TestNumpyJit(LLJitMixin):
+class TestNumpyJit(Jit386Mixin):
     enable_opts = "intbounds:rewrite:virtualize:string:earlyforce:pure:heap:unroll"
     graph = None
     interp = None
@@ -105,11 +99,12 @@
                                              backendopt=True,
                                              graph_and_interp_only=True,
                                              ProfilerClass=Profiler,
-                                             #translate_support_code=True,
-                                             #translationoptions={'gc':'minimark',
-                                             #                    'gcrootfinder': 'asmgcc',
-                                             #                    'gcremovetypeptr': False
-                                             #                   },
+                                             translate_support_code=True,
+                                             translationoptions={'gc':'minimark',
+                                                                 'gcrootfinder': 'asmgcc',
+                                                                 'gcremovetypeptr': False
+                                                                },
+                                             deterministic_jit_counter=True,
                                              vec=True)
             self.__class__.interp = interp
             self.__class__.graph = graph