Author: Armin Rigo <[email protected]>
Branch: stringbuilder-perf
Changeset: r71997:99a38a918a30
Date: 2014-06-09 16:19 +0200
http://bitbucket.org/pypy/pypy/changeset/99a38a918a30/
Log: Test and fix
diff --git a/rpython/jit/metainterp/test/test_string.py
b/rpython/jit/metainterp/test/test_string.py
--- a/rpython/jit/metainterp/test/test_string.py
+++ b/rpython/jit/metainterp/test/test_string.py
@@ -690,6 +690,26 @@
assert res == 0
self.check_resops(call=2) # (ll_shrink_array) * 2 unroll
+ def test_stringbuilder_append_len2_2(self):
+ jitdriver = JitDriver(reds=['n', 'str1'], greens=[])
+ def f(n):
+ str1 = str(n)
+ while n > 0:
+ jitdriver.jit_merge_point(n=n, str1=str1)
+ sb = StringBuilder(4)
+ sb.append("a")
+ sb.append(str1)
+ s = sb.build()
+ if len(s) != 3: raise ValueError
+ if s[0] != "a": raise ValueError
+ if s[1] != "1": raise ValueError
+ if s[2] != "0": raise ValueError
+ n -= 1
+ return n
+ res = self.meta_interp(f, [10], backendopt=True)
+ assert res == 0
+ self.check_resops(call=2) # (ll_shrink_array) * 2 unroll
+
def test_stringbuilder_append_slice_1(self):
jitdriver = JitDriver(reds=['n'], greens=[])
def f(n):
@@ -764,6 +784,26 @@
assert res == 0
self.check_resops(call=4) # (append, build) * 2 unroll
+ def test_stringbuilder_bug1(self):
+ jitdriver = JitDriver(reds=['n', 's1'], greens=[])
+ @dont_look_inside
+ def escape(x):
+ pass
+ def f(n):
+ s1 = unicode(str(n) * 16)
+ while n > 0:
+ jitdriver.jit_merge_point(n=n, s1=s1)
+ sb = UnicodeBuilder(32)
+ sb.append(s1)
+ sb.append(u"\n\n")
+ s = sb.build()
+ if len(s) != 34: raise ValueError
+ n -= 1
+ return n
+ f(10)
+ res = self.meta_interp(f, [10], backendopt=True)
+ assert res == 0
+
def test_shrink_array(self):
jitdriver = JitDriver(reds=['result', 'n'], greens=[])
_str, _StringBuilder = self._str, self._StringBuilder
diff --git a/rpython/rtyper/lltypesystem/rbuilder.py
b/rpython/rtyper/lltypesystem/rbuilder.py
--- a/rpython/rtyper/lltypesystem/rbuilder.py
+++ b/rpython/rtyper/lltypesystem/rbuilder.py
@@ -262,6 +262,7 @@
end = ofs + 2 * ll_builder.charsize
if end > ll_builder.current_end:
ofs = ll_builder.grow(ll_builder, 2)
+ end = ofs + 2 * ll_builder.charsize
ll_builder.current_ofs = end
# --- no GC! ---
raw = rffi.cast(rffi.CCHARP, ll_builder.current_buf)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
