mirror of
https://github.com/licsber/micropython.git
synced 2024-09-20 17:10:24 +08:00
b326edf68c
This commit removes all parts of code associated with the existing MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE optimisation option, including the -mcache-lookup-bc option to mpy-cross. This feature originally provided a significant performance boost for Unix, but wasn't able to be enabled for MCU targets (due to frozen bytecode), and added significant extra complexity to generating and distributing .mpy files. The equivalent performance gain is now provided by the combination of MICROPY_OPT_LOAD_ATTR_FAST_PATH and MICROPY_OPT_MAP_LOOKUP_CACHE (which has been enabled on the unix port in the previous commit). It's hard to provide precise performance numbers, but tests have been run on a wide variety of architectures (x86-64, ARM Cortex, Aarch64, RISC-V, xtensa) and they all generally agree on the qualitative improvements seen by the combination of MICROPY_OPT_LOAD_ATTR_FAST_PATH and MICROPY_OPT_MAP_LOOKUP_CACHE. For example, on a "quiet" Linux x64 environment (i3-5010U @ 2.10GHz) the change from CACHE_MAP_LOOKUP_IN_BYTECODE, to LOAD_ATTR_FAST_PATH combined with MAP_LOOKUP_CACHE is: diff of scores (higher is better) N=2000 M=2000 bccache -> attrmapcache diff diff% (error%) bm_chaos.py 13742.56 -> 13905.67 : +163.11 = +1.187% (+/-3.75%) bm_fannkuch.py 60.13 -> 61.34 : +1.21 = +2.012% (+/-2.11%) bm_fft.py 113083.20 -> 114793.68 : +1710.48 = +1.513% (+/-1.57%) bm_float.py 256552.80 -> 243908.29 : -12644.51 = -4.929% (+/-1.90%) bm_hexiom.py 521.93 -> 625.41 : +103.48 = +19.826% (+/-0.40%) bm_nqueens.py 197544.25 -> 217713.12 : +20168.87 = +10.210% (+/-3.01%) bm_pidigits.py 8072.98 -> 8198.75 : +125.77 = +1.558% (+/-3.22%) misc_aes.py 17283.45 -> 16480.52 : -802.93 = -4.646% (+/-0.82%) misc_mandel.py 99083.99 -> 128939.84 : +29855.85 = +30.132% (+/-5.88%) misc_pystone.py 83860.10 -> 82592.56 : -1267.54 = -1.511% (+/-2.27%) misc_raytrace.py 21490.40 -> 22227.23 : +736.83 = +3.429% (+/-1.88%) This shows that the new optimisations are at least as good as the existing inline-bytecode-caching, and are sometimes much better (because the new ones apply caching to a wider variety of map lookups). The new optimisations can also benefit code generated by the native emitter, because they apply to the runtime rather than the generated code. The improvement for the native emitter when LOAD_ATTR_FAST_PATH and MAP_LOOKUP_CACHE are enabled is (same Linux environment as above): diff of scores (higher is better) N=2000 M=2000 native -> nat-attrmapcache diff diff% (error%) bm_chaos.py 14130.62 -> 15464.68 : +1334.06 = +9.441% (+/-7.11%) bm_fannkuch.py 74.96 -> 76.16 : +1.20 = +1.601% (+/-1.80%) bm_fft.py 166682.99 -> 168221.86 : +1538.87 = +0.923% (+/-4.20%) bm_float.py 233415.23 -> 265524.90 : +32109.67 = +13.756% (+/-2.57%) bm_hexiom.py 628.59 -> 734.17 : +105.58 = +16.796% (+/-1.39%) bm_nqueens.py 225418.44 -> 232926.45 : +7508.01 = +3.331% (+/-3.10%) bm_pidigits.py 6322.00 -> 6379.52 : +57.52 = +0.910% (+/-5.62%) misc_aes.py 20670.10 -> 27223.18 : +6553.08 = +31.703% (+/-1.56%) misc_mandel.py 138221.11 -> 152014.01 : +13792.90 = +9.979% (+/-2.46%) misc_pystone.py 85032.14 -> 105681.44 : +20649.30 = +24.284% (+/-2.25%) misc_raytrace.py 19800.01 -> 23350.73 : +3550.72 = +17.933% (+/-2.79%) In summary, compared to MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE, the new MICROPY_OPT_LOAD_ATTR_FAST_PATH and MICROPY_OPT_MAP_LOOKUP_CACHE options: - are simpler; - take less code size; - are faster (generally); - work with code generated by the native emitter; - can be used on embedded targets with a small and constant RAM overhead; - allow the same .mpy bytecode to run on all targets. See #7680 for further discussion. And see also #7653 for a discussion about simplifying mpy-cross options. Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
222 lines
10 KiB
C
222 lines
10 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2013, 2014 Damien P. George
|
|
* Copyright (c) 2015 Daniel Campora
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <stdint.h>
|
|
|
|
#ifndef BOOTLOADER
|
|
#include "FreeRTOS.h"
|
|
#include "semphr.h"
|
|
#endif
|
|
|
|
// options to control how MicroPython is built
|
|
|
|
#define MICROPY_GC_STACK_ENTRY_TYPE uint16_t
|
|
#define MICROPY_ALLOC_PATH_MAX (128)
|
|
#define MICROPY_PERSISTENT_CODE_LOAD (1)
|
|
#define MICROPY_EMIT_THUMB (0)
|
|
#define MICROPY_EMIT_INLINE_THUMB (0)
|
|
#define MICROPY_COMP_CONST_LITERAL (0)
|
|
#define MICROPY_COMP_MODULE_CONST (1)
|
|
#define MICROPY_ENABLE_GC (1)
|
|
#define MICROPY_ENABLE_FINALISER (1)
|
|
#define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (0)
|
|
#define MICROPY_STACK_CHECK (0)
|
|
#define MICROPY_HELPER_REPL (1)
|
|
#define MICROPY_ENABLE_SOURCE_LINE (1)
|
|
#define MICROPY_ENABLE_DOC_STRING (0)
|
|
#define MICROPY_REPL_AUTO_INDENT (1)
|
|
#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_TERSE)
|
|
#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_MPZ)
|
|
#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_NONE)
|
|
#define MICROPY_OPT_COMPUTED_GOTO (0)
|
|
#define MICROPY_READER_VFS (1)
|
|
#ifndef DEBUG // we need ram on the launchxl while debugging
|
|
#define MICROPY_CPYTHON_COMPAT (1)
|
|
#else
|
|
#define MICROPY_CPYTHON_COMPAT (0)
|
|
#endif
|
|
#define MICROPY_QSTR_BYTES_IN_HASH (1)
|
|
|
|
// fatfs configuration used in ffconf.h
|
|
#define MICROPY_FATFS_ENABLE_LFN (2)
|
|
#define MICROPY_FATFS_MAX_LFN (MICROPY_ALLOC_PATH_MAX)
|
|
#define MICROPY_FATFS_LFN_CODE_PAGE 437 // 1=SFN/ANSI 437=LFN/U.S.(OEM)
|
|
#define MICROPY_FATFS_RPATH (2)
|
|
#define MICROPY_FATFS_REENTRANT (1)
|
|
#define MICROPY_FATFS_TIMEOUT (2500)
|
|
#define MICROPY_FATFS_SYNC_T SemaphoreHandle_t
|
|
|
|
#define MICROPY_STREAMS_NON_BLOCK (1)
|
|
#define MICROPY_MODULE_WEAK_LINKS (1)
|
|
#define MICROPY_CAN_OVERRIDE_BUILTINS (1)
|
|
#define MICROPY_USE_INTERNAL_ERRNO (1)
|
|
#define MICROPY_VFS (1)
|
|
#define MICROPY_VFS_FAT (1)
|
|
#define MICROPY_PY_ASYNC_AWAIT (0)
|
|
#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
|
|
#define MICROPY_PY_BUILTINS_INPUT (1)
|
|
#define MICROPY_PY_BUILTINS_HELP (1)
|
|
#define MICROPY_PY_BUILTINS_HELP_TEXT cc3200_help_text
|
|
#ifndef DEBUG
|
|
#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
|
|
#define MICROPY_PY_BUILTINS_STR_SPLITLINES (1)
|
|
#define MICROPY_PY_BUILTINS_MEMORYVIEW (1)
|
|
#define MICROPY_PY_BUILTINS_FROZENSET (1)
|
|
#define MICROPY_PY_BUILTINS_EXECFILE (1)
|
|
#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
|
|
#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (1)
|
|
#else
|
|
#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
|
|
#define MICROPY_PY_BUILTINS_STR_SPLITLINES (0)
|
|
#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
|
|
#define MICROPY_PY_BUILTINS_FROZENSET (0)
|
|
#define MICROPY_PY_BUILTINS_EXECFILE (0)
|
|
#define MICROPY_PY_ARRAY_SLICE_ASSIGN (0)
|
|
#define MICROPY_PY_COLLECTIONS_ORDEREDDICT (0)
|
|
#endif
|
|
#define MICROPY_PY_MICROPYTHON_MEM_INFO (0)
|
|
#define MICROPY_PY_SYS_MAXSIZE (1)
|
|
#define MICROPY_PY_SYS_EXIT (1)
|
|
#define MICROPY_PY_SYS_STDFILES (1)
|
|
#define MICROPY_PY_CMATH (0)
|
|
#define MICROPY_PY_IO (1)
|
|
#define MICROPY_PY_IO_FILEIO (1)
|
|
#define MICROPY_PY_UERRNO (1)
|
|
#define MICROPY_PY_UERRNO_ERRORCODE (0)
|
|
#define MICROPY_PY_THREAD (1)
|
|
#define MICROPY_PY_THREAD_GIL (1)
|
|
#define MICROPY_PY_UBINASCII (1)
|
|
#define MICROPY_PY_UCTYPES (0)
|
|
#define MICROPY_PY_UZLIB (0)
|
|
#define MICROPY_PY_UJSON (1)
|
|
#define MICROPY_PY_URE (1)
|
|
#define MICROPY_PY_UHEAPQ (0)
|
|
#define MICROPY_PY_UHASHLIB (0)
|
|
#define MICROPY_PY_USELECT (1)
|
|
#define MICROPY_PY_UTIME_MP_HAL (1)
|
|
|
|
#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (1)
|
|
#define MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE (0)
|
|
#define MICROPY_KBD_EXCEPTION (1)
|
|
|
|
// We define our own list of errno constants to include in uerrno module
|
|
#define MICROPY_PY_UERRNO_LIST \
|
|
X(EPERM) \
|
|
X(EIO) \
|
|
X(ENODEV) \
|
|
X(EINVAL) \
|
|
X(ETIMEDOUT) \
|
|
|
|
// TODO these should be generic, not bound to fatfs
|
|
#define mp_type_fileio mp_type_vfs_fat_fileio
|
|
#define mp_type_textio mp_type_vfs_fat_textio
|
|
|
|
// use vfs's functions for import stat and builtin open
|
|
#define mp_import_stat mp_vfs_import_stat
|
|
#define mp_builtin_open mp_vfs_open
|
|
#define mp_builtin_open_obj mp_vfs_open_obj
|
|
|
|
// extra built in names to add to the global namespace
|
|
#define MICROPY_PORT_BUILTINS \
|
|
{ MP_ROM_QSTR(MP_QSTR_open), MP_ROM_PTR(&mp_builtin_open_obj) }, \
|
|
|
|
// extra built in modules to add to the list of known ones
|
|
extern const struct _mp_obj_module_t machine_module;
|
|
extern const struct _mp_obj_module_t wipy_module;
|
|
extern const struct _mp_obj_module_t mp_module_ure;
|
|
extern const struct _mp_obj_module_t mp_module_ujson;
|
|
extern const struct _mp_obj_module_t mp_module_uos;
|
|
extern const struct _mp_obj_module_t mp_module_utime;
|
|
extern const struct _mp_obj_module_t mp_module_uselect;
|
|
extern const struct _mp_obj_module_t mp_module_usocket;
|
|
extern const struct _mp_obj_module_t mp_module_network;
|
|
extern const struct _mp_obj_module_t mp_module_ubinascii;
|
|
extern const struct _mp_obj_module_t mp_module_ussl;
|
|
|
|
#define MICROPY_PORT_BUILTIN_MODULES \
|
|
{ MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&machine_module) }, \
|
|
{ MP_ROM_QSTR(MP_QSTR_wipy), MP_ROM_PTR(&wipy_module) }, \
|
|
{ MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
|
|
{ MP_ROM_QSTR(MP_QSTR_utime), MP_ROM_PTR(&mp_module_utime) }, \
|
|
{ MP_ROM_QSTR(MP_QSTR_uselect), MP_ROM_PTR(&mp_module_uselect) }, \
|
|
{ MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) }, \
|
|
{ MP_ROM_QSTR(MP_QSTR_network), MP_ROM_PTR(&mp_module_network) }, \
|
|
{ MP_ROM_QSTR(MP_QSTR_ubinascii), MP_ROM_PTR(&mp_module_ubinascii) }, \
|
|
{ MP_ROM_QSTR(MP_QSTR_ussl), MP_ROM_PTR(&mp_module_ussl) }, \
|
|
|
|
// extra constants
|
|
#define MICROPY_PORT_CONSTANTS \
|
|
{ MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&machine_module) }, \
|
|
|
|
// vm state and root pointers for the gc
|
|
#define MP_STATE_PORT MP_STATE_VM
|
|
#define MICROPY_PORT_ROOT_POINTERS \
|
|
const char *readline_hist[8]; \
|
|
mp_obj_t mp_const_user_interrupt; \
|
|
mp_obj_t machine_config_main; \
|
|
mp_obj_list_t pyb_sleep_obj_list; \
|
|
mp_obj_list_t mp_irq_obj_list; \
|
|
mp_obj_list_t pyb_timer_channel_obj_list; \
|
|
struct _pyb_uart_obj_t *pyb_uart_objs[2]; \
|
|
struct _os_term_dup_obj_t *os_term_dup_obj; \
|
|
|
|
|
|
// type definitions for the specific machine
|
|
#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((mp_uint_t)(p) | 1))
|
|
#define MP_SSIZE_MAX (0x7FFFFFFF)
|
|
|
|
#define UINT_FMT "%u"
|
|
#define INT_FMT "%d"
|
|
|
|
typedef int32_t mp_int_t; // must be pointer size
|
|
typedef unsigned int mp_uint_t; // must be pointer size
|
|
typedef long mp_off_t;
|
|
|
|
#define MICROPY_BEGIN_ATOMIC_SECTION() disable_irq()
|
|
#define MICROPY_END_ATOMIC_SECTION(state) enable_irq(state)
|
|
#define MICROPY_EVENT_POLL_HOOK __WFI();
|
|
|
|
// assembly functions to handle critical sections, interrupt
|
|
// disabling/enabling and sleep mode enter/exit
|
|
#include "cc3200_asm.h"
|
|
|
|
// We need to provide a declaration/definition of alloca()
|
|
#include <alloca.h>
|
|
|
|
// Include board specific configuration
|
|
#include "mpconfigboard.h"
|
|
|
|
#define MICROPY_MPHALPORT_H "cc3200_hal.h"
|
|
#define MICROPY_PORT_HAS_TELNET (1)
|
|
#define MICROPY_PORT_HAS_FTP (1)
|
|
#define MICROPY_PY_SYS_PLATFORM "WiPy"
|
|
|
|
#define MICROPY_PORT_WLAN_AP_SSID "wipy-wlan"
|
|
#define MICROPY_PORT_WLAN_AP_KEY "www.wipy.io"
|
|
#define MICROPY_PORT_WLAN_AP_SECURITY SL_SEC_TYPE_WPA_WPA2
|
|
#define MICROPY_PORT_WLAN_AP_CHANNEL 5
|