From 16cc8f974df3fca1eafaac8c8d21e2e4f7bed11d Mon Sep 17 00:00:00 2001 From: laokaiyao Date: Mon, 12 May 2025 11:33:56 +0800 Subject: [PATCH] ci: test i2s, touch, ana_cmpr with CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0 --- .../analog_comparator/CMakeLists.txt | 2 +- .../analog_comparator/main/CMakeLists.txt | 2 +- .../analog_comparator/sdkconfig.defaults | 2 +- .../sdkconfig.defaults.esp32p4 | 3 +++ .../test_apps/dac/sdkconfig.defaults | 2 +- .../test_apps/i2s/main/CMakeLists.txt | 3 ++- .../test_apps/i2s/pytest_i2s.py | 20 ++++++++++++++++++- .../test_apps/i2s/sdkconfig.defaults.esp32p4 | 3 +++ .../test_apps/i2s/sdkconfig.defaults.esp32s3 | 4 ++++ .../test_apps/touch_sens/main/CMakeLists.txt | 2 +- .../touch_sens/sdkconfig.defaults.esp32p4 | 3 +++ 11 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.defaults.esp32p4 create mode 100644 components/esp_driver_i2s/test_apps/i2s/sdkconfig.defaults.esp32p4 create mode 100644 components/esp_driver_i2s/test_apps/i2s/sdkconfig.defaults.esp32s3 create mode 100644 components/esp_driver_touch_sens/test_apps/touch_sens/sdkconfig.defaults.esp32p4 diff --git a/components/esp_driver_ana_cmpr/test_apps/analog_comparator/CMakeLists.txt b/components/esp_driver_ana_cmpr/test_apps/analog_comparator/CMakeLists.txt index 6bc3f82173..72ee984b6a 100644 --- a/components/esp_driver_ana_cmpr/test_apps/analog_comparator/CMakeLists.txt +++ b/components/esp_driver_ana_cmpr/test_apps/analog_comparator/CMakeLists.txt @@ -14,7 +14,7 @@ if(CONFIG_COMPILER_DUMP_RTL_FILES) --elf-file ${CMAKE_BINARY_DIR}/test_ana_cmpr.elf find-refs --from-sections=.iram0.text - --to-sections=.flash.text + --to-sections=.flash.text,.flash.rodata --exit-code DEPENDS ${elf} ) diff --git a/components/esp_driver_ana_cmpr/test_apps/analog_comparator/main/CMakeLists.txt b/components/esp_driver_ana_cmpr/test_apps/analog_comparator/main/CMakeLists.txt index 0863879495..264d7eb0df 100644 --- a/components/esp_driver_ana_cmpr/test_apps/analog_comparator/main/CMakeLists.txt +++ b/components/esp_driver_ana_cmpr/test_apps/analog_comparator/main/CMakeLists.txt @@ -13,5 +13,5 @@ endif() idf_component_register(SRCS ${srcs} INCLUDE_DIRS "." - PRIV_REQUIRES unity esp_driver_gpio esp_driver_ana_cmpr esp_driver_gptimer esp_pm + PRIV_REQUIRES unity esp_driver_gpio esp_driver_ana_cmpr esp_driver_gptimer esp_pm esp_psram WHOLE_ARCHIVE) diff --git a/components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.defaults b/components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.defaults index b308cb2ddd..fa8ac618b9 100644 --- a/components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.defaults +++ b/components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.defaults @@ -1,2 +1,2 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n diff --git a/components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.defaults.esp32p4 b/components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.defaults.esp32p4 new file mode 100644 index 0000000000..d2699b2221 --- /dev/null +++ b/components/esp_driver_ana_cmpr/test_apps/analog_comparator/sdkconfig.defaults.esp32p4 @@ -0,0 +1,3 @@ +CONFIG_SPIRAM=y +CONFIG_SPIRAM_MODE_HEX=y +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0 diff --git a/components/esp_driver_dac/test_apps/dac/sdkconfig.defaults b/components/esp_driver_dac/test_apps/dac/sdkconfig.defaults index 0a847f27d5..51ec00b756 100644 --- a/components/esp_driver_dac/test_apps/dac/sdkconfig.defaults +++ b/components/esp_driver_dac/test_apps/dac/sdkconfig.defaults @@ -1,4 +1,4 @@ CONFIG_FREERTOS_HZ=1000 -CONFIG_ESP_TASK_WDT=n +CONFIG_ESP_TASK_WDT_EN=n # Disable this config, otherwise DAC will be disabled when ADC initialized CONFIG_ADC_DISABLE_DAC_OUTPUT=n diff --git a/components/esp_driver_i2s/test_apps/i2s/main/CMakeLists.txt b/components/esp_driver_i2s/test_apps/i2s/main/CMakeLists.txt index d90f51c9f4..827d77dba5 100644 --- a/components/esp_driver_i2s/test_apps/i2s/main/CMakeLists.txt +++ b/components/esp_driver_i2s/test_apps/i2s/main/CMakeLists.txt @@ -8,5 +8,6 @@ if(CONFIG_SOC_I2S_SUPPORTS_ETM AND CONFIG_SOC_GPIO_SUPPORT_ETM) endif() idf_component_register(SRCS ${srcs} - PRIV_REQUIRES unity esp_driver_pcnt spi_flash esp_driver_gpio esp_driver_i2s esp_driver_uart + PRIV_REQUIRES unity esp_driver_pcnt spi_flash + esp_driver_gpio esp_driver_i2s esp_driver_uart esp_psram WHOLE_ARCHIVE) diff --git a/components/esp_driver_i2s/test_apps/i2s/pytest_i2s.py b/components/esp_driver_i2s/test_apps/i2s/pytest_i2s.py index 2f7ac561f3..9c34a48bbb 100644 --- a/components/esp_driver_i2s/test_apps/i2s/pytest_i2s.py +++ b/components/esp_driver_i2s/test_apps/i2s/pytest_i2s.py @@ -16,8 +16,26 @@ from pytest_embedded_idf.utils import idf_parametrize ) @idf_parametrize( 'target', - ['esp32', 'esp32s2', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32s3', 'esp32h2', 'esp32p4', 'esp32c61'], + ['esp32', 'esp32s2', 'esp32c3', 'esp32c5', 'esp32c6', 'esp32h2', 'esp32p4', 'esp32c61'], indirect=['target'], ) def test_i2s(dut: Dut) -> None: dut.run_all_single_board_cases() + + +@pytest.mark.octal_psram +@pytest.mark.parametrize( + 'config', + [ + 'iram_safe', + 'release', + ], + indirect=True, +) +@idf_parametrize( + 'target', + ['esp32s3'], + indirect=['target'], +) +def test_i2s_psram(dut: Dut) -> None: + dut.run_all_single_board_cases() diff --git a/components/esp_driver_i2s/test_apps/i2s/sdkconfig.defaults.esp32p4 b/components/esp_driver_i2s/test_apps/i2s/sdkconfig.defaults.esp32p4 new file mode 100644 index 0000000000..d2699b2221 --- /dev/null +++ b/components/esp_driver_i2s/test_apps/i2s/sdkconfig.defaults.esp32p4 @@ -0,0 +1,3 @@ +CONFIG_SPIRAM=y +CONFIG_SPIRAM_MODE_HEX=y +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0 diff --git a/components/esp_driver_i2s/test_apps/i2s/sdkconfig.defaults.esp32s3 b/components/esp_driver_i2s/test_apps/i2s/sdkconfig.defaults.esp32s3 new file mode 100644 index 0000000000..24336a0742 --- /dev/null +++ b/components/esp_driver_i2s/test_apps/i2s/sdkconfig.defaults.esp32s3 @@ -0,0 +1,4 @@ +CONFIG_SPIRAM=y +CONFIG_SPIRAM_MODE_OCT=y +CONFIG_SPIRAM_SPEED_80M=y +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0 diff --git a/components/esp_driver_touch_sens/test_apps/touch_sens/main/CMakeLists.txt b/components/esp_driver_touch_sens/test_apps/touch_sens/main/CMakeLists.txt index 97285a1122..62b7b431c1 100644 --- a/components/esp_driver_touch_sens/test_apps/touch_sens/main/CMakeLists.txt +++ b/components/esp_driver_touch_sens/test_apps/touch_sens/main/CMakeLists.txt @@ -2,5 +2,5 @@ set(srcs "test_app_main.c" "test_touch_sens_common.c") idf_component_register(SRCS ${srcs} INCLUDE_DIRS "." - PRIV_REQUIRES unity esp_driver_touch_sens + PRIV_REQUIRES unity esp_driver_touch_sens esp_psram WHOLE_ARCHIVE) diff --git a/components/esp_driver_touch_sens/test_apps/touch_sens/sdkconfig.defaults.esp32p4 b/components/esp_driver_touch_sens/test_apps/touch_sens/sdkconfig.defaults.esp32p4 new file mode 100644 index 0000000000..d2699b2221 --- /dev/null +++ b/components/esp_driver_touch_sens/test_apps/touch_sens/sdkconfig.defaults.esp32p4 @@ -0,0 +1,3 @@ +CONFIG_SPIRAM=y +CONFIG_SPIRAM_MODE_HEX=y +CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0