Merge pull request #1934 from dhalbert/vm-computed-goto

Turn on MICROPY_OPT_COMPUTED_GOTO for 5x CPU-bound speedup

ports/atmel-samd/Makefile

@@ -111,12 +111,18 @@ else
   # -finline-limit can shrink the image size.
   # -finline-limit=80 or so is similar to not having it on.
   # There is no simple default value, though.
-  ifeq ($(INTERNAL_FLASH_FILESYSTEM),1)
+
-    CFLAGS += -finline-limit=50
+  # Do a default shrink for small builds.
+  ifndef CFLAGS_INLINE_LIMIT
+    ifeq ($(CIRCUITPY_SMALL_BUILD),1)
+      CFLAGS_INLINE_LIMIT = 50
     endif
+  endif
+
   ifdef CFLAGS_INLINE_LIMIT
     CFLAGS += -finline-limit=$(CFLAGS_INLINE_LIMIT)
   endif
+
   CFLAGS += -flto
 endif
 

ports/atmel-samd/boards/arduino_mkr1300/mpconfigboard.mk

@@ -4,9 +4,10 @@ USB_PID = 0x8053
 USB_PRODUCT = "Arduino MKR1300"
 USB_MANUFACTURER = "Arduino"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
-
+SUPEROPT_GC = 0
-CHIP_VARIANT = SAMD21G18A
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/arduino_mkrzero/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0x8050
 USB_PRODUCT = "Arduino MKRZero"
 USB_MANUFACTURER = "Arduino"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/arduino_zero/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0x824D
 USB_PRODUCT = "Arduino Zero"
 USB_MANUFACTURER = "Arduino"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/bast_pro_mini_m0/mpconfigboard.mk

@@ -4,9 +4,9 @@ USB_PID = 0xBAB3
 USB_PRODUCT = "Bast Pro Mini M0"
 USB_MANUFACTURER = "Electronic Cats"
 
+CHIP_VARIANT = SAMD21E18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
-
-CHIP_VARIANT = SAMD21E18A
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/capablerobot_usbhub/mpconfigboard.mk

@@ -4,6 +4,9 @@ USB_PID = 0xEDB3
 USB_PRODUCT = "Programmable USB Hub"
 USB_MANUFACTURER = "Capable Robot Components"
 
+CHIP_VARIANT = SAMD51G19A
+CHIP_FAMILY = samd51
+
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
@@ -13,6 +16,3 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_AUDIOBUSIO = 0
 # No touch on SAMD51 yet
 CIRCUITPY_TOUCHIO = 0
-
-CHIP_VARIANT = SAMD51G19A
-CHIP_FAMILY = samd51

ports/atmel-samd/boards/catwan_usbstick/mpconfigboard.mk

@@ -4,9 +4,9 @@ USB_PID = 0xBAB2
 USB_PRODUCT = "CatWAN USBStick"
 USB_MANUFACTURER = "Electronic Cats"
 
+CHIP_VARIANT = SAMD21E18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
-
-CHIP_VARIANT = SAMD21E18A
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk

@@ -4,6 +4,9 @@ USB_PID = 0x8019
 USB_PRODUCT = "CircuitPlayground Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
@@ -14,8 +17,8 @@ CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CSLAVE = 0
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21
+CFLAGS_INLINE_LIMIT = 55
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
@@ -24,11 +27,3 @@ FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_LIS3DH
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Thermistor
-
-# Tweak inlining depending on language.
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-CFLAGS_INLINE_LIMIT = 25
-RELEASE_NEEDS_CLEAN_BUILD = 1
-else
-CFLAGS_INLINE_LIMIT = 55
-endif

ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk

@@ -4,27 +4,23 @@ USB_PID = 0x8019
 USB_PRODUCT = "CircuitPlayground Express with Crickit libraries"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
-# Turn off longints for Crickit build to make room for additional frozen libs.
-LONGINT_IMPL = NONE
 
+# Turn off features and optimizations for Crickit build to make room for additional frozen libs.
+LONGINT_IMPL = NONE
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_PIXELBUF = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CSLAVE = 0
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21
-
-# Tweak inlining depending on language.
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-CFLAGS_INLINE_LIMIT = 23
-RELEASE_NEEDS_CLEAN_BUILD = 1
-else
 CFLAGS_INLINE_LIMIT = 55
-endif
+
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice

ports/atmel-samd/boards/cp32-m4/mpconfigboard.mk

@@ -4,16 +4,15 @@ USB_PID = 0x8021
 USB_PRODUCT = "CP32-M4"
 USB_MANUFACTURER = "Nadda-Reel Company LLC"
 
+CHIP_VARIANT = SAMD51J20A
+CHIP_FAMILY = samd51
+
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = "W25Q128JV_PM"
 
-# No I2S on SAMD51G
-CIRCUITPY_AUDIOBUSIO = 0
-# No touch on SAMD51 yet
-CIRCUITPY_TOUCHIO = 0
-
-CHIP_VARIANT = SAMD51J20A
-CHIP_FAMILY = samd51
-
 CIRCUITPY_PS2IO = 1
+# No I2S on SAMD51G.
+CIRCUITPY_AUDIOBUSIO = 0
+# No touch on SAMD51 yet.
+CIRCUITPY_TOUCHIO = 0

ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.mk

@@ -4,19 +4,16 @@ USB_PID = 0x0001
 USB_PRODUCT = "Datalore IP M4"
 USB_MANUFACTURER = "TG-Boards"
 
-QSPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICE_COUNT = 3
-EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JV_IQ, W25Q16JV_IM"
-
-LONGINT_IMPL = MPZ
-
 CHIP_VARIANT = SAMD51J19A
 CHIP_FAMILY = samd51
 
-# No touch on SAMD51 yet
+QSPI_FLASH_FILESYSTEM = 1
-CIRCUITPY_TOUCHIO = 0
+EXTERNAL_FLASH_DEVICE_COUNT = 3
+EXTERNAL_FLASH_DEVICES = "GD25Q16C, W25Q16JV_IQ, W25Q16JV_IM"
+LONGINT_IMPL = MPZ
 
 CIRCUITPY_NETWORK = 1
 MICROPY_PY_WIZNET5K = 5500
-
 CIRCUITPY_PS2IO = 1
+# No touch on SAMD51 yet
+CIRCUITPY_TOUCHIO = 0

ports/atmel-samd/boards/escornabot_makech/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0xBAB6
 USB_PRODUCT = "Escornabot Makech"
 USB_MANUFACTURER = "Electronic Cats"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0x8015
 USB_PRODUCT = "Feather M0 Adalogger"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0x8015
 USB_PRODUCT = "Feather M0"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk

@@ -4,16 +4,12 @@ USB_PID = 0x8023
 USB_PRODUCT = "Feather M0 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ
 
-CHIP_VARIANT = SAMD21G18A
-CHIP_FAMILY = samd21
-
-# Tweak inlining depending on language.
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
 CFLAGS_INLINE_LIMIT = 60
-RELEASE_NEEDS_CLEAN_BUILD = 1
-endif

ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk

@@ -4,6 +4,9 @@ USB_PID = 0x8023
 USB_PRODUCT = "Feather M0 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
@@ -14,13 +17,8 @@ CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_I2CSLAVE = 0
-
-CHIP_VARIANT = SAMD21G18A
-CHIP_FAMILY = samd21
-
-CFLAGS_INLINE_LIMIT = 50
-
 CIRCUITPY_GAMEPAD = 0
+CFLAGS_INLINE_LIMIT = 50
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice

ports/atmel-samd/boards/feather_m0_rfm69/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0x8015
 USB_PRODUCT = "Feather M0 RFM69"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/feather_m0_rfm9x/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0x8015
 USB_PRODUCT = "Feather M0 RFM9x"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk

@@ -4,10 +4,10 @@ USB_PID = 0x8023
 USB_PRODUCT = "Feather M0 Supersized"
 USB_MANUFACTURER = "Dave Astels"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = "S25FL064L"
 LONGINT_IMPL = MPZ
-
-CHIP_VARIANT = SAMD21G18A
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/feather_m4_express/mpconfigboard.mk

@@ -4,19 +4,16 @@ USB_PID = 0x8026
 USB_PRODUCT = "Feather M4 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
-QSPI_FLASH_FILESYSTEM = 1
+CHIP_VARIANT = SAMD51J19A
+CHIP_FAMILY = samd51
 
+QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
-# No touch on SAMD51 yet
-CIRCUITPY_TOUCHIO = 0
-
-CHIP_VARIANT = SAMD51J19A
-CHIP_FAMILY = samd51
-
 CIRCUITPY_NETWORK = 1
 MICROPY_PY_WIZNET5K = 5500
-
 CIRCUITPY_PS2IO = 1
+# No touch on SAMD51 yet
+CIRCUITPY_TOUCHIO = 0

ports/atmel-samd/boards/feather_radiofruit_zigbee/mpconfigboard.mk

@@ -4,6 +4,9 @@ USB_PID = 0x8023
 USB_PRODUCT = "Feather RadioFruit Zigbee"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMR21G18A
+CHIP_FAMILY = samd21
+
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
@@ -13,6 +16,3 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_AUDIOBUSIO = 0
 # No DAC on SAMR21G
 CIRCUITPY_AUDIOIO = 0
-
-CHIP_VARIANT = SAMR21G18A
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/gemma_m0/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0x801D
 USB_PRODUCT = "Gemma M0"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21E18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21E18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/grandcentral_m4_express/mpconfigboard.mk

@@ -4,16 +4,14 @@ USB_PID = 0x8032
 USB_PRODUCT = "Grand Central M4 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
-QSPI_FLASH_FILESYSTEM = 1
+CHIP_VARIANT = SAMD51P20A
+CHIP_FAMILY = samd51
 
+QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "W25Q64JV_IQ, GD25Q64C"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_PS2IO = 1
 # No touch on SAMD51 yet
 CIRCUITPY_TOUCHIO = 0
-
-CHIP_VARIANT = SAMD51P20A
-CHIP_FAMILY = samd51
-
-CIRCUITPY_PS2IO = 1

ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk

@@ -4,6 +4,9 @@ USB_PID = 0xD1ED
 USB_PRODUCT = "HalloWing M0 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "W25Q64JV_IQ, GD25Q64C"
@@ -13,11 +16,7 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_I2CSLAVE = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
-
+SUPEROPT_GC = 0
-CFLAGS_INLINE_LIMIT = 50
-
-CHIP_VARIANT = SAMD21G18A
-CHIP_FAMILY = samd21
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice

ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk

@@ -4,18 +4,12 @@ USB_PID = 0x8012
 USB_PRODUCT = "ItsyBitsy M0 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "W25Q16FW, GD25Q16C"
 LONGINT_IMPL = MPZ
 
-CHIP_VARIANT = SAMD21G18A
+CFLAGS_INLINE_LIMIT = 60
-CHIP_FAMILY = samd21
-
-# Tweak inlining depending on language.
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-CFLAGS_INLINE_LIMIT = 45
-RELEASE_NEEDS_CLEAN_BUILD = 1
-else
-CFLAGS_INLINE_LIMIT = 70
-endif

ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk

@@ -4,17 +4,16 @@ USB_PID = 0x802C
 USB_PRODUCT = "ItsyBitsy M4 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD51G19A
+CHIP_FAMILY = samd51
+
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_PS2IO = 1
 # No I2S on SAMD51G
 CIRCUITPY_AUDIOBUSIO = 0
 # No touch on SAMD51 yet
 CIRCUITPY_TOUCHIO = 0
-
-CHIP_VARIANT = SAMD51G19A
-CHIP_FAMILY = samd51
-
-CIRCUITPY_PS2IO = 1

ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk

@@ -4,14 +4,15 @@ USB_PID = 0xED94
 USB_PRODUCT = "kicksat-sprite"
 USB_MANUFACTURER = "maholli"
 
+CHIP_VARIANT = SAMD51G19A
+CHIP_FAMILY = samd51
+
 QSPI_FLASH_FILESYSTEM = 0
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
 # No touch on SAMD51 yet
 CIRCUITPY_TOUCHIO = 0
+# Not needed.
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_DISPLAYIO = 0
-
-CHIP_VARIANT = SAMD51G19A
-CHIP_FAMILY = samd51

ports/atmel-samd/boards/meowmeow/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0xBAB1
 USB_PRODUCT = "Meow Meow"
 USB_MANUFACTURER = "Electronic Cats"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk

@@ -4,17 +4,12 @@ USB_PID = 0x8014
 USB_PRODUCT = "Metro M0 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
-SPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICE_COUNT = 2
-EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
-
-LONGINT_IMPL = MPZ
-
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
-# Tweak inlining depending on language.
+SPI_FLASH_FILESYSTEM = 1
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
+EXTERNAL_FLASH_DEVICE_COUNT = 2
-CFLAGS_INLINE_LIMIT = 50
+EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
-RELEASE_NEEDS_CLEAN_BUILD = 1
+LONGINT_IMPL = MPZ
-endif
+
+CFLAGS_INLINE_LIMIT = 60

ports/atmel-samd/boards/metro_m4_airlift_lite/mpconfigboard.mk

@@ -4,19 +4,16 @@ USB_PID = 0x8038
 USB_PRODUCT = "Metro M4 Airlift Lite"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
-QSPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICE_COUNT = 3
-EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
-
-LONGINT_IMPL = MPZ
-
-# No touch on SAMD51 yet
-CIRCUITPY_TOUCHIO = 0
-
 CHIP_VARIANT = SAMD51J19A
 CHIP_FAMILY = samd51
 
+QSPI_FLASH_FILESYSTEM = 1
+EXTERNAL_FLASH_DEVICE_COUNT = 3
+EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
+LONGINT_IMPL = MPZ
+
 CIRCUITPY_NETWORK = 1
 MICROPY_PY_WIZNET5K = 5500
-
 CIRCUITPY_PS2IO = 1
+# No touch on SAMD51 yet
+CIRCUITPY_TOUCHIO = 0

ports/atmel-samd/boards/metro_m4_express/mpconfigboard.mk

@@ -4,19 +4,16 @@ USB_PID = 0x8021
 USB_PRODUCT = "Metro M4 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
-QSPI_FLASH_FILESYSTEM = 1
-EXTERNAL_FLASH_DEVICE_COUNT = 3
-EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
-
-LONGINT_IMPL = MPZ
-
-# No touch on SAMD51 yet
-CIRCUITPY_TOUCHIO = 0
-
 CHIP_VARIANT = SAMD51J19A
 CHIP_FAMILY = samd51
 
+QSPI_FLASH_FILESYSTEM = 1
+EXTERNAL_FLASH_DEVICE_COUNT = 3
+EXTERNAL_FLASH_DEVICES = "S25FL116K, S25FL216K, GD25Q16C"
+LONGINT_IMPL = MPZ
+
 CIRCUITPY_NETWORK = 1
 MICROPY_PY_WIZNET5K = 5500
-
 CIRCUITPY_PS2IO = 1
+# No touch on SAMD51 yet
+CIRCUITPY_TOUCHIO = 0

ports/atmel-samd/boards/mini_sam_m4/mpconfigboard.mk

@@ -4,18 +4,16 @@ USB_PID = 0x2017
 USB_PRODUCT = "Mini SAM M4"
 USB_MANUFACTURER = "Benjamin Shockley"
 
+CHIP_VARIANT = SAMD51G19A
+CHIP_FAMILY = samd51
+
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = "W25Q16JV_IM"
-
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_PS2IO = 1
 # No I2S on SAMD51G
 CIRCUITPY_AUDIOBUSIO = 0
 # No touch on SAMD51 yet
 CIRCUITPY_TOUCHIO = 0
-
-CHIP_VARIANT = SAMD51G19A
-CHIP_FAMILY = samd51
-
-CIRCUITPY_PS2IO = 1

ports/atmel-samd/boards/pewpew10/mpconfigboard.mk

@@ -4,13 +4,12 @@ USB_PID = 0x801D
 USB_PRODUCT = "PewPew 10.2"
 USB_MANUFACTURER = "Radomir Dopieralski"
 
-INTERNAL_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = NONE
-
 CHIP_VARIANT = SAMD21E18A
 CHIP_FAMILY = samd21
 
-FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-standalone-10.x
+INTERNAL_FLASH_FILESYSTEM = 1
+LONGINT_IMPL = NONE
+CIRCUITPY_SMALL_BUILD = 1
 
 CIRCUITPY_PEW = 1
 CIRCUITPY_ANALOGIO = 1
@@ -20,10 +19,7 @@ CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
 CIRCUITPY_SAMD = 0
 CIRCUITPY_USB_MIDI = 0
-CIRCUITPY_SMALL_BUILD = 1
 
-# Tweak inlining depending on language.
+SUPEROPT_GC = 0
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
+
-CFLAGS_INLINE_LIMIT = 40
+FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-standalone-10.x
-RELEASE_NEEDS_CLEAN_BUILD = 1
-endif

ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk

@@ -4,6 +4,9 @@ USB_PID = 0x8028
 USB_PRODUCT = "pIRKey M0"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21E18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 
@@ -19,11 +22,8 @@ CIRCUITPY_SAMD = 0
 CIRCUITPY_USB_MIDI = 1
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_SMALL_BUILD = 1
-
+# Make more room.
-CHIP_VARIANT = SAMD21E18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21
-
-CFLAGS_INLINE_LIMIT = 25
 
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar

ports/atmel-samd/boards/pybadge/mpconfigboard.mk

@@ -4,22 +4,20 @@ USB_PID = 0x8034
 USB_PRODUCT = "PyBadge"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD51J19A
+CHIP_FAMILY = samd51
+
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = GD25Q16C
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_AUDIOIO = 1
+CIRCUITPY_DISPLAYIO = 1
+CIRCUITPY_GAMEPAD = 1
+CIRCUITPY_GAMEPADSHIFT = 1
+CIRCUITPY_STAGE = 1
 # No touch on SAMD51 yet
 CIRCUITPY_TOUCHIO = 0
 
-CIRCUITPY_GAMEPADSHIFT = 1
-
-CHIP_VARIANT = SAMD51J19A
-CHIP_FAMILY = samd51
-
-CIRCUITPY_STAGE = 1
-CIRCUITPY_GAMEPAD = 1
-CIRCUITPY_DISPLAYIO = 1
-CIRCUITPY_AUDIOIO = 1
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pybadge

ports/atmel-samd/boards/pygamer/mpconfigboard.mk

@@ -4,22 +4,20 @@ USB_PID = 0x803E
 USB_PRODUCT = "PyGamer"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD51J19A
+CHIP_FAMILY = samd51
+
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = GD25Q64C
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_AUDIOIO = 1
+CIRCUITPY_DISPLAYIO = 1
+CIRCUITPY_GAMEPAD = 1
+CIRCUITPY_GAMEPADSHIFT = 1
+CIRCUITPY_STAGE = 1
 # No touch on SAMD51 yet
 CIRCUITPY_TOUCHIO = 0
 
-CIRCUITPY_GAMEPADSHIFT = 1
-
-CHIP_VARIANT = SAMD51J19A
-CHIP_FAMILY = samd51
-
-CIRCUITPY_STAGE = 1
-CIRCUITPY_GAMEPAD = 1
-CIRCUITPY_DISPLAYIO = 1
-CIRCUITPY_AUDIOIO = 1
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pybadge

ports/atmel-samd/boards/pyportal/mpconfigboard.mk

@@ -4,14 +4,13 @@ USB_PID = 0x8036
 USB_PRODUCT = "PyPortal"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
-QSPI_FLASH_FILESYSTEM = 1
+CHIP_VARIANT = SAMD51J20A
+CHIP_FAMILY = samd51
 
+QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "W25Q64JV_IQ, GD25Q64C"
 LONGINT_IMPL = MPZ
 
 # No touch on SAMD51 yet
 CIRCUITPY_TOUCHIO = 0
-
-CHIP_VARIANT = SAMD51J20A
-CHIP_FAMILY = samd51

ports/atmel-samd/boards/robohatmm1/mpconfigboard.mk

@@ -4,23 +4,25 @@ USB_PID = 0x4D43
 USB_PRODUCT = "Robo HAT MM1"
 USB_MANUFACTURER = "Robotics Masters"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 # Non-Flash Edition
 #INTERNAL_FLASH_FILESYSTEM = 1
 #LONGINT_IMPL = NONE
+#SUPEROPT_GC = 0
 
 # SPI-Flash Edition
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = "W25Q64JV_IQ"
 LONGINT_IMPL = MPZ
-
-CHIP_VARIANT = SAMD21G18A
-CHIP_FAMILY = samd21
-
 # Make room for frozen Libraries
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 
+CFLAGS_INLINE_LIMIT = 55
+
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 #FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_INA219
@@ -29,6 +31,3 @@ FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_NeoPixel
 #FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Crickit
 #FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Motor
 #FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_seesaw
-
-#Adding per @danh to reduce memory usage and get the latest changes in
-CFLAGS_INLINE_LIMIT = 55

ports/atmel-samd/boards/sam32/mpconfigboard.mk

@@ -4,11 +4,11 @@ USB_PID = 0xEDBE
 USB_PRODUCT = "SAM32"
 USB_MANUFACTURER = "maholli"
 
+CHIP_VARIANT = SAMD51J20A
+CHIP_FAMILY = samd51
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
 # No touch on SAMD51 yet
 CIRCUITPY_TOUCHIO = 0
-
-CHIP_VARIANT = SAMD51J20A
-CHIP_FAMILY = samd51

ports/atmel-samd/boards/sparkfun_lumidrive/mpconfigboard.mk

@@ -4,16 +4,15 @@ USB_PID = 0x0017
 USB_PRODUCT = "LUMIDrive Board"
 USB_MANUFACTURER = "SparkFun Electronics"
 
-SPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
+SPI_FLASH_FILESYSTEM = 1
+EXTERNAL_FLASH_DEVICE_COUNT = 1
+EXTERNAL_FLASH_DEVICES = "W25Q32FV"
+LONGINT_IMPL = MPZ
+
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
 
-EXTERNAL_FLASH_DEVICE_COUNT = 1
-EXTERNAL_FLASH_DEVICES = "W25Q32FV"
-
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar

ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk

@@ -4,17 +4,12 @@ USB_PID = 0x0015
 USB_PRODUCT = "RedBoard Turbo Board"
 USB_MANUFACTURER = "SparkFun Electronics"
 
-SPI_FLASH_FILESYSTEM = 1
-LONGINT_IMPL = MPZ
-
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
+SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = "W25Q32FV"
+LONGINT_IMPL = MPZ
 
-# Tweak inlining depending on language.
+CFLAGS_INLINE_LIMIT = 60
-ifeq ($(TRANSLATION), zh_Latn_pinyin)
-CFLAGS_INLINE_LIMIT = 50
-RELEASE_NEEDS_CLEAN_BUILD = 1
-endif

ports/atmel-samd/boards/sparkfun_samd21_dev/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0x8D23
 USB_PRODUCT = "SparkFun SAMD21 Dev Breakout"
 USB_MANUFACTURER = "SparkFun"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0x8D22
 USB_PRODUCT = "SparkFun SAMD21 Mini Breakout"
 USB_MANUFACTURER = "SparkFun"
 
+CHIP_VARIANT = SAMD21G18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21G18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/trellis_m4_express/mpconfigboard.mk

@@ -4,17 +4,16 @@ USB_PID = 0x8030
 USB_PRODUCT = "Trellis M4 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD51G19A
+CHIP_FAMILY = samd51
+
 QSPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "W25Q64JV_IQ, GD25Q64C"
 LONGINT_IMPL = MPZ
 
+CIRCUITPY_PS2IO = 1
 # No I2S on SAMD51G
 CIRCUITPY_AUDIOBUSIO = 0
 # No touch on SAMD51 yet
 CIRCUITPY_TOUCHIO = 0
-
-CHIP_VARIANT = SAMD51G19A
-CHIP_FAMILY = samd51
-
-CIRCUITPY_PS2IO = 1

ports/atmel-samd/boards/trinket_m0/mpconfigboard.mk

@@ -4,9 +4,11 @@ USB_PID = 0x801F
 USB_PRODUCT = "Trinket M0"
 USB_MANUFACTURER = "Adafruit Industries LLC"
 
+CHIP_VARIANT = SAMD21E18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
 
-CHIP_VARIANT = SAMD21E18A
+SUPEROPT_GC = 0
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk

@@ -4,10 +4,10 @@ USB_PID = 0x801F
 USB_PRODUCT="Trinket M0 Haxpress"
 USB_MANUFACTURER="Radomir Dopieralski"
 
+CHIP_VARIANT = SAMD21E18A
+CHIP_FAMILY = samd21
+
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = W25Q32BV
 LONGINT_IMPL = MPZ
-
-CHIP_VARIANT = SAMD21E18A
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/uchip/mpconfigboard.mk

@@ -4,9 +4,9 @@ USB_PID = 0xED5F
 USB_PRODUCT = "uChip CircuitPython"
 USB_MANUFACTURER = "Itaca Innovation"
 
+CHIP_VARIANT = SAMD21E18A
+CHIP_FAMILY = samd21
+
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_SMALL_BUILD = 1
-
-CHIP_VARIANT = SAMD21E18A
-CHIP_FAMILY = samd21

ports/atmel-samd/boards/ugame10/mpconfigboard.mk

@@ -4,14 +4,14 @@ USB_PID = 0x801F
 USB_PRODUCT = "uGame10"
 USB_MANUFACTURER = "Radomir Dopieralski"
 
+CHIP_VARIANT = SAMD21E18A
+CHIP_FAMILY = samd21
+
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
 EXTERNAL_FLASH_DEVICES = S25FL216K
 LONGINT_IMPL = MPZ
 
-CHIP_VARIANT = SAMD21E18A
-CHIP_FAMILY = samd21
-
 CIRCUITPY_STAGE = 1
 CIRCUITPY_MATH = 1
 CIRCUITPY_AUDIOIO = 1

py/circuitpy_mpconfig.h

@@ -72,6 +72,7 @@
 #define MICROPY_KBD_EXCEPTION            (1)
 #define MICROPY_MEM_STATS                (0)
 #define MICROPY_NONSTANDARD_TYPECODES    (0)
+#define MICROPY_OPT_COMPUTED_GOTO        (1)
 #define MICROPY_PERSISTENT_CODE_LOAD     (1)
 
 #define MICROPY_PY_ARRAY                 (1)

py/py.mk

@@ -343,10 +343,23 @@ $(PY_BUILD)/qstr.o: $(HEADER_BUILD)/qstrdefs.generated.h
 $(PY_BUILD)/nlr%.o: CFLAGS += -Os
 
 # optimising gc for speed; 5ms down to 4ms on pybv2
+ifndef SUPEROPT_GC
+  SUPEROPT_GC = 1
+endif
+
+ifeq ($(SUPEROPT_GC),1)
 $(PY_BUILD)/gc.o: CFLAGS += $(CSUPEROPT)
+endif
 
 # optimising vm for speed, adds only a small amount to code size but makes a huge difference to speed (20% faster)
+ifndef SUPEROPT_VM
+  SUPEROPT_VM = 1
+endif
+
+ifeq ($(SUPEROPT_VM),1)
 $(PY_BUILD)/vm.o: CFLAGS += $(CSUPEROPT)
+endif
+
 # Optimizing vm.o for modern deeply pipelined CPUs with branch predictors
 # may require disabling tail jump optimization. This will make sure that
 # each opcode has its own dispatching jump which will improve branch

py/vmentrytable.h

@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#if __clang__
+#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Winitializer-overrides"
 #endif // __clang__
@@ -113,6 +113,6 @@ static const void *const entry_table[256] = {
     [MP_BC_BINARY_OP_MULTI ... MP_BC_BINARY_OP_MULTI + MP_BINARY_OP_NUM_BYTECODE - 1] = &&entry_MP_BC_BINARY_OP_MULTI,
 };
 
-#if __clang__
+#ifdef __clang__
 #pragma clang diagnostic pop
 #endif // __clang__