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>
144 lines
5.5 KiB
C
144 lines
5.5 KiB
C
/*
|
|
* This file is part of the MicroPython project, http://micropython.org/
|
|
*
|
|
* The MIT License (MIT)
|
|
*
|
|
* Copyright (c) 2015 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.
|
|
*/
|
|
|
|
// options to control how MicroPython is built
|
|
|
|
// Prevent the rest of the default mpconfigport.h being used.
|
|
#define MICROPY_UNIX_MINIMAL (1)
|
|
|
|
#define MICROPY_ALLOC_QSTR_CHUNK_INIT (64)
|
|
#define MICROPY_ALLOC_PARSE_RULE_INIT (8)
|
|
#define MICROPY_ALLOC_PARSE_RULE_INC (8)
|
|
#define MICROPY_ALLOC_PARSE_RESULT_INIT (8)
|
|
#define MICROPY_ALLOC_PARSE_RESULT_INC (8)
|
|
#define MICROPY_ALLOC_PARSE_CHUNK_INIT (64)
|
|
#define MICROPY_ALLOC_PATH_MAX (PATH_MAX)
|
|
#define MICROPY_ENABLE_GC (1)
|
|
#define MICROPY_GC_ALLOC_THRESHOLD (0)
|
|
#define MICROPY_ENABLE_FINALISER (0)
|
|
#define MICROPY_STACK_CHECK (0)
|
|
#define MICROPY_COMP_CONST (0)
|
|
#define MICROPY_MEM_STATS (0)
|
|
#define MICROPY_DEBUG_PRINTERS (0)
|
|
#define MICROPY_READER_POSIX (1)
|
|
#define MICROPY_HELPER_REPL (1)
|
|
#define MICROPY_HELPER_LEXER_UNIX (1)
|
|
#define MICROPY_ENABLE_SOURCE_LINE (0)
|
|
#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_TERSE)
|
|
#define MICROPY_WARNINGS (0)
|
|
#define MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF (0)
|
|
#define MICROPY_KBD_EXCEPTION (1)
|
|
#define MICROPY_FLOAT_IMPL (MICROPY_FLOAT_IMPL_NONE)
|
|
#define MICROPY_LONGINT_IMPL (MICROPY_LONGINT_IMPL_NONE)
|
|
#define MICROPY_STREAMS_NON_BLOCK (0)
|
|
#define MICROPY_OPT_COMPUTED_GOTO (0)
|
|
#define MICROPY_OPT_LOAD_ATTR_FAST_PATH (0)
|
|
#define MICROPY_OPT_MAP_LOOKUP_CACHE (0)
|
|
#define MICROPY_CAN_OVERRIDE_BUILTINS (0)
|
|
#define MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG (0)
|
|
#define MICROPY_CPYTHON_COMPAT (0)
|
|
#define MICROPY_PY_BUILTINS_BYTEARRAY (0)
|
|
#define MICROPY_PY_BUILTINS_MEMORYVIEW (0)
|
|
#define MICROPY_PY_BUILTINS_COMPILE (0)
|
|
#define MICROPY_PY_BUILTINS_ENUMERATE (0)
|
|
#define MICROPY_PY_BUILTINS_FILTER (0)
|
|
#define MICROPY_PY_BUILTINS_FROZENSET (0)
|
|
#define MICROPY_PY_BUILTINS_REVERSED (0)
|
|
#define MICROPY_PY_BUILTINS_SET (0)
|
|
#define MICROPY_PY_BUILTINS_SLICE (0)
|
|
#define MICROPY_PY_BUILTINS_STR_COUNT (0)
|
|
#define MICROPY_PY_BUILTINS_STR_OP_MODULO (0)
|
|
#define MICROPY_PY_BUILTINS_STR_UNICODE (0)
|
|
#define MICROPY_PY_BUILTINS_PROPERTY (0)
|
|
#define MICROPY_PY_BUILTINS_MIN_MAX (0)
|
|
#define MICROPY_PY___FILE__ (0)
|
|
#define MICROPY_PY_MICROPYTHON_MEM_INFO (0)
|
|
#define MICROPY_PY_GC (0)
|
|
#define MICROPY_PY_GC_COLLECT_RETVAL (0)
|
|
#define MICROPY_PY_ARRAY (0)
|
|
#define MICROPY_PY_COLLECTIONS (0)
|
|
#define MICROPY_PY_MATH (0)
|
|
#define MICROPY_PY_CMATH (0)
|
|
#define MICROPY_PY_IO (0)
|
|
#define MICROPY_PY_IO_FILEIO (0)
|
|
#define MICROPY_PY_STRUCT (0)
|
|
#define MICROPY_PY_SYS (1)
|
|
#define MICROPY_PY_SYS_EXIT (0)
|
|
#define MICROPY_PY_SYS_PLATFORM "linux"
|
|
#define MICROPY_PY_SYS_MAXSIZE (0)
|
|
#define MICROPY_PY_SYS_STDFILES (0)
|
|
#define MICROPY_PY_CMATH (0)
|
|
#define MICROPY_PY_UCTYPES (0)
|
|
#define MICROPY_PY_UTIME (0)
|
|
#define MICROPY_PY_UZLIB (0)
|
|
#define MICROPY_PY_UJSON (0)
|
|
#define MICROPY_PY_URE (0)
|
|
#define MICROPY_PY_UHEAPQ (0)
|
|
#define MICROPY_PY_UHASHLIB (0)
|
|
#define MICROPY_PY_UBINASCII (0)
|
|
|
|
extern const struct _mp_obj_module_t mp_module_os;
|
|
|
|
#define MICROPY_PORT_BUILTIN_MODULES \
|
|
{ MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_os) }, \
|
|
|
|
#define MICROPY_PORT_ROOT_POINTERS \
|
|
|
|
//////////////////////////////////////////
|
|
// Do not change anything beyond this line
|
|
//////////////////////////////////////////
|
|
|
|
#if !(defined(MICROPY_GCREGS_SETJMP) || defined(__x86_64__) || defined(__i386__) || defined(__thumb2__) || defined(__thumb__) || defined(__arm__))
|
|
// Fall back to setjmp() implementation for discovery of GC pointers in registers.
|
|
#define MICROPY_GCREGS_SETJMP (1)
|
|
#endif
|
|
|
|
// type definitions for the specific machine
|
|
|
|
#ifdef __LP64__
|
|
typedef long mp_int_t; // must be pointer size
|
|
typedef unsigned long mp_uint_t; // must be pointer size
|
|
#else
|
|
// These are definitions for machines where sizeof(int) == sizeof(void*),
|
|
// regardless for actual size.
|
|
typedef int mp_int_t; // must be pointer size
|
|
typedef unsigned int mp_uint_t; // must be pointer size
|
|
#endif
|
|
|
|
// Cannot include <sys/types.h>, as it may lead to symbol name clashes
|
|
#if _FILE_OFFSET_BITS == 64 && !defined(__LP64__)
|
|
typedef long long mp_off_t;
|
|
#else
|
|
typedef long mp_off_t;
|
|
#endif
|
|
|
|
// We need to provide a declaration/definition of alloca()
|
|
#ifdef __FreeBSD__
|
|
#include <stdlib.h>
|
|
#else
|
|
#include <alloca.h>
|
|
#endif
|