Author: Richard Plangger <r...@pasra.at> Branch: vecopt-merge Changeset: r79105:8956d04bc00d Date: 2015-08-21 10:45 +0200 http://bitbucket.org/pypy/pypy/changeset/8956d04bc00d/
Log: reverted some changes 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 @@ -569,7 +569,7 @@ fullsize = self.mc.get_relative_pos() # rawstart = self.materialize_loop(original_loop_token) - faildescr.bridge_rawstart = rawstart + original_loop_token.rawstart = rawstart self.patch_stack_checks(frame_depth_no_fixed_size + JITFRAME_FIXED_SIZE, rawstart) debug_bridge(descr_number, rawstart, codeendpos) 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 @@ -202,16 +202,14 @@ vl.inputargs = version.inputargs vl.operations = version.operations vl.original_jitcell_token = jitcell_token - asminfo = send_bridge_to_backend(jitdriver_sd, metainterp_sd, - faildescr, version.inputargs, - version.operations, jitcell_token) + send_bridge_to_backend(jitdriver_sd, metainterp_sd, + faildescr, version.inputargs, + version.operations, jitcell_token) record_loop_or_bridge(metainterp_sd, vl) - version.compiled = faildescr.bridge_rawstart - assert asminfo is not None # stitch the rest of the traces for version in loop.versions: for faildescr in version.faildescrs[1:]: - cpu.stitch_bridge(faildescr, version.compiled) + cpu.stitch_bridge(faildescr, jitcell_token) loop.versions = None def compile_retrace(metainterp, greenkey, start, @@ -443,7 +441,6 @@ #if metainterp_sd.warmrunnerdesc is not None: # for tests # metainterp_sd.warmrunnerdesc.memory_manager.keep_loop_alive( # original_loop_token) - return asminfo # ____________________________________________________________ diff --git a/rpython/jit/metainterp/optimizeopt/vectorize.py b/rpython/jit/metainterp/optimizeopt/vectorize.py --- a/rpython/jit/metainterp/optimizeopt/vectorize.py +++ b/rpython/jit/metainterp/optimizeopt/vectorize.py @@ -52,8 +52,6 @@ # gso = GuardStrengthenOpt(opt.dependency_graph.index_vars, opt.has_two_labels) gso.propagate_all_forward(opt.loop, user_code) - # connect all compile loop version fail descriptors to this version - #version.register_all_guards(loop.operations, opt.appended_arg_count) # # end = time.clock() diff --git a/rpython/jit/metainterp/test/test_vectorize.py b/rpython/jit/metainterp/test/test_vectorize.py --- a/rpython/jit/metainterp/test/test_vectorize.py +++ b/rpython/jit/metainterp/test/test_vectorize.py @@ -221,7 +221,7 @@ assert res == f(60,58.4547) == 58.4547 def test_accum(self): - myjitdriver = JitDriver(greens = [], reds = 'auto') + myjitdriver = JitDriver(greens = [], reds = 'auto', vectorize=True) T = lltype.Array(rffi.DOUBLE) def f(d, value): va = lltype.malloc(T, d, flavor='raw', zero=True) @@ -239,7 +239,7 @@ i += 1 lltype.free(va, flavor='raw') return r - res = self.meta_interp(f, [60,0.5], vec_all=True) + res = self.meta_interp(f, [60,0.5], vec=True) assert res == f(60,0.5) == 60*0.5 _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit