2014-04-02 10:31:39 -04:00
|
|
|
#! /usr/bin/env python3
|
2014-01-27 16:53:28 -05:00
|
|
|
|
|
|
|
import os
|
|
|
|
import subprocess
|
|
|
|
import sys
|
2014-09-17 17:56:34 -04:00
|
|
|
import platform
|
2014-05-03 11:43:27 -04:00
|
|
|
import argparse
|
2020-04-08 02:01:58 -04:00
|
|
|
import inspect
|
2015-03-20 13:25:25 -04:00
|
|
|
import re
|
2021-05-13 11:33:24 -04:00
|
|
|
from glob import glob
|
2021-05-11 20:31:27 -04:00
|
|
|
import multiprocessing
|
|
|
|
from multiprocessing.pool import ThreadPool
|
2021-05-13 11:33:24 -04:00
|
|
|
import threading
|
|
|
|
import tempfile
|
2014-01-27 16:53:28 -05:00
|
|
|
|
2020-04-08 02:01:58 -04:00
|
|
|
# See stackoverflow.com/questions/2632199: __file__ nor sys.argv[0]
|
|
|
|
# are guaranteed to always work, this one should though.
|
|
|
|
BASEPATH = os.path.dirname(os.path.abspath(inspect.getsourcefile(lambda: None)))
|
|
|
|
|
2021-03-11 00:11:27 -05:00
|
|
|
|
2020-04-08 02:01:58 -04:00
|
|
|
def base_path(*p):
|
2021-03-11 00:11:27 -05:00
|
|
|
return os.path.abspath(os.path.join(BASEPATH, *p)).replace("\\", "/")
|
|
|
|
|
2020-04-08 02:01:58 -04:00
|
|
|
|
2014-04-04 10:28:34 -04:00
|
|
|
# Tests require at least CPython 3.3. If your default python3 executable
|
|
|
|
# is of lower version, you can point MICROPY_CPYTHON3 environment var
|
|
|
|
# to the correct executable.
|
2021-03-11 00:11:27 -05:00
|
|
|
if os.name == "nt":
|
|
|
|
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python")
|
|
|
|
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", base_path("../ports/windows/micropython.exe"))
|
2014-01-27 16:53:28 -05:00
|
|
|
else:
|
2021-03-11 00:11:27 -05:00
|
|
|
CPYTHON3 = os.getenv("MICROPY_CPYTHON3", "python3")
|
|
|
|
MICROPYTHON = os.getenv("MICROPY_MICROPYTHON", base_path("../ports/unix/micropython"))
|
2014-01-27 16:53:28 -05:00
|
|
|
|
2020-09-23 22:03:30 -04:00
|
|
|
# Use CPython options to not save .pyc files, to only access the core standard library
|
|
|
|
# (not site packages which may clash with u-module names), and improve start up time.
|
2021-05-11 20:31:27 -04:00
|
|
|
CPYTHON3_CMD = [CPYTHON3, "-Wignore", "-BS"]
|
2020-09-23 22:03:30 -04:00
|
|
|
|
2016-09-19 22:19:35 -04:00
|
|
|
# mpy-cross is only needed if --via-mpy command-line arg is passed
|
2021-03-11 00:11:27 -05:00
|
|
|
MPYCROSS = os.getenv("MICROPY_MPYCROSS", base_path("../mpy-cross/mpy-cross"))
|
2016-09-19 22:19:35 -04:00
|
|
|
|
2020-03-30 04:14:09 -04:00
|
|
|
# For diff'ing test output
|
2021-03-11 00:11:27 -05:00
|
|
|
DIFF = os.getenv("MICROPY_DIFF", "diff -u")
|
2020-03-30 04:14:09 -04:00
|
|
|
|
2014-11-19 10:44:31 -05:00
|
|
|
# Set PYTHONIOENCODING so that CPython will use utf-8 on systems which set another encoding in the locale
|
2021-03-11 00:11:27 -05:00
|
|
|
os.environ["PYTHONIOENCODING"] = "utf-8"
|
|
|
|
|
2014-11-19 10:44:31 -05:00
|
|
|
|
2014-03-22 19:07:30 -04:00
|
|
|
def rm_f(fname):
|
|
|
|
if os.path.exists(fname):
|
|
|
|
os.remove(fname)
|
|
|
|
|
2016-07-26 14:29:48 -04:00
|
|
|
|
|
|
|
# unescape wanted regex chars and escape unwanted ones
|
|
|
|
def convert_regex_escapes(line):
|
|
|
|
cs = []
|
|
|
|
escape = False
|
2021-03-11 00:11:27 -05:00
|
|
|
for c in str(line, "utf8"):
|
2016-07-26 14:29:48 -04:00
|
|
|
if escape:
|
|
|
|
escape = False
|
|
|
|
cs.append(c)
|
2021-03-11 00:11:27 -05:00
|
|
|
elif c == "\\":
|
2016-07-26 14:29:48 -04:00
|
|
|
escape = True
|
2021-03-11 00:11:27 -05:00
|
|
|
elif c in ("(", ")", "[", "]", "{", "}", ".", "*", "+", "^", "$"):
|
|
|
|
cs.append("\\" + c)
|
2016-07-26 14:29:48 -04:00
|
|
|
else:
|
|
|
|
cs.append(c)
|
|
|
|
# accept carriage-return(s) before final newline
|
2021-03-11 00:11:27 -05:00
|
|
|
if cs[-1] == "\n":
|
|
|
|
cs[-1] = "\r*\n"
|
|
|
|
return bytes("".join(cs), "utf8")
|
2016-07-26 14:29:48 -04:00
|
|
|
|
|
|
|
|
2017-04-14 10:07:13 -04:00
|
|
|
def run_micropython(pyb, args, test_file, is_special=False):
|
2017-12-04 18:52:41 -05:00
|
|
|
special_tests = (
|
2021-03-11 00:11:27 -05:00
|
|
|
"micropython/meminfo.py",
|
|
|
|
"basics/bytes_compare3.py",
|
|
|
|
"basics/builtin_help.py",
|
|
|
|
"thread/thread_exc2.py",
|
|
|
|
"esp32/partition_ota.py",
|
2017-12-04 18:52:41 -05:00
|
|
|
)
|
2018-02-14 01:19:44 -05:00
|
|
|
had_crash = False
|
2014-10-05 17:27:12 -04:00
|
|
|
if pyb is None:
|
|
|
|
# run on PC
|
2021-03-11 00:11:27 -05:00
|
|
|
if (
|
|
|
|
test_file.startswith(("cmdline/", base_path("feature_check/")))
|
|
|
|
or test_file in special_tests
|
|
|
|
):
|
2015-03-13 06:58:34 -04:00
|
|
|
# special handling for tests of the unix cmdline program
|
2016-07-26 14:29:48 -04:00
|
|
|
is_special = True
|
2015-03-13 06:58:34 -04:00
|
|
|
|
2017-04-14 10:07:13 -04:00
|
|
|
if is_special:
|
2015-03-13 06:58:34 -04:00
|
|
|
# check for any cmdline options needed for this test
|
|
|
|
args = [MICROPYTHON]
|
2021-03-11 00:11:27 -05:00
|
|
|
with open(test_file, "rb") as f:
|
2015-03-13 06:58:34 -04:00
|
|
|
line = f.readline()
|
2021-03-11 00:11:27 -05:00
|
|
|
if line.startswith(b"# cmdline:"):
|
2015-08-06 06:34:48 -04:00
|
|
|
# subprocess.check_output on Windows only accepts strings, not bytes
|
2021-03-11 00:11:27 -05:00
|
|
|
args += [str(c, "utf-8") for c in line[10:].strip().split()]
|
2015-03-13 06:58:34 -04:00
|
|
|
|
|
|
|
# run the test, possibly with redirected input
|
|
|
|
try:
|
2021-03-11 00:11:27 -05:00
|
|
|
if "repl_" in test_file:
|
2015-07-23 15:05:30 -04:00
|
|
|
# Need to use a PTY to test command line editing
|
2015-08-06 06:34:48 -04:00
|
|
|
try:
|
|
|
|
import pty
|
|
|
|
except ImportError:
|
|
|
|
# in case pty module is not available, like on Windows
|
2021-03-11 00:11:27 -05:00
|
|
|
return b"SKIP\n"
|
2015-07-23 15:05:30 -04:00
|
|
|
import select
|
|
|
|
|
2015-11-24 12:52:03 -05:00
|
|
|
def get(required=False):
|
2021-03-11 00:11:27 -05:00
|
|
|
rv = b""
|
2015-07-23 15:05:30 -04:00
|
|
|
while True:
|
Merge tag 'v1.18'
Boosted performance, board.json metadata, more mimxrt, rp2, samd features
This release of MicroPython sees a boost to the overall performance of the
VM and runtime. This is achieved by the addition of an optional cache to
speed up general hash table lookups, as well as a fast path in the VM for
the LOAD_ATTR opcode on instance types. The new configuration options are
MICROPY_OPT_MAP_LOOKUP_CACHE and MICROPY_OPT_LOAD_ATTR_FAST_PATH. As part
of this improvement the MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE option has
been removed, which provided a similar map caching mechanism but with the
cache stored in the bytecode, which made it not useful on bare metal ports.
The new mechanism is measured to be at least as good as the old one,
applies to more map lookups, has a constant RAM overhead, and applies to
native code as well as bytecode.
These performance options are enabled on the esp32, mimxrt, rp2, stm32 and
unix ports. For esp32 and mimxrt some code is also moved to RAM to further
boost performance. On stm32, performance increases by about 20% for
benchmarks that are heavy on name lookups, like misc_pystone.py and
misc_raytrace.py. On esp32 performance can increase by 2-3x, and on mimxrt
it is up to 6x.
All boards in all ports now have a board.json metadata file, which is used
to automatically build firmware and generate a webpage for that board
(among other possibilities). Auto-build scripts have been added for this
purpose and they build all esp32, mimxrt, rp2, samd and stm32 boards. The
generated output is available at https://micropython.org/download.
Support for FROZEN_DIR and FROZEN_MPY_DIR has been deprecated for some time
and was finally removed in this release. Instead of these, FROZEN_MANIFEST
can be used. The io.resource_stream() function is also removed, replaced
by the pure Python version in micropython-lib.
The search order for importing frozen Python modules is now controlled by
the ".frozen" entry in sys.path. This string is added by default in the
second position in sys.path. User code should adjust sys.path depending on
the desired behaviour. Putting ".frozen" first in sys.path will speed up
importing frozen modules.
A bug in multiple precision integers with bitwise of -0 was fixed in commit
2c139bbf4e5724ab253b5b034ce925e04267a9c4.
The platform module has been added to allow querying the compiler and
underlying SDK/HAL/libc version. This is enabled on esp32, mimxrt and
stm32 ports.
The mpremote tool now supports seek, flush, mkdir and rmdir on PC-mounted
filesystems. And a help command has been added.
The documentation has seen many additions and improvements thanks (for a
second time) to the Google Season of Docs project. The rp2 documentation
now includes a reference for PIO assembly instructions, a PIO quick
reference and a PIO tutorial. The random and stm modules have been
documented, along with sys.settrace, manifest.py files and mpremote. There
is also now more detail about the differences between MicroPython and
standard Python 3.5 and above.
The esp32 port sees support for ESP32-S3 SoCs, and new boards GENERIC_S3,
ESP32_S2_WROVER, LOLIN_S2_MINI, LOLIN_S2_PICO and UM_FEATHERS2NEO. The PWM
driver has been improved and now supports all PWM timers and channels, and
the duty_u16() and duty_ns() methods, and it keeps the duty constant when
changing frequency. The machine.bitstream() function has been improved to
use RMT, with an option to select the original bit-banging implementation.
The mimxrt port gained new hardware features: SDRAM and SD card support, as
well as network integration with a LAN driver. The machine.WDT class was
added along with the machine.reset_cause(), machine.soft_reset(),
machine.unique_id() add machine.bitstream() functions. DHT sensor support
was added, and f-strings were enabled.
The rp2 port now has support for networking, and bluetooth using NimBLE.
The Nina-W10 WiFi/BT driver is fully integrated and supported by the new
Arduino Nano RP2040 connect board. I2S protocol support is added along
with a machine.bitstream() driver and DHT sensor support. The PWM driver
had a bug fix with the accuracy of setting/getting the frequency, and the
duty value is now retained when changing the frequency.
On the samd port there is now support for the internal flash being a block
device, and for filesystems and the os module. Pin and LED classes have
been implemented. There are more time functions, more Python features
enabled, and the help() function is added. SEEED_WIO_TERMINAL and
SEEED_XIAO board definitions are now available.
The stm32 port now has support for F427, F479 and H7A3(Q)/H7B3(Q) MCUs, and
new board definitions for VCC_GND_H743VI, OLIMEX_H407, MIKROE_QUAIL,
GARATRONIC_PYBSTICK26_F411, STM32H73B3I_DK. A bug was fixed in the SPI
driver where a SPI transfer could fail if the CYW43 WiFi driver was also
active at the same time.
On the windows port the help() function has been enabled, and support for
build variants added, to match the unix port.
The zephyr port upgraded Zephyr to v2.7.0.
The change in code size since the previous release for various ports is
(absolute and percentage change in the text section):
bare-arm: -1520 -2.605%
minimal x86: -2256 -1.531%
unix x64: -457 -0.089%
unix nanbox: -925 -0.204%
stm32: +312 +0.079% PYBV10
cc3200: -176 -0.096%
esp8266: +532 +0.076% GENERIC
esp32: +27096 +1.820% GENERIC
nrf: -212 -0.121% pca10040
rp2: +9904 +2.051% PICO
samd: +35332 +33.969% ADAFRUIT_ITSYBITSY_M4_EXPRESS
The changes that dominate these numbers are:
- bare-arm, minimal: use of new MICROPY_CONFIG_ROM_LEVEL_MINIMUM option and
subsequent disabling of remaining optional features
- unix, cc3200, nrf: general code size reductions of the core
- stm32: performance improvements, addition of platform module
- esp8266: enabling f-strings
- esp32: use of -O2 instead of -Os
- rp2: machine.I2S and other new hardware features
- samd: filesystem support and other new hardware features
Thanks to everyone who contributed to this release: Alan Dragomirecký,
Alexey Shvetsov, Andrew Leech, Andrew Scheller, Antoine Aubert, Boris
Vinogradov, Chris Boudacoff, Chris Fiege, Christian Decker, Damien George,
Daniel Gorny, Dave Hylands, David Michieli, Emilie Feral, Frédéric Pierson,
gibbonsc, Henk Vergonet, iabdalkader, Ihor Nehrutsa, Jan Hrudka, Jan Staal,
jc_.kim, Jim Mussared, Jonathan Hogg, Laurens Valk, leo chung, Lorenzo
Cappelletti, Magnus von Wachenfeldt, Matt Trentini, Matt van de Werken,
Maureen Helm, Michael Bentley, Michael Buesch, Mike Causer, Mike Teachman,
Mike Wadsten, Ned Konz, NitiKaur, oli, patrick, Patrick Van Oosterwijck,
Peter Boin, Peter Hinch, Peter van der Burg, Philipp Ebensberger, Pooya
Moradi, retsyo, robert-hh, roland van straten, Scott Armitage, Sebastian
Wicki, Seon Rozenblum, Sergei Silnov, Simon Baatz, Stewart Bonnick, stijn,
Tobias Thyrrestrup, Tomas Vanek, YoungJoon Chun.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- remove MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
- update Python formatting to latest Black version 21.12b0
- remove support for FROZEN_DIR and FROZEN_MPY_DIR
py core:
- parse: simplify parse nodes representing a list
- emitnative: ensure load_subscr does not clobber existing REG_RET
- mpconfig.h: define initial templates for "feature levels"
- vm: add a fast path for LOAD_ATTR on instance types
- map: add an optional cache of (map+index) to speed up map lookups
- builtinimport: forward all debug printing to MICROPY_DEBUG_PRINTER
- add wrapper macros so hot VM functions can go in fast code location
- runtime: fix crash when exc __new__ doesn't return an exc instance
- mpconfig.h: define the "extra" feature level
- mpconfig.h: revert MICROPY_REPL_INFO to disabled at all levels
- gc: add hook to run code during time consuming GC operations
- showbc: print unary-op string when dumping bytecode
- modsys: replace non-ASCII quote char with ASCII char
- runtime: allow types to use both .attr and .locals_dict
- lexer: support nested [] and {} characters within f-string params
- objfun.h: remove obsolete comments about entries in extra_args
- builtinimport: refactor module importing
- showbc: fix printing of raw bytecode header on nanbox builds
- modio: remove io.resource_stream function
- only search frozen modules when '.frozen' is found in sys.path
- mkrules.cmake: set frozen preprocessor defs early
- runtime: allow initialising sys.path/argv with defaults
- mpstate.h: only include sys.path/argv objects in state when enabled
- mpz: fix bugs with bitwise of -0 by ensuring all 0's are positive
- qstr: reset mpstate.qstr_last_chunk before raising an error
- modbuiltins: add additional macro for extending builtins
- mpconfig.h: define MICROPY_PY_USSL_FINALISER only if not defined
extmod:
- machine_i2c: make SoftI2C configurable via macro option
- machine_spi: make SoftSPI configurable via macro option
- modonewire: make _onewire module configurable via macro option
- machine_pwm: factor out machine.PWM bindings to common code
- move modnetwork and modusocket from stm32 to extmod
- modnetwork: add STA_IF and AP_IF constants
- modnetwork: add extended socket state
- modusocket: add read/write stream methods to socket object
- modnetwork: define network interfaces in port config files
- network_cyw43: make consistent use of STA and AP constants
- modnetwork: remove STM32 references
- modnetwork: remove modnetwork socket u_state member
- mpbthci.h: add mp_bluetooth_hci_uart_any prototype
- nimble: add nimble CMake fragment file
- add platform module
- moduplatform: improve implementation for PC ports
- vfs_posix_file: support MP_STREAM_POLL in vfs_posix_file_ioctl
- modbluetooth: add connection interval to gap_connect
- nimble: update to NimBLE v1.4
- nimble: remove workaround for OS_ENOMEM
- uasyncio: fix gather returning exceptions from a cancelled task
- uplatform: remove unused definitions
- uplatform: use generic custom platform string
- network_ninaw10: fix scan list order to match other NICs
- modbluetooth: support gap_connect(None) to cancel a connection
- modure: redirect regex debug printing to mp_printf
- network_ninaw10: fix config of AP mode
- network_ninaw10: disable active connections before connecting
- network_ninaw10: make NIC state persistent
- network_ninaw10: return -1 on timeout from recv/send
- network_ninaw10: make recv/recvfrom interchangeable
- moduplatform: detect xtensa arch
- modusocket: allow setting timeout on unbound sockets
- modusocket: initialise accepted socket state
- network_ninaw10: use socket timeout preset in modusocket
- modbluetooth: fix conditional compilation of ringbuf_put_uuid
- modbluetooth: put declaration of connect_cancel in correct place
shared:
- libc/string0: don't include string.h, and provide __memcpy_chk
- runtime/pyexec: cleanup EXEC_FLAG flag constants
drivers:
- ninaw10: add ublox Nina-W10 WiFi/BT module driver
- lsm6dsox: add LSM6DSOX driver and examples
- neopixel: avoid heap alloc in fill()
- ninaw10: fix BSSID byte order, and add null byte to ESSID
- ninaw10/nina_wifi_drv: fix DNS resolution
mpy-cross: no changes specific to this component/port
lib:
- mynewt-nimble: switch to the MicroPython fork of NimBLE
- asf4: point submodule to latest commit on circuitpython branch
- update pico-sdk to 1.3.0 and tinyusb to 0.12.0
- stm32lib: update library for L4 v1.17.0, new G4, WL, and MMC fixes
- stm32lib: update library for fix to F7 USB HS
Support components
==================
docs:
- library/os.rst: clarify littlefs requirements for block erase
- library/bluetooth.rst: update incorrect link to gatts_write
- make.bat: change Windows output dir from '_build' to 'build'
- library/machine.I2S.rst: specify that I2S.shift args are kw-only
- esp32: explain ESP32 PWM modes, timers, and channels
- rp2: add reference for PIO assembly instructions, and PIO tutorial
- library/random.rst: document the random module
- reference/mpremote.rst: add docs for mpremote
- reference/manifest.rst: add docs for manifest.py files
- library/stm.rst: document the stm module
- esp32/tutorial: add an example of peripheral control via regs
- rp2/general.rst: fix typo with missing spaces
- library/framebuf.rst: adjust dimensions in example
- library/rp2.rst: update function asm_pio_encode to add sideset_opt
- reference/filesystem.rst: add detail on how to use littlefs fuse
- rp2/quickref.rst: add section on PIO
- library/sys.rst: add docs for sys.settrace
- esp8266/tutorial: fix comments of FrameBuffer examples
- library/uasyncio.rst: detail exception behaviour in cancel/timeout
- library/machine.Timer.rst: document 'id' as positional-only arg
- library/machine.SPI.rst: add example SPI usage
- library/machine.Timer.rst: document `period` and `callback` args
- library/machine.Pin.rst: add Pin.ANALOG mode constant
- remove trailing spaces and convert tabs to spaces
- library/sys.rst: add note about '.frozen' as an entry in sys.path
- differences: document details of new PEPs/features in Python 3.5+
- update copyright year range to include 2022
- esp32: update RMT quickref example to match latest code
examples: no changes specific to this component/port
tests:
- perf_bench: use math.log instead of math.log2
- basics: add tests for type-checking subclassed exc instances
- micropython/const.py: add comment about required config for test
- cpydiff: clarify f-string diffs regarding concatenation
- basics/int_big_cmp.py: add more tests for big-int comparison
- extmod: skip uselect_poll_udp when poll() is not available
tools:
- autobuild: add auto build for GENERIC_C3_USB
- ci.sh: use IDF v4.4 as part of esp32 CI and build GENERIC_S3
- autobuild: add the MIMXRT1010_EVK board to autobuild
- ci.sh: use a specific ESP IDF v4.4 commit
- autobuild: add script to generate website board metadata
- dfu.py: make tool work with python3 when parsing DFU files
- autobuild: automatically build all mimxrt, rp2 and samd boards
- autobuild: automatically build all stm32 boards
- mpremote: implement seek and flush in ioctl method
- autobuild: automatically build all esp32 boards
- upip.py: support == to specify exact package version
- makemanifest.py: make str conversion compatible with Python 2
- makemanifest.py: merge make-frozen.py
- mpremote: add mkdir and rmdir to RemoteFS
- mpremote: add help command
- mpremote: add link to mpremote docs URL in help message
- upip.py: skip '.frozen' entry in sys.path for install path
- autobuild: build esp8266 OTA image with GENERIC_1M board
- ci.sh: upgrade Zephyr docker image to v0.21.0
- ci.sh: build zephyr nucleo_wb55rg to test zephyr bluetooth build
CI:
- workflows: use Python 3.8 for macos workflow
- workflows: add new workflow to build ports download metadata
The ports
=========
all ports:
- add board.json for all boards
- add images, features and urls to board.json
- add '.frozen' as the first entry in sys.path
- move '.frozen' to second entry in sys.path
bare-arm port:
- mpconfigport.h: use MICROPY_CONFIG_ROM_LEVEL_MINIMUM
- mpconfigport.h: disable remaining optional features
cc3200 port: no changes specific to this component/port
esp8266 port:
- boards/GENERIC: enable f-strings
- extract qstr from object when comparing keys in config()
- etshal.h: remove unneeded function declarations
- allow building a board to any dest directory
esp32 port:
- boards: add new FeatherS2-Neo board definition
- machine_timer: use tx_update member for IDF 4.4 and above
- add support for ESP32-S3 SoCs
- boards: add new GENERIC_S3 board definition
- machine_hw_spi: fix hardware SPI DMA channels for S2/S3
- boards: add board definition for ESP32-S2-WROVER module
- boards: add LOLIN_S2_MINI ESP32-S2 board
- machine_pwm: add support for all PWM timers and channels
- README: updated readme with req IDF vers for ESP32-S2, C3 and S3
- usb: add USB host connection detection for CDC serial output
- machine_pin: block out IO16 and IO17 when using SPIRAM on ESP32
- mpthreadport: fix TCB cleanup function so thread_mutex is ready
- main: add option for a board to hook code into startup sequence
- split out WLAN code from modnetwork.c to network_wlan.c
- enable optimisations and move code to iRAM to boost performance
- usb: improve speed of USB CDC output
- add specific deploy_s2.md instructions for esp32-s2
- boards/LOLIN_S2_MINI: add image to board.json
- boards: update board and deploy metadata for UM_xxx boards
- usb: further improve speed of USB CDC output
- boards/LOLIN_S2_PICO: add LOLIN_S2_PICO board definition files
- boards/ESP32_S2_WROVER: link to specific deploy_s2 instructions
- support building with latest IDF v5
- in machine_i2s, send null samples in underflow situations
- in machine_i2s, make object reference arrays root pointers
- add SDCard support for S3, and a GENERIC_S3_SPIRAM board
- boards/GENERIC_S3: enable BLE on ESP32 S3
- machine_pwm: implement duty_u16() and duty_ns() PWM methods
- extract qstr from object when comparing keys in config()
- machine_pin: make GPIO 26 usable for S2,S3 if SPIRAM not config'd
- machine_hw_spi: fix SPI default pins reordering on ESP32-S2/S3
- machine_hw_spi: set proper default SPI(id=1) pins on S2,S3 and C3
- machine_hw_spi: set proper default SPI(id=2) pins on S2 and S3
- boards: remove SPI pin defaults from GENERIC S2/S3 boards
- modnetwork: synchronize WiFi AUTH_xxx constants with IDF values
- machine_pwm: keep duty constant when changing frequency
- machine_bitstream: replace bit-bang code with RMT-based driver
- machine_i2s: add support for ESP-IDF 4.4
- machine_bitstream: fix signal duplication on output pins
- esp32: enable platform module with IDF version
- boards/GENERIC_D2WD: build with -Os optimisation
- esp32_rmt: install RMT driver on core 1
- machine_bitstream: reinstate bitstream bit-bang implementation
javascript port: no changes specific to this component/port
mimxrt port:
- sdcard: implement SDCard driver
- machine_bitstream: add bitstream function to machine module
- rework flash configuration
- sdram: add SDRAM support
- eth: add LAN support and integrate the network module
- modmachine: implement machine.WDT() and machine.reset_cause()
- boards: fix the D14/D15 pin assignment of MIMXRT1050/60/64_EVK
- hal: remove duplicate definitions from flexspi_hyper_flash.h
- dma_channel: fix the DMA channel management
- fix cycle counter for time.ticks_cpu() and machine.bitstream()
- add dht_readinto() to the mimxrt module, and freeze dht.py
- extend the help() message and README.md
- mpconfigport.h: enable f-strings
- modmachine: implement soft_reset() and unique_id() functions
- boards/make-pins.py: allow empty lines and comments in pins.csv
- optimize the runtime speed
- enable the platform module
- boards: add the Seeed ARCH MIX board
- boards: update the board.json files and add deploy_xx.md files
- fix mp_hal_quiet_timing_enter()/exit() so timer still runs
- support PWM using the FLEXPWM and QTMR modules
- define UART 0 on MIMXRT boards
- support selection of PHY type and address
- re-enable eth checksum creation by HW
- fix a tiny unnoticed bug in sdcard.c
- add a driver for the DP83848 PHY device
- refactor the reading of the machine id
- enable ticks_cpu at boot time for NDEBUG builds only
- use -Og instead of -O0 for DEBUG builds
- tidy up the board flash related files
- hal: allow readSampleClkSrc to be configured by a board
- enable MICROPY_PY_USSL_FINALISER
minimal port:
- mpconfigport.h: use MICROPY_CONFIG_ROM_LEVEL_MINIMUM
- Makefile: don't force a 32-bit build
- mpconfigport.h: disable features that are not needed
nrf port:
- Makefile: improve Black Magic Probe commands
- main: use VFS helper function to mount fs and chdir
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- mpconfigport.h: enable heapq module
- add support for bluetooth module using NimBLE
- add framework for networking
- mpconfigport.h: use the "extra" feature level
- enable optimisations (comp goto, map cache, fast attr)
- machine_i2s: add I2S protocol support
- add support for Nina-W10 WiFi/BT module
- boards: add support for Arduino Nano RP2040
- machine_bitstream: implement the machine.bitstream driver
- boards: add neopixel.py to manifest.py
- rp2_pio: support exec with sideset
- boards/PIMORONI_PICOLIPO_16MB: fix 16MB flash size
- boards: add PYBSTICK26 RP2040 board definition
- machine_uart: handle and clear UART RX timeout IRQ
- boards/ARDUINO_NANO_RP2040_CONNECT: set default I2C pins
- machine_pwm: fix PWM frequency setting
- machine_pwm: keep duty value when changing the frequency
- add support for DHT11 and DHT22 sensors
- CMakeLists.txt: allow a board to override PICO_BOARD
- boards/GARATRONIC_PYBSTICK26_RP2040: use correct pico-sdk board cfg
samd port:
- integrate latest asf4, add help, more time funcs and uPy features
- samd_soc: allow a board to configure the low-level MCU config
- add internal flash block device, filesystem and uos support
- add Pin and LED classes, and machine.unique_id
- boards/ADAFRUIT_FEATHER_M0_EXPRESS: update for flash and pins
- boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS: update for flash and pins
- boards/MINISAM_M4: update for flash and pins
- boards/ADAFRUIT_TRINKET_M0: update for flash and pins
- boards/SAMD21_XPLAINED_PRO: update for flash and pins
- boards/SEEED_WIO_TERMINAL: add new board definition
- boards/SEEED_XIAO: add new board definition
- README.md: update README to reflect new features and boards
stm32 port:
- pin: enable GPIO clock of pin if it's constructed without init
- main: don't unconditionally enable GPIO A,B,C,D clocks
- boards/VCC_GND_H743VI: add board definition for VCC_GND_H743VI
- boards/OLIMEX_E407: add Ethernet RMII support
- boards/LEGO_HUB_NO6: remove user paths from cc2564 init file
- boards: remove trailing spaces, and add newline at end of file
- add basic support for STM32H750
- add support for H7A3(Q)/H7B3(Q), and STM32H73B3I_DK board defn
- suggest putting code in main.py not boot.py
- boards/make-pins.py: allow a CPU pin to be hidden
- boards/make-pins.py: allow empty lines and comments in pins.csv
- dma: add functions for external users of DMA to enable clock
- enable LOAD_ATTR fast path, and map lookup caching on >M0
- boards: add OLIMEX H407 board definition
- enable platform module
- extended flash filesystem space to 512K on H743 boards
- boards/NUCLEO_H743ZI: enable VfsLfs2 on NUCLEO_H743ZI(2) boards
- boards: add PF11-BOOT0 to stm32f091_af.csv
- machine_i2c: use hardware I2C for STM32H7
- sdram: enforce gcc opt, and use volatile and DSB in sdram_test
- usbd_cdc_interface: allow a board to hook into USBD CDC RX events
- mpbthciport: allow a board to hook BT HCI poll functions
- pendsv: allow a board to add entries for pendsv_schedule_dispatch
- boards: add images to board.json for Adafruit and VCC_GND boards
- uart: fix race conditions and clearing status in IRQ handler
- mpconfigport.h: use the "extra" feature level
- in machine_i2s, send null samples in underflow situations
- in machine_i2s, make object reference arrays root pointers
- led: support an extra 2 LEDs in board configuration
- boards/MIKROE_CLICKER2_STM32: add more detail to board.json
- boards: add new board MikroElektronika Quail, and F427 support
- main: run optional frozen module at boot
- sdio: don't explicitly disable DMA2 on deinit of SDIO
- dma: make DMA2_Stream3 exclusive to SDIO when CYW43 enabled
- boards: build NUCLEO_WB55 and STM32F769DISC without mboot enabled
- boards: add PYBSTICK26 F411 board definition
- boards/NADHAT_PYBF405: rename board to GARATRONIC_NADHAT_F405
- usb: use a table of allowed values to simplify usb_mode get/set
- boards/NUCLEO_WB55: update rfcore_firmwre for new WS
- flashbdev: support generic flash storage config via link symbols
- boards: convert F413,F439,H743,L4xx,WB55 to new flash FS config
- add support for F479 MCUs
- include HAL MMC code in F4 builds
- boards/make-pins.py: use cpu pins to define static alt-fun macros
- boards/NUCLEO_WB55: fix LED ordering
- boards/LEGO_HUB_NO6: set filesystem label as HUB_NO6
- boards: remove stray '+' characters at start of lines in ld files
- boards: remove unused MICROPY_HW_ENABLE_TIMER config
- boards: enable MICROPY_HW_ENABLE_SERVO on various boards
- update L4 code to build with latest stm32lib and L4 HAL 1.17.0
- main: call sdcard_init when only MICROPY_HW_ENABLE_MMCARD enabled
- sdcard: support 8-bit wide SDIO bus
- sdcard: add config option to force MM card capacity
- factoryreset: init vfs flags before calling pyb_flash_init_vfs
- qspi: fix typo in address comment
- boards/make-pins.py: generate empty ADC table if needed
- boards/OLIMEX_H407: fix typo in OLIMEX H407 board.json
- network_wiznet5k: fix build error with wiznet5k and lwip enabled
- enable MICROPY_PY_USSL_FINALISER
teensy port:
- switch to use manifest.py instead of FROZEN_DIR
unix port:
- enable LOAD_ATTR fast path, and map lookup caching
- modusocket: support MP_STREAM_POLL in unix socket_ioctl
- modos: add support for uos.urandom(n)
- coverage: change remaining printf to mp_printf
- Makefile: use -Og instead of -O0 for debug builds
windows port:
- README: remove unsupported Python instructions for Cygwin
- mpconfigport.h: enable help and help("modules")
- add support for build variants to windows port
- run tests via Makefile
- appveyor: build both standard and dev variants
- appveyor: build mpy-cross only once for mingw-w64
- msvc: run qstr preprocessing phase in parallel
zephyr port:
- mphalport.h: remove unused and unimplemented C-level pin API
- increase minimum CMake version to 3.20.0
- update include path to reboot.h
- get UART console device from devicetree instead of Kconfig
- use CONFIG_USB_DEVICE_STACK for conditional USB device support
- upgrade to Zephyr v2.7.0
- modbluetooth_zephyr: provide dummy connect_cancel function
2022-02-15 13:36:26 -05:00
|
|
|
ready = select.select([emulator], [], [emulator], 0.02)
|
2021-05-11 20:31:27 -04:00
|
|
|
if ready[0] == [emulator]:
|
|
|
|
rv += os.read(emulator, 1024)
|
2015-07-23 15:05:30 -04:00
|
|
|
else:
|
2015-11-24 12:52:03 -05:00
|
|
|
if not required or rv:
|
|
|
|
return rv
|
2015-07-23 15:05:30 -04:00
|
|
|
|
|
|
|
def send_get(what):
|
2021-05-11 20:31:27 -04:00
|
|
|
os.write(emulator, what)
|
2015-07-23 15:05:30 -04:00
|
|
|
return get()
|
|
|
|
|
2021-03-11 00:11:27 -05:00
|
|
|
with open(test_file, "rb") as f:
|
2015-07-23 15:05:30 -04:00
|
|
|
# instead of: output_mupy = subprocess.check_output(args, stdin=f)
|
2021-05-11 20:31:27 -04:00
|
|
|
# openpty returns two read/write file descriptors. The first one is
|
|
|
|
# used by the program which provides the virtual
|
|
|
|
# terminal service, and the second one is used by the
|
|
|
|
# subprogram which requires a tty to work.
|
|
|
|
emulator, subterminal = pty.openpty()
|
2021-03-11 00:11:27 -05:00
|
|
|
p = subprocess.Popen(
|
2021-05-11 20:31:27 -04:00
|
|
|
args,
|
|
|
|
stdin=subterminal,
|
|
|
|
stdout=subterminal,
|
|
|
|
stderr=subprocess.STDOUT,
|
|
|
|
bufsize=0,
|
2021-03-11 00:11:27 -05:00
|
|
|
)
|
2015-11-24 12:52:03 -05:00
|
|
|
banner = get(True)
|
2021-03-11 00:11:27 -05:00
|
|
|
output_mupy = banner + b"".join(send_get(line) for line in f)
|
|
|
|
send_get(b"\x04") # exit the REPL, so coverage info is saved
|
2019-03-31 03:47:11 -04:00
|
|
|
# At this point the process might have exited already, but trying to
|
|
|
|
# kill it 'again' normally doesn't result in exceptions as Python and/or
|
|
|
|
# the OS seem to try to handle this nicely. When running Linux on WSL
|
|
|
|
# though, the situation differs and calling Popen.kill after the process
|
|
|
|
# terminated results in a ProcessLookupError. Just catch that one here
|
|
|
|
# since we just want the process to be gone and that's the case.
|
|
|
|
try:
|
|
|
|
p.kill()
|
|
|
|
except ProcessLookupError:
|
|
|
|
pass
|
2021-05-11 20:31:27 -04:00
|
|
|
os.close(subterminal)
|
Merge tag 'v1.18'
Boosted performance, board.json metadata, more mimxrt, rp2, samd features
This release of MicroPython sees a boost to the overall performance of the
VM and runtime. This is achieved by the addition of an optional cache to
speed up general hash table lookups, as well as a fast path in the VM for
the LOAD_ATTR opcode on instance types. The new configuration options are
MICROPY_OPT_MAP_LOOKUP_CACHE and MICROPY_OPT_LOAD_ATTR_FAST_PATH. As part
of this improvement the MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE option has
been removed, which provided a similar map caching mechanism but with the
cache stored in the bytecode, which made it not useful on bare metal ports.
The new mechanism is measured to be at least as good as the old one,
applies to more map lookups, has a constant RAM overhead, and applies to
native code as well as bytecode.
These performance options are enabled on the esp32, mimxrt, rp2, stm32 and
unix ports. For esp32 and mimxrt some code is also moved to RAM to further
boost performance. On stm32, performance increases by about 20% for
benchmarks that are heavy on name lookups, like misc_pystone.py and
misc_raytrace.py. On esp32 performance can increase by 2-3x, and on mimxrt
it is up to 6x.
All boards in all ports now have a board.json metadata file, which is used
to automatically build firmware and generate a webpage for that board
(among other possibilities). Auto-build scripts have been added for this
purpose and they build all esp32, mimxrt, rp2, samd and stm32 boards. The
generated output is available at https://micropython.org/download.
Support for FROZEN_DIR and FROZEN_MPY_DIR has been deprecated for some time
and was finally removed in this release. Instead of these, FROZEN_MANIFEST
can be used. The io.resource_stream() function is also removed, replaced
by the pure Python version in micropython-lib.
The search order for importing frozen Python modules is now controlled by
the ".frozen" entry in sys.path. This string is added by default in the
second position in sys.path. User code should adjust sys.path depending on
the desired behaviour. Putting ".frozen" first in sys.path will speed up
importing frozen modules.
A bug in multiple precision integers with bitwise of -0 was fixed in commit
2c139bbf4e5724ab253b5b034ce925e04267a9c4.
The platform module has been added to allow querying the compiler and
underlying SDK/HAL/libc version. This is enabled on esp32, mimxrt and
stm32 ports.
The mpremote tool now supports seek, flush, mkdir and rmdir on PC-mounted
filesystems. And a help command has been added.
The documentation has seen many additions and improvements thanks (for a
second time) to the Google Season of Docs project. The rp2 documentation
now includes a reference for PIO assembly instructions, a PIO quick
reference and a PIO tutorial. The random and stm modules have been
documented, along with sys.settrace, manifest.py files and mpremote. There
is also now more detail about the differences between MicroPython and
standard Python 3.5 and above.
The esp32 port sees support for ESP32-S3 SoCs, and new boards GENERIC_S3,
ESP32_S2_WROVER, LOLIN_S2_MINI, LOLIN_S2_PICO and UM_FEATHERS2NEO. The PWM
driver has been improved and now supports all PWM timers and channels, and
the duty_u16() and duty_ns() methods, and it keeps the duty constant when
changing frequency. The machine.bitstream() function has been improved to
use RMT, with an option to select the original bit-banging implementation.
The mimxrt port gained new hardware features: SDRAM and SD card support, as
well as network integration with a LAN driver. The machine.WDT class was
added along with the machine.reset_cause(), machine.soft_reset(),
machine.unique_id() add machine.bitstream() functions. DHT sensor support
was added, and f-strings were enabled.
The rp2 port now has support for networking, and bluetooth using NimBLE.
The Nina-W10 WiFi/BT driver is fully integrated and supported by the new
Arduino Nano RP2040 connect board. I2S protocol support is added along
with a machine.bitstream() driver and DHT sensor support. The PWM driver
had a bug fix with the accuracy of setting/getting the frequency, and the
duty value is now retained when changing the frequency.
On the samd port there is now support for the internal flash being a block
device, and for filesystems and the os module. Pin and LED classes have
been implemented. There are more time functions, more Python features
enabled, and the help() function is added. SEEED_WIO_TERMINAL and
SEEED_XIAO board definitions are now available.
The stm32 port now has support for F427, F479 and H7A3(Q)/H7B3(Q) MCUs, and
new board definitions for VCC_GND_H743VI, OLIMEX_H407, MIKROE_QUAIL,
GARATRONIC_PYBSTICK26_F411, STM32H73B3I_DK. A bug was fixed in the SPI
driver where a SPI transfer could fail if the CYW43 WiFi driver was also
active at the same time.
On the windows port the help() function has been enabled, and support for
build variants added, to match the unix port.
The zephyr port upgraded Zephyr to v2.7.0.
The change in code size since the previous release for various ports is
(absolute and percentage change in the text section):
bare-arm: -1520 -2.605%
minimal x86: -2256 -1.531%
unix x64: -457 -0.089%
unix nanbox: -925 -0.204%
stm32: +312 +0.079% PYBV10
cc3200: -176 -0.096%
esp8266: +532 +0.076% GENERIC
esp32: +27096 +1.820% GENERIC
nrf: -212 -0.121% pca10040
rp2: +9904 +2.051% PICO
samd: +35332 +33.969% ADAFRUIT_ITSYBITSY_M4_EXPRESS
The changes that dominate these numbers are:
- bare-arm, minimal: use of new MICROPY_CONFIG_ROM_LEVEL_MINIMUM option and
subsequent disabling of remaining optional features
- unix, cc3200, nrf: general code size reductions of the core
- stm32: performance improvements, addition of platform module
- esp8266: enabling f-strings
- esp32: use of -O2 instead of -Os
- rp2: machine.I2S and other new hardware features
- samd: filesystem support and other new hardware features
Thanks to everyone who contributed to this release: Alan Dragomirecký,
Alexey Shvetsov, Andrew Leech, Andrew Scheller, Antoine Aubert, Boris
Vinogradov, Chris Boudacoff, Chris Fiege, Christian Decker, Damien George,
Daniel Gorny, Dave Hylands, David Michieli, Emilie Feral, Frédéric Pierson,
gibbonsc, Henk Vergonet, iabdalkader, Ihor Nehrutsa, Jan Hrudka, Jan Staal,
jc_.kim, Jim Mussared, Jonathan Hogg, Laurens Valk, leo chung, Lorenzo
Cappelletti, Magnus von Wachenfeldt, Matt Trentini, Matt van de Werken,
Maureen Helm, Michael Bentley, Michael Buesch, Mike Causer, Mike Teachman,
Mike Wadsten, Ned Konz, NitiKaur, oli, patrick, Patrick Van Oosterwijck,
Peter Boin, Peter Hinch, Peter van der Burg, Philipp Ebensberger, Pooya
Moradi, retsyo, robert-hh, roland van straten, Scott Armitage, Sebastian
Wicki, Seon Rozenblum, Sergei Silnov, Simon Baatz, Stewart Bonnick, stijn,
Tobias Thyrrestrup, Tomas Vanek, YoungJoon Chun.
What follows is a detailed list of changes, generated from the git commit
history, and organised into sections.
Main components
===============
all:
- remove MICROPY_OPT_CACHE_MAP_LOOKUP_IN_BYTECODE
- update Python formatting to latest Black version 21.12b0
- remove support for FROZEN_DIR and FROZEN_MPY_DIR
py core:
- parse: simplify parse nodes representing a list
- emitnative: ensure load_subscr does not clobber existing REG_RET
- mpconfig.h: define initial templates for "feature levels"
- vm: add a fast path for LOAD_ATTR on instance types
- map: add an optional cache of (map+index) to speed up map lookups
- builtinimport: forward all debug printing to MICROPY_DEBUG_PRINTER
- add wrapper macros so hot VM functions can go in fast code location
- runtime: fix crash when exc __new__ doesn't return an exc instance
- mpconfig.h: define the "extra" feature level
- mpconfig.h: revert MICROPY_REPL_INFO to disabled at all levels
- gc: add hook to run code during time consuming GC operations
- showbc: print unary-op string when dumping bytecode
- modsys: replace non-ASCII quote char with ASCII char
- runtime: allow types to use both .attr and .locals_dict
- lexer: support nested [] and {} characters within f-string params
- objfun.h: remove obsolete comments about entries in extra_args
- builtinimport: refactor module importing
- showbc: fix printing of raw bytecode header on nanbox builds
- modio: remove io.resource_stream function
- only search frozen modules when '.frozen' is found in sys.path
- mkrules.cmake: set frozen preprocessor defs early
- runtime: allow initialising sys.path/argv with defaults
- mpstate.h: only include sys.path/argv objects in state when enabled
- mpz: fix bugs with bitwise of -0 by ensuring all 0's are positive
- qstr: reset mpstate.qstr_last_chunk before raising an error
- modbuiltins: add additional macro for extending builtins
- mpconfig.h: define MICROPY_PY_USSL_FINALISER only if not defined
extmod:
- machine_i2c: make SoftI2C configurable via macro option
- machine_spi: make SoftSPI configurable via macro option
- modonewire: make _onewire module configurable via macro option
- machine_pwm: factor out machine.PWM bindings to common code
- move modnetwork and modusocket from stm32 to extmod
- modnetwork: add STA_IF and AP_IF constants
- modnetwork: add extended socket state
- modusocket: add read/write stream methods to socket object
- modnetwork: define network interfaces in port config files
- network_cyw43: make consistent use of STA and AP constants
- modnetwork: remove STM32 references
- modnetwork: remove modnetwork socket u_state member
- mpbthci.h: add mp_bluetooth_hci_uart_any prototype
- nimble: add nimble CMake fragment file
- add platform module
- moduplatform: improve implementation for PC ports
- vfs_posix_file: support MP_STREAM_POLL in vfs_posix_file_ioctl
- modbluetooth: add connection interval to gap_connect
- nimble: update to NimBLE v1.4
- nimble: remove workaround for OS_ENOMEM
- uasyncio: fix gather returning exceptions from a cancelled task
- uplatform: remove unused definitions
- uplatform: use generic custom platform string
- network_ninaw10: fix scan list order to match other NICs
- modbluetooth: support gap_connect(None) to cancel a connection
- modure: redirect regex debug printing to mp_printf
- network_ninaw10: fix config of AP mode
- network_ninaw10: disable active connections before connecting
- network_ninaw10: make NIC state persistent
- network_ninaw10: return -1 on timeout from recv/send
- network_ninaw10: make recv/recvfrom interchangeable
- moduplatform: detect xtensa arch
- modusocket: allow setting timeout on unbound sockets
- modusocket: initialise accepted socket state
- network_ninaw10: use socket timeout preset in modusocket
- modbluetooth: fix conditional compilation of ringbuf_put_uuid
- modbluetooth: put declaration of connect_cancel in correct place
shared:
- libc/string0: don't include string.h, and provide __memcpy_chk
- runtime/pyexec: cleanup EXEC_FLAG flag constants
drivers:
- ninaw10: add ublox Nina-W10 WiFi/BT module driver
- lsm6dsox: add LSM6DSOX driver and examples
- neopixel: avoid heap alloc in fill()
- ninaw10: fix BSSID byte order, and add null byte to ESSID
- ninaw10/nina_wifi_drv: fix DNS resolution
mpy-cross: no changes specific to this component/port
lib:
- mynewt-nimble: switch to the MicroPython fork of NimBLE
- asf4: point submodule to latest commit on circuitpython branch
- update pico-sdk to 1.3.0 and tinyusb to 0.12.0
- stm32lib: update library for L4 v1.17.0, new G4, WL, and MMC fixes
- stm32lib: update library for fix to F7 USB HS
Support components
==================
docs:
- library/os.rst: clarify littlefs requirements for block erase
- library/bluetooth.rst: update incorrect link to gatts_write
- make.bat: change Windows output dir from '_build' to 'build'
- library/machine.I2S.rst: specify that I2S.shift args are kw-only
- esp32: explain ESP32 PWM modes, timers, and channels
- rp2: add reference for PIO assembly instructions, and PIO tutorial
- library/random.rst: document the random module
- reference/mpremote.rst: add docs for mpremote
- reference/manifest.rst: add docs for manifest.py files
- library/stm.rst: document the stm module
- esp32/tutorial: add an example of peripheral control via regs
- rp2/general.rst: fix typo with missing spaces
- library/framebuf.rst: adjust dimensions in example
- library/rp2.rst: update function asm_pio_encode to add sideset_opt
- reference/filesystem.rst: add detail on how to use littlefs fuse
- rp2/quickref.rst: add section on PIO
- library/sys.rst: add docs for sys.settrace
- esp8266/tutorial: fix comments of FrameBuffer examples
- library/uasyncio.rst: detail exception behaviour in cancel/timeout
- library/machine.Timer.rst: document 'id' as positional-only arg
- library/machine.SPI.rst: add example SPI usage
- library/machine.Timer.rst: document `period` and `callback` args
- library/machine.Pin.rst: add Pin.ANALOG mode constant
- remove trailing spaces and convert tabs to spaces
- library/sys.rst: add note about '.frozen' as an entry in sys.path
- differences: document details of new PEPs/features in Python 3.5+
- update copyright year range to include 2022
- esp32: update RMT quickref example to match latest code
examples: no changes specific to this component/port
tests:
- perf_bench: use math.log instead of math.log2
- basics: add tests for type-checking subclassed exc instances
- micropython/const.py: add comment about required config for test
- cpydiff: clarify f-string diffs regarding concatenation
- basics/int_big_cmp.py: add more tests for big-int comparison
- extmod: skip uselect_poll_udp when poll() is not available
tools:
- autobuild: add auto build for GENERIC_C3_USB
- ci.sh: use IDF v4.4 as part of esp32 CI and build GENERIC_S3
- autobuild: add the MIMXRT1010_EVK board to autobuild
- ci.sh: use a specific ESP IDF v4.4 commit
- autobuild: add script to generate website board metadata
- dfu.py: make tool work with python3 when parsing DFU files
- autobuild: automatically build all mimxrt, rp2 and samd boards
- autobuild: automatically build all stm32 boards
- mpremote: implement seek and flush in ioctl method
- autobuild: automatically build all esp32 boards
- upip.py: support == to specify exact package version
- makemanifest.py: make str conversion compatible with Python 2
- makemanifest.py: merge make-frozen.py
- mpremote: add mkdir and rmdir to RemoteFS
- mpremote: add help command
- mpremote: add link to mpremote docs URL in help message
- upip.py: skip '.frozen' entry in sys.path for install path
- autobuild: build esp8266 OTA image with GENERIC_1M board
- ci.sh: upgrade Zephyr docker image to v0.21.0
- ci.sh: build zephyr nucleo_wb55rg to test zephyr bluetooth build
CI:
- workflows: use Python 3.8 for macos workflow
- workflows: add new workflow to build ports download metadata
The ports
=========
all ports:
- add board.json for all boards
- add images, features and urls to board.json
- add '.frozen' as the first entry in sys.path
- move '.frozen' to second entry in sys.path
bare-arm port:
- mpconfigport.h: use MICROPY_CONFIG_ROM_LEVEL_MINIMUM
- mpconfigport.h: disable remaining optional features
cc3200 port: no changes specific to this component/port
esp8266 port:
- boards/GENERIC: enable f-strings
- extract qstr from object when comparing keys in config()
- etshal.h: remove unneeded function declarations
- allow building a board to any dest directory
esp32 port:
- boards: add new FeatherS2-Neo board definition
- machine_timer: use tx_update member for IDF 4.4 and above
- add support for ESP32-S3 SoCs
- boards: add new GENERIC_S3 board definition
- machine_hw_spi: fix hardware SPI DMA channels for S2/S3
- boards: add board definition for ESP32-S2-WROVER module
- boards: add LOLIN_S2_MINI ESP32-S2 board
- machine_pwm: add support for all PWM timers and channels
- README: updated readme with req IDF vers for ESP32-S2, C3 and S3
- usb: add USB host connection detection for CDC serial output
- machine_pin: block out IO16 and IO17 when using SPIRAM on ESP32
- mpthreadport: fix TCB cleanup function so thread_mutex is ready
- main: add option for a board to hook code into startup sequence
- split out WLAN code from modnetwork.c to network_wlan.c
- enable optimisations and move code to iRAM to boost performance
- usb: improve speed of USB CDC output
- add specific deploy_s2.md instructions for esp32-s2
- boards/LOLIN_S2_MINI: add image to board.json
- boards: update board and deploy metadata for UM_xxx boards
- usb: further improve speed of USB CDC output
- boards/LOLIN_S2_PICO: add LOLIN_S2_PICO board definition files
- boards/ESP32_S2_WROVER: link to specific deploy_s2 instructions
- support building with latest IDF v5
- in machine_i2s, send null samples in underflow situations
- in machine_i2s, make object reference arrays root pointers
- add SDCard support for S3, and a GENERIC_S3_SPIRAM board
- boards/GENERIC_S3: enable BLE on ESP32 S3
- machine_pwm: implement duty_u16() and duty_ns() PWM methods
- extract qstr from object when comparing keys in config()
- machine_pin: make GPIO 26 usable for S2,S3 if SPIRAM not config'd
- machine_hw_spi: fix SPI default pins reordering on ESP32-S2/S3
- machine_hw_spi: set proper default SPI(id=1) pins on S2,S3 and C3
- machine_hw_spi: set proper default SPI(id=2) pins on S2 and S3
- boards: remove SPI pin defaults from GENERIC S2/S3 boards
- modnetwork: synchronize WiFi AUTH_xxx constants with IDF values
- machine_pwm: keep duty constant when changing frequency
- machine_bitstream: replace bit-bang code with RMT-based driver
- machine_i2s: add support for ESP-IDF 4.4
- machine_bitstream: fix signal duplication on output pins
- esp32: enable platform module with IDF version
- boards/GENERIC_D2WD: build with -Os optimisation
- esp32_rmt: install RMT driver on core 1
- machine_bitstream: reinstate bitstream bit-bang implementation
javascript port: no changes specific to this component/port
mimxrt port:
- sdcard: implement SDCard driver
- machine_bitstream: add bitstream function to machine module
- rework flash configuration
- sdram: add SDRAM support
- eth: add LAN support and integrate the network module
- modmachine: implement machine.WDT() and machine.reset_cause()
- boards: fix the D14/D15 pin assignment of MIMXRT1050/60/64_EVK
- hal: remove duplicate definitions from flexspi_hyper_flash.h
- dma_channel: fix the DMA channel management
- fix cycle counter for time.ticks_cpu() and machine.bitstream()
- add dht_readinto() to the mimxrt module, and freeze dht.py
- extend the help() message and README.md
- mpconfigport.h: enable f-strings
- modmachine: implement soft_reset() and unique_id() functions
- boards/make-pins.py: allow empty lines and comments in pins.csv
- optimize the runtime speed
- enable the platform module
- boards: add the Seeed ARCH MIX board
- boards: update the board.json files and add deploy_xx.md files
- fix mp_hal_quiet_timing_enter()/exit() so timer still runs
- support PWM using the FLEXPWM and QTMR modules
- define UART 0 on MIMXRT boards
- support selection of PHY type and address
- re-enable eth checksum creation by HW
- fix a tiny unnoticed bug in sdcard.c
- add a driver for the DP83848 PHY device
- refactor the reading of the machine id
- enable ticks_cpu at boot time for NDEBUG builds only
- use -Og instead of -O0 for DEBUG builds
- tidy up the board flash related files
- hal: allow readSampleClkSrc to be configured by a board
- enable MICROPY_PY_USSL_FINALISER
minimal port:
- mpconfigport.h: use MICROPY_CONFIG_ROM_LEVEL_MINIMUM
- Makefile: don't force a 32-bit build
- mpconfigport.h: disable features that are not needed
nrf port:
- Makefile: improve Black Magic Probe commands
- main: use VFS helper function to mount fs and chdir
pic16bit port: no changes specific to this component/port
powerpc port: no changes specific to this component/port
qemu-arm port: no changes specific to this component/port
rp2 port:
- mpconfigport.h: enable heapq module
- add support for bluetooth module using NimBLE
- add framework for networking
- mpconfigport.h: use the "extra" feature level
- enable optimisations (comp goto, map cache, fast attr)
- machine_i2s: add I2S protocol support
- add support for Nina-W10 WiFi/BT module
- boards: add support for Arduino Nano RP2040
- machine_bitstream: implement the machine.bitstream driver
- boards: add neopixel.py to manifest.py
- rp2_pio: support exec with sideset
- boards/PIMORONI_PICOLIPO_16MB: fix 16MB flash size
- boards: add PYBSTICK26 RP2040 board definition
- machine_uart: handle and clear UART RX timeout IRQ
- boards/ARDUINO_NANO_RP2040_CONNECT: set default I2C pins
- machine_pwm: fix PWM frequency setting
- machine_pwm: keep duty value when changing the frequency
- add support for DHT11 and DHT22 sensors
- CMakeLists.txt: allow a board to override PICO_BOARD
- boards/GARATRONIC_PYBSTICK26_RP2040: use correct pico-sdk board cfg
samd port:
- integrate latest asf4, add help, more time funcs and uPy features
- samd_soc: allow a board to configure the low-level MCU config
- add internal flash block device, filesystem and uos support
- add Pin and LED classes, and machine.unique_id
- boards/ADAFRUIT_FEATHER_M0_EXPRESS: update for flash and pins
- boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS: update for flash and pins
- boards/MINISAM_M4: update for flash and pins
- boards/ADAFRUIT_TRINKET_M0: update for flash and pins
- boards/SAMD21_XPLAINED_PRO: update for flash and pins
- boards/SEEED_WIO_TERMINAL: add new board definition
- boards/SEEED_XIAO: add new board definition
- README.md: update README to reflect new features and boards
stm32 port:
- pin: enable GPIO clock of pin if it's constructed without init
- main: don't unconditionally enable GPIO A,B,C,D clocks
- boards/VCC_GND_H743VI: add board definition for VCC_GND_H743VI
- boards/OLIMEX_E407: add Ethernet RMII support
- boards/LEGO_HUB_NO6: remove user paths from cc2564 init file
- boards: remove trailing spaces, and add newline at end of file
- add basic support for STM32H750
- add support for H7A3(Q)/H7B3(Q), and STM32H73B3I_DK board defn
- suggest putting code in main.py not boot.py
- boards/make-pins.py: allow a CPU pin to be hidden
- boards/make-pins.py: allow empty lines and comments in pins.csv
- dma: add functions for external users of DMA to enable clock
- enable LOAD_ATTR fast path, and map lookup caching on >M0
- boards: add OLIMEX H407 board definition
- enable platform module
- extended flash filesystem space to 512K on H743 boards
- boards/NUCLEO_H743ZI: enable VfsLfs2 on NUCLEO_H743ZI(2) boards
- boards: add PF11-BOOT0 to stm32f091_af.csv
- machine_i2c: use hardware I2C for STM32H7
- sdram: enforce gcc opt, and use volatile and DSB in sdram_test
- usbd_cdc_interface: allow a board to hook into USBD CDC RX events
- mpbthciport: allow a board to hook BT HCI poll functions
- pendsv: allow a board to add entries for pendsv_schedule_dispatch
- boards: add images to board.json for Adafruit and VCC_GND boards
- uart: fix race conditions and clearing status in IRQ handler
- mpconfigport.h: use the "extra" feature level
- in machine_i2s, send null samples in underflow situations
- in machine_i2s, make object reference arrays root pointers
- led: support an extra 2 LEDs in board configuration
- boards/MIKROE_CLICKER2_STM32: add more detail to board.json
- boards: add new board MikroElektronika Quail, and F427 support
- main: run optional frozen module at boot
- sdio: don't explicitly disable DMA2 on deinit of SDIO
- dma: make DMA2_Stream3 exclusive to SDIO when CYW43 enabled
- boards: build NUCLEO_WB55 and STM32F769DISC without mboot enabled
- boards: add PYBSTICK26 F411 board definition
- boards/NADHAT_PYBF405: rename board to GARATRONIC_NADHAT_F405
- usb: use a table of allowed values to simplify usb_mode get/set
- boards/NUCLEO_WB55: update rfcore_firmwre for new WS
- flashbdev: support generic flash storage config via link symbols
- boards: convert F413,F439,H743,L4xx,WB55 to new flash FS config
- add support for F479 MCUs
- include HAL MMC code in F4 builds
- boards/make-pins.py: use cpu pins to define static alt-fun macros
- boards/NUCLEO_WB55: fix LED ordering
- boards/LEGO_HUB_NO6: set filesystem label as HUB_NO6
- boards: remove stray '+' characters at start of lines in ld files
- boards: remove unused MICROPY_HW_ENABLE_TIMER config
- boards: enable MICROPY_HW_ENABLE_SERVO on various boards
- update L4 code to build with latest stm32lib and L4 HAL 1.17.0
- main: call sdcard_init when only MICROPY_HW_ENABLE_MMCARD enabled
- sdcard: support 8-bit wide SDIO bus
- sdcard: add config option to force MM card capacity
- factoryreset: init vfs flags before calling pyb_flash_init_vfs
- qspi: fix typo in address comment
- boards/make-pins.py: generate empty ADC table if needed
- boards/OLIMEX_H407: fix typo in OLIMEX H407 board.json
- network_wiznet5k: fix build error with wiznet5k and lwip enabled
- enable MICROPY_PY_USSL_FINALISER
teensy port:
- switch to use manifest.py instead of FROZEN_DIR
unix port:
- enable LOAD_ATTR fast path, and map lookup caching
- modusocket: support MP_STREAM_POLL in unix socket_ioctl
- modos: add support for uos.urandom(n)
- coverage: change remaining printf to mp_printf
- Makefile: use -Og instead of -O0 for debug builds
windows port:
- README: remove unsupported Python instructions for Cygwin
- mpconfigport.h: enable help and help("modules")
- add support for build variants to windows port
- run tests via Makefile
- appveyor: build both standard and dev variants
- appveyor: build mpy-cross only once for mingw-w64
- msvc: run qstr preprocessing phase in parallel
zephyr port:
- mphalport.h: remove unused and unimplemented C-level pin API
- increase minimum CMake version to 3.20.0
- update include path to reboot.h
- get UART console device from devicetree instead of Kconfig
- use CONFIG_USB_DEVICE_STACK for conditional USB device support
- upgrade to Zephyr v2.7.0
- modbluetooth_zephyr: provide dummy connect_cancel function
2022-02-15 13:36:26 -05:00
|
|
|
os.close(emulator)
|
2015-03-13 06:58:34 -04:00
|
|
|
else:
|
2021-03-11 00:11:27 -05:00
|
|
|
output_mupy = subprocess.check_output(
|
|
|
|
args + [test_file], stderr=subprocess.STDOUT
|
|
|
|
)
|
2021-05-11 20:31:27 -04:00
|
|
|
|
|
|
|
except subprocess.CalledProcessError as error:
|
|
|
|
return error.output + b"CRASH"
|
2015-03-13 06:58:34 -04:00
|
|
|
|
|
|
|
else:
|
2016-09-19 22:19:35 -04:00
|
|
|
# a standard test run on PC
|
|
|
|
|
|
|
|
# create system command
|
2021-03-11 00:11:27 -05:00
|
|
|
cmdlist = [MICROPYTHON, "-X", "emit=" + args.emit]
|
2016-09-19 22:19:35 -04:00
|
|
|
if args.heapsize is not None:
|
2021-03-11 00:11:27 -05:00
|
|
|
cmdlist.extend(["-X", "heapsize=" + args.heapsize])
|
2016-09-19 22:19:35 -04:00
|
|
|
|
|
|
|
# if running via .mpy, first compile the .py file
|
|
|
|
if args.via_mpy:
|
2021-05-13 11:33:24 -04:00
|
|
|
mpy_modname = tempfile.mktemp(dir="")
|
|
|
|
mpy_filename = mpy_modname + ".mpy"
|
2021-03-11 00:11:27 -05:00
|
|
|
subprocess.check_output(
|
|
|
|
[MPYCROSS]
|
|
|
|
+ args.mpy_cross_flags.split()
|
2021-05-13 11:33:24 -04:00
|
|
|
+ ["-o", mpy_filename, "-X", "emit=" + args.emit, test_file]
|
2021-03-11 00:11:27 -05:00
|
|
|
)
|
2021-05-13 11:33:24 -04:00
|
|
|
cmdlist.extend(["-m", mpy_modname])
|
2016-09-19 22:19:35 -04:00
|
|
|
else:
|
2016-03-15 09:04:43 -04:00
|
|
|
cmdlist.append(test_file)
|
2016-09-19 22:19:35 -04:00
|
|
|
|
|
|
|
# run the actual test
|
|
|
|
try:
|
2022-10-14 17:40:10 -04:00
|
|
|
result = subprocess.run(
|
|
|
|
cmdlist,
|
|
|
|
stderr=subprocess.STDOUT,
|
|
|
|
stdout=subprocess.PIPE,
|
|
|
|
check=True,
|
|
|
|
timeout=10,
|
|
|
|
)
|
|
|
|
output_mupy = result.stdout
|
|
|
|
except subprocess.TimeoutExpired as er:
|
|
|
|
had_crash = True
|
|
|
|
output_mupy = (er.output or b"") + b"TIMEOUT"
|
2021-05-13 11:33:24 -04:00
|
|
|
except subprocess.CalledProcessError as er:
|
2018-02-14 01:19:44 -05:00
|
|
|
had_crash = True
|
2021-05-13 11:33:24 -04:00
|
|
|
output_mupy = er.output + b"CRASH"
|
2016-09-19 22:19:35 -04:00
|
|
|
|
|
|
|
# clean up if we had an intermediate .mpy file
|
|
|
|
if args.via_mpy:
|
2021-05-13 11:33:24 -04:00
|
|
|
rm_f(mpy_filename)
|
2016-09-19 22:19:35 -04:00
|
|
|
|
2014-10-05 17:27:12 -04:00
|
|
|
else:
|
|
|
|
# run on pyboard
|
|
|
|
pyb.enter_raw_repl()
|
|
|
|
try:
|
2016-03-07 07:01:21 -05:00
|
|
|
output_mupy = pyb.execfile(test_file)
|
2018-07-18 09:45:23 -04:00
|
|
|
except pyboard.PyboardError as e:
|
2018-02-14 01:19:44 -05:00
|
|
|
had_crash = True
|
2021-03-11 00:11:27 -05:00
|
|
|
if not is_special and e.args[0] == "exception":
|
|
|
|
output_mupy = e.args[1] + e.args[2] + b"CRASH"
|
2018-07-18 09:45:23 -04:00
|
|
|
else:
|
2021-05-13 11:33:24 -04:00
|
|
|
output_mupy = bytes(e.args[0], "ascii") + b"\nCRASH"
|
2014-10-05 17:27:12 -04:00
|
|
|
|
2016-03-07 07:01:21 -05:00
|
|
|
# canonical form for all ports/platforms is to use \n for end-of-line
|
2021-03-11 00:11:27 -05:00
|
|
|
output_mupy = output_mupy.replace(b"\r\n", b"\n")
|
2016-03-07 07:01:21 -05:00
|
|
|
|
2017-01-23 04:44:29 -05:00
|
|
|
# don't try to convert the output if we should skip this test
|
2021-03-11 00:11:27 -05:00
|
|
|
if had_crash or output_mupy in (b"SKIP\n", b"CRASH"):
|
2017-01-23 04:44:29 -05:00
|
|
|
return output_mupy
|
|
|
|
|
2016-07-26 14:29:48 -04:00
|
|
|
if is_special or test_file in special_tests:
|
|
|
|
# convert parts of the output that are not stable across runs
|
2021-03-11 00:11:27 -05:00
|
|
|
with open(test_file + ".exp", "rb") as f:
|
2016-07-26 14:29:48 -04:00
|
|
|
lines_exp = []
|
|
|
|
for line in f.readlines():
|
2021-03-11 00:11:27 -05:00
|
|
|
if line == b"########\n":
|
2016-07-26 14:29:48 -04:00
|
|
|
line = (line,)
|
|
|
|
else:
|
|
|
|
line = (line, re.compile(convert_regex_escapes(line)))
|
|
|
|
lines_exp.append(line)
|
2021-03-11 00:11:27 -05:00
|
|
|
lines_mupy = [line + b"\n" for line in output_mupy.split(b"\n")]
|
|
|
|
if output_mupy.endswith(b"\n"):
|
|
|
|
lines_mupy = lines_mupy[:-1] # remove erroneous last empty line
|
2016-07-26 14:29:48 -04:00
|
|
|
i_mupy = 0
|
|
|
|
for i in range(len(lines_exp)):
|
2021-03-11 00:11:27 -05:00
|
|
|
if lines_exp[i][0] == b"########\n":
|
2016-07-26 14:29:48 -04:00
|
|
|
# 8x #'s means match 0 or more whole lines
|
|
|
|
line_exp = lines_exp[i + 1]
|
|
|
|
skip = 0
|
2021-03-11 00:11:27 -05:00
|
|
|
while i_mupy + skip < len(lines_mupy) and not line_exp[1].match(
|
|
|
|
lines_mupy[i_mupy + skip]
|
|
|
|
):
|
2016-07-26 14:29:48 -04:00
|
|
|
skip += 1
|
|
|
|
if i_mupy + skip >= len(lines_mupy):
|
2021-03-11 00:11:27 -05:00
|
|
|
lines_mupy[i_mupy] = b"######## FAIL\n"
|
2016-07-26 14:29:48 -04:00
|
|
|
break
|
2021-03-11 00:11:27 -05:00
|
|
|
del lines_mupy[i_mupy : i_mupy + skip]
|
|
|
|
lines_mupy.insert(i_mupy, b"########\n")
|
2016-07-26 14:29:48 -04:00
|
|
|
i_mupy += 1
|
|
|
|
else:
|
|
|
|
# a regex
|
|
|
|
if lines_exp[i][1].match(lines_mupy[i_mupy]):
|
|
|
|
lines_mupy[i_mupy] = lines_exp[i][0]
|
|
|
|
else:
|
2021-05-13 11:33:24 -04:00
|
|
|
# print("don't match: %r %s" % (lines_exp[i][1], lines_mupy[i_mupy])) # DEBUG
|
2016-07-26 14:29:48 -04:00
|
|
|
pass
|
|
|
|
i_mupy += 1
|
|
|
|
if i_mupy >= len(lines_mupy):
|
|
|
|
break
|
2021-03-11 00:11:27 -05:00
|
|
|
output_mupy = b"".join(lines_mupy)
|
2016-07-26 14:29:48 -04:00
|
|
|
|
2014-10-05 17:27:12 -04:00
|
|
|
return output_mupy
|
|
|
|
|
2017-04-14 10:07:13 -04:00
|
|
|
|
|
|
|
def run_feature_check(pyb, args, base_path, test_file):
|
2020-05-09 02:20:40 -04:00
|
|
|
if pyb is not None and test_file.startswith("repl_"):
|
|
|
|
# REPL feature tests will not run via pyboard because they require prompt interactivity
|
|
|
|
return b""
|
2020-04-08 02:01:58 -04:00
|
|
|
return run_micropython(pyb, args, base_path("feature_check", test_file), is_special=True)
|
2017-04-14 10:07:13 -04:00
|
|
|
|
|
|
|
|
2021-05-11 20:31:27 -04:00
|
|
|
class ThreadSafeCounter:
|
|
|
|
def __init__(self, start=0):
|
|
|
|
self._value = start
|
|
|
|
self._lock = threading.Lock()
|
|
|
|
|
2021-05-13 11:33:24 -04:00
|
|
|
def increment(self):
|
|
|
|
self.add(1)
|
|
|
|
|
2021-05-11 20:31:27 -04:00
|
|
|
def add(self, to_add):
|
|
|
|
with self._lock:
|
|
|
|
self._value += to_add
|
|
|
|
|
|
|
|
def append(self, arg):
|
|
|
|
self.add([arg])
|
|
|
|
|
|
|
|
@property
|
|
|
|
def value(self):
|
|
|
|
return self._value
|
|
|
|
|
|
|
|
|
|
|
|
def run_tests(pyb, tests, args, result_dir, num_threads=1):
|
|
|
|
test_count = ThreadSafeCounter()
|
|
|
|
testcase_count = ThreadSafeCounter()
|
|
|
|
passed_count = ThreadSafeCounter()
|
|
|
|
failed_tests = ThreadSafeCounter([])
|
|
|
|
skipped_tests = ThreadSafeCounter([])
|
2014-05-03 11:43:27 -04:00
|
|
|
|
2014-06-05 17:45:55 -04:00
|
|
|
skip_tests = set()
|
2014-12-12 17:50:54 -05:00
|
|
|
skip_native = False
|
2017-03-03 12:14:02 -05:00
|
|
|
skip_int_big = False
|
2019-10-18 04:48:15 -04:00
|
|
|
skip_bytearray = False
|
2017-01-04 16:16:29 -05:00
|
|
|
skip_set_type = False
|
2019-10-29 06:44:22 -04:00
|
|
|
skip_slice = False
|
2017-02-14 14:03:25 -05:00
|
|
|
skip_async = False
|
2017-04-02 15:51:31 -04:00
|
|
|
skip_const = False
|
2017-09-10 10:05:31 -04:00
|
|
|
skip_revops = False
|
2019-10-29 07:13:38 -04:00
|
|
|
skip_io_module = False
|
2021-08-12 11:44:08 -04:00
|
|
|
skip_fstring = False
|
2017-12-15 05:07:09 -05:00
|
|
|
skip_endian = False
|
|
|
|
has_complex = True
|
|
|
|
has_coverage = False
|
|
|
|
|
|
|
|
upy_float_precision = 32
|
|
|
|
|
|
|
|
# If we're asked to --list-tests, we can't assume that there's a
|
|
|
|
# connection to target, so we can't run feature checks usefully.
|
|
|
|
if not (args.list_tests or args.write_exp):
|
2020-04-08 02:01:58 -04:00
|
|
|
# Even if we run completely different tests in a different directory,
|
|
|
|
# we need to access feature_checks from the same directory as the
|
2021-05-13 11:33:24 -04:00
|
|
|
# run-tests.py script itself so use base_path.
|
2020-04-08 02:01:58 -04:00
|
|
|
|
2017-12-15 05:07:09 -05:00
|
|
|
# Check if micropython.native is supported, and skip such tests if it's not
|
2021-03-11 00:11:27 -05:00
|
|
|
output = run_feature_check(pyb, args, base_path, "native_check.py")
|
2021-05-13 11:33:24 -04:00
|
|
|
if output != b"native\n":
|
2017-12-15 05:07:09 -05:00
|
|
|
skip_native = True
|
|
|
|
|
|
|
|
# Check if arbitrary-precision integers are supported, and skip such tests if it's not
|
2021-03-11 00:11:27 -05:00
|
|
|
output = run_feature_check(pyb, args, base_path, "int_big.py")
|
|
|
|
if output != b"1000000000000000000000000000000000000000000000\n":
|
2017-12-15 05:07:09 -05:00
|
|
|
skip_int_big = True
|
|
|
|
|
2019-10-18 04:48:15 -04:00
|
|
|
# Check if bytearray is supported, and skip such tests if it's not
|
2021-03-11 00:11:27 -05:00
|
|
|
output = run_feature_check(pyb, args, base_path, "bytearray.py")
|
|
|
|
if output != b"bytearray\n":
|
2019-10-18 04:48:15 -04:00
|
|
|
skip_bytearray = True
|
|
|
|
|
2017-12-15 05:07:09 -05:00
|
|
|
# Check if set type (and set literals) is supported, and skip such tests if it's not
|
2021-03-11 00:11:27 -05:00
|
|
|
output = run_feature_check(pyb, args, base_path, "set_check.py")
|
2021-05-13 11:33:24 -04:00
|
|
|
if output != b"{1}\n":
|
2017-12-15 05:07:09 -05:00
|
|
|
skip_set_type = True
|
|
|
|
|
2019-10-29 06:44:22 -04:00
|
|
|
# Check if slice is supported, and skip such tests if it's not
|
2021-03-11 00:11:27 -05:00
|
|
|
output = run_feature_check(pyb, args, base_path, "slice.py")
|
|
|
|
if output != b"slice\n":
|
2019-10-29 06:44:22 -04:00
|
|
|
skip_slice = True
|
|
|
|
|
2017-12-15 05:07:09 -05:00
|
|
|
# Check if async/await keywords are supported, and skip such tests if it's not
|
2021-03-11 00:11:27 -05:00
|
|
|
output = run_feature_check(pyb, args, base_path, "async_check.py")
|
2021-05-13 11:33:24 -04:00
|
|
|
if output != b"async\n":
|
2017-12-15 05:07:09 -05:00
|
|
|
skip_async = True
|
|
|
|
|
|
|
|
# Check if const keyword (MicroPython extension) is supported, and skip such tests if it's not
|
2021-03-11 00:11:27 -05:00
|
|
|
output = run_feature_check(pyb, args, base_path, "const.py")
|
2021-05-13 11:33:24 -04:00
|
|
|
if output != b"1\n":
|
2017-12-15 05:07:09 -05:00
|
|
|
skip_const = True
|
|
|
|
|
|
|
|
# Check if __rOP__ special methods are supported, and skip such tests if it's not
|
2021-03-11 00:11:27 -05:00
|
|
|
output = run_feature_check(pyb, args, base_path, "reverse_ops.py")
|
|
|
|
if output == b"TypeError\n":
|
2017-12-15 05:07:09 -05:00
|
|
|
skip_revops = True
|
|
|
|
|
2019-10-29 07:13:38 -04:00
|
|
|
# Check if uio module exists, and skip such tests if it doesn't
|
2021-03-11 00:11:27 -05:00
|
|
|
output = run_feature_check(pyb, args, base_path, "uio_module.py")
|
|
|
|
if output != b"uio\n":
|
2019-10-29 07:13:38 -04:00
|
|
|
skip_io_module = True
|
|
|
|
|
2021-08-12 11:44:08 -04:00
|
|
|
# Check if fstring feature is enabled, and skip such tests if it doesn't
|
|
|
|
output = run_feature_check(pyb, args, base_path, "fstring.py")
|
|
|
|
if output != b"a=1\n":
|
|
|
|
skip_fstring = True
|
|
|
|
|
2017-12-15 05:07:09 -05:00
|
|
|
# Check if emacs repl is supported, and skip such tests if it's not
|
2021-03-11 00:11:27 -05:00
|
|
|
t = run_feature_check(pyb, args, base_path, "repl_emacs_check.py")
|
|
|
|
if "True" not in str(t, "ascii"):
|
|
|
|
skip_tests.add("cmdline/repl_emacs_keys.py")
|
2017-12-15 05:07:09 -05:00
|
|
|
|
2019-12-14 16:42:03 -05:00
|
|
|
# Check if words movement in repl is supported, and skip such tests if it's not
|
2021-03-11 00:11:27 -05:00
|
|
|
t = run_feature_check(pyb, args, base_path, "repl_words_move_check.py")
|
|
|
|
if "True" not in str(t, "ascii"):
|
|
|
|
skip_tests.add("cmdline/repl_words_move.py")
|
2019-12-14 16:42:03 -05:00
|
|
|
|
2021-03-11 00:11:27 -05:00
|
|
|
upy_byteorder = run_feature_check(pyb, args, base_path, "byteorder.py")
|
|
|
|
upy_float_precision = run_feature_check(pyb, args, base_path, "float.py")
|
2021-05-13 11:33:24 -04:00
|
|
|
try:
|
2021-05-11 20:31:27 -04:00
|
|
|
upy_float_precision = int(upy_float_precision)
|
2021-05-13 11:33:24 -04:00
|
|
|
except ValueError:
|
|
|
|
upy_float_precision = 0
|
2021-03-11 00:11:27 -05:00
|
|
|
has_complex = run_feature_check(pyb, args, base_path, "complex.py") == b"complex\n"
|
|
|
|
has_coverage = run_feature_check(pyb, args, base_path, "coverage.py") == b"coverage\n"
|
|
|
|
cpy_byteorder = subprocess.check_output(
|
|
|
|
CPYTHON3_CMD + [base_path("feature_check/byteorder.py")]
|
|
|
|
)
|
|
|
|
skip_endian = upy_byteorder != cpy_byteorder
|
2015-08-29 17:28:59 -04:00
|
|
|
|
2019-10-29 07:01:17 -04:00
|
|
|
# These tests don't test slice explicitly but rather use it to perform the test
|
|
|
|
misc_slice_tests = (
|
2021-03-11 00:11:27 -05:00
|
|
|
"builtin_range",
|
|
|
|
"class_super",
|
|
|
|
"containment",
|
|
|
|
"errno1",
|
|
|
|
"fun_str",
|
|
|
|
"generator1",
|
|
|
|
"globals_del",
|
|
|
|
"memoryview1",
|
|
|
|
"memoryview_gc",
|
|
|
|
"object1",
|
|
|
|
"python34",
|
|
|
|
"struct_endian",
|
2019-10-29 07:01:17 -04:00
|
|
|
)
|
|
|
|
|
2020-11-29 18:28:48 -05:00
|
|
|
# Some tests shouldn't be run on GitHub Actions
|
2021-03-11 00:11:27 -05:00
|
|
|
if os.getenv("GITHUB_ACTIONS") == "true":
|
|
|
|
skip_tests.add("thread/stress_schedule.py") # has reliability issues
|
2014-05-03 11:43:27 -04:00
|
|
|
|
2017-06-25 23:47:00 -04:00
|
|
|
if upy_float_precision == 0:
|
2021-03-11 00:11:27 -05:00
|
|
|
skip_tests.add("extmod/uctypes_le_float.py")
|
|
|
|
skip_tests.add("extmod/uctypes_native_float.py")
|
|
|
|
skip_tests.add("extmod/uctypes_sizeof_float.py")
|
|
|
|
skip_tests.add("extmod/ujson_dumps_float.py")
|
|
|
|
skip_tests.add("extmod/ujson_loads_float.py")
|
|
|
|
skip_tests.add("extmod/urandom_extra_float.py")
|
|
|
|
skip_tests.add("misc/rge_sm.py")
|
2017-06-25 23:47:00 -04:00
|
|
|
if upy_float_precision < 32:
|
2021-03-11 00:11:27 -05:00
|
|
|
skip_tests.add(
|
|
|
|
"float/float2int_intbig.py"
|
|
|
|
) # requires fp32, there's float2int_fp30_intbig.py instead
|
|
|
|
skip_tests.add(
|
|
|
|
"float/string_format.py"
|
|
|
|
) # requires fp32, there's string_format_fp30.py instead
|
|
|
|
skip_tests.add("float/bytes_construct.py") # requires fp32
|
|
|
|
skip_tests.add("float/bytearray_construct.py") # requires fp32
|
2017-06-25 23:47:00 -04:00
|
|
|
if upy_float_precision < 64:
|
2021-03-11 00:11:27 -05:00
|
|
|
skip_tests.add("float/float_divmod.py") # tested by float/float_divmod_relaxed.py instead
|
|
|
|
skip_tests.add("float/float2int_doubleprec_intbig.py")
|
2022-07-12 09:48:38 -04:00
|
|
|
skip_tests.add("float/float_format_ints_doubleprec.py")
|
2021-03-11 00:11:27 -05:00
|
|
|
skip_tests.add("float/float_parse_doubleprec.py")
|
2017-06-25 23:47:00 -04:00
|
|
|
|
2015-12-06 07:56:37 -05:00
|
|
|
if not has_complex:
|
2021-03-11 00:11:27 -05:00
|
|
|
skip_tests.add("float/complex1.py")
|
|
|
|
skip_tests.add("float/complex1_intbig.py")
|
|
|
|
skip_tests.add("float/complex_special_methods.py")
|
|
|
|
skip_tests.add("float/int_big_float.py")
|
|
|
|
skip_tests.add("float/true_value.py")
|
|
|
|
skip_tests.add("float/types.py")
|
2015-12-06 07:56:37 -05:00
|
|
|
|
2016-12-21 19:26:06 -05:00
|
|
|
if not has_coverage:
|
2021-03-11 00:11:27 -05:00
|
|
|
skip_tests.add("cmdline/cmd_parsetree.py")
|
2016-12-21 19:26:06 -05:00
|
|
|
|
2016-07-09 11:52:57 -04:00
|
|
|
# Some tests shouldn't be run on a PC
|
2021-03-11 00:11:27 -05:00
|
|
|
if args.target == "unix":
|
2016-07-09 11:52:57 -04:00
|
|
|
# unix build does not have the GIL so can't run thread mutation tests
|
|
|
|
for t in tests:
|
2021-03-11 00:11:27 -05:00
|
|
|
if t.startswith("thread/mutate_"):
|
2016-07-09 11:52:57 -04:00
|
|
|
skip_tests.add(t)
|
|
|
|
|
2014-09-13 13:43:09 -04:00
|
|
|
# Some tests shouldn't be run on pyboard
|
2021-03-11 00:11:27 -05:00
|
|
|
if args.target != "unix":
|
|
|
|
skip_tests.add("basics/exception_chain.py") # warning is not printed
|
|
|
|
skip_tests.add("micropython/meminfo.py") # output is very different to PC output
|
|
|
|
skip_tests.add("extmod/machine_mem.py") # raw memory access not supported
|
|
|
|
|
|
|
|
if args.target == "wipy":
|
|
|
|
skip_tests.add("misc/print_exception.py") # requires error reporting full
|
|
|
|
skip_tests.update(
|
|
|
|
{
|
|
|
|
"extmod/uctypes_%s.py" % t
|
|
|
|
for t in "bytearray le native_le ptr_le ptr_native_le sizeof sizeof_native array_assign_le array_assign_native_le".split()
|
|
|
|
}
|
|
|
|
) # requires uctypes
|
|
|
|
skip_tests.add("extmod/zlibd_decompress.py") # requires zlib
|
|
|
|
skip_tests.add("extmod/uheapq1.py") # uheapq not supported by WiPy
|
|
|
|
skip_tests.add("extmod/urandom_basic.py") # requires urandom
|
|
|
|
skip_tests.add("extmod/urandom_extra.py") # requires urandom
|
|
|
|
elif args.target == "esp8266":
|
|
|
|
skip_tests.add("misc/rge_sm.py") # too large
|
|
|
|
elif args.target == "minimal":
|
|
|
|
skip_tests.add("basics/class_inplace_op.py") # all special methods not supported
|
|
|
|
skip_tests.add(
|
|
|
|
"basics/subclass_native_init.py"
|
|
|
|
) # native subclassing corner cases not support
|
|
|
|
skip_tests.add("misc/rge_sm.py") # too large
|
|
|
|
skip_tests.add("micropython/opt_level.py") # don't assume line numbers are stored
|
|
|
|
elif args.target == "nrf":
|
|
|
|
skip_tests.add("basics/memoryview1.py") # no item assignment for memoryview
|
|
|
|
skip_tests.add("extmod/urandom_basic.py") # unimplemented: urandom.seed
|
|
|
|
skip_tests.add("micropython/opt_level.py") # no support for line numbers
|
|
|
|
skip_tests.add("misc/non_compliant.py") # no item assignment for bytearray
|
2018-07-19 18:50:00 -04:00
|
|
|
for t in tests:
|
2021-03-11 00:11:27 -05:00
|
|
|
if t.startswith("basics/io_"):
|
2018-07-19 18:50:00 -04:00
|
|
|
skip_tests.add(t)
|
2021-03-11 00:11:27 -05:00
|
|
|
elif args.target == "qemu-arm":
|
|
|
|
skip_tests.add("misc/print_exception.py") # requires sys stdfiles
|
2015-06-23 15:24:51 -04:00
|
|
|
|
2014-09-17 17:56:34 -04:00
|
|
|
# Some tests are known to fail on 64-bit machines
|
2021-03-11 00:11:27 -05:00
|
|
|
if pyb is None and platform.architecture()[0] == "64bit":
|
2014-09-23 08:09:26 -04:00
|
|
|
pass
|
2014-09-17 17:56:34 -04:00
|
|
|
|
2014-10-04 02:39:15 -04:00
|
|
|
# Some tests use unsupported features on Windows
|
2021-03-11 00:11:27 -05:00
|
|
|
if os.name == "nt":
|
|
|
|
skip_tests.add("import/import_file.py") # works but CPython prints forward slashes
|
2014-10-04 02:39:15 -04:00
|
|
|
|
2014-08-29 14:47:10 -04:00
|
|
|
# Some tests are known to fail with native emitter
|
|
|
|
# Remove them from the below when they work
|
2021-03-11 00:11:27 -05:00
|
|
|
if args.emit == "native":
|
|
|
|
skip_tests.update(
|
|
|
|
{"basics/%s.py" % t for t in "gen_yield_from_close generator_name".split()}
|
|
|
|
) # require raise_varargs, generator name
|
|
|
|
skip_tests.update(
|
|
|
|
{"basics/async_%s.py" % t for t in "with with2 with_break with_return".split()}
|
|
|
|
) # require async_with
|
|
|
|
skip_tests.update(
|
|
|
|
{"basics/%s.py" % t for t in "try_reraise try_reraise2".split()}
|
|
|
|
) # require raise_varargs
|
|
|
|
skip_tests.add("basics/annotate_var.py") # requires checking for unbound local
|
|
|
|
skip_tests.add("basics/del_deref.py") # requires checking for unbound local
|
|
|
|
skip_tests.add("basics/del_local.py") # requires checking for unbound local
|
|
|
|
skip_tests.add("basics/exception_chain.py") # raise from is not supported
|
|
|
|
skip_tests.add("basics/scope_implicit.py") # requires checking for unbound local
|
|
|
|
skip_tests.add("basics/try_finally_return2.py") # requires raise_varargs
|
|
|
|
skip_tests.add("basics/unboundlocal.py") # requires checking for unbound local
|
2022-10-16 16:58:44 -04:00
|
|
|
skip_tests.update(
|
|
|
|
(
|
|
|
|
"basics/chained_exception.py",
|
|
|
|
"circuitpython/traceback_test.py",
|
|
|
|
"circuitpython/traceback_test_chained.py",
|
|
|
|
)
|
2021-12-02 00:41:11 -05:00
|
|
|
) # because native doesn't have proper traceback info
|
2021-03-11 00:11:27 -05:00
|
|
|
skip_tests.add("extmod/uasyncio_event.py") # unknown issue
|
|
|
|
skip_tests.add("extmod/uasyncio_lock.py") # requires async with
|
|
|
|
skip_tests.add("extmod/uasyncio_micropython.py") # unknown issue
|
|
|
|
skip_tests.add("extmod/uasyncio_wait_for.py") # unknown issue
|
|
|
|
skip_tests.add("misc/features.py") # requires raise_varargs
|
|
|
|
skip_tests.add(
|
|
|
|
"misc/print_exception.py"
|
|
|
|
) # because native doesn't have proper traceback info
|
|
|
|
skip_tests.add("misc/sys_exc_info.py") # sys.exc_info() is not supported for native
|
|
|
|
skip_tests.add(
|
|
|
|
"micropython/emg_exc.py"
|
|
|
|
) # because native doesn't have proper traceback info
|
|
|
|
skip_tests.add(
|
|
|
|
"micropython/heapalloc_traceback.py"
|
|
|
|
) # because native doesn't have proper traceback info
|
|
|
|
skip_tests.add(
|
|
|
|
"micropython/opt_level_lineno.py"
|
|
|
|
) # native doesn't have proper traceback info
|
|
|
|
skip_tests.add("micropython/schedule.py") # native code doesn't check pending events
|
2014-08-29 14:47:10 -04:00
|
|
|
|
2021-05-11 20:31:27 -04:00
|
|
|
def run_one_test(test_file):
|
2021-03-11 00:11:27 -05:00
|
|
|
test_file = test_file.replace("\\", "/")
|
2017-12-14 05:26:10 -05:00
|
|
|
|
|
|
|
if args.filters:
|
|
|
|
# Default verdict is the opposit of the first action
|
|
|
|
verdict = "include" if args.filters[0][0] == "exclude" else "exclude"
|
|
|
|
for action, pat in args.filters:
|
|
|
|
if pat.search(test_file):
|
|
|
|
verdict = action
|
|
|
|
if verdict == "exclude":
|
2021-05-11 20:31:27 -04:00
|
|
|
return
|
2017-12-14 05:26:10 -05:00
|
|
|
|
2021-03-11 00:11:27 -05:00
|
|
|
test_basename = test_file.replace("..", "_").replace("./", "").replace("/", "_")
|
2018-08-08 09:20:22 -04:00
|
|
|
test_name = os.path.splitext(os.path.basename(test_file))[0]
|
2021-03-11 00:11:27 -05:00
|
|
|
is_native = (
|
|
|
|
test_name.startswith("native_")
|
|
|
|
or test_name.startswith("viper_")
|
|
|
|
or args.emit == "native"
|
|
|
|
)
|
2015-08-29 17:28:59 -04:00
|
|
|
is_endian = test_name.endswith("_endian")
|
2017-03-03 16:13:27 -05:00
|
|
|
is_int_big = test_name.startswith("int_big") or test_name.endswith("_intbig")
|
2019-10-18 04:48:15 -04:00
|
|
|
is_bytearray = test_name.startswith("bytearray") or test_name.endswith("_bytearray")
|
2017-01-30 16:25:09 -05:00
|
|
|
is_set_type = test_name.startswith("set_") or test_name.startswith("frozenset")
|
2019-10-29 07:01:17 -04:00
|
|
|
is_slice = test_name.find("slice") != -1 or test_name in misc_slice_tests
|
2021-05-13 11:33:24 -04:00
|
|
|
is_async = test_name.startswith(("async_", "uasyncio_"))
|
2017-04-02 15:51:31 -04:00
|
|
|
is_const = test_name.startswith("const")
|
2019-10-29 07:13:38 -04:00
|
|
|
is_io_module = test_name.startswith("io_")
|
2021-08-12 11:44:08 -04:00
|
|
|
is_fstring = test_name.startswith("string_fstring")
|
2017-01-04 16:16:29 -05:00
|
|
|
|
|
|
|
skip_it = test_file in skip_tests
|
|
|
|
skip_it |= skip_native and is_native
|
|
|
|
skip_it |= skip_endian and is_endian
|
2017-03-03 12:14:02 -05:00
|
|
|
skip_it |= skip_int_big and is_int_big
|
2019-10-18 04:48:15 -04:00
|
|
|
skip_it |= skip_bytearray and is_bytearray
|
2017-01-04 16:16:29 -05:00
|
|
|
skip_it |= skip_set_type and is_set_type
|
2019-10-29 06:44:22 -04:00
|
|
|
skip_it |= skip_slice and is_slice
|
2017-02-14 14:03:25 -05:00
|
|
|
skip_it |= skip_async and is_async
|
2017-04-02 15:51:31 -04:00
|
|
|
skip_it |= skip_const and is_const
|
2020-08-29 00:04:59 -04:00
|
|
|
skip_it |= skip_revops and "reverse_op" in test_name
|
2019-10-29 07:13:38 -04:00
|
|
|
skip_it |= skip_io_module and is_io_module
|
2021-08-12 11:44:08 -04:00
|
|
|
skip_it |= skip_fstring and is_fstring
|
2014-06-05 17:41:30 -04:00
|
|
|
|
2017-12-14 05:11:17 -05:00
|
|
|
if args.list_tests:
|
|
|
|
if not skip_it:
|
|
|
|
print(test_file)
|
2021-05-11 20:31:27 -04:00
|
|
|
return
|
2017-12-14 05:11:17 -05:00
|
|
|
|
2017-01-04 16:16:29 -05:00
|
|
|
if skip_it:
|
2014-05-03 11:43:27 -04:00
|
|
|
print("skip ", test_file)
|
2014-05-10 09:52:58 -04:00
|
|
|
skipped_tests.append(test_name)
|
2021-05-11 20:31:27 -04:00
|
|
|
return
|
2014-05-03 11:43:27 -04:00
|
|
|
|
|
|
|
# get expected output
|
2021-03-11 00:11:27 -05:00
|
|
|
test_file_expected = test_file + ".exp"
|
2014-05-03 11:43:27 -04:00
|
|
|
if os.path.isfile(test_file_expected):
|
|
|
|
# expected output given by a file, so read that in
|
2021-03-11 00:11:27 -05:00
|
|
|
with open(test_file_expected, "rb") as f:
|
2014-05-03 11:43:27 -04:00
|
|
|
output_expected = f.read()
|
|
|
|
else:
|
2021-05-11 20:31:27 -04:00
|
|
|
e = {"PYTHONPATH": os.getcwd(), "PATH": os.environ["PATH"], "LANG": "en_US.UTF-8"}
|
2014-05-11 06:45:02 -04:00
|
|
|
# run CPython to work out expected output
|
2014-05-03 11:43:27 -04:00
|
|
|
try:
|
2021-05-11 20:31:27 -04:00
|
|
|
output_expected = subprocess.check_output(
|
|
|
|
CPYTHON3_CMD + [test_file], env=e, stderr=subprocess.STDOUT
|
|
|
|
)
|
2014-07-12 09:34:51 -04:00
|
|
|
if args.write_exp:
|
2021-03-11 00:11:27 -05:00
|
|
|
with open(test_file_expected, "wb") as f:
|
2014-07-12 09:34:51 -04:00
|
|
|
f.write(output_expected)
|
2021-05-11 20:31:27 -04:00
|
|
|
except subprocess.CalledProcessError as error:
|
|
|
|
output_expected = error.output + b"CPYTHON3 CRASH"
|
2014-05-03 11:43:27 -04:00
|
|
|
|
2016-03-07 07:01:21 -05:00
|
|
|
# canonical form for all host platforms is to use \n for end-of-line
|
2021-03-11 00:11:27 -05:00
|
|
|
output_expected = output_expected.replace(b"\r\n", b"\n")
|
2016-03-07 07:01:21 -05:00
|
|
|
|
2014-07-12 09:34:51 -04:00
|
|
|
if args.write_exp:
|
2021-05-11 20:31:27 -04:00
|
|
|
return
|
2014-07-12 09:34:51 -04:00
|
|
|
|
2017-06-30 03:22:17 -04:00
|
|
|
# run MicroPython
|
2014-10-05 17:27:12 -04:00
|
|
|
output_mupy = run_micropython(pyb, args, test_file)
|
2014-05-03 11:43:27 -04:00
|
|
|
|
2021-03-11 00:11:27 -05:00
|
|
|
if output_mupy == b"SKIP\n":
|
2014-05-10 09:52:58 -04:00
|
|
|
print("skip ", test_file)
|
|
|
|
skipped_tests.append(test_name)
|
2021-05-11 20:31:27 -04:00
|
|
|
return
|
2014-05-10 09:52:58 -04:00
|
|
|
|
2021-05-11 20:31:27 -04:00
|
|
|
testcase_count.add(len(output_expected.splitlines()))
|
2014-05-10 09:52:58 -04:00
|
|
|
|
2020-04-07 10:19:49 -04:00
|
|
|
filename_expected = os.path.join(result_dir, test_basename + ".exp")
|
|
|
|
filename_mupy = os.path.join(result_dir, test_basename + ".out")
|
2014-05-03 11:43:27 -04:00
|
|
|
|
|
|
|
if output_expected == output_mupy:
|
2021-05-13 11:33:24 -04:00
|
|
|
print("pass ", test_file)
|
|
|
|
passed_count.increment()
|
2014-05-03 11:43:27 -04:00
|
|
|
rm_f(filename_expected)
|
|
|
|
rm_f(filename_mupy)
|
|
|
|
else:
|
2014-06-28 05:29:12 -04:00
|
|
|
with open(filename_expected, "wb") as f:
|
|
|
|
f.write(output_expected)
|
|
|
|
with open(filename_mupy, "wb") as f:
|
|
|
|
f.write(output_mupy)
|
2014-05-03 11:43:27 -04:00
|
|
|
print("FAIL ", test_file)
|
2021-05-13 11:33:24 -04:00
|
|
|
failed_tests.append(test_name)
|
2014-05-03 11:43:27 -04:00
|
|
|
|
2021-05-13 11:33:24 -04:00
|
|
|
test_count.increment()
|
2014-05-03 11:43:27 -04:00
|
|
|
|
2021-05-13 11:33:24 -04:00
|
|
|
if pyb or args.list_tests:
|
|
|
|
num_threads = 1
|
2017-12-13 11:01:35 -05:00
|
|
|
|
2021-05-11 20:31:27 -04:00
|
|
|
if num_threads > 1:
|
|
|
|
pool = ThreadPool(num_threads)
|
|
|
|
pool.map(run_one_test, tests)
|
|
|
|
else:
|
|
|
|
for test in tests:
|
|
|
|
run_one_test(test)
|
|
|
|
|
2021-05-13 11:33:24 -04:00
|
|
|
if args.list_tests:
|
|
|
|
return True
|
|
|
|
|
2021-05-11 20:31:27 -04:00
|
|
|
print(
|
|
|
|
"{} tests performed ({} individual testcases)".format(
|
|
|
|
test_count.value, testcase_count.value
|
|
|
|
)
|
|
|
|
)
|
|
|
|
print("{} tests passed".format(passed_count.value))
|
2014-05-03 11:43:27 -04:00
|
|
|
|
2021-05-13 11:33:24 -04:00
|
|
|
skipped_tests = sorted(skipped_tests.value)
|
|
|
|
if len(skipped_tests) > 0:
|
|
|
|
print("{} tests skipped: {}".format(len(skipped_tests), " ".join(skipped_tests)))
|
|
|
|
failed_tests = sorted(failed_tests.value)
|
|
|
|
if len(failed_tests) > 0:
|
|
|
|
print("{} tests failed: {}".format(len(failed_tests), " ".join(failed_tests)))
|
2014-05-03 11:43:27 -04:00
|
|
|
return False
|
|
|
|
|
|
|
|
# all tests succeeded
|
|
|
|
return True
|
|
|
|
|
2017-12-14 05:26:10 -05:00
|
|
|
|
|
|
|
class append_filter(argparse.Action):
|
|
|
|
def __init__(self, option_strings, dest, **kwargs):
|
|
|
|
super().__init__(option_strings, dest, default=[], **kwargs)
|
|
|
|
|
|
|
|
def __call__(self, parser, args, value, option):
|
|
|
|
if not hasattr(args, self.dest):
|
|
|
|
args.filters = []
|
|
|
|
if option.startswith(("-e", "--e")):
|
|
|
|
option = "exclude"
|
|
|
|
else:
|
|
|
|
option = "include"
|
|
|
|
args.filters.append((option, re.compile(value)))
|
|
|
|
|
|
|
|
|
2014-05-03 11:43:27 -04:00
|
|
|
def main():
|
2017-12-14 05:26:10 -05:00
|
|
|
cmd_parser = argparse.ArgumentParser(
|
|
|
|
formatter_class=argparse.RawDescriptionHelpFormatter,
|
2021-03-11 00:11:27 -05:00
|
|
|
description="""Run and manage tests for MicroPython.
|
2020-01-16 12:07:50 -05:00
|
|
|
|
2020-04-08 02:01:58 -04:00
|
|
|
Tests are discovered by scanning test directories for .py files or using the
|
|
|
|
specified test files. If test files nor directories are specified, the script
|
|
|
|
expects to be ran in the tests directory (where this file is located) and the
|
|
|
|
builtin tests suitable for the target platform are ran.
|
2021-03-11 00:09:27 -05:00
|
|
|
When running tests, run-tests.py compares the MicroPython output of the test with the output
|
2020-01-16 12:07:50 -05:00
|
|
|
produced by running the test through CPython unless a <test>.exp file is found, in which
|
|
|
|
case it is used as comparison.
|
2021-03-11 00:09:27 -05:00
|
|
|
If a test fails, run-tests.py produces a pair of <test>.out and <test>.exp files in the result
|
2020-01-16 12:07:50 -05:00
|
|
|
directory with the MicroPython output and the expectations, respectively.
|
2021-03-11 00:11:27 -05:00
|
|
|
""",
|
|
|
|
epilog="""\
|
2017-12-14 05:26:10 -05:00
|
|
|
Options -i and -e can be multiple and processed in the order given. Regex
|
|
|
|
"search" (vs "match") operation is used. An action (include/exclude) of
|
|
|
|
the last matching regex is used:
|
2021-03-11 00:09:27 -05:00
|
|
|
run-tests.py -i async - exclude all, then include tests containing "async" anywhere
|
|
|
|
run-tests.py -e '/big.+int' - include all, then exclude by regex
|
|
|
|
run-tests.py -e async -i async_foo - include all, exclude async, yet still include async_foo
|
2021-03-11 00:11:27 -05:00
|
|
|
""",
|
|
|
|
)
|
|
|
|
cmd_parser.add_argument("--target", default="unix", help="the target platform")
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"--device",
|
|
|
|
default="/dev/ttyACM0",
|
|
|
|
help="the serial device or the IP address of the pyboard",
|
|
|
|
)
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"-b", "--baudrate", default=115200, help="the baud rate of the serial device"
|
|
|
|
)
|
|
|
|
cmd_parser.add_argument("-u", "--user", default="micro", help="the telnet login username")
|
|
|
|
cmd_parser.add_argument("-p", "--password", default="python", help="the telnet login password")
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"-d", "--test-dirs", nargs="*", help="input test directories (if no files given)"
|
|
|
|
)
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"-r", "--result-dir", default=base_path("results"), help="directory for test results"
|
|
|
|
)
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"-e",
|
|
|
|
"--exclude",
|
|
|
|
action=append_filter,
|
|
|
|
metavar="REGEX",
|
|
|
|
dest="filters",
|
|
|
|
help="exclude test by regex on path/name.py",
|
|
|
|
)
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"-i",
|
|
|
|
"--include",
|
|
|
|
action=append_filter,
|
|
|
|
metavar="REGEX",
|
|
|
|
dest="filters",
|
|
|
|
help="include test by regex on path/name.py",
|
|
|
|
)
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"--write-exp",
|
|
|
|
action="store_true",
|
|
|
|
help="use CPython to generate .exp files to run tests w/o CPython",
|
|
|
|
)
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"--list-tests", action="store_true", help="list tests instead of running them"
|
|
|
|
)
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"--emit", default="bytecode", help="MicroPython emitter to use (bytecode or native)"
|
|
|
|
)
|
|
|
|
cmd_parser.add_argument("--heapsize", help="heapsize to use (use default if not specified)")
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"--via-mpy", action="store_true", help="compile .py files to .mpy first"
|
|
|
|
)
|
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
|
|
|
cmd_parser.add_argument("--mpy-cross-flags", default="", help="flags to pass to mpy-cross")
|
2021-03-11 00:11:27 -05:00
|
|
|
cmd_parser.add_argument(
|
|
|
|
"--keep-path", action="store_true", help="do not clear MICROPYPATH when running tests"
|
|
|
|
)
|
2021-05-11 20:31:27 -04:00
|
|
|
cmd_parser.add_argument(
|
|
|
|
"-j",
|
|
|
|
"--jobs",
|
2021-05-13 11:33:24 -04:00
|
|
|
default=multiprocessing.cpu_count(),
|
2021-05-11 20:31:27 -04:00
|
|
|
metavar="N",
|
|
|
|
type=int,
|
|
|
|
help="Number of tests to run simultaneously",
|
|
|
|
)
|
2021-03-11 00:11:27 -05:00
|
|
|
cmd_parser.add_argument("files", nargs="*", help="input test files")
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"--print-failures",
|
|
|
|
action="store_true",
|
|
|
|
help="print the diff of expected vs. actual output for failed tests and exit",
|
|
|
|
)
|
|
|
|
cmd_parser.add_argument(
|
|
|
|
"--clean-failures",
|
|
|
|
action="store_true",
|
|
|
|
help="delete the .exp and .out files from failed tests and exit",
|
|
|
|
)
|
2014-05-03 11:43:27 -04:00
|
|
|
args = cmd_parser.parse_args()
|
|
|
|
|
2020-03-26 23:41:38 -04:00
|
|
|
if args.print_failures:
|
2020-04-07 10:19:49 -04:00
|
|
|
for exp in glob(os.path.join(args.result_dir, "*.exp")):
|
2020-04-08 02:01:58 -04:00
|
|
|
testbase = exp[:-4]
|
2020-03-26 23:41:38 -04:00
|
|
|
print()
|
|
|
|
print("FAILURE {0}".format(testbase))
|
2020-03-30 04:14:09 -04:00
|
|
|
os.system("{0} {1}.exp {1}.out".format(DIFF, testbase))
|
2020-03-26 23:41:38 -04:00
|
|
|
|
|
|
|
sys.exit(0)
|
|
|
|
|
|
|
|
if args.clean_failures:
|
2021-03-11 00:11:27 -05:00
|
|
|
for f in glob(os.path.join(args.result_dir, "*.exp")) + glob(
|
|
|
|
os.path.join(args.result_dir, "*.out")
|
|
|
|
):
|
2020-03-26 23:41:38 -04:00
|
|
|
os.remove(f)
|
|
|
|
|
|
|
|
sys.exit(0)
|
|
|
|
|
2021-03-11 00:11:27 -05:00
|
|
|
LOCAL_TARGETS = (
|
|
|
|
"unix",
|
|
|
|
"qemu-arm",
|
|
|
|
)
|
|
|
|
EXTERNAL_TARGETS = ("pyboard", "wipy", "esp8266", "esp32", "minimal", "nrf")
|
2019-08-18 20:59:27 -04:00
|
|
|
if args.target in LOCAL_TARGETS or args.list_tests:
|
2017-12-13 11:01:35 -05:00
|
|
|
pyb = None
|
|
|
|
elif args.target in EXTERNAL_TARGETS:
|
2018-09-05 01:35:18 -04:00
|
|
|
global pyboard
|
2021-03-11 00:11:27 -05:00
|
|
|
sys.path.append(base_path("../tools"))
|
2014-05-03 11:43:27 -04:00
|
|
|
import pyboard
|
2021-03-11 00:11:27 -05:00
|
|
|
|
2015-06-28 08:01:27 -04:00
|
|
|
pyb = pyboard.Pyboard(args.device, args.baudrate, args.user, args.password)
|
2014-04-13 08:48:33 -04:00
|
|
|
pyb.enter_raw_repl()
|
2015-06-23 15:24:51 -04:00
|
|
|
else:
|
2021-03-11 00:11:27 -05:00
|
|
|
raise ValueError("target must be one of %s" % ", ".join(LOCAL_TARGETS + EXTERNAL_TARGETS))
|
2014-05-03 11:43:27 -04:00
|
|
|
|
|
|
|
if len(args.files) == 0:
|
2014-05-28 08:27:54 -04:00
|
|
|
if args.test_dirs is None:
|
2021-03-11 00:11:27 -05:00
|
|
|
test_dirs = (
|
|
|
|
"basics",
|
2021-11-12 18:06:44 -05:00
|
|
|
"circuitpython",
|
2021-03-11 00:11:27 -05:00
|
|
|
"micropython",
|
|
|
|
"misc",
|
|
|
|
"extmod",
|
|
|
|
)
|
|
|
|
if args.target == "pyboard":
|
2014-05-28 08:27:54 -04:00
|
|
|
# run pyboard tests
|
2021-03-11 00:11:27 -05:00
|
|
|
test_dirs += ("float", "stress", "pyb", "pybnative", "inlineasm")
|
|
|
|
elif args.target in ("esp8266", "esp32", "minimal", "nrf"):
|
|
|
|
test_dirs += ("float",)
|
|
|
|
elif args.target == "wipy":
|
2015-06-23 15:24:51 -04:00
|
|
|
# run WiPy tests
|
2021-03-11 00:11:27 -05:00
|
|
|
test_dirs += ("wipy",)
|
|
|
|
elif args.target == "unix":
|
2015-06-23 15:24:51 -04:00
|
|
|
# run PC tests
|
2021-03-11 00:11:27 -05:00
|
|
|
test_dirs += (
|
|
|
|
"float",
|
|
|
|
"import",
|
|
|
|
"io",
|
|
|
|
"stress",
|
|
|
|
"unicode",
|
|
|
|
"unix",
|
|
|
|
"cmdline",
|
2021-05-11 20:31:27 -04:00
|
|
|
"../extmod/ulab/tests",
|
2021-03-11 00:11:27 -05:00
|
|
|
)
|
|
|
|
elif args.target == "qemu-arm":
|
2019-08-18 20:59:27 -04:00
|
|
|
if not args.write_exp:
|
2021-03-11 00:11:27 -05:00
|
|
|
raise ValueError("--target=qemu-arm must be used with --write-exp")
|
2019-08-18 20:59:27 -04:00
|
|
|
# Generate expected output files for qemu run.
|
|
|
|
# This list should match the test_dirs tuple in tinytest-codegen.py.
|
2021-03-11 00:11:27 -05:00
|
|
|
test_dirs += (
|
|
|
|
"float",
|
|
|
|
"inlineasm",
|
|
|
|
"qemu-arm",
|
|
|
|
)
|
2014-05-03 11:43:27 -04:00
|
|
|
else:
|
2014-05-28 08:27:54 -04:00
|
|
|
# run tests from these directories
|
|
|
|
test_dirs = args.test_dirs
|
2021-03-11 00:11:27 -05:00
|
|
|
tests = sorted(
|
|
|
|
test_file
|
|
|
|
for test_files in (glob("{}/*.py".format(dir)) for dir in test_dirs)
|
|
|
|
for test_file in test_files
|
|
|
|
)
|
2014-01-27 16:53:28 -05:00
|
|
|
else:
|
2014-05-03 11:43:27 -04:00
|
|
|
# tests explicitly given
|
|
|
|
tests = args.files
|
2014-01-27 16:53:28 -05:00
|
|
|
|
2015-03-24 06:55:26 -04:00
|
|
|
if not args.keep_path:
|
2022-10-14 17:40:10 -04:00
|
|
|
# clear search path to make sure tests use only builtin modules and those that can be frozen
|
2022-10-14 15:44:23 -04:00
|
|
|
os.environ["MICROPYPATH"] = os.pathsep.join(
|
|
|
|
[
|
|
|
|
"",
|
|
|
|
".frozen",
|
|
|
|
base_path("../frozen/Adafruit_CircuitPython_asyncio"),
|
|
|
|
base_path("../frozen/Adafruit_CircuitPython_Ticks"),
|
|
|
|
]
|
|
|
|
)
|
2017-10-07 08:49:58 -04:00
|
|
|
try:
|
2020-04-07 10:19:49 -04:00
|
|
|
os.makedirs(args.result_dir, exist_ok=True)
|
2021-05-11 20:31:27 -04:00
|
|
|
res = run_tests(pyb, tests, args, args.result_dir, args.jobs)
|
2017-10-07 08:49:58 -04:00
|
|
|
finally:
|
|
|
|
if pyb:
|
|
|
|
pyb.close()
|
|
|
|
|
2017-04-02 13:47:44 -04:00
|
|
|
if not res:
|
2014-05-03 11:43:27 -04:00
|
|
|
sys.exit(1)
|
2014-01-27 16:53:28 -05:00
|
|
|
|
2021-03-11 00:11:27 -05:00
|
|
|
|
2014-05-03 11:43:27 -04:00
|
|
|
if __name__ == "__main__":
|
|
|
|
main()
|