Author: Richard Plangger <r...@pasra.at> Branch: vecopt-merge Changeset: r79037:328fce203b85 Date: 2015-08-18 13:47 +0200 http://bitbucket.org/pypy/pypy/changeset/328fce203b85/
Log: removed recently added STR_PARAMETERS as it does not allow specialization diff --git a/pypy/module/pypyjit/interp_jit.py b/pypy/module/pypyjit/interp_jit.py --- a/pypy/module/pypyjit/interp_jit.py +++ b/pypy/module/pypyjit/interp_jit.py @@ -142,7 +142,7 @@ else: intval = space.int_w(w_value) for name, _ in unroll_parameters: - if name == key and name != 'enable_opts': + if name == key and name != 'enable_opts' and name != 'vec_params': jit.set_param(None, name, intval) break else: diff --git a/rpython/rlib/jit.py b/rpython/rlib/jit.py --- a/rpython/rlib/jit.py +++ b/rpython/rlib/jit.py @@ -579,9 +579,7 @@ 'vec': 0, 'vec_params': '0:0:50:0.60', } -STR_PARAMETERS = ('enable_opts','vec_params') unroll_parameters = unrolling_iterable(PARAMETERS.items()) -string_parameters = unrolling_iterable(STR_PARAMETERS) # ____________________________________________________________ @@ -805,7 +803,7 @@ set_param(driver, 'vec_params', value) else: for name1, _ in unroll_parameters: - if name1 == name and name1 not in STR_PARAMETERS: + if name1 == name and name1 != 'vec_params' and name != 'enable_opts': try: set_param(driver, name1, int(value)) except ValueError: @@ -984,7 +982,9 @@ hop.exception_cannot_occur() driver = hop.inputarg(lltype.Void, arg=0) name = hop.args_s[1].const - if name in STR_PARAMETERS: + if name == 'enable_opts': + repr = string_repr + elif name == 'vec_params': repr = string_repr else: repr = lltype.Signed _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit