2019-10-22 20:20:07 -04:00
|
|
|
# Select the variant to build for.
|
|
|
|
VARIANT ?= standard
|
|
|
|
|
|
|
|
# If the build directory is not given, make it reflect the variant name.
|
|
|
|
BUILD ?= build-$(VARIANT)
|
|
|
|
|
|
|
|
VARIANT_DIR ?= variants/$(VARIANT)
|
|
|
|
ifeq ($(wildcard $(VARIANT_DIR)/.),)
|
|
|
|
$(error Invalid VARIANT specified: $(VARIANT_DIR))
|
|
|
|
endif
|
|
|
|
|
2017-09-06 00:09:13 -04:00
|
|
|
include ../../py/mkenv.mk
|
2019-10-22 20:20:07 -04:00
|
|
|
-include mpconfigport.mk
|
|
|
|
include $(VARIANT_DIR)/mpconfigvariant.mk
|
2014-01-24 04:05:30 -05:00
|
|
|
|
2021-12-08 00:04:11 -05:00
|
|
|
# Use the default frozen manifest, variants may override this.
|
2020-06-09 02:45:17 -04:00
|
|
|
FROZEN_MANIFEST ?= variants/manifest.py
|
2016-11-07 10:13:56 -05:00
|
|
|
|
2019-10-22 20:20:07 -04:00
|
|
|
# This should be configured by the mpconfigvariant.mk
|
|
|
|
PROG ?= micropython
|
2014-01-07 09:54:15 -05:00
|
|
|
|
2014-01-21 16:40:13 -05:00
|
|
|
# qstr definitions (must come before including py.mk)
|
|
|
|
QSTR_DEFS = qstrdefsport.h
|
2019-10-22 20:20:07 -04:00
|
|
|
QSTR_GLOBAL_DEPENDENCIES = $(VARIANT_DIR)/mpconfigvariant.h
|
2014-01-21 16:40:13 -05:00
|
|
|
|
2014-06-20 12:25:54 -04:00
|
|
|
# OS name, for simple autoconfig
|
|
|
|
UNAME_S := $(shell uname -s)
|
|
|
|
|
2014-01-07 09:54:15 -05:00
|
|
|
# include py core make definitions
|
2017-08-10 22:22:19 -04:00
|
|
|
include $(TOP)/py/py.mk
|
2022-06-17 12:11:30 -04:00
|
|
|
include $(TOP)/extmod/extmod.mk
|
2013-10-12 09:30:21 -04:00
|
|
|
|
2022-07-18 12:40:27 -04:00
|
|
|
GIT_SUBMODULES += lib/berkeley-db-1.xx
|
2019-10-13 21:09:06 -04:00
|
|
|
|
2015-10-19 11:22:16 -04:00
|
|
|
INC += -I.
|
2017-08-10 22:22:19 -04:00
|
|
|
INC += -I$(TOP)
|
2014-04-17 13:03:27 -04:00
|
|
|
INC += -I$(BUILD)
|
2014-04-16 17:10:33 -04:00
|
|
|
|
2014-01-07 09:54:15 -05:00
|
|
|
# compiler settings
|
2015-01-22 09:10:11 -05:00
|
|
|
CWARN = -Wall -Werror
|
2020-10-03 05:31:13 -04:00
|
|
|
CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith -Wdouble-promotion -Wfloat-conversion
|
extmod: Make extmod.mk self-contained.
This makes it so that all a port needs to do is set the relevant variables
and "include extmod.mk" and doesn't need to worry about adding anything to
OBJ, CFLAGS, SRC_QSTR, etc.
Make all extmod variables (src, flags, etc) private to extmod.mk.
Also move common/shared, extmod-related fragments (e.g. wiznet, cyw43,
bluetooth) into extmod.mk.
Now that SRC_MOD, CFLAGS_MOD, CXXFLAGS_MOD are unused by both extmod.mk
(and user-C-modules in a previous commit), remove all uses of them from
port makefiles.
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
2022-10-08 08:59:08 -04:00
|
|
|
CFLAGS += $(INC) $(CWARN) -std=gnu99 -DUNIX $(COPT) -I$(VARIANT_DIR) $(CFLAGS_EXTRA)
|
2014-02-14 17:37:37 -05:00
|
|
|
|
2014-06-20 12:19:06 -04:00
|
|
|
# Debugging/Optimization
|
|
|
|
ifdef DEBUG
|
2021-12-08 20:53:09 -05:00
|
|
|
COPT ?= -Og
|
2014-06-20 12:19:06 -04:00
|
|
|
else
|
2020-04-02 21:55:14 -04:00
|
|
|
COPT ?= -Os
|
|
|
|
COPT += -DNDEBUG
|
|
|
|
endif
|
|
|
|
|
2020-08-14 02:40:55 -04:00
|
|
|
# Remove unused sections.
|
|
|
|
COPT += -fdata-sections -ffunction-sections
|
|
|
|
|
2020-04-02 21:55:14 -04:00
|
|
|
# Always enable symbols -- They're occasionally useful, and don't make it into the
|
|
|
|
# final .bin/.hex/.dfu so the extra size doesn't matter.
|
|
|
|
CFLAGS += -g
|
|
|
|
|
|
|
|
ifndef DEBUG
|
2016-01-26 12:46:40 -05:00
|
|
|
# _FORTIFY_SOURCE is a feature in gcc/glibc which is intended to provide extra
|
|
|
|
# security for detecting buffer overflows. Some distros (Ubuntu at the very least)
|
|
|
|
# have it enabled by default.
|
|
|
|
#
|
|
|
|
# gcc already optimizes some printf calls to call puts and/or putchar. When
|
|
|
|
# _FORTIFY_SOURCE is enabled and compiling with -O1 or greater, then some
|
|
|
|
# printf calls will also be optimized to call __printf_chk (in glibc). Any
|
|
|
|
# printfs which get redirected to __printf_chk are then no longer synchronized
|
|
|
|
# with printfs that go through mp_printf.
|
|
|
|
#
|
|
|
|
# In MicroPython, we don't want to use the runtime library's printf but rather
|
|
|
|
# go through mp_printf, so that stdout is properly tied into streams, etc.
|
|
|
|
# This means that we either need to turn off _FORTIFY_SOURCE or provide our
|
|
|
|
# own implementation of __printf_chk. We've chosen to turn off _FORTIFY_SOURCE.
|
|
|
|
# It should also be noted that the use of printf in MicroPython is typically
|
|
|
|
# quite limited anyways (primarily for debug and some error reporting, etc
|
|
|
|
# in the unix version).
|
|
|
|
#
|
|
|
|
# Information about _FORTIFY_SOURCE seems to be rather scarce. The best I could
|
|
|
|
# find was this: https://securityblog.redhat.com/2014/03/26/fortify-and-you/
|
|
|
|
# Original patchset was introduced by
|
|
|
|
# https://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html .
|
|
|
|
#
|
|
|
|
# Turning off _FORTIFY_SOURCE is only required when compiling with -O1 or greater
|
|
|
|
CFLAGS += -U _FORTIFY_SOURCE
|
2014-06-20 12:19:06 -04:00
|
|
|
endif
|
|
|
|
|
2014-09-23 09:42:18 -04:00
|
|
|
# On OSX, 'gcc' is a symlink to clang unless a real gcc is installed.
|
2017-06-30 03:22:17 -04:00
|
|
|
# The unix port of MicroPython on OSX must be compiled with clang,
|
2016-06-02 13:10:39 -04:00
|
|
|
# while cross-compile ports require gcc, so we test here for OSX and
|
2014-09-23 09:42:18 -04:00
|
|
|
# if necessary override the value of 'CC' set in py/mkenv.mk
|
2014-09-22 15:16:14 -04:00
|
|
|
ifeq ($(UNAME_S),Darwin)
|
2016-06-02 13:10:39 -04:00
|
|
|
ifeq ($(MICROPY_FORCE_32BIT),1)
|
|
|
|
CC = clang -m32
|
|
|
|
else
|
2014-09-22 15:16:14 -04:00
|
|
|
CC = clang
|
2016-06-02 13:10:39 -04:00
|
|
|
endif
|
2015-01-08 04:32:45 -05:00
|
|
|
# Use clang syntax for map file
|
2016-06-25 11:59:49 -04:00
|
|
|
LDFLAGS_ARCH = -Wl,-map,$@.map -Wl,-dead_strip
|
2014-09-22 23:00:42 -04:00
|
|
|
else
|
2014-09-23 09:42:18 -04:00
|
|
|
# Use gcc syntax for map file
|
2016-06-25 11:59:49 -04:00
|
|
|
LDFLAGS_ARCH = -Wl,-Map=$@.map,--cref -Wl,--gc-sections
|
2014-09-22 15:16:14 -04:00
|
|
|
endif
|
2020-01-23 19:51:21 -05:00
|
|
|
LDFLAGS += $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
|
2014-02-01 13:06:55 -05:00
|
|
|
|
2018-09-08 19:40:51 -04:00
|
|
|
# Flags to link with pthread library
|
|
|
|
LIBPTHREAD = -lpthread
|
|
|
|
|
2014-04-15 20:46:01 -04:00
|
|
|
ifeq ($(MICROPY_FORCE_32BIT),1)
|
2014-10-11 13:29:51 -04:00
|
|
|
# Note: you may need to install i386 versions of dependency packages,
|
|
|
|
# starting with linux-libc-dev:i386
|
2014-05-24 18:03:12 -04:00
|
|
|
ifeq ($(MICROPY_PY_FFI),1)
|
2014-04-15 20:46:01 -04:00
|
|
|
ifeq ($(UNAME_S),Linux)
|
2022-10-08 08:38:18 -04:00
|
|
|
CFLAGS += -I/usr/include/i686-linux-gnu
|
2014-04-15 20:46:01 -04:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2014-02-27 11:10:40 -05:00
|
|
|
ifeq ($(MICROPY_USE_READLINE),1)
|
2021-07-09 00:19:15 -04:00
|
|
|
INC += -I$(TOP)/shared/readline
|
2022-10-08 08:38:18 -04:00
|
|
|
CFLAGS += -DMICROPY_USE_READLINE=1
|
2021-07-09 00:19:15 -04:00
|
|
|
SHARED_SRC_C_EXTRA += readline/readline.c
|
2015-05-24 17:36:31 -04:00
|
|
|
endif
|
2014-08-19 03:23:14 -04:00
|
|
|
ifeq ($(MICROPY_PY_TERMIOS),1)
|
2022-10-08 08:38:18 -04:00
|
|
|
CFLAGS += -DMICROPY_PY_TERMIOS=1
|
2014-08-19 03:23:14 -04:00
|
|
|
endif
|
2015-01-11 12:28:27 -05:00
|
|
|
ifeq ($(MICROPY_PY_SOCKET),1)
|
2022-10-08 08:38:18 -04:00
|
|
|
CFLAGS += -DMICROPY_PY_SOCKET=1
|
2015-01-11 12:28:27 -05:00
|
|
|
endif
|
2016-04-22 18:53:51 -04:00
|
|
|
ifeq ($(MICROPY_PY_THREAD),1)
|
2022-10-08 08:38:18 -04:00
|
|
|
CFLAGS += -DMICROPY_PY_THREAD=1 -DMICROPY_PY_THREAD_GIL=0
|
|
|
|
LDFLAGS += $(LIBPTHREAD)
|
2016-04-22 18:53:51 -04:00
|
|
|
endif
|
2015-08-30 03:57:38 -04:00
|
|
|
|
2022-07-14 22:27:23 -04:00
|
|
|
ifeq ($(MICROPY_PY_USSL),1)
|
2022-07-18 08:44:45 -04:00
|
|
|
ifeq ($(MICROPY_SSL_AXTLS),1)
|
2022-10-08 08:47:57 -04:00
|
|
|
|
2022-07-14 22:27:23 -04:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2020-08-14 01:46:53 -04:00
|
|
|
# If the variant enables it, enable modbluetooth.
|
2020-04-07 01:02:52 -04:00
|
|
|
ifeq ($(MICROPY_PY_BLUETOOTH),1)
|
2020-08-14 01:46:53 -04:00
|
|
|
ifeq ($(MICROPY_BLUETOOTH_BTSTACK),1)
|
extmod: Make extmod.mk self-contained.
This makes it so that all a port needs to do is set the relevant variables
and "include extmod.mk" and doesn't need to worry about adding anything to
OBJ, CFLAGS, SRC_QSTR, etc.
Make all extmod variables (src, flags, etc) private to extmod.mk.
Also move common/shared, extmod-related fragments (e.g. wiznet, cyw43,
bluetooth) into extmod.mk.
Now that SRC_MOD, CFLAGS_MOD, CXXFLAGS_MOD are unused by both extmod.mk
(and user-C-modules in a previous commit), remove all uses of them from
port makefiles.
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
2022-10-08 08:59:08 -04:00
|
|
|
HAVE_LIBUSB := $(shell (which pkg-config > /dev/null && pkg-config --exists libusb-1.0) 2>/dev/null && echo '1')
|
2020-08-14 01:46:53 -04:00
|
|
|
|
|
|
|
# Figure out which BTstack transport to use.
|
|
|
|
ifeq ($(HAVE_LIBUSB),1)
|
|
|
|
# Default to btstack-over-usb.
|
2020-04-07 01:02:52 -04:00
|
|
|
MICROPY_BLUETOOTH_BTSTACK_USB ?= 1
|
2020-08-14 01:46:53 -04:00
|
|
|
else
|
|
|
|
# Fallback to HCI controller via a H4 UART (e.g. Zephyr on nRF) over a /dev/tty serial port.
|
|
|
|
MICROPY_BLUETOOTH_BTSTACK_H4 ?= 1
|
|
|
|
endif
|
2020-04-07 01:02:52 -04:00
|
|
|
|
extmod: Make extmod.mk self-contained.
This makes it so that all a port needs to do is set the relevant variables
and "include extmod.mk" and doesn't need to worry about adding anything to
OBJ, CFLAGS, SRC_QSTR, etc.
Make all extmod variables (src, flags, etc) private to extmod.mk.
Also move common/shared, extmod-related fragments (e.g. wiznet, cyw43,
bluetooth) into extmod.mk.
Now that SRC_MOD, CFLAGS_MOD, CXXFLAGS_MOD are unused by both extmod.mk
(and user-C-modules in a previous commit), remove all uses of them from
port makefiles.
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
2022-10-08 08:59:08 -04:00
|
|
|
SRC_BTSTACK_C += lib/btstack/platform/embedded/btstack_run_loop_embedded.c
|
2020-04-07 09:01:43 -04:00
|
|
|
endif
|
|
|
|
endif
|
|
|
|
|
2014-05-24 18:03:12 -04:00
|
|
|
ifeq ($(MICROPY_PY_FFI),1)
|
2015-08-30 03:57:38 -04:00
|
|
|
|
|
|
|
ifeq ($(MICROPY_STANDALONE),1)
|
2022-07-18 12:40:27 -04:00
|
|
|
# Build libffi from source.
|
|
|
|
GIT_SUBMODULES += lib/libffi
|
|
|
|
DEPLIBS += libffi
|
2022-10-08 08:38:18 -04:00
|
|
|
LIBFFI_CFLAGS := -I$(shell ls -1d $(BUILD)/lib/libffi/out/lib/libffi-*/include)
|
2015-08-30 03:57:38 -04:00
|
|
|
ifeq ($(MICROPY_FORCE_32BIT),1)
|
2022-10-08 08:38:18 -04:00
|
|
|
LIBFFI_LDFLAGS = $(BUILD)/lib/libffi/out/lib32/libffi.a
|
2015-08-30 03:57:38 -04:00
|
|
|
else
|
2022-10-08 08:38:18 -04:00
|
|
|
LIBFFI_LDFLAGS = $(BUILD)/lib/libffi/out/lib/libffi.a
|
2015-08-30 03:57:38 -04:00
|
|
|
endif
|
|
|
|
else
|
2022-07-18 12:40:27 -04:00
|
|
|
# Use system version of libffi.
|
2022-10-08 08:38:18 -04:00
|
|
|
LIBFFI_CFLAGS := $(shell pkg-config --cflags libffi)
|
|
|
|
LIBFFI_LDFLAGS := $(shell pkg-config --libs libffi)
|
2015-08-30 03:57:38 -04:00
|
|
|
endif
|
|
|
|
|
2014-06-07 03:16:42 -04:00
|
|
|
ifeq ($(UNAME_S),Linux)
|
2022-10-08 08:38:18 -04:00
|
|
|
LIBFFI_LDFLAGS += -ldl
|
2014-06-07 03:16:42 -04:00
|
|
|
endif
|
2015-08-30 03:57:38 -04:00
|
|
|
|
2022-10-08 08:38:18 -04:00
|
|
|
CFLAGS += $(LIBFFI_CFLAGS) -DMICROPY_PY_FFI=1
|
|
|
|
LDFLAGS += $(LIBFFI_LDFLAGS)
|
2014-02-01 13:06:55 -05:00
|
|
|
endif
|
|
|
|
|
2015-09-11 10:57:47 -04:00
|
|
|
ifeq ($(MICROPY_PY_JNI),1)
|
|
|
|
# Path for 64-bit OpenJDK, should be adjusted for other JDKs
|
2022-10-08 08:38:18 -04:00
|
|
|
CFLAGS += -I/usr/lib/jvm/java-7-openjdk-amd64/include -DMICROPY_PY_JNI=1
|
2015-09-11 10:57:47 -04:00
|
|
|
endif
|
2013-10-12 09:30:21 -04:00
|
|
|
|
2014-01-07 09:54:15 -05:00
|
|
|
# source files
|
2020-10-29 02:33:34 -04:00
|
|
|
SRC_C += \
|
2013-10-12 09:30:21 -04:00
|
|
|
main.c \
|
2014-02-10 17:44:37 -05:00
|
|
|
gccollect.c \
|
2015-05-24 15:00:50 -04:00
|
|
|
unix_mphal.c \
|
2016-04-22 18:53:51 -04:00
|
|
|
mpthreadport.c \
|
2014-05-07 10:15:00 -04:00
|
|
|
input.c \
|
2015-12-12 17:15:33 -05:00
|
|
|
modmachine.c \
|
2016-06-17 16:35:00 -04:00
|
|
|
modtime.c \
|
2015-11-16 17:35:29 -05:00
|
|
|
moduselect.c \
|
2014-09-03 17:47:23 -04:00
|
|
|
alloc.c \
|
2016-02-13 16:03:23 -05:00
|
|
|
fatfs_port.c \
|
2020-08-14 01:46:53 -04:00
|
|
|
mpbthciport.c \
|
2020-08-14 01:43:09 -04:00
|
|
|
mpbtstackport_common.c \
|
2020-08-14 01:46:53 -04:00
|
|
|
mpbtstackport_h4.c \
|
2020-08-14 01:43:09 -04:00
|
|
|
mpbtstackport_usb.c \
|
|
|
|
mpnimbleport.c \
|
2022-10-08 08:38:18 -04:00
|
|
|
modtermios.c \
|
|
|
|
modusocket.c \
|
|
|
|
modffi.c \
|
|
|
|
modjni.c \
|
2019-10-22 20:20:07 -04:00
|
|
|
$(wildcard $(VARIANT_DIR)/*.c)
|
2013-10-12 09:30:21 -04:00
|
|
|
|
2021-07-09 00:19:15 -04:00
|
|
|
SHARED_SRC_C += $(addprefix shared/,\
|
|
|
|
runtime/gchelper_generic.c \
|
2016-06-15 17:03:24 -04:00
|
|
|
timeutils/timeutils.c \
|
2021-07-09 00:19:15 -04:00
|
|
|
$(SHARED_SRC_C_EXTRA) \
|
2016-06-15 17:03:24 -04:00
|
|
|
)
|
|
|
|
|
2020-10-08 10:52:25 -04:00
|
|
|
SRC_CXX += \
|
|
|
|
|
2015-05-24 17:36:31 -04:00
|
|
|
OBJ = $(PY_O)
|
|
|
|
OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
|
2020-10-08 10:52:25 -04:00
|
|
|
OBJ += $(addprefix $(BUILD)/, $(SRC_CXX:.cpp=.o))
|
2021-07-09 00:19:15 -04:00
|
|
|
OBJ += $(addprefix $(BUILD)/, $(SHARED_SRC_C:.c=.o))
|
2013-10-12 09:30:21 -04:00
|
|
|
|
py: Add rules for automated extraction of qstrs from sources.
- add template rule that converts a specified source file into a qstring file
- add special rule for generating a central header that contains all
extracted/autogenerated strings - defined by QSTR_DEFS_COLLECTED
variable. Each platform appends a list of sources that may contain
qstrings into a new build variable: SRC_QSTR. Any autogenerated
prerequisities are should be appened to SRC_QSTR_AUTO_DEPS variable.
- remove most qstrings from py/qstrdefs, keep only qstrings that
contain special characters - these cannot be easily detected in the
sources without additional annotations
- remove most manual qstrdefs, use qstrdef autogen for: py, cc3200,
stmhal, teensy, unix, windows, pic16bit:
- remove all micropython generic qstrdefs except for the special strings that contain special characters (e.g. /,+,<,> etc.)
- remove all port specific qstrdefs except for special strings
- append sources for qstr generation in platform makefiles (SRC_QSTR)
2016-03-10 04:22:41 -05:00
|
|
|
# List of sources for qstr extraction
|
extmod: Make extmod.mk self-contained.
This makes it so that all a port needs to do is set the relevant variables
and "include extmod.mk" and doesn't need to worry about adding anything to
OBJ, CFLAGS, SRC_QSTR, etc.
Make all extmod variables (src, flags, etc) private to extmod.mk.
Also move common/shared, extmod-related fragments (e.g. wiznet, cyw43,
bluetooth) into extmod.mk.
Now that SRC_MOD, CFLAGS_MOD, CXXFLAGS_MOD are unused by both extmod.mk
(and user-C-modules in a previous commit), remove all uses of them from
port makefiles.
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
2022-10-08 08:59:08 -04:00
|
|
|
SRC_QSTR += $(SRC_C) $(SRC_CXX) $(SHARED_SRC_C)
|
py: Add rules for automated extraction of qstrs from sources.
- add template rule that converts a specified source file into a qstring file
- add special rule for generating a central header that contains all
extracted/autogenerated strings - defined by QSTR_DEFS_COLLECTED
variable. Each platform appends a list of sources that may contain
qstrings into a new build variable: SRC_QSTR. Any autogenerated
prerequisities are should be appened to SRC_QSTR_AUTO_DEPS variable.
- remove most qstrings from py/qstrdefs, keep only qstrings that
contain special characters - these cannot be easily detected in the
sources without additional annotations
- remove most manual qstrdefs, use qstrdef autogen for: py, cc3200,
stmhal, teensy, unix, windows, pic16bit:
- remove all micropython generic qstrdefs except for the special strings that contain special characters (e.g. /,+,<,> etc.)
- remove all port specific qstrdefs except for special strings
- append sources for qstr generation in platform makefiles (SRC_QSTR)
2016-03-10 04:22:41 -05:00
|
|
|
# Append any auto-generated sources that are needed by sources listed in
|
|
|
|
# SRC_QSTR
|
|
|
|
SRC_QSTR_AUTO_DEPS +=
|
|
|
|
|
2021-12-08 00:04:11 -05:00
|
|
|
ifneq ($(FROZEN_MANIFEST),)
|
2019-09-09 10:50:04 -04:00
|
|
|
# To use frozen code create a manifest.py file with a description of files to
|
|
|
|
# freeze, then invoke make with FROZEN_MANIFEST=manifest.py (be sure to build from scratch).
|
2016-05-16 18:17:11 -04:00
|
|
|
CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
|
|
|
|
CFLAGS += -DMICROPY_MODULE_FROZEN_MPY
|
|
|
|
CFLAGS += -DMPZ_DIG_SIZE=16 # force 16 bits to work on both 32 and 64 bit archs
|
2019-10-18 09:39:11 -04:00
|
|
|
CFLAGS += -DMICROPY_MODULE_FROZEN_STR
|
|
|
|
endif
|
py: Add rules for automated extraction of qstrs from sources.
- add template rule that converts a specified source file into a qstring file
- add special rule for generating a central header that contains all
extracted/autogenerated strings - defined by QSTR_DEFS_COLLECTED
variable. Each platform appends a list of sources that may contain
qstrings into a new build variable: SRC_QSTR. Any autogenerated
prerequisities are should be appened to SRC_QSTR_AUTO_DEPS variable.
- remove most qstrings from py/qstrdefs, keep only qstrings that
contain special characters - these cannot be easily detected in the
sources without additional annotations
- remove most manual qstrdefs, use qstrdef autogen for: py, cc3200,
stmhal, teensy, unix, windows, pic16bit:
- remove all micropython generic qstrdefs except for the special strings that contain special characters (e.g. /,+,<,> etc.)
- remove all port specific qstrdefs except for special strings
- append sources for qstr generation in platform makefiles (SRC_QSTR)
2016-03-10 04:22:41 -05:00
|
|
|
|
2020-10-08 10:52:25 -04:00
|
|
|
CXXFLAGS += $(filter-out -Wmissing-prototypes -Wold-style-definition -std=gnu99,$(CFLAGS) $(CXXFLAGS_MOD))
|
|
|
|
|
2020-03-11 02:03:01 -04:00
|
|
|
ifeq ($(MICROPY_FORCE_32BIT),1)
|
all: Remove MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE.
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>
2021-09-05 22:28:06 -04:00
|
|
|
RUN_TESTS_MPY_CROSS_FLAGS = --mpy-cross-flags='-march=x86'
|
2020-03-11 02:03:01 -04:00
|
|
|
endif
|
|
|
|
|
2021-08-16 08:43:02 -04:00
|
|
|
ifeq ($(CROSS_COMPILE),arm-linux-gnueabi-)
|
|
|
|
# Force disable error text compression when compiling for ARM as the compiler
|
|
|
|
# cannot optimise out the giant strcmp list generated for MP_MATCH_COMPRESSED.
|
|
|
|
# Checked on:
|
|
|
|
# arm-linux-gnueabi-gcc (Ubuntu/Linaro 7.5.0-3ubuntu1~18.04) 7.5.0
|
|
|
|
# arm-linux-gnueabi-gcc (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0
|
|
|
|
# See https://github.com/micropython/micropython/pull/7659 for details.
|
|
|
|
$(info Detected arm-linux-gnueabi-gcc. Disabling error message compression.)
|
|
|
|
MICROPY_ROM_TEXT_COMPRESSION = 0
|
|
|
|
endif
|
|
|
|
|
2017-08-10 22:22:19 -04:00
|
|
|
include $(TOP)/py/mkrules.mk
|
2013-12-29 13:01:01 -05:00
|
|
|
|
2019-10-22 20:20:07 -04:00
|
|
|
.PHONY: test test_full
|
2014-04-16 15:38:16 -04:00
|
|
|
|
2022-08-02 17:48:41 -04:00
|
|
|
test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
|
2017-09-06 00:09:13 -04:00
|
|
|
$(eval DIRNAME=ports/$(notdir $(CURDIR)))
|
2022-08-02 17:48:41 -04:00
|
|
|
cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py
|
2014-08-11 13:47:00 -04:00
|
|
|
|
2022-08-02 17:48:41 -04:00
|
|
|
test_full: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
|
2019-10-22 20:20:07 -04:00
|
|
|
$(eval DIRNAME=ports/$(notdir $(CURDIR)))
|
2022-08-02 17:48:41 -04:00
|
|
|
cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py
|
|
|
|
cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py -d thread
|
|
|
|
cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py --emit native
|
|
|
|
cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) -d basics float micropython
|
|
|
|
cd $(TOP)/tests && MICROPY_MICROPYTHON=../$(DIRNAME)/$(BUILD)/$(PROG) ./run-tests.py --via-mpy $(RUN_TESTS_MPY_CROSS_FLAGS) --emit native -d basics float micropython
|
|
|
|
cat $(TOP)/tests/basics/0prelim.py | ./$(BUILD)/$(PROG) | grep -q 'abc'
|
2014-08-11 13:47:00 -04:00
|
|
|
|
2019-10-22 20:20:07 -04:00
|
|
|
test_gcov: test_full
|
|
|
|
gcov -o $(BUILD)/py $(TOP)/py/*.c
|
|
|
|
gcov -o $(BUILD)/extmod $(TOP)/extmod/*.c
|
2014-11-01 10:01:21 -04:00
|
|
|
|
2015-08-30 03:57:38 -04:00
|
|
|
# Value of configure's --host= option (required for cross-compilation).
|
2017-05-29 03:08:14 -04:00
|
|
|
# Deduce it from CROSS_COMPILE by default, but can be overridden.
|
2015-08-30 03:57:38 -04:00
|
|
|
ifneq ($(CROSS_COMPILE),)
|
|
|
|
CROSS_COMPILE_HOST = --host=$(patsubst %-,%,$(CROSS_COMPILE))
|
|
|
|
else
|
|
|
|
CROSS_COMPILE_HOST =
|
|
|
|
endif
|
|
|
|
|
2022-07-18 12:40:27 -04:00
|
|
|
deplibs: $(DEPLIBS)
|
2015-08-30 03:57:38 -04:00
|
|
|
|
2018-07-28 09:39:33 -04:00
|
|
|
libffi: $(BUILD)/lib/libffi/include/ffi.h
|
|
|
|
|
|
|
|
$(TOP)/lib/libffi/configure: $(TOP)/lib/libffi/autogen.sh
|
|
|
|
cd $(TOP)/lib/libffi; ./autogen.sh
|
|
|
|
|
2015-10-19 13:28:06 -04:00
|
|
|
# install-exec-recursive & install-data-am targets are used to avoid building
|
|
|
|
# docs and depending on makeinfo
|
2018-07-28 09:39:33 -04:00
|
|
|
$(BUILD)/lib/libffi/include/ffi.h: $(TOP)/lib/libffi/configure
|
|
|
|
mkdir -p $(BUILD)/lib/libffi; cd $(BUILD)/lib/libffi; \
|
|
|
|
$(abspath $(TOP))/lib/libffi/configure $(CROSS_COMPILE_HOST) --prefix=$$PWD/out --disable-structs CC="$(CC)" CXX="$(CXX)" LD="$(LD)" CFLAGS="-Os -fomit-frame-pointer -fstrict-aliasing -ffast-math -fno-exceptions"; \
|
2017-06-07 11:51:01 -04:00
|
|
|
$(MAKE) install-exec-recursive; $(MAKE) -C include install-data-am
|
2015-09-19 10:12:02 -04:00
|
|
|
|
2020-02-12 18:17:09 -05:00
|
|
|
PREFIX = /usr/local
|
|
|
|
BINDIR = $(DESTDIR)$(PREFIX)/bin
|
|
|
|
|
2022-08-02 17:48:41 -04:00
|
|
|
install: $(BUILD)/$(PROG)
|
2020-04-08 16:15:02 -04:00
|
|
|
install -d $(BINDIR)
|
2022-08-02 17:48:41 -04:00
|
|
|
install $(BUILD)/$(PROG) $(BINDIR)/$(PROG)
|
2020-02-12 18:17:09 -05:00
|
|
|
|
|
|
|
uninstall:
|
|
|
|
-rm $(BINDIR)/$(PROG)
|