From cf3846028675375d45cdcc0a3019fd22c59a5756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Vejpustek?= Date: Thu, 8 Aug 2024 14:23:13 +0200 Subject: [PATCH] build(core): hide benchmark application behind compilation flag [no changelog] --- core/Makefile | 10 ++++++---- core/SConscript.firmware | 4 ++++ core/SConscript.unix | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index 1755fd674..69ca726bd 100644 --- a/core/Makefile +++ b/core/Makefile @@ -40,6 +40,7 @@ PYTEST_TIMEOUT ?= 500 TEST_LANG ?= "en" NEW_RENDERING ?= 1 THP ?= 0 +BENCHMARK ?= 0 # OpenOCD interface default. Alternative: ftdi/olimex-arm-usb-tiny-h OPENOCD_INTERFACE ?= stlink @@ -291,25 +292,26 @@ build_firmware: templates build_cross build_kernel ## build firmware with frozen PYOPT="$(PYOPT)" BITCOIN_ONLY="$(BITCOIN_ONLY)" \ BOOTLOADER_QA="$(BOOTLOADER_QA)" BOOTLOADER_DEVEL="$(BOOTLOADER_DEVEL)" \ DISABLE_OPTIGA="$(DISABLE_OPTIGA)" THP="$(THP)" NEW_RENDERING="$(NEW_RENDERING)" \ - $(FIRMWARE_BUILD_DIR)/firmware.bin + BENCHMARK="$(BENCHMARK)" $(FIRMWARE_BUILD_DIR)/firmware.bin build_unix: templates ## build unix port $(SCONS) CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) \ TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" THP="$(THP)" \ PYOPT="0" BITCOIN_ONLY="$(BITCOIN_ONLY)" TREZOR_EMULATOR_ASAN="$(ADDRESS_SANITIZER)" \ - NEW_RENDERING="$(NEW_RENDERING)" + NEW_RENDERING="$(NEW_RENDERING)" BENCHMARK="$(BENCHMARK)" build_unix_frozen: templates build_cross ## build unix port with frozen modules $(SCONS) CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) \ TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" \ PYOPT="$(PYOPT)" BITCOIN_ONLY="$(BITCOIN_ONLY)" TREZOR_EMULATOR_ASAN="$(ADDRESS_SANITIZER)" \ - TREZOR_MEMPERF="$(TREZOR_MEMPERF)" TREZOR_EMULATOR_FROZEN=1 NEW_RENDERING="$(NEW_RENDERING)" + TREZOR_MEMPERF="$(TREZOR_MEMPERF)" TREZOR_EMULATOR_FROZEN=1 NEW_RENDERING="$(NEW_RENDERING)" \ + BENCHMARK="$(BENCHMARK)" build_unix_debug: templates ## build unix port $(SCONS) --max-drift=1 CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) \ TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" \ BITCOIN_ONLY="$(BITCOIN_ONLY)" TREZOR_EMULATOR_ASAN=1 TREZOR_EMULATOR_DEBUGGABLE=1 \ - NEW_RENDERING="$(NEW_RENDERING)" + NEW_RENDERING="$(NEW_RENDERING)" BENCHMARK="$(BENCHMARK)" build_cross: ## build mpy-cross port $(MAKE) -C vendor/micropython/mpy-cross $(CROSS_PORT_OPTS) diff --git a/core/SConscript.firmware b/core/SConscript.firmware index 83fa005da..7a8185ccf 100644 --- a/core/SConscript.firmware +++ b/core/SConscript.firmware @@ -17,6 +17,7 @@ HW_REVISION = ARGUMENTS.get('HW_REVISION', None) THP = ARGUMENTS.get('THP', '0') == '1' # Trezor-Host Protocol NEW_RENDERING = ARGUMENTS.get('NEW_RENDERING', '1') == '1' MODEL_IDENTIFIER = models.get_model_identifier(TREZOR_MODEL) +BENCHMARK = ARGUMENTS.get('BENCHMARK', '0') == '1' FEATURE_FLAGS = { "RDI": True, @@ -672,6 +673,9 @@ if FROZEN: SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'apps/bitcoin/sign_tx/zcash_v4.py')) SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/enums/Zcash*.py')) + if BENCHMARK: + SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'apps/benchmark/*.py')) + source_mpy = env.FrozenModule( source=SOURCE_PY, source_dir=SOURCE_PY_DIR, diff --git a/core/SConscript.unix b/core/SConscript.unix index aa46f36af..f841b7a93 100644 --- a/core/SConscript.unix +++ b/core/SConscript.unix @@ -11,6 +11,7 @@ CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0)) HW_REVISION ='emulator' THP = ARGUMENTS.get('THP', '0') == '1' # Trezor-Host Protocol NEW_RENDERING = ARGUMENTS.get('NEW_RENDERING', '1') == '1' +BENCHMARK = ARGUMENTS.get('BENCHMARK', '0') == '1' FEATURES_WANTED = ["input", "sd_card", "dma2d", "optiga", "sbu"] @@ -751,6 +752,9 @@ if FROZEN: SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'apps/bitcoin/sign_tx/zcash_v4.py')) SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'trezor/enums/Zcash*.py')) + if BENCHMARK: + SOURCE_PY.extend(Glob(SOURCE_PY_DIR + 'apps/benchmark/*.py')) + source_mpy = env.FrozenModule( source=SOURCE_PY, source_dir=SOURCE_PY_DIR,