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>
71 lines
1.9 KiB
C
71 lines
1.9 KiB
C
// x86 specific stuff
|
|
|
|
#include "py/mpconfig.h"
|
|
#include "py/nativeglue.h"
|
|
|
|
#if MICROPY_EMIT_X86
|
|
|
|
// This is defined so that the assembler exports generic assembler API macros
|
|
#define GENERIC_ASM_API (1)
|
|
#include "py/asmx86.h"
|
|
|
|
// Word indices of REG_LOCAL_x in nlr_buf_t
|
|
#define NLR_BUF_IDX_LOCAL_1 (5) // ebx
|
|
|
|
// x86 needs a table to know how many args a given function has
|
|
STATIC byte mp_f_n_args[MP_F_NUMBER_OF] = {
|
|
[MP_F_CONVERT_OBJ_TO_NATIVE] = 2,
|
|
[MP_F_CONVERT_NATIVE_TO_OBJ] = 2,
|
|
[MP_F_NATIVE_SWAP_GLOBALS] = 1,
|
|
[MP_F_LOAD_NAME] = 1,
|
|
[MP_F_LOAD_GLOBAL] = 1,
|
|
[MP_F_LOAD_BUILD_CLASS] = 0,
|
|
[MP_F_LOAD_ATTR] = 2,
|
|
[MP_F_LOAD_METHOD] = 3,
|
|
[MP_F_LOAD_SUPER_METHOD] = 2,
|
|
[MP_F_STORE_NAME] = 2,
|
|
[MP_F_STORE_GLOBAL] = 2,
|
|
[MP_F_STORE_ATTR] = 3,
|
|
[MP_F_OBJ_SUBSCR] = 3,
|
|
[MP_F_OBJ_IS_TRUE] = 1,
|
|
[MP_F_UNARY_OP] = 2,
|
|
[MP_F_BINARY_OP] = 3,
|
|
[MP_F_BUILD_TUPLE] = 2,
|
|
[MP_F_BUILD_LIST] = 2,
|
|
[MP_F_BUILD_MAP] = 1,
|
|
[MP_F_BUILD_SET] = 2,
|
|
[MP_F_STORE_SET] = 2,
|
|
[MP_F_LIST_APPEND] = 2,
|
|
[MP_F_STORE_MAP] = 3,
|
|
[MP_F_MAKE_FUNCTION_FROM_RAW_CODE] = 3,
|
|
[MP_F_NATIVE_CALL_FUNCTION_N_KW] = 3,
|
|
[MP_F_CALL_METHOD_N_KW] = 3,
|
|
[MP_F_CALL_METHOD_N_KW_VAR] = 3,
|
|
[MP_F_NATIVE_GETITER] = 2,
|
|
[MP_F_NATIVE_ITERNEXT] = 1,
|
|
[MP_F_NLR_PUSH] = 1,
|
|
[MP_F_NLR_POP] = 0,
|
|
[MP_F_NATIVE_RAISE] = 1,
|
|
[MP_F_IMPORT_NAME] = 3,
|
|
[MP_F_IMPORT_FROM] = 2,
|
|
[MP_F_IMPORT_ALL] = 1,
|
|
[MP_F_NEW_SLICE] = 3,
|
|
[MP_F_UNPACK_SEQUENCE] = 3,
|
|
[MP_F_UNPACK_EX] = 3,
|
|
[MP_F_DELETE_NAME] = 1,
|
|
[MP_F_DELETE_GLOBAL] = 1,
|
|
[MP_F_NEW_CLOSURE] = 3,
|
|
[MP_F_ARG_CHECK_NUM_SIG] = 3,
|
|
[MP_F_SETUP_CODE_STATE] = 4,
|
|
[MP_F_SMALL_INT_FLOOR_DIVIDE] = 2,
|
|
[MP_F_SMALL_INT_MODULO] = 2,
|
|
[MP_F_NATIVE_YIELD_FROM] = 3,
|
|
[MP_F_SETJMP] = 1,
|
|
};
|
|
|
|
#define N_X86 (1)
|
|
#define EXPORT_FUN(name) emit_native_x86_##name
|
|
#include "py/emitnative.c"
|
|
|
|
#endif
|