diff --git a/components/esp_adc/test_apps/adc/include/adc_performance.h b/components/esp_adc/test_apps/adc/include/adc_performance.h index 721e52213bd..a6d5f94f395 100644 --- a/components/esp_adc/test_apps/adc/include/adc_performance.h +++ b/components/esp_adc/test_apps/adc/include/adc_performance.h @@ -4,24 +4,84 @@ */ #pragma once -#if __has_include("adc_performance_esp32.h") -#include "adc_performance_esp32.h" -#elif __has_include("adc_performance_esp32s2.h") -#include "adc_performance_esp32s2.h" -#elif __has_include("adc_performance_esp32s3.h") -#include "adc_performance_esp32s3.h" -#elif __has_include("adc_performance_esp32c2.h") -#include "adc_performance_esp32c2.h" -#elif __has_include("adc_performance_esp32c3.h") -#include "adc_performance_esp32c3.h" -#elif __has_include("adc_performance_esp32c5.h") -#include "adc_performance_esp32c5.h" -#elif __has_include("adc_performance_esp32c6.h") -#include "adc_performance_esp32c6.h" -#elif __has_include("adc_performance_esp32c61.h") -#include "adc_performance_esp32c61.h" -#elif __has_include("adc_performance_esp32h2.h") -#include "adc_performance_esp32h2.h" -#elif __has_include("adc_performance_esp32p4.h") -#include "adc_performance_esp32p4.h" +// Chip-Specific Data +#if CONFIG_IDF_TARGET_ESP32 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 3 +#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 3 + +#elif CONFIG_IDF_TARGET_ESP32S2 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 3 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 3 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 3 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 3 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 3 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 3 +#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 6 + +#elif CONFIG_IDF_TARGET_ESP32S3 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 4 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 4 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 4 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 4 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 4 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 4 +#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 4 + +#elif CONFIG_IDF_TARGET_ESP32C2 +#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 3 + +#elif CONFIG_IDF_TARGET_ESP32C3 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 5 +#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 5 + +#elif CONFIG_IDF_TARGET_ESP32C5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 5 +#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 5 + +#elif CONFIG_IDF_TARGET_ESP32C6 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 10 +#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 10 + +#elif CONFIG_IDF_TARGET_ESP32C61 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 5 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 5 +#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 5 + +#elif CONFIG_IDF_TARGET_ESP32H2 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 10 +#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 10 + +#elif CONFIG_IDF_TARGET_ESP32P4 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 10 +#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 10 +#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 10 + #endif diff --git a/components/esp_adc/test_apps/adc/include/adc_performance_esp32.h b/components/esp_adc/test_apps/adc/include/adc_performance_esp32.h deleted file mode 100644 index 9cf8f03d635..00000000000 --- a/components/esp_adc/test_apps/adc/include/adc_performance_esp32.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 3 -#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 3 diff --git a/components/esp_adc/test_apps/adc/include/adc_performance_esp32c2.h b/components/esp_adc/test_apps/adc/include/adc_performance_esp32c2.h deleted file mode 100644 index 1ffdf72d247..00000000000 --- a/components/esp_adc/test_apps/adc/include/adc_performance_esp32c2.h +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 3 diff --git a/components/esp_adc/test_apps/adc/include/adc_performance_esp32c3.h b/components/esp_adc/test_apps/adc/include/adc_performance_esp32c3.h deleted file mode 100644 index 6deff44134e..00000000000 --- a/components/esp_adc/test_apps/adc/include/adc_performance_esp32c3.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 5 -#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 5 diff --git a/components/esp_adc/test_apps/adc/include/adc_performance_esp32c5.h b/components/esp_adc/test_apps/adc/include/adc_performance_esp32c5.h deleted file mode 100644 index f52d212237b..00000000000 --- a/components/esp_adc/test_apps/adc/include/adc_performance_esp32c5.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 5 -#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 5 diff --git a/components/esp_adc/test_apps/adc/include/adc_performance_esp32c6.h b/components/esp_adc/test_apps/adc/include/adc_performance_esp32c6.h deleted file mode 100644 index a7cb854a24d..00000000000 --- a/components/esp_adc/test_apps/adc/include/adc_performance_esp32c6.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 10 -#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 10 diff --git a/components/esp_adc/test_apps/adc/include/adc_performance_esp32c61.h b/components/esp_adc/test_apps/adc/include/adc_performance_esp32c61.h deleted file mode 100644 index f52d212237b..00000000000 --- a/components/esp_adc/test_apps/adc/include/adc_performance_esp32c61.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 5 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 5 -#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 5 diff --git a/components/esp_adc/test_apps/adc/include/adc_performance_esp32h2.h b/components/esp_adc/test_apps/adc/include/adc_performance_esp32h2.h deleted file mode 100644 index a7cb854a24d..00000000000 --- a/components/esp_adc/test_apps/adc/include/adc_performance_esp32h2.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 10 -#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 10 diff --git a/components/esp_adc/test_apps/adc/include/adc_performance_esp32p4.h b/components/esp_adc/test_apps/adc/include/adc_performance_esp32p4.h deleted file mode 100644 index 3791480ab23..00000000000 --- a/components/esp_adc/test_apps/adc/include/adc_performance_esp32p4.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 10 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 10 -#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 10 diff --git a/components/esp_adc/test_apps/adc/include/adc_performance_esp32s2.h b/components/esp_adc/test_apps/adc/include/adc_performance_esp32s2.h deleted file mode 100644 index a9f4258bece..00000000000 --- a/components/esp_adc/test_apps/adc/include/adc_performance_esp32s2.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 3 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 3 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 3 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 3 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 3 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 3 -#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 6 diff --git a/components/esp_adc/test_apps/adc/include/adc_performance_esp32s3.h b/components/esp_adc/test_apps/adc/include/adc_performance_esp32s3.h deleted file mode 100644 index 5de3f833860..00000000000 --- a/components/esp_adc/test_apps/adc/include/adc_performance_esp32s3.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_NO_FILTER 4 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_2 4 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_4 4 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_8 4 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_16 4 -#define IDF_PERFORMANCE_MAX_ADC_CONTINUOUS_STD_ATTEN3_FILTER_64 4 -#define IDF_PERFORMANCE_MAX_ADC_ONESHOT_STD_ATTEN3 4 diff --git a/components/esp_driver_sdio/test_apps/include/sdio_performance.h b/components/esp_driver_sdio/test_apps/include/sdio_performance.h index c5600fdf68c..c86bd077c9c 100644 --- a/components/esp_driver_sdio/test_apps/include/sdio_performance.h +++ b/components/esp_driver_sdio/test_apps/include/sdio_performance.h @@ -5,8 +5,41 @@ */ #pragma once -#if __has_include("sdio_performance_esp32.h") -#include "sdio_performance_esp32.h" -#elif __has_include("sdio_performance_esp32c6.h") -#include "sdio_performance_esp32c6.h" +#include "sdkconfig.h" + +#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_1BIT +#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_1BIT 4000 +#endif +#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_1BIT +#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_1BIT 4000 +#endif +#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_SPI +#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_SPI 1000 +#endif +#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_SPI +#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_SPI 1000 +#endif + +// Chip-Specific Data +#if CONFIG_IDF_TARGET_ESP32 +#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_4BIT +#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_4BIT 12200 +#endif + +#if !CONFIG_FREERTOS_SMP // IDF-5826 +#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT +#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT 11000 +#endif +#else +#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT +#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT 12200 +#endif +#endif + +#elif CONFIG_IDF_TARGET_ESP32C6 +#undef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_4BIT +#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_4BIT 9000 +#undef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT +#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT 10000 + #endif diff --git a/components/esp_driver_sdio/test_apps/include/sdio_performance_esp32.h b/components/esp_driver_sdio/test_apps/include/sdio_performance_esp32.h deleted file mode 100644 index b2a82e2b27c..00000000000 --- a/components/esp_driver_sdio/test_apps/include/sdio_performance_esp32.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#include "sdkconfig.h" - -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_4BIT -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_4BIT 12200 -#endif - -#if !CONFIG_FREERTOS_SMP // IDF-5826 -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT 11000 -#endif -#else -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT 12200 -#endif -#endif - -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_1BIT -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_1BIT 4000 -#endif -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_1BIT -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_1BIT 4000 -#endif -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_SPI -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_SPI 1000 -#endif -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_SPI -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_SPI 1000 -#endif diff --git a/components/esp_driver_sdio/test_apps/include/sdio_performance_esp32c6.h b/components/esp_driver_sdio/test_apps/include/sdio_performance_esp32c6.h deleted file mode 100644 index fde1ba72836..00000000000 --- a/components/esp_driver_sdio/test_apps/include/sdio_performance_esp32c6.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_4BIT -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_4BIT 9000 -#endif -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_4BIT 10000 -#endif -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_1BIT -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_1BIT 4000 -#endif -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_1BIT -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_1BIT 4000 -#endif -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_SPI -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_TOHOST_SPI 1000 -#endif -#ifndef IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_SPI -#define IDF_PERFORMANCE_MIN_SDIO_THROUGHPUT_KBSEC_FRHOST_SPI 1000 -#endif diff --git a/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/main/CMakeLists.txt b/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/main/CMakeLists.txt index 78a3742fed8..bb2b79f5cbd 100644 --- a/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/main/CMakeLists.txt +++ b/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/main/CMakeLists.txt @@ -2,5 +2,6 @@ set(srcs "test_app_main.c" "test_sdio_sdhost.c") idf_component_register(SRCS ${srcs} + PRIV_INCLUDE_DIRS "../../../../include" PRIV_REQUIRES unity esp_serial_slave_link test_utils esp_timer esp_driver_sdmmc WHOLE_ARCHIVE) diff --git a/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/main/test_sdio_sdhost.c b/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/main/test_sdio_sdhost.c index 732ac2940f5..eeee68f41eb 100644 --- a/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/main/test_sdio_sdhost.c +++ b/components/esp_driver_sdio/test_apps/sdio/sdio_common_tests/host_sdmmc/main/test_sdio_sdhost.c @@ -22,7 +22,7 @@ #include "soc/soc_caps.h" #include "test_utils.h" -#include "idf_performance.h" +#include "sdio_performance.h" #include "test_dualboard_utils.h" #include "../../sdio_common_test.h" diff --git a/components/esp_event/test_apps/main/CMakeLists.txt b/components/esp_event/test_apps/main/CMakeLists.txt index 655140a9722..f5f1624eda0 100644 --- a/components/esp_event/test_apps/main/CMakeLists.txt +++ b/components/esp_event/test_apps/main/CMakeLists.txt @@ -14,6 +14,6 @@ if(NOT ${target} STREQUAL "linux") endif() idf_component_register(SRCS ${srcs} - PRIV_INCLUDE_DIRS . ../../private_include + PRIV_INCLUDE_DIRS . ../../private_include ../include PRIV_REQUIRES ${priv_requires} WHOLE_ARCHIVE) diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance.h b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance.h index 04afd1de68f..754439031e4 100644 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance.h +++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance.h @@ -4,14 +4,28 @@ */ #pragma once -#if __has_include("hw_support_performance_esp32.h") -#include "hw_support_performance_esp32.h" -#elif __has_include("hw_support_performance_esp32c2.h") -#include "hw_support_performance_esp32c2.h" -#elif __has_include("hw_support_performance_esp32c3.h") -#include "hw_support_performance_esp32c3.h" -#elif __has_include("hw_support_performance_esp32h2.h") -#include "hw_support_performance_esp32h2.h" -#elif __has_include("hw_support_performance_esp32s3.h") -#include "hw_support_performance_esp32s3.h" +// Chip-Specific Data +#if CONFIG_IDF_TARGET_ESP32 +#define IDF_PERFORMANCE_MAX_CYCLES_PER_DIV 70 +#define IDF_PERFORMANCE_MAX_CYCLES_PER_SQRT 140 + +#elif CONFIG_IDF_TARGET_ESP32C2 +// floating point instructions per divide and per sqrt (configured for worst-case with PSRAM workaround) +#define IDF_PERFORMANCE_MAX_CYCLES_PER_DIV 70 +#define IDF_PERFORMANCE_MAX_CYCLES_PER_SQRT 140 + +#elif CONFIG_IDF_TARGET_ESP32C3 +// floating point instructions per divide and per sqrt (configured for worst-case with PSRAM workaround) +#define IDF_PERFORMANCE_MAX_CYCLES_PER_DIV 70 +#define IDF_PERFORMANCE_MAX_CYCLES_PER_SQRT 140 + +#elif CONFIG_IDF_TARGET_ESP32H2 +// floating point instructions per divide and per sqrt (configured for worst-case with PSRAM workaround) +#define IDF_PERFORMANCE_MAX_CYCLES_PER_DIV 70 +#define IDF_PERFORMANCE_MAX_CYCLES_PER_SQRT 140 + +#elif CONFIG_IDF_TARGET_ESP32S3 +#define IDF_PERFORMANCE_MAX_CYCLES_PER_DIV 70 +#define IDF_PERFORMANCE_MAX_CYCLES_PER_SQRT 140 + #endif diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32.h b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32.h deleted file mode 100644 index d8d64f6c2ec..00000000000 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_CYCLES_PER_DIV 70 -#define IDF_PERFORMANCE_MAX_CYCLES_PER_SQRT 140 diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32c2.h b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32c2.h deleted file mode 100644 index 4ebc01ecb2e..00000000000 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32c2.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -// floating point instructions per divide and per sqrt (configured for worst-case with PSRAM workaround) -#define IDF_PERFORMANCE_MAX_CYCLES_PER_DIV 70 -#define IDF_PERFORMANCE_MAX_CYCLES_PER_SQRT 140 diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32c3.h b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32c3.h deleted file mode 100644 index 4ebc01ecb2e..00000000000 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32c3.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -// floating point instructions per divide and per sqrt (configured for worst-case with PSRAM workaround) -#define IDF_PERFORMANCE_MAX_CYCLES_PER_DIV 70 -#define IDF_PERFORMANCE_MAX_CYCLES_PER_SQRT 140 diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32h2.h b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32h2.h deleted file mode 100644 index 4ebc01ecb2e..00000000000 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32h2.h +++ /dev/null @@ -1,9 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -// floating point instructions per divide and per sqrt (configured for worst-case with PSRAM workaround) -#define IDF_PERFORMANCE_MAX_CYCLES_PER_DIV 70 -#define IDF_PERFORMANCE_MAX_CYCLES_PER_SQRT 140 diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32s3.h b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32s3.h deleted file mode 100644 index 066b1c348ff..00000000000 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/include/hw_support_performance_esp32s3.h +++ /dev/null @@ -1,8 +0,0 @@ -/* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_CYCLES_PER_DIV 70 -#define IDF_PERFORMANCE_MAX_CYCLES_PER_SQRT 140 diff --git a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/CMakeLists.txt b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/CMakeLists.txt index e0666deb215..1210fb2b55c 100644 --- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/CMakeLists.txt +++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/CMakeLists.txt @@ -26,6 +26,7 @@ endif() # In order for the cases defined by `TEST_CASE` to be linked into the final elf, # the component can be registered as WHOLE_ARCHIVE idf_component_register(SRCS ${srcs} + PRIV_INCLUDE_DIRS "../include" PRIV_REQUIRES unity esp_driver_gpio esp_driver_gptimer esp_driver_uart test_utils spi_flash esp_timer esp_hal_wdt WHOLE_ARCHIVE) diff --git a/components/esp_tee/test_apps/tee_test_fw/main/CMakeLists.txt b/components/esp_tee/test_apps/tee_test_fw/main/CMakeLists.txt index a4410f1f9b9..8669c5eca6b 100644 --- a/components/esp_tee/test_apps/tee_test_fw/main/CMakeLists.txt +++ b/components/esp_tee/test_apps/tee_test_fw/main/CMakeLists.txt @@ -50,5 +50,6 @@ list(APPEND srcs "${mbedtls_test_srcs_dir}/test_apb_dport_access.c" "${mbedtls_test_srcs_dir}/test_mbedtls_utils.c") idf_component_register(SRCS ${srcs} + PRIV_INCLUDE_DIRS "${idf_path}/components/mbedtls/test_apps/include" PRIV_REQUIRES ${priv_requires} WHOLE_ARCHIVE) diff --git a/components/esp_timer/test_apps/include/esp_timer_performance.h b/components/esp_timer/test_apps/include/esp_timer_performance.h index 3a024c6cd2c..f3cef704eab 100644 --- a/components/esp_timer/test_apps/include/esp_timer_performance.h +++ b/components/esp_timer/test_apps/include/esp_timer_performance.h @@ -2,20 +2,41 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#if __has_include("esp_timer_performance_esp32c2.h") -#include "esp_timer_performance_esp32c2.h" -#elif __has_include("esp_timer_performance_esp32c5.h") -#include "esp_timer_performance_esp32c5.h" -#elif __has_include("esp_timer_performance_esp32c6.h") -#include "esp_timer_performance_esp32c6.h" -#elif __has_include("esp_timer_performance_esp32c61.h") -#include "esp_timer_performance_esp32c61.h" -#elif __has_include("esp_timer_performance_esp32h2.h") -#include "esp_timer_performance_esp32h2.h" -#elif __has_include("esp_timer_performance_esp32h21.h") -#include "esp_timer_performance_esp32h21.h" -#endif +#pragma once +#include "sdkconfig.h" #ifndef IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL #define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1000 #endif + +// Chip-Specific Data +#if CONFIG_IDF_TARGET_ESP32C2 +#ifdef CONFIG_XTAL_FREQ_26 +#undef IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL +#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1900 +#else +#undef IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL +#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1200 +#endif + +#elif CONFIG_IDF_TARGET_ESP32C5 +#undef IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL +#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1200 + +#elif CONFIG_IDF_TARGET_ESP32C6 +#undef IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL +#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1200 + +#elif CONFIG_IDF_TARGET_ESP32C61 +#undef IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL +#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1300 + +#elif CONFIG_IDF_TARGET_ESP32H2 +#undef IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL +#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1900 + +#elif CONFIG_IDF_TARGET_ESP32H21 +#undef IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL +#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1900 + +#endif diff --git a/components/esp_timer/test_apps/include/esp_timer_performance_esp32c2.h b/components/esp_timer/test_apps/include/esp_timer_performance_esp32c2.h deleted file mode 100644 index 05bbc31a8cb..00000000000 --- a/components/esp_timer/test_apps/include/esp_timer_performance_esp32c2.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#include "sdkconfig.h" - -#ifdef CONFIG_XTAL_FREQ_26 -#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1900 -#else -#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1200 -#endif diff --git a/components/esp_timer/test_apps/include/esp_timer_performance_esp32c5.h b/components/esp_timer/test_apps/include/esp_timer_performance_esp32c5.h deleted file mode 100644 index 7cd9d272e2e..00000000000 --- a/components/esp_timer/test_apps/include/esp_timer_performance_esp32c5.h +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1200 diff --git a/components/esp_timer/test_apps/include/esp_timer_performance_esp32c6.h b/components/esp_timer/test_apps/include/esp_timer_performance_esp32c6.h deleted file mode 100644 index 7cd9d272e2e..00000000000 --- a/components/esp_timer/test_apps/include/esp_timer_performance_esp32c6.h +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1200 diff --git a/components/esp_timer/test_apps/include/esp_timer_performance_esp32c61.h b/components/esp_timer/test_apps/include/esp_timer_performance_esp32c61.h deleted file mode 100644 index 11de4e39634..00000000000 --- a/components/esp_timer/test_apps/include/esp_timer_performance_esp32c61.h +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1300 diff --git a/components/esp_timer/test_apps/include/esp_timer_performance_esp32h2.h b/components/esp_timer/test_apps/include/esp_timer_performance_esp32h2.h deleted file mode 100644 index 416625ee5ea..00000000000 --- a/components/esp_timer/test_apps/include/esp_timer_performance_esp32h2.h +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1900 diff --git a/components/esp_timer/test_apps/include/esp_timer_performance_esp32h21.h b/components/esp_timer/test_apps/include/esp_timer_performance_esp32h21.h deleted file mode 100644 index 27cf757382e..00000000000 --- a/components/esp_timer/test_apps/include/esp_timer_performance_esp32h21.h +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ESP_TIMER_GET_TIME_PER_CALL 1900 diff --git a/components/esp_timer/test_apps/main/CMakeLists.txt b/components/esp_timer/test_apps/main/CMakeLists.txt index 49467353b28..53c4d8eed69 100644 --- a/components/esp_timer/test_apps/main/CMakeLists.txt +++ b/components/esp_timer/test_apps/main/CMakeLists.txt @@ -20,6 +20,6 @@ if(CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD) endif() idf_component_register(SRCS ${srcs} - PRIV_INCLUDE_DIRS "../../private_include" + PRIV_INCLUDE_DIRS "../../private_include" "../include" PRIV_REQUIRES cmock test_utils esp_timer spi_flash esp_psram esp_driver_gpio esp_pm WHOLE_ARCHIVE) diff --git a/components/freertos/test_apps/freertos/include/freertos_performance.h b/components/freertos/test_apps/freertos/include/freertos_performance.h index f5a8ef4e150..80f48febfa0 100644 --- a/components/freertos/test_apps/freertos/include/freertos_performance.h +++ b/components/freertos/test_apps/freertos/include/freertos_performance.h @@ -4,10 +4,6 @@ */ #pragma once -#if __has_include("freertos_performance_esp32p4.h") -#include "freertos_performance_esp32p4.h" -#endif - #ifndef IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP #define IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP 215 #endif @@ -28,3 +24,16 @@ #ifndef IDF_PERFORMANCE_MAX_SCHEDULING_TIME #define IDF_PERFORMANCE_MAX_SCHEDULING_TIME 2000 #endif + +// Chip-Specific Data +#if CONFIG_IDF_TARGET_ESP32P4 +/* Spinlock performance on esp32p4 is slower. */ +#undef IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP +#define IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP 400 +#undef IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP_UNICORE +#define IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP_UNICORE 150 + +/* Solicited yields (portYIELD() or taskYIELD()) take longer on esp32p4. TODO: IDF-2809 */ +#undef IDF_PERFORMANCE_MAX_SCHEDULING_TIME +#define IDF_PERFORMANCE_MAX_SCHEDULING_TIME 3200 +#endif diff --git a/components/freertos/test_apps/freertos/include/freertos_performance_esp32p4.h b/components/freertos/test_apps/freertos/include/freertos_performance_esp32p4.h deleted file mode 100644 index 1c31a2200a6..00000000000 --- a/components/freertos/test_apps/freertos/include/freertos_performance_esp32p4.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -/* Spinlock performance on esp32p4 is slower. */ -#define IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP 400 -#define IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP_UNICORE 150 - -/* Solicited yields (portYIELD() or taskYIELD()) take longer on esp32p4. TODO: IDF-2809 */ -#define IDF_PERFORMANCE_MAX_SCHEDULING_TIME 3200 diff --git a/components/freertos/test_apps/freertos/performance/CMakeLists.txt b/components/freertos/test_apps/freertos/performance/CMakeLists.txt index d7be03bc1b3..d9c5a004e3a 100644 --- a/components/freertos/test_apps/freertos/performance/CMakeLists.txt +++ b/components/freertos/test_apps/freertos/performance/CMakeLists.txt @@ -3,5 +3,6 @@ # In order for the cases defined by `TEST_CASE` in "performance" to be linked into # the final elf, the component can be registered as WHOLE_ARCHIVE idf_component_register(SRC_DIRS "." + PRIV_INCLUDE_DIRS "../include" PRIV_REQUIRES unity test_utils WHOLE_ARCHIVE) diff --git a/components/freertos/test_apps/freertos/port/CMakeLists.txt b/components/freertos/test_apps/freertos/port/CMakeLists.txt index 6eb7eb8d09b..d3cf85b8793 100644 --- a/components/freertos/test_apps/freertos/port/CMakeLists.txt +++ b/components/freertos/test_apps/freertos/port/CMakeLists.txt @@ -3,5 +3,6 @@ # In order for the cases defined by `TEST_CASE` in "port" to be linked into # the final elf, the component can be registered as WHOLE_ARCHIVE idf_component_register(SRC_DIRS "." + PRIV_INCLUDE_DIRS "../include" PRIV_REQUIRES unity test_utils WHOLE_ARCHIVE) diff --git a/components/mbedtls/test_apps/include/crypto_performance.h b/components/mbedtls/test_apps/include/crypto_performance.h index 5358a82f835..edd7141f556 100644 --- a/components/mbedtls/test_apps/include/crypto_performance.h +++ b/components/mbedtls/test_apps/include/crypto_performance.h @@ -5,18 +5,116 @@ */ #pragma once -#if __has_include("crypto_performance_esp32.h") -#include "crypto_performance_esp32.h" -#elif __has_include("crypto_performance_esp32s2.h") -#include "crypto_performance_esp32s2.h" -#elif __has_include("crypto_performance_esp32s3.h") -#include "crypto_performance_esp32s3.h" -#elif __has_include("crypto_performance_esp32c2.h") -#include "crypto_performance_esp32c2.h" -#elif __has_include("crypto_performance_esp32c3.h") -#include "crypto_performance_esp32c3.h" -#elif __has_include("crypto_performance_esp32c6.h") -#include "crypto_performance_esp32c6.h" -#elif __has_include("crypto_performance_esp32h2.h") -#include "crypto_performance_esp32h2.h" +#include "sdkconfig.h" + +// Chip-Specific Data +#if CONFIG_IDF_TARGET_ESP32 +// AES-CBC hardware throughput (accounts for worst-case performance with PSRAM workaround) +#define IDF_PERFORMANCE_MIN_AES_CBC_THROUGHPUT_MBSEC 8.2 + +// SHA256 hardware throughput at 240MHz, threshold set lower than worst case +#if CONFIG_FREERTOS_SMP // IDF-5826 +#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 6.0 +#else +#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 8.0 +#endif + +#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 5000 +#define IDF_PERFORMANCE_MAX_TIME_SHA512_32KB 4500 + +#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP 19000 +#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 750000 +#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP 33000 +#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP 950000 +#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP 90000 +#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP 3000000 + +#elif CONFIG_IDF_TARGET_ESP32S2 +#define IDF_PERFORMANCE_MIN_AES_CBC_THROUGHPUT_MBSEC 43.0 +#define IDF_PERFORMANCE_MIN_AES_GCM_CRYPT_TAG_THROUGHPUT_MBSEC 30.0 +#define IDF_PERFORMANCE_MIN_AES_GCM_UPDATE_THROUGHPUT_MBSEC 2.1 + +// SHA256 hardware throughput at 240MHz, threshold set lower than worst case +#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 90.0 +// esp_sha() time to process 32KB of input data from RAM +#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 900 +#define IDF_PERFORMANCE_MAX_TIME_SHA512_32KB 900 + +#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP 15500 +#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 650000 +#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP 36000 +#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP 960000 +#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP 62000 +#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP 2850000 + +#elif CONFIG_IDF_TARGET_ESP32S3 +#define IDF_PERFORMANCE_MIN_AES_CBC_THROUGHPUT_MBSEC 43 + +#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 90 +#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 1000 +#define IDF_PERFORMANCE_MAX_TIME_SHA512_32KB 900 + +#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP 23000 +#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 700000 +#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP 45000 +#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP 1300000 +#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP 80000 +#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP 3500000 + +#elif CONFIG_IDF_TARGET_ESP32C2 +// SHA256 hardware throughput at 160 MHz, threshold set lower than worst case +#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 14 +// esp_sha() time to process 32KB of input data from RAM +#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 2500 + +#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_MULTIPLY_OP 9000 +#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_VERIFY_OP 300 +#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_MULTIPLY_OP 14000 +#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_VERIFY_OP 300 + +#define IDF_PERFORMANCE_MAX_ECDSA_P192_VERIFY_OP 32000 +#define IDF_PERFORMANCE_MAX_ECDSA_P256_VERIFY_OP 49000 + +#elif CONFIG_IDF_TARGET_ESP32C3 +#define IDF_PERFORMANCE_MIN_AES_CBC_THROUGHPUT_MBSEC 43 + +// SHA256 hardware throughput at 160 MHz, threshold set lower than worst case +#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 90 +// esp_sha() time to process 32KB of input data from RAM +#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 560 + +#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP 19000 +#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 210000 +#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP 45000 +#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP 670000 + +#elif CONFIG_IDF_TARGET_ESP32C6 +#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_MULTIPLY_OP 5000 +#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_VERIFY_OP 60 +#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_MULTIPLY_OP 8400 +#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_VERIFY_OP 70 + +#define IDF_PERFORMANCE_MAX_ECDSA_P192_VERIFY_OP 18000 +#define IDF_PERFORMANCE_MAX_ECDSA_P256_VERIFY_OP 27000 + +#elif CONFIG_IDF_TARGET_ESP32H2 +#define IDF_PERFORMANCE_MIN_AES_CBC_THROUGHPUT_MBSEC 43 + +// SHA256 hardware throughput at 160 MHz, threshold set lower than worst case +#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 90 +// esp_sha() time to process 32KB of input data from RAM +#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 560 + +#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP 19000 +#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 210000 +#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP 45000 +#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP 670000 + +#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_MULTIPLY_OP 11000 +#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_VERIFY_OP 300 +#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_MULTIPLY_OP 19000 +#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_VERIFY_OP 300 + +#define IDF_PERFORMANCE_MAX_ECDSA_P192_VERIFY_OP 44000 +#define IDF_PERFORMANCE_MAX_ECDSA_P256_VERIFY_OP 67000 #endif diff --git a/components/mbedtls/test_apps/include/crypto_performance_esp32.h b/components/mbedtls/test_apps/include/crypto_performance_esp32.h deleted file mode 100644 index d357636188d..00000000000 --- a/components/mbedtls/test_apps/include/crypto_performance_esp32.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#include "sdkconfig.h" - - -// AES-CBC hardware throughput (accounts for worst-case performance with PSRAM workaround) -#define IDF_PERFORMANCE_MIN_AES_CBC_THROUGHPUT_MBSEC 8.2 - -// SHA256 hardware throughput at 240MHz, threshold set lower than worst case -#if CONFIG_FREERTOS_SMP // IDF-5826 -#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 6.0 -#else -#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 8.0 -#endif - -#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 5000 -#define IDF_PERFORMANCE_MAX_TIME_SHA512_32KB 4500 - -#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP 19000 -#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 750000 -#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP 33000 -#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP 950000 -#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP 90000 -#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP 3000000 diff --git a/components/mbedtls/test_apps/include/crypto_performance_esp32c2.h b/components/mbedtls/test_apps/include/crypto_performance_esp32c2.h deleted file mode 100644 index 234fc1dc28d..00000000000 --- a/components/mbedtls/test_apps/include/crypto_performance_esp32c2.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -// SHA256 hardware throughput at 160 MHz, threshold set lower than worst case -#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 14 -// esp_sha() time to process 32KB of input data from RAM -#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 2500 - -#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_MULTIPLY_OP 9000 -#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_VERIFY_OP 300 -#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_MULTIPLY_OP 14000 -#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_VERIFY_OP 300 - -#define IDF_PERFORMANCE_MAX_ECDSA_P192_VERIFY_OP 32000 -#define IDF_PERFORMANCE_MAX_ECDSA_P256_VERIFY_OP 49000 diff --git a/components/mbedtls/test_apps/include/crypto_performance_esp32c3.h b/components/mbedtls/test_apps/include/crypto_performance_esp32c3.h deleted file mode 100644 index 06eeded2826..00000000000 --- a/components/mbedtls/test_apps/include/crypto_performance_esp32c3.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MIN_AES_CBC_THROUGHPUT_MBSEC 43 - -// SHA256 hardware throughput at 160 MHz, threshold set lower than worst case -#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 90 -// esp_sha() time to process 32KB of input data from RAM -#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 560 - -#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP 19000 -#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 210000 -#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP 45000 -#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP 670000 diff --git a/components/mbedtls/test_apps/include/crypto_performance_esp32c6.h b/components/mbedtls/test_apps/include/crypto_performance_esp32c6.h deleted file mode 100644 index da4177e70d7..00000000000 --- a/components/mbedtls/test_apps/include/crypto_performance_esp32c6.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_MULTIPLY_OP 5000 -#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_VERIFY_OP 60 -#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_MULTIPLY_OP 8400 -#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_VERIFY_OP 70 - -#define IDF_PERFORMANCE_MAX_ECDSA_P192_VERIFY_OP 18000 -#define IDF_PERFORMANCE_MAX_ECDSA_P256_VERIFY_OP 27000 diff --git a/components/mbedtls/test_apps/include/crypto_performance_esp32h2.h b/components/mbedtls/test_apps/include/crypto_performance_esp32h2.h deleted file mode 100644 index b0400a30692..00000000000 --- a/components/mbedtls/test_apps/include/crypto_performance_esp32h2.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MIN_AES_CBC_THROUGHPUT_MBSEC 43 - -// SHA256 hardware throughput at 160 MHz, threshold set lower than worst case -#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 90 -// esp_sha() time to process 32KB of input data from RAM -#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 560 - -#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP 19000 -#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 210000 -#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP 45000 -#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP 670000 - -#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_MULTIPLY_OP 11000 -#define IDF_PERFORMANCE_MAX_ECP_P192_POINT_VERIFY_OP 300 -#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_MULTIPLY_OP 19000 -#define IDF_PERFORMANCE_MAX_ECP_P256_POINT_VERIFY_OP 300 - -#define IDF_PERFORMANCE_MAX_ECDSA_P192_VERIFY_OP 44000 -#define IDF_PERFORMANCE_MAX_ECDSA_P256_VERIFY_OP 67000 diff --git a/components/mbedtls/test_apps/include/crypto_performance_esp32s2.h b/components/mbedtls/test_apps/include/crypto_performance_esp32s2.h deleted file mode 100644 index ca1704fc5b9..00000000000 --- a/components/mbedtls/test_apps/include/crypto_performance_esp32s2.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MIN_AES_CBC_THROUGHPUT_MBSEC 43.0 -#define IDF_PERFORMANCE_MIN_AES_GCM_CRYPT_TAG_THROUGHPUT_MBSEC 30.0 -#define IDF_PERFORMANCE_MIN_AES_GCM_UPDATE_THROUGHPUT_MBSEC 2.1 - -// SHA256 hardware throughput at 240MHz, threshold set lower than worst case -#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 90.0 -// esp_sha() time to process 32KB of input data from RAM -#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 900 -#define IDF_PERFORMANCE_MAX_TIME_SHA512_32KB 900 - -#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP 15500 -#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 650000 -#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP 36000 -#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP 960000 -#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP 62000 -#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP 2850000 diff --git a/components/mbedtls/test_apps/include/crypto_performance_esp32s3.h b/components/mbedtls/test_apps/include/crypto_performance_esp32s3.h deleted file mode 100644 index b17c3a7af93..00000000000 --- a/components/mbedtls/test_apps/include/crypto_performance_esp32s3.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Apache-2.0 - */ -#pragma once - -#define IDF_PERFORMANCE_MIN_AES_CBC_THROUGHPUT_MBSEC 43 - -#define IDF_PERFORMANCE_MIN_SHA256_THROUGHPUT_MBSEC 90 -#define IDF_PERFORMANCE_MAX_TIME_SHA1_32KB 1000 -#define IDF_PERFORMANCE_MAX_TIME_SHA512_32KB 900 - -#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PUBLIC_OP 23000 -#define IDF_PERFORMANCE_MAX_RSA_2048KEY_PRIVATE_OP 700000 -#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP 45000 -#define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP 1300000 -#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP 80000 -#define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP 3500000 diff --git a/components/mbedtls/test_apps/main/CMakeLists.txt b/components/mbedtls/test_apps/main/CMakeLists.txt index 842f1ce872d..09a63220598 100644 --- a/components/mbedtls/test_apps/main/CMakeLists.txt +++ b/components/mbedtls/test_apps/main/CMakeLists.txt @@ -10,7 +10,7 @@ set(TEST_CRTS "crts/server_cert_chain.pem" idf_component_register( SRC_DIRS "." - PRIV_INCLUDE_DIRS "." + PRIV_INCLUDE_DIRS "." "../include" PRIV_REQUIRES efuse cmock test_utils mbedtls esp_timer unity spi_flash esp_psram esp_security EMBED_TXTFILES ${TEST_CRTS} WHOLE_ARCHIVE) diff --git a/components/vfs/test_apps/main/CMakeLists.txt b/components/vfs/test_apps/main/CMakeLists.txt index e7cfc100f53..5f1f58399c8 100644 --- a/components/vfs/test_apps/main/CMakeLists.txt +++ b/components/vfs/test_apps/main/CMakeLists.txt @@ -7,7 +7,7 @@ set(src "test_app_main.c" "test_vfs_access.c" ) idf_component_register(SRCS ${src} - PRIV_INCLUDE_DIRS . + PRIV_INCLUDE_DIRS . ../include PRIV_REQUIRES test_utils vfs fatfs spiffs unity lwip wear_levelling cmock esp_driver_gptimer esp_driver_uart WHOLE_ARCHIVE