[pypy-commit] pypy py3.6: merge default
cfbolz
pypy.commits at gmail.com
Wed Oct 9 09:59:42 EDT 2019
Author: Carl Friedrich Bolz-Tereick <cfbolz at gmx.de>
Branch: py3.6
Changeset: r97746:60306f724eeb
Date: 2019-10-09 15:49 +0200
http://bitbucket.org/pypy/pypy/changeset/60306f724eeb/
Log: merge default
diff --git a/pypy/doc/commandline_ref.rst b/pypy/doc/commandline_ref.rst
--- a/pypy/doc/commandline_ref.rst
+++ b/pypy/doc/commandline_ref.rst
@@ -9,3 +9,4 @@
man/pypy.1.rst
man/pypy3.1.rst
+ jit_help.rst
diff --git a/pypy/doc/index-of-whatsnew.rst b/pypy/doc/index-of-whatsnew.rst
--- a/pypy/doc/index-of-whatsnew.rst
+++ b/pypy/doc/index-of-whatsnew.rst
@@ -42,7 +42,8 @@
-------------------------------
.. toctree::
- whatsnew-pypy3-head.rst
+ whatsnew-pypy3-head.rst
+ whatsnew-pypy3-7.1.0.rst
CPython 3.5 compatible versions
-------------------------------
@@ -50,6 +51,8 @@
.. toctree::
whatsnew-pypy3-7.0.0.rst
+ whatsnew-pypy3-6.0.0.rst
+ whatsnew-pypy3-5.10.0.rst
whatsnew-pypy3-5.9.0.rst
whatsnew-pypy3-5.8.0.rst
whatsnew-pypy3-5.7.0.rst
@@ -62,10 +65,4 @@
whatsnew-pypy3-5.5.0.rst
whatsnew-pypy3-5.1.1-alpha1.rst
-CPython 3.2 compatible versions
--------------------------------
-.. toctree::
-
- whatsnew-pypy3-2.4.0.rst
- whatsnew-pypy3-2.3.1.rst
diff --git a/pypy/doc/jit_help.rst b/pypy/doc/jit_help.rst
new file mode 100644
--- /dev/null
+++ b/pypy/doc/jit_help.rst
@@ -0,0 +1,78 @@
+========
+JIT help
+========
+
+.. note this is from ``pypy --jit help``
+
+Advanced JIT options
+====================
+
+``<pypy> --jit`` [*options*] where *options* is a comma-separated list of
+``OPTION=VALUE``:
+
+ decay=N
+ amount to regularly decay counters by (0=none, 1000=max) (default 40)
+
+ disable_unrolling=N
+ after how many operations we should not unroll (default 200)
+
+ enable_opts=N
+ INTERNAL USE ONLY (MAY NOT WORK OR LEAD TO CRASHES): optimizations to
+ enable, or all =
+ intbounds:rewrite:virtualize:string:pure:earlyforce:heap:unroll (default
+ all)
+
+ function_threshold=N
+ number of times a function must run for it to become traced from start
+ (default 1619)
+
+ inlining=N
+ inline python functions or not (1/0) (default 1)
+
+ loop_longevity=N
+ a parameter controlling how long loops will be kept before being freed,
+ an estimate (default 1000)
+
+ max_retrace_guards=N
+ number of extra guards a retrace can cause (default 15)
+
+ max_unroll_loops=N
+ number of extra unrollings a loop can cause (default 0)
+
+ max_unroll_recursion=N
+ how many levels deep to unroll a recursive function (default 7)
+
+ retrace_limit=N
+ how many times we can try retracing before giving up (default 0)
+
+ threshold=N
+ number of times a loop has to run for it to become hot (default 1039)
+
+ trace_eagerness=N
+ number of times a guard has to fail before we start compiling a bridge
+ (default 200)
+
+ trace_limit=N
+ number of recorded operations before we abort tracing with ABORT_TOO_LONG
+ (default 6000)
+
+ vec=N
+ turn on the vectorization optimization (vecopt). Supports x86 (SSE 4.1),
+ powerpc (SVX), s390x SIMD (default 0)
+
+ vec_all=N
+ try to vectorize trace loops that occur outside of the numpypy library
+ (default 0)
+
+ vec_cost=N
+ threshold for which traces to bail. Unpacking increases the counter,
+ vector operation decrease the cost (default 0)
+
+ off
+ turn off the JIT
+ help
+ print this page
+
+The :ref:`pypyjit<jit-hooks>` module can be used to control the JIT from inside
+pypy
+
diff --git a/pypy/doc/release-v7.2.0.rst b/pypy/doc/release-v7.2.0.rst
--- a/pypy/doc/release-v7.2.0.rst
+++ b/pypy/doc/release-v7.2.0.rst
@@ -307,6 +307,7 @@
.. _33786 : https://bugs.python.org/issue33786
.. _32270 : https://bugs.python.org/issue32270
.. _28691 : https://bugs.python.org/issue28691
+.. _33729 : https://bugs.python.org/issue33729
.. _opencv2: https://github.com/skvark/opencv-python/
.. _`issue 2617`: https://bitbucket.com/pypy/pypy/issues/2617
diff --git a/pypy/doc/whatsnew-pypy3-2.3.1.rst b/pypy/doc/whatsnew-pypy3-2.3.1.rst
deleted file mode 100644
--- a/pypy/doc/whatsnew-pypy3-2.3.1.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-=========================
-What's new in PyPy3 2.3.1
-=========================
-
-.. this is a revision shortly after pypy3-release-2.3.x
-.. startrev: 0137d8e6657d
diff --git a/pypy/doc/whatsnew-pypy3-2.4.0.rst b/pypy/doc/whatsnew-pypy3-2.4.0.rst
deleted file mode 100644
--- a/pypy/doc/whatsnew-pypy3-2.4.0.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-=========================
-What's new in PyPy3 2.4.0
-=========================
-
-.. this is a revision shortly after pypy3-release-2.4.x
-.. startrev: 12b940544622
diff --git a/pypy/objspace/fake/objspace.py b/pypy/objspace/fake/objspace.py
--- a/pypy/objspace/fake/objspace.py
+++ b/pypy/objspace/fake/objspace.py
@@ -164,6 +164,9 @@
is_root(w_obj)
return NonConstant(False)
+ def utf8_len_w(self, space):
+ return NonConstant((NonConstant("utf8len_foobar"), NonConstant(14)))
+
@not_rpython
def unwrap(self, w_obj):
raise NotImplementedError
diff --git a/pypy/objspace/fake/test/test_objspace.py b/pypy/objspace/fake/test/test_objspace.py
--- a/pypy/objspace/fake/test/test_objspace.py
+++ b/pypy/objspace/fake/test/test_objspace.py
@@ -1,4 +1,5 @@
-import py
+import pytest
+from rpython.rlib.nonconst import NonConstant
from pypy.objspace.fake.objspace import FakeObjSpace, W_Root
from pypy.interpreter.argument import Arguments
from pypy.interpreter.typedef import TypeDef
@@ -63,8 +64,8 @@
def test_is_true(self):
space = self.space
space.translates(lambda: space.is_true(W_Root()))
- py.test.raises(AssertionError,
- space.translates, lambda: space.is_true(42))
+ with pytest.raises(AssertionError):
+ space.translates(lambda: space.is_true(42))
def test_unpackiterable(self):
space = self.space
@@ -79,3 +80,23 @@
space = self.space
space.translates(lambda: (space.get(W_Root(), W_Root()),
space.get(W_Root(), W_Root(), W_Root())))
+
+ def test_bug_utf8_len_w(self):
+ space = self.space
+
+ class A(object):
+ pass
+
+ def f():
+ s = NonConstant('a')
+ w_s = space.newutf8(s, 1)
+ t, l = space.utf8_len_w(w_s)
+ a = A()
+ if l == 1:
+ a.x = 1
+ else:
+ raise Exception
+ return a.x
+ space.translates(f)
+
+
More information about the pypy-commit
mailing list