[pypy-commit] pypy getarrayitem-into-bridges: in progress
cfbolz
pypy.commits at gmail.com
Wed Aug 2 11:32:24 EDT 2017
Author: Carl Friedrich Bolz <cfbolz at gmx.de>
Branch: getarrayitem-into-bridges
Changeset: r92038:046804fa21b3
Date: 2017-08-02 11:05 +0200
http://bitbucket.org/pypy/pypy/changeset/046804fa21b3/
Log: in progress
diff --git a/rpython/jit/metainterp/optimizeopt/bridgeopt.py b/rpython/jit/metainterp/optimizeopt/bridgeopt.py
--- a/rpython/jit/metainterp/optimizeopt/bridgeopt.py
+++ b/rpython/jit/metainterp/optimizeopt/bridgeopt.py
@@ -18,6 +18,10 @@
# (<box1> <descr> <box2>) length times, if getfield(box1, descr) == box2
# both boxes should be in the liveboxes
#
+# <length>
+# (<box1> <index> <descr> <box2>) length times, if getarrayitem_gc(box1, index, descr) == box2
+# both boxes should be in the liveboxes
+#
# ----
@@ -82,18 +86,26 @@
# structs
# XXX could be extended to arrays
if optimizer.optheap:
- triples = optimizer.optheap.serialize_optheap(available_boxes)
+ triples_struct, triples_array = optimizer.optheap.serialize_optheap(available_boxes)
# can only encode descrs that have a known index into
# metainterp_sd.all_descrs
- triples = [triple for triple in triples if triple[1].descr_index != -1]
- numb_state.append_int(len(triples))
- for box1, descr, box2 in triples:
- index = descr.descr_index
+ triples_struct = [triple for triple in triples_struct if triple[1].descr_index != -1]
+ numb_state.append_int(len(triples_struct))
+ for box1, descr, box2 in triples_struct:
+ descr_index = descr.descr_index
+ numb_state.append_short(tag_box(box1, liveboxes_from_env, memo))
+ numb_state.append_int(descr_index)
+ numb_state.append_short(tag_box(box2, liveboxes_from_env, memo))
+ numb_state.append_int(len(triples_array))
+ for box1, index, descr, box2 in triples_array:
+ descr_index = descr.descr_index
numb_state.append_short(tag_box(box1, liveboxes_from_env, memo))
numb_state.append_int(index)
+ numb_state.append_int(descr_index)
numb_state.append_short(tag_box(box2, liveboxes_from_env, memo))
else:
numb_state.append_int(0)
+ numb_state.append_int(0)
def deserialize_optimizer_knowledge(optimizer, resumestorage, frontend_boxes, liveboxes):
reader = resumecode.Reader(resumestorage.rd_numb)
@@ -123,13 +135,24 @@
if not optimizer.optheap:
return
length = reader.next_item()
- result = []
+ result_struct = []
+ for i in range(length):
+ tagged = reader.next_item()
+ box1 = decode_box(resumestorage, tagged, liveboxes, metainterp_sd.cpu)
+ descr_index = reader.next_item()
+ descr = metainterp_sd.all_descrs[descr_index]
+ tagged = reader.next_item()
+ box2 = decode_box(resumestorage, tagged, liveboxes, metainterp_sd.cpu)
+ result_struct.append((box1, descr, box2))
+ length = reader.next_item()
+ result_array = []
for i in range(length):
tagged = reader.next_item()
box1 = decode_box(resumestorage, tagged, liveboxes, metainterp_sd.cpu)
index = reader.next_item()
- descr = metainterp_sd.all_descrs[index]
+ descr_index = reader.next_item()
+ descr = metainterp_sd.all_descrs[descr_index]
tagged = reader.next_item()
box2 = decode_box(resumestorage, tagged, liveboxes, metainterp_sd.cpu)
- result.append((box1, descr, box2))
- optimizer.optheap.deserialize_optheap(result)
+ result_array.append((box1, index, descr, box2))
+ optimizer.optheap.deserialize_optheap(result_struct, result_array)
diff --git a/rpython/jit/metainterp/optimizeopt/heap.py b/rpython/jit/metainterp/optimizeopt/heap.py
--- a/rpython/jit/metainterp/optimizeopt/heap.py
+++ b/rpython/jit/metainterp/optimizeopt/heap.py
@@ -116,6 +116,7 @@
return None
def force_lazy_set(self, optheap, descr, can_cache=True):
+ import pdb; pdb.set_trace()
op = self._lazy_set
if op is not None:
# This is the way _lazy_set is usually reset to None.
@@ -223,7 +224,7 @@
def invalidate(self, descr):
for opinfo in self.cached_infos:
assert isinstance(opinfo, info.ArrayPtrInfo)
- opinfo._items = None
+ opinfo._items[self.index] = None
self.cached_infos = []
self.cached_structs = []
@@ -574,6 +575,7 @@
cf.do_setfield(self, op)
def optimize_GETARRAYITEM_GC_I(self, op):
+ import pdb; pdb.set_trace()
arrayinfo = self.ensure_ptr_info_arg0(op)
indexb = self.getintbound(op.getarg(1))
cf = None
@@ -636,6 +638,7 @@
optimize_GETARRAYITEM_GC_PURE_F = optimize_GETARRAYITEM_GC_PURE_I
def optimize_SETARRAYITEM_GC(self, op):
+ import pdb; pdb.set_trace()
#opnum = OpHelpers.getarrayitem_pure_for_descr(op.getdescr())
#if self.has_pure_result(opnum, [op.getarg(0), op.getarg(1)],
# op.getdescr()):
@@ -695,7 +698,7 @@
return self.emit(op)
def serialize_optheap(self, available_boxes):
- result = []
+ result_getfield = []
for descr, cf in self.cached_fields.iteritems():
if cf._lazy_set:
continue # XXX safe default for now
@@ -708,11 +711,24 @@
structinfo = cf.cached_infos[i]
box2 = structinfo.getfield(descr).get_box_replacement()
if isinstance(box2, Const) or box2 in available_boxes:
- result.append((box1, descr, box2))
- return result
+ result_getfield.append((box1, descr, box2))
+ result_array = []
+ import pdb; pdb.set_trace()
+ for descr, indexdict in self.cached_arrayitems.iteritems():
+ for index, cf in indexdict.iteritems():
+ if cf._lazy_set:
+ continue # XXX safe default for now
+ for i, box1 in enumerate(cf.cached_structs):
+ if box1 not in available_boxes:
+ continue
+ arrayinfo = cf.cached_infos[i]
+ box2 = arrayinfo.getitem(descr, index).get_box_replacement()
+ if isinstance(box2, Const) or box2 in available_boxes:
+ result_array.append((box1, index, descr, box2))
+ return result_getfield, result_array
- def deserialize_optheap(self, triples):
- for box1, descr, box2 in triples:
+ def deserialize_optheap(self, triples_struct, triples_array):
+ for box1, descr, box2 in triples_struct[0]:
parent_descr = descr.get_parent_descr()
assert parent_descr.is_object()
structinfo = box1.get_forwarded()
@@ -723,6 +739,15 @@
cf = self.field_cache(descr)
structinfo.setfield(descr, box1, box2, optheap=self, cf=cf)
+ import pdb; pdb.set_trace()
+ for box1, index, descr, box2 in triples_array[0]:
+ structinfo = box1.get_forwarded()
+ if not isinstance(structinfo, info.AbstractVirtualPtrInfo):
+ structinfo = info.ArrayPtrInfo(descr)
+ box1.set_forwarded(structinfo)
+
+ cf = self.arrayitem_cache(index, descr)
+ structinfo.setfield(descr, box1, box2, optheap=self, cf=cf)
dispatch_opt = make_dispatcher_method(OptHeap, 'optimize_',
diff --git a/rpython/jit/metainterp/test/test_bridgeopt.py b/rpython/jit/metainterp/test/test_bridgeopt.py
--- a/rpython/jit/metainterp/test/test_bridgeopt.py
+++ b/rpython/jit/metainterp/test/test_bridgeopt.py
@@ -186,3 +186,31 @@
self.check_resops(getfield_gc_i=4) # 3x a.x, 1x a.n
self.check_resops(getfield_gc_r=1) # in main loop
+ def test_bridge_array_read(self):
+ myjitdriver = jit.JitDriver(greens=[], reds=['y', 'res', 'n', 'a'])
+ def f(x, y, n):
+ if x:
+ a = [1, n, 0]
+ else:
+ a = [2, n, 0]
+ res = 0
+ while y > 0:
+ myjitdriver.jit_merge_point(y=y, n=n, res=res, a=a)
+ n1 = a[1]
+ m = jit.promote(a[0])
+ res += m
+ a[2] += 1
+ if y > n:
+ res += 1
+ m = jit.promote(a[0])
+ res += m
+ res += n1 + a[1]
+ y -= 1
+ return res
+ res = self.meta_interp(f, [6, 32, 16])
+ assert res == f(6, 32, 16)
+ self.check_trace_count(3)
+ self.check_resops(guard_value=1)
+ self.check_resops(getarrayitem_gc_r=4) # 3x a.x, 1x a.n
+ self.check_resops(getfield_gc_r=1) # in main loop
+
More information about the pypy-commit
mailing list