Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch:
Changeset: r87705:adff0c72c0f1
Date: 2016-10-11 13:06 +0200
http://bitbucket.org/pypy/pypy/changeset/adff0c72c0f1/
Log: kill the dead "forget_numberings" code in resume.py
diff --git a/rpython/jit/metainterp/optimizeopt/info.py
b/rpython/jit/metainterp/optimizeopt/info.py
--- a/rpython/jit/metainterp/optimizeopt/info.py
+++ b/rpython/jit/metainterp/optimizeopt/info.py
@@ -132,7 +132,6 @@
def force_box(self, op, optforce):
if self.is_virtual():
- optforce.forget_numberings()
#
if
self._is_immutable_and_filled_with_constants(optforce.optimizer):
constptr = optforce.optimizer.constant_fold(op)
diff --git a/rpython/jit/metainterp/optimizeopt/optimizer.py
b/rpython/jit/metainterp/optimizeopt/optimizer.py
--- a/rpython/jit/metainterp/optimizeopt/optimizer.py
+++ b/rpython/jit/metainterp/optimizeopt/optimizer.py
@@ -249,9 +249,6 @@
def produce_potential_short_preamble_ops(self, potential_ops):
pass
- def forget_numberings(self):
- self.optimizer.forget_numberings()
-
def _can_optimize_call_pure(self, op):
arg_consts = []
for i in range(op.numargs()):
@@ -350,10 +347,6 @@
for opt in self.optimizations:
opt.produce_potential_short_preamble_ops(sb)
- def forget_numberings(self):
- self.metainterp_sd.profiler.count(jitprof.Counters.OPT_FORCINGS)
- self.resumedata_memo.forget_numberings()
-
def getinfo(self, op):
if op.type == 'r':
return self.getptrinfo(op)
diff --git a/rpython/jit/metainterp/optimizeopt/vstring.py
b/rpython/jit/metainterp/optimizeopt/vstring.py
--- a/rpython/jit/metainterp/optimizeopt/vstring.py
+++ b/rpython/jit/metainterp/optimizeopt/vstring.py
@@ -79,7 +79,6 @@
def force_box(self, op, optforce):
if not self.is_virtual():
return op
- optforce.forget_numberings()
if self.mode is mode_string:
s = self.get_constant_string_spec(optforce, mode_string)
if s is not None:
diff --git a/rpython/jit/metainterp/resume.py b/rpython/jit/metainterp/resume.py
--- a/rpython/jit/metainterp/resume.py
+++ b/rpython/jit/metainterp/resume.py
@@ -182,7 +182,6 @@
self.consts = []
self.large_ints = {}
self.refs = self.cpu.ts.new_ref_dict_2()
- self.numberings = {}
self.cached_boxes = {}
self.cached_virtuals = {}
@@ -282,11 +281,7 @@
numb = resumecode.create_numbering(state.current)
return numb, state.liveboxes, state.v
-
- def forget_numberings(self):
- # XXX ideally clear only the affected numberings
- self.numberings.clear()
- self.clear_box_virtual_numbers()
+
# caching for virtuals and boxes inside them
@@ -526,7 +521,7 @@
if self._invalidation_needed(len(liveboxes), nholes):
memo.clear_box_virtual_numbers()
-
+
def _invalidation_needed(self, nliveboxes, nholes):
memo = self.memo
# xxx heuristic a bit out of thin air
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
