mirror of
https://github.com/licsber/micropython.git
synced 2024-09-20 09:00:23 +08:00
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>
235 lines
8.1 KiB
C
235 lines
8.1 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.
|
|
*/
|
|
|
|
// This code glues the code emitters to the runtime.
|
|
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "py/emitglue.h"
|
|
#include "py/runtime0.h"
|
|
#include "py/bc.h"
|
|
#include "py/objfun.h"
|
|
#include "py/profile.h"
|
|
|
|
#if MICROPY_DEBUG_VERBOSE // print debugging info
|
|
#define DEBUG_PRINT (1)
|
|
#define WRITE_CODE (1)
|
|
#define DEBUG_printf DEBUG_printf
|
|
#define DEBUG_OP_printf(...) DEBUG_printf(__VA_ARGS__)
|
|
#else // don't print debugging info
|
|
#define DEBUG_printf(...) (void)0
|
|
#define DEBUG_OP_printf(...) (void)0
|
|
#endif
|
|
|
|
#if MICROPY_DEBUG_PRINTERS
|
|
mp_uint_t mp_verbose_flag = 0;
|
|
#endif
|
|
|
|
mp_raw_code_t *mp_emit_glue_new_raw_code(void) {
|
|
mp_raw_code_t *rc = m_new0(mp_raw_code_t, 1);
|
|
rc->kind = MP_CODE_RESERVED;
|
|
#if MICROPY_PY_SYS_SETTRACE
|
|
rc->line_of_definition = 0;
|
|
#endif
|
|
return rc;
|
|
}
|
|
|
|
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) {
|
|
|
|
rc->kind = MP_CODE_BYTECODE;
|
|
rc->scope_flags = scope_flags;
|
|
rc->fun_data = code;
|
|
#if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
|
|
rc->fun_data_len = len;
|
|
#endif
|
|
rc->children = children;
|
|
|
|
#if MICROPY_PERSISTENT_CODE_SAVE
|
|
rc->n_children = n_children;
|
|
#endif
|
|
|
|
#if MICROPY_PY_SYS_SETTRACE
|
|
mp_bytecode_prelude_t *prelude = &rc->prelude;
|
|
mp_prof_extract_prelude(code, prelude);
|
|
#endif
|
|
|
|
#ifdef DEBUG_PRINT
|
|
#if !(MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS)
|
|
const size_t len = 0;
|
|
#endif
|
|
DEBUG_printf("assign byte code: code=%p len=" UINT_FMT " flags=%x\n", code, len, (uint)scope_flags);
|
|
#endif
|
|
}
|
|
|
|
#if MICROPY_EMIT_MACHINE_CODE
|
|
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) {
|
|
|
|
assert(kind == MP_CODE_NATIVE_PY || kind == MP_CODE_NATIVE_VIPER || kind == MP_CODE_NATIVE_ASM);
|
|
|
|
// Some architectures require flushing/invalidation of the I/D caches,
|
|
// so that the generated native code which was created in data RAM will
|
|
// be available for execution from instruction RAM.
|
|
#if MICROPY_EMIT_THUMB || MICROPY_EMIT_INLINE_THUMB
|
|
#if __ICACHE_PRESENT == 1
|
|
// Flush D-cache, so the code emitted is stored in RAM.
|
|
MP_HAL_CLEAN_DCACHE(fun_data, fun_len);
|
|
// Invalidate I-cache, so the newly-created code is reloaded from RAM.
|
|
SCB_InvalidateICache();
|
|
#endif
|
|
#elif MICROPY_EMIT_ARM
|
|
#if (defined(__linux__) && defined(__GNUC__)) || __ARM_ARCH == 7
|
|
__builtin___clear_cache(fun_data, (uint8_t *)fun_data + fun_len);
|
|
#elif defined(__arm__)
|
|
// Flush I-cache and D-cache.
|
|
asm volatile (
|
|
"0:"
|
|
"mrc p15, 0, r15, c7, c10, 3\n" // test and clean D-cache
|
|
"bne 0b\n"
|
|
"mov r0, #0\n"
|
|
"mcr p15, 0, r0, c7, c7, 0\n" // invalidate I-cache and D-cache
|
|
: : : "r0", "cc");
|
|
#endif
|
|
#endif
|
|
|
|
rc->kind = kind;
|
|
rc->scope_flags = scope_flags;
|
|
rc->fun_data = fun_data;
|
|
|
|
#if MICROPY_PERSISTENT_CODE_SAVE || MICROPY_DEBUG_PRINTERS
|
|
rc->fun_data_len = fun_len;
|
|
#endif
|
|
rc->children = children;
|
|
|
|
#if MICROPY_PERSISTENT_CODE_SAVE
|
|
rc->n_children = n_children;
|
|
rc->prelude_offset = prelude_offset;
|
|
#endif
|
|
|
|
// These two entries are only needed for MP_CODE_NATIVE_ASM.
|
|
rc->n_pos_args = n_pos_args;
|
|
rc->type_sig = type_sig;
|
|
|
|
#ifdef DEBUG_PRINT
|
|
DEBUG_printf("assign native: kind=%d fun=%p len=" UINT_FMT " n_pos_args=" UINT_FMT " flags=%x\n", kind, fun_data, fun_len, n_pos_args, (uint)scope_flags);
|
|
for (mp_uint_t i = 0; i < fun_len; i++) {
|
|
if (i > 0 && i % 16 == 0) {
|
|
DEBUG_printf("\n");
|
|
}
|
|
DEBUG_printf(" %02x", ((byte *)fun_data)[i]);
|
|
}
|
|
DEBUG_printf("\n");
|
|
|
|
#ifdef WRITE_CODE
|
|
FILE *fp_write_code = fopen("out-code", "wb");
|
|
fwrite(fun_data, fun_len, 1, fp_write_code);
|
|
fclose(fp_write_code);
|
|
#endif
|
|
#else
|
|
(void)fun_len;
|
|
#endif
|
|
}
|
|
#endif
|
|
|
|
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) {
|
|
DEBUG_OP_printf("make_function_from_raw_code %p\n", rc);
|
|
assert(rc != NULL);
|
|
|
|
// def_args must be MP_OBJ_NULL or a tuple
|
|
assert(def_args == NULL || def_args[0] == MP_OBJ_NULL || mp_obj_is_type(def_args[0], &mp_type_tuple));
|
|
|
|
// def_kw_args must be MP_OBJ_NULL or a dict
|
|
assert(def_args == NULL || def_args[1] == MP_OBJ_NULL || mp_obj_is_type(def_args[1], &mp_type_dict));
|
|
|
|
// make the function, depending on the raw code kind
|
|
mp_obj_t fun;
|
|
switch (rc->kind) {
|
|
#if MICROPY_EMIT_NATIVE
|
|
case MP_CODE_NATIVE_PY:
|
|
case MP_CODE_NATIVE_VIPER:
|
|
fun = mp_obj_new_fun_native(def_args, rc->fun_data, context, rc->children);
|
|
// Check for a generator function, and if so change the type of the object
|
|
if ((rc->scope_flags & MP_SCOPE_FLAG_GENERATOR) != 0) {
|
|
((mp_obj_base_t *)MP_OBJ_TO_PTR(fun))->type = &mp_type_native_gen_wrap;
|
|
}
|
|
break;
|
|
#endif
|
|
#if MICROPY_EMIT_INLINE_ASM
|
|
case MP_CODE_NATIVE_ASM:
|
|
fun = mp_obj_new_fun_asm(rc->n_pos_args, rc->fun_data, rc->type_sig);
|
|
break;
|
|
#endif
|
|
default:
|
|
// rc->kind should always be set and BYTECODE is the only remaining case
|
|
assert(rc->kind == MP_CODE_BYTECODE);
|
|
fun = mp_obj_new_fun_bc(def_args, rc->fun_data, context, rc->children);
|
|
// check for generator functions and if so change the type of the object
|
|
if ((rc->scope_flags & MP_SCOPE_FLAG_GENERATOR) != 0) {
|
|
((mp_obj_base_t *)MP_OBJ_TO_PTR(fun))->type = &mp_type_gen_wrap;
|
|
}
|
|
|
|
#if MICROPY_PY_SYS_SETTRACE
|
|
mp_obj_fun_bc_t *self_fun = (mp_obj_fun_bc_t *)MP_OBJ_TO_PTR(fun);
|
|
self_fun->rc = rc;
|
|
#endif
|
|
|
|
break;
|
|
}
|
|
|
|
return fun;
|
|
}
|
|
|
|
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) {
|
|
DEBUG_OP_printf("make_closure_from_raw_code %p " UINT_FMT " %p\n", rc, n_closed_over, args);
|
|
// make function object
|
|
mp_obj_t ffun;
|
|
if (n_closed_over & 0x100) {
|
|
// default positional and keyword args given
|
|
ffun = mp_make_function_from_raw_code(rc, context, args);
|
|
} else {
|
|
// default positional and keyword args not given
|
|
ffun = mp_make_function_from_raw_code(rc, context, NULL);
|
|
}
|
|
// wrap function in closure object
|
|
return mp_obj_new_closure(ffun, n_closed_over & 0xff, args + ((n_closed_over >> 7) & 2));
|
|
}
|