From 971290815802c95b40bacbf3f802f059111fd0c8 Mon Sep 17 00:00:00 2001 From: Liu Zhongwei Date: Thu, 30 May 2024 18:56:38 +0800 Subject: [PATCH] feat(repo): finish high_perf/v3.0.2 --- .github/workflows/build_sdk_manual_v3.yml | 8 +------- CMakeLists.txt | 16 +++++++++------- configs/defconfig.esp32s3 | 3 +++ configs/defconfig.opi_ram | 5 ++++- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build_sdk_manual_v3.yml b/.github/workflows/build_sdk_manual_v3.yml index 04049e99..1ac46cb2 100644 --- a/.github/workflows/build_sdk_manual_v3.yml +++ b/.github/workflows/build_sdk_manual_v3.yml @@ -6,15 +6,9 @@ on: target: type: choice description: Choose Target - default: 'all' + default: 'esp32s3' options: - - 'all' - - 'esp32' - - 'esp32s2' - 'esp32s3' - - 'esp32c3' - - 'esp32c6' - - 'esp32h6' log_level: type: choice description: Choose Log Level diff --git a/CMakeLists.txt b/CMakeLists.txt index 88cede19..51384b1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,31 +5,33 @@ cmake_minimum_required(VERSION 3.5) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(arduino-lib-builder) +idf_build_set_property(COMPILE_OPTIONS -Wno-error=maybe-uninitialized APPEND) +idf_build_set_property(COMPILE_OPTIONS -Wno-error=stringop-truncation APPEND) idf_build_get_property(elf EXECUTABLE GENERATOR_EXPRESSION) add_custom_command( - OUTPUT "idf_libs" + OUTPUT "idf_libs" COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-libs.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_SPIRAM_MODE_OCT}" "${CONFIG_IDF_TARGET_ARCH_XTENSA}" DEPENDS ${elf} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM ) add_custom_target(idf-libs DEPENDS "idf_libs") add_custom_command( - OUTPUT "copy_bootloader" + OUTPUT "copy_bootloader" COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-bootloader.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_LIB_BUILDER_FLASHFREQ}" - DEPENDS bootloader - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + DEPENDS bootloader + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM ) add_custom_target(copy-bootloader DEPENDS "copy_bootloader") add_custom_command( - OUTPUT "mem_variant" + OUTPUT "mem_variant" COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-mem-variant.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_SPIRAM_MODE_OCT}" DEPENDS ${elf} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM ) add_custom_target(mem-variant DEPENDS "mem_variant") diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 2c2cba3c..4656069b 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -17,3 +17,6 @@ CONFIG_ULP_COPROC_ENABLED=y CONFIG_ULP_COPROC_TYPE_FSM=y # CONFIG_ULP_COPROC_TYPE_RISCV=y CONFIG_ULP_COPROC_RESERVE_MEM=512 + +CONFIG_COMPILER_OPTIMIZATION_PERF=y +CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y diff --git a/configs/defconfig.opi_ram b/configs/defconfig.opi_ram index 16e6a278..72c4cbcc 100644 --- a/configs/defconfig.opi_ram +++ b/configs/defconfig.opi_ram @@ -1,3 +1,6 @@ CONFIG_SPIRAM_MODE_OCT=y CONFIG_SPIRAM_IGNORE_NOTFOUND=y -# CONFIG_SPIRAM_MEMTEST is not set \ No newline at end of file +# CONFIG_SPIRAM_MEMTEST is not set + +CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y +CONFIG_SPIRAM_RODATA=y \ No newline at end of file