[pypy-commit] pypy resume-refactor: Move stuff around so we have all resume related things in one directory

fijal noreply at buildbot.pypy.org
Fri Jan 17 10:28:03 CET 2014 

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: resume-refactor
Changeset: r68707:5b57b97f8470
Date: 2014-01-17 10:27 +0100
http://bitbucket.org/pypy/pypy/changeset/5b57b97f8470/

Log:	Move stuff around so we have all resume related things in one
	directory

diff --git a/rpython/jit/backend/llgraph/runner.py b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgraph/runner.py
+++ b/rpython/jit/backend/llgraph/runner.py
@@ -1,7 +1,7 @@
 import py, weakref
 from rpython.jit.backend import model
 from rpython.jit.backend.llgraph import support
-from rpython.jit.backend.resumebuilder import ResumeBuilder,\
+from rpython.jit.resume.backend import ResumeBuilder,\
      LivenessAnalyzer, compute_vars_longevity, flatten
 from rpython.jit.metainterp.history import AbstractDescr
 from rpython.jit.metainterp.history import Const, getkind
diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -5,7 +5,7 @@
 from rpython.jit.backend.llsupport.assembler import (GuardToken, BaseAssembler,
                                                      debug_bridge)
 from rpython.jit.backend.llsupport.asmmemmgr import MachineDataBlockWrapper
-from rpython.jit.backend.resumebuilder import flatten
+from rpython.jit.resume.backend import flatten
 from rpython.jit.metainterp.history import Const, Box, VOID
 from rpython.jit.metainterp.history import AbstractFailDescr, INT, REF, FLOAT
 from rpython.rtyper.lltypesystem import lltype, rffi, rstr, llmemory
diff --git a/rpython/jit/backend/x86/regalloc.py b/rpython/jit/backend/x86/regalloc.py
--- a/rpython/jit/backend/x86/regalloc.py
+++ b/rpython/jit/backend/x86/regalloc.py
@@ -7,7 +7,7 @@
 from rpython.jit.backend.llsupport.descr import (ArrayDescr, CallDescr,
     unpack_arraydescr, unpack_fielddescr, unpack_interiorfielddescr)
 from rpython.jit.backend.llsupport.gcmap import allocate_gcmap
-from rpython.jit.backend.resumebuilder import ResumeBuilder,\
+from rpython.jit.resume.backend import ResumeBuilder,\
      compute_vars_longevity, flatten
 from rpython.jit.backend.llsupport.regalloc import (FrameManager, BaseRegalloc,
      RegisterManager, TempBox, is_comparison_or_ovf_op)
diff --git a/rpython/jit/backend/x86/test/test_resumebuilder.py b/rpython/jit/backend/x86/test/test_resumebuilder.py
--- a/rpython/jit/backend/x86/test/test_resumebuilder.py
+++ b/rpython/jit/backend/x86/test/test_resumebuilder.py
@@ -1,6 +1,6 @@
 
 from rpython.jit.backend.x86.test.test_basic import Jit386Mixin
-from rpython.jit.backend.llsupport.test.test_resumebuilder import ResumeTest
+from rpython.jit.resume.test.test_backend import ResumeTest
 
 class TestResumeX86(Jit386Mixin, ResumeTest):
     # for the individual tests see
diff --git a/rpython/jit/metainterp/blackhole.py b/rpython/jit/metainterp/blackhole.py
--- a/rpython/jit/metainterp/blackhole.py
+++ b/rpython/jit/metainterp/blackhole.py
@@ -2,7 +2,8 @@
 from rpython.jit.codewriter.jitcode import JitCode, SwitchDictDescr
 from rpython.jit.metainterp.compile import ResumeAtPositionDescr
 from rpython.jit.metainterp.jitexc import get_llexception, reraise
-from rpython.jit.metainterp import jitexc, resume2
+from rpython.jit.metainterp import jitexc
+from rpython.jit.resume import frontend as resume2
 from rpython.rlib import longlong2float
 from rpython.rlib.debug import ll_assert, make_sure_not_resized
 from rpython.rlib.objectmodel import we_are_translated
diff --git a/rpython/jit/metainterp/compile.py b/rpython/jit/metainterp/compile.py
--- a/rpython/jit/metainterp/compile.py
+++ b/rpython/jit/metainterp/compile.py
@@ -14,9 +14,8 @@
 from rpython.jit.metainterp import history, jitexc
 from rpython.jit.metainterp.optimize import InvalidLoop
 from rpython.jit.metainterp.inliner import Inliner
-from rpython.jit.metainterp.resume import NUMBERING, PENDINGFIELDSP, ResumeDataDirectReader
 from rpython.jit.codewriter import heaptracker, longlong
-from rpython.jit.backend.resumebuilder import flatten
+from rpython.jit.resume.backend import flatten
 
 def giveup():
     from rpython.jit.metainterp.pyjitpl import SwitchToBlackhole
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
@@ -5,7 +5,7 @@
                                                      ImmutableIntUnbounded, \
                                                      IntLowerBound, MININT, MAXINT
 from rpython.jit.metainterp.optimizeopt.util import make_dispatcher_method
-from rpython.jit.metainterp.optimizeopt.resumeopt import OptResumeBuilder
+from rpython.jit.resume.optimizer import OptResumeBuilder
 from rpython.jit.metainterp.resoperation import rop, ResOperation, AbstractResOp
 from rpython.jit.metainterp.typesystem import llhelper
 from rpython.tool.pairtype import extendabletype
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -5,7 +5,7 @@
 from rpython.jit.codewriter import heaptracker
 from rpython.jit.codewriter.effectinfo import EffectInfo
 from rpython.jit.codewriter.jitcode import JitCode, SwitchDictDescr
-from rpython.jit.metainterp import history, compile, resume2, executor, jitexc
+from rpython.jit.metainterp import history, compile, executor, jitexc
 from rpython.jit.metainterp.heapcache import HeapCache
 from rpython.jit.metainterp.history import (Const, ConstInt, ConstPtr,
     ConstFloat, Box, TargetToken)
@@ -13,7 +13,7 @@
 from rpython.jit.metainterp.logger import Logger
 from rpython.jit.metainterp.optimizeopt.util import args_dict_box
 from rpython.jit.metainterp.resoperation import rop
-from rpython.jit.metainterp.resume2 import ResumeRecorder
+from rpython.jit.resume.frontend import ResumeRecorder
 from rpython.rlib import nonconst, rstack
 from rpython.rlib.debug import debug_start, debug_stop, debug_print, make_sure_not_resized
 from rpython.rlib.jit import Counters
diff --git a/rpython/jit/resume/__init__.py b/rpython/jit/resume/__init__.py
new file mode 100644
diff --git a/rpython/jit/backend/resumebuilder.py b/rpython/jit/resume/backend.py
rename from rpython/jit/backend/resumebuilder.py
rename to rpython/jit/resume/backend.py
--- a/rpython/jit/backend/resumebuilder.py
+++ b/rpython/jit/resume/backend.py
@@ -1,7 +1,7 @@
 
 from rpython.jit.metainterp.resoperation import rop, ResOperation
 from rpython.jit.metainterp.history import ConstInt, Box, Const
-from rpython.jit.metainterp.resume2 import ResumeBytecode, AbstractResumeReader
+from rpython.jit.resume.frontend import ResumeBytecode, AbstractResumeReader
 
 class LivenessAnalyzer(AbstractResumeReader):
     def __init__(self, inputframes=None):
@@ -87,6 +87,7 @@
             box = op.getarg(0)
             args = op.getarglist()
             if isinstance(box, Const):
+                XXX
                 newop = op.copy_and_change(rop.RESUME_PUT_CONST)
             elif box in self.virtuals:
                 newop = op
diff --git a/rpython/jit/metainterp/resume2.py b/rpython/jit/resume/frontend.py
rename from rpython/jit/metainterp/resume2.py
rename to rpython/jit/resume/frontend.py
--- a/rpython/jit/metainterp/resume2.py
+++ b/rpython/jit/resume/frontend.py
@@ -124,9 +124,6 @@
             elif op.getopnum() == rop.RESUME_PUT:
                 self.resume_put(op.getarg(0), op.getarg(1).getint(),
                                  op.getarg(2).getint())
-            elif op.getopnum() == rop.RESUME_PUT_CONST:
-                self.resume_put_const(op.getarg(0), op.getarg(1).getint(),
-                                      op.getarg(2).getint())
             elif op.getopnum() == rop.RESUME_NEW:
                 self.resume_new(op.result, op.getdescr())
             elif op.getopnum() == rop.RESUME_SETFIELD_GC:
diff --git a/rpython/jit/metainterp/optimizeopt/resumeopt.py b/rpython/jit/resume/optimizer.py
rename from rpython/jit/metainterp/optimizeopt/resumeopt.py
rename to rpython/jit/resume/optimizer.py
diff --git a/rpython/jit/resume/test/__init__.py b/rpython/jit/resume/test/__init__.py
new file mode 100644
diff --git a/rpython/jit/backend/llsupport/test/test_resumebuilder.py b/rpython/jit/resume/test/test_backend.py
rename from rpython/jit/backend/llsupport/test/test_resumebuilder.py
rename to rpython/jit/resume/test/test_backend.py
--- a/rpython/jit/backend/llsupport/test/test_resumebuilder.py
+++ b/rpython/jit/resume/test/test_backend.py
@@ -4,7 +4,7 @@
 from rpython.jit.codewriter.jitcode import JitCode
 from rpython.jit.tool.oparser import parse
 from rpython.jit.metainterp.optimizeopt.util import equaloplists
-from rpython.jit.metainterp.test.test_resume2 import rebuild_locs_from_resumedata
+from rpython.jit.resume.test.test_frontend import rebuild_locs_from_resumedata
 from rpython.rtyper.lltypesystem import lltype
 
 class MockJitCode(JitCode):
diff --git a/rpython/jit/metainterp/test/test_resume2.py b/rpython/jit/resume/test/test_frontend.py
rename from rpython/jit/metainterp/test/test_resume2.py
rename to rpython/jit/resume/test/test_frontend.py
--- a/rpython/jit/metainterp/test/test_resume2.py
+++ b/rpython/jit/resume/test/test_frontend.py
@@ -1,9 +1,8 @@
 
-import py
 from rpython.jit.tool.oparser import parse
 from rpython.jit.codewriter.jitcode import JitCode
 from rpython.jit.metainterp.history import AbstractDescr, Const, INT, Stats
-from rpython.jit.metainterp.resume2 import rebuild_from_resumedata,\
+from rpython.jit.resume.frontend import rebuild_from_resumedata,\
      ResumeBytecode, AbstractResumeReader
 from rpython.jit.metainterp.resoperation import rop
 from rpython.jit.codewriter.format import unformat_assembler
diff --git a/rpython/jit/tool/oparser.py b/rpython/jit/tool/oparser.py
--- a/rpython/jit/tool/oparser.py
+++ b/rpython/jit/tool/oparser.py
@@ -300,6 +300,7 @@
         loop.original_jitcell_token = self.original_jitcell_token
         loop.operations = ops
         loop.inputframes = [inpargs]
+        loop.inputargs = inpargs # for the tests
         loop.last_offset = last_offset
         return loop

More information about the pypy-commit mailing list