Author: Richard Plangger <r...@pasra.at>
Branch: vecopt2
Changeset: r77134:5243693fd30f
Date: 2015-05-05 08:53 +0200
http://bitbucket.org/pypy/pypy/changeset/5243693fd30f/

Log:    turned off vectorization by default added assert to ensure type
        (annotator)

diff --git a/rpython/jit/metainterp/optimizeopt/dependency.py 
b/rpython/jit/metainterp/optimizeopt/dependency.py
--- a/rpython/jit/metainterp/optimizeopt/dependency.py
+++ b/rpython/jit/metainterp/optimizeopt/dependency.py
@@ -117,11 +117,12 @@
         assert isinstance(tgt_op, GuardResOp)
         assert isinstance(op, GuardResOp)
         olddescr = tgt_op.getdescr()
+        assert isinstance(olddescr, compile.ResumeGuardDescr)
         descr = compile.ResumeAtLoopHeaderDescr()
         if olddescr:
-            #descr.rd_consts = olddescr.rd_consts 
-            #descr.rd_pendingfields = olddescr.rd_pendingfields
-            #descr.rd_virtuals = olddescr.rd_virtuals
+            descr.rd_consts = olddescr.rd_consts 
+            descr.rd_pendingfields = olddescr.rd_pendingfields
+            descr.rd_virtuals = olddescr.rd_virtuals
             descr.rd_numb = olddescr.rd_numb
             descr.rd_count = olddescr.rd_count
             descr.rd_frame_info_list = olddescr.rd_frame_info_list
diff --git a/rpython/rlib/jit.py b/rpython/rlib/jit.py
--- a/rpython/rlib/jit.py
+++ b/rpython/rlib/jit.py
@@ -464,7 +464,7 @@
     'enable_opts': 'INTERNAL USE ONLY (MAY NOT WORK OR LEAD TO CRASHES): '
                    'optimizations to enable, or all = %s' % ENABLE_ALL_OPTS,
     'max_unroll_recursion': 'how many levels deep to unroll a recursive 
function',
-    'vectorize': 'try to vectorize loops instead of unrolling them. This only 
works if the cpu model has the sse2 instruction set. default on',
+    'vectorize': 'turn on the vectorization optimization. default off. 
requirement: (sse2)',
     }
 
 PARAMETERS = {'threshold': 1039, # just above 1024, prime
@@ -479,7 +479,7 @@
               'max_unroll_loops': 0,
               'enable_opts': 'all',
               'max_unroll_recursion': 7,
-              'vectorize': 1,
+              'vectorize': 0,
               }
 unroll_parameters = unrolling_iterable(PARAMETERS.items())
 
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to