Author: Richard Plangger <planri...@gmail.com> Branch: vecopt-merge Changeset: r79902:3e5ea9adeb03 Date: 2015-09-30 09:10 +0200 http://bitbucket.org/pypy/pypy/changeset/3e5ea9adeb03/
Log: partial test fixes in backend directory diff --git a/rpython/jit/backend/detect_cpu.py b/rpython/jit/backend/detect_cpu.py --- a/rpython/jit/backend/detect_cpu.py +++ b/rpython/jit/backend/detect_cpu.py @@ -135,6 +135,7 @@ MODEL_X86: ['floats', 'singlefloats', 'longlong'], MODEL_X86_NO_SSE2: ['longlong'], MODEL_X86_64: ['floats', 'singlefloats'], + MODEL_X86_64_SSE4: ['floats', 'singlefloats'], MODEL_ARM: ['floats', 'singlefloats', 'longlong'], MODEL_PPC_64: [], # we don't even have PPC directory, so no }[backend_name] diff --git a/rpython/jit/backend/llsupport/test/test_descr.py b/rpython/jit/backend/llsupport/test/test_descr.py --- a/rpython/jit/backend/llsupport/test/test_descr.py +++ b/rpython/jit/backend/llsupport/test/test_descr.py @@ -144,6 +144,7 @@ descr4 = get_array_descr(c0, A4) descr5 = get_array_descr(c0, A5) descr6 = get_array_descr(c0, A6) + import pdb; pdb.set_trace() assert isinstance(descr1, ArrayDescr) assert descr1 == get_array_descr(c0, lltype.GcArray(lltype.Char)) assert descr1.flag == FLAG_UNSIGNED 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 @@ -23,9 +23,8 @@ from rpython.jit.codewriter import longlong from rpython.jit.codewriter.effectinfo import EffectInfo from rpython.jit.metainterp.history import (Const, ConstInt, ConstPtr, - ConstFloat, INT, REF, FLOAT, VECTOR, TargetToken) + ConstFloat, INT, REF, FLOAT, VECTOR, TargetToken, AbstractFailDescr) from rpython.jit.metainterp.resoperation import rop, ResOperation -from rpython.jit.metainterp.compile import ResumeGuardDescr from rpython.jit.metainterp.resume import AccumInfo from rpython.rlib import rgc from rpython.rlib.objectmodel import we_are_translated @@ -320,8 +319,10 @@ def locs_for_fail(self, guard_op): faillocs = [self.loc(arg) for arg in guard_op.getfailargs()] descr = guard_op.getdescr() - assert isinstance(descr, ResumeGuardDescr) - if descr and descr.rd_accum_list: + if not descr: + return faillocs + assert isinstance(descr, AbstractFailDescr) + if descr.rd_accum_list: accuminfo = descr.rd_accum_list while accuminfo: accuminfo.vector_loc = faillocs[accuminfo.getpos_in_failargs()] _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit