forked from Lephenixnoir/PythonExtra
d4d53e9e11
This changes the native emitter to access qstr values using the qstr indirection table qstr_table, but only when generating native code that will be saved to a .mpy file. This makes the resulting native code fully static, ie it does not require any fix-ups or rewriting when it is imported. The performance of native code is more or less unchanged. Benchmark results on PYBv1.0 (using --via-mpy and --emit native) are: N=100 M=100 baseline -> this-commit diff diff% (error%) bm_chaos.py 407.16 -> 411.85 : +4.69 = +1.152% (+/-0.01%) bm_fannkuch.py 100.89 -> 101.20 : +0.31 = +0.307% (+/-0.01%) bm_fft.py 3521.17 -> 3441.72 : -79.45 = -2.256% (+/-0.00%) bm_float.py 6707.29 -> 6644.83 : -62.46 = -0.931% (+/-0.00%) bm_hexiom.py 55.91 -> 55.41 : -0.50 = -0.894% (+/-0.00%) bm_nqueens.py 5343.54 -> 5326.17 : -17.37 = -0.325% (+/-0.00%) bm_pidigits.py 603.89 -> 632.79 : +28.90 = +4.786% (+/-0.33%) core_qstr.py 64.18 -> 64.09 : -0.09 = -0.140% (+/-0.01%) core_yield_from.py 313.61 -> 311.11 : -2.50 = -0.797% (+/-0.03%) misc_aes.py 654.29 -> 659.75 : +5.46 = +0.834% (+/-0.02%) misc_mandel.py 4205.10 -> 4272.08 : +66.98 = +1.593% (+/-0.01%) misc_pystone.py 3077.79 -> 3128.39 : +50.60 = +1.644% (+/-0.01%) misc_raytrace.py 388.45 -> 393.71 : +5.26 = +1.354% (+/-0.01%) viper_call0.py 576.83 -> 566.76 : -10.07 = -1.746% (+/-0.05%) viper_call1a.py 550.39 -> 540.12 : -10.27 = -1.866% (+/-0.11%) viper_call1b.py 438.32 -> 432.09 : -6.23 = -1.421% (+/-0.11%) viper_call1c.py 442.96 -> 436.11 : -6.85 = -1.546% (+/-0.08%) viper_call2a.py 536.31 -> 527.37 : -8.94 = -1.667% (+/-0.04%) viper_call2b.py 378.99 -> 377.50 : -1.49 = -0.393% (+/-0.08%) Signed-off-by: Damien George <damien@micropython.org>
107 lines
3.9 KiB
C
107 lines
3.9 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
#ifndef MICROPY_INCLUDED_PY_EMITGLUE_H
|
|
#define MICROPY_INCLUDED_PY_EMITGLUE_H
|
|
|
|
#include "py/obj.h"
|
|
#include "py/bc.h"
|
|
|
|
// These variables and functions glue the code emitters to the runtime.
|
|
|
|
// These must fit in 8 bits; see scope.h
|
|
enum {
|
|
MP_EMIT_OPT_NONE,
|
|
MP_EMIT_OPT_BYTECODE,
|
|
MP_EMIT_OPT_NATIVE_PYTHON,
|
|
MP_EMIT_OPT_VIPER,
|
|
MP_EMIT_OPT_ASM,
|
|
};
|
|
|
|
typedef enum {
|
|
MP_CODE_UNUSED,
|
|
MP_CODE_RESERVED,
|
|
MP_CODE_BYTECODE,
|
|
MP_CODE_NATIVE_PY,
|
|
MP_CODE_NATIVE_VIPER,
|
|
MP_CODE_NATIVE_ASM,
|
|
} mp_raw_code_kind_t;
|
|
|
|
// compiled bytecode: instance in RAM, referenced by outer scope, usually freed after first (and only) use
|
|
// mpy file: instance in RAM, created when .mpy file is loaded (same comments as above)
|
|
// frozen: instance in ROM
|
|
typedef struct _mp_raw_code_t {
|
|
mp_uint_t kind : 3; // of type mp_raw_code_kind_t
|
|
mp_uint_t scope_flags : 7;
|
|
mp_uint_t n_pos_args : 11;
|
|
const void *fun_data;
|
|
#if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
|
|
size_t fun_data_len; // so mp_raw_code_save and mp_bytecode_print work
|
|
#endif
|
|
struct _mp_raw_code_t **children;
|
|
#if MICROPY_PERSISTENT_CODE_SAVE
|
|
size_t n_children;
|
|
#if MICROPY_PY_SYS_SETTRACE
|
|
mp_bytecode_prelude_t prelude;
|
|
// line_of_definition is a Python source line where the raw_code was
|
|
// created e.g. MP_BC_MAKE_FUNCTION. This is different from lineno info
|
|
// stored in prelude, which provides line number for first statement of
|
|
// a function. Required to properly implement "call" trace event.
|
|
mp_uint_t line_of_definition;
|
|
#endif
|
|
#if MICROPY_EMIT_MACHINE_CODE
|
|
uint16_t prelude_offset;
|
|
#endif
|
|
#endif
|
|
#if MICROPY_EMIT_MACHINE_CODE
|
|
mp_uint_t type_sig; // for viper, compressed as 2-bit types; ret is MSB, then arg0, arg1, etc
|
|
#endif
|
|
} mp_raw_code_t;
|
|
|
|
mp_raw_code_t *mp_emit_glue_new_raw_code(void);
|
|
|
|
void mp_emit_glue_assign_bytecode(mp_raw_code_t *rc, const byte *code,
|
|
#if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
|
|
size_t len,
|
|
#endif
|
|
mp_raw_code_t **children,
|
|
#if MICROPY_PERSISTENT_CODE_SAVE
|
|
size_t n_children,
|
|
#endif
|
|
mp_uint_t scope_flags);
|
|
|
|
void mp_emit_glue_assign_native(mp_raw_code_t *rc, mp_raw_code_kind_t kind, void *fun_data, mp_uint_t fun_len,
|
|
mp_raw_code_t **children,
|
|
#if MICROPY_PERSISTENT_CODE_SAVE
|
|
size_t n_children,
|
|
uint16_t prelude_offset,
|
|
#endif
|
|
mp_uint_t scope_flags, mp_uint_t n_pos_args, mp_uint_t type_sig);
|
|
|
|
mp_obj_t mp_make_function_from_raw_code(const mp_raw_code_t *rc, const mp_module_context_t *context, const mp_obj_t *def_args);
|
|
mp_obj_t mp_make_closure_from_raw_code(const mp_raw_code_t *rc, const mp_module_context_t *context, mp_uint_t n_closed_over, const mp_obj_t *args);
|
|
|
|
#endif // MICROPY_INCLUDED_PY_EMITGLUE_H
|