diff --git a/components/driver/test_apps/components/test_driver_utils/test_spi_utils.c b/components/driver/test_apps/components/test_driver_utils/test_spi_utils.c
index ad6a698e68..8b997e62df 100644
--- a/components/driver/test_apps/components/test_driver_utils/test_spi_utils.c
+++ b/components/driver/test_apps/components/test_driver_utils/test_spi_utils.c
@@ -7,6 +7,7 @@
 #include "driver/spi_slave.h"
 #include "esp_log.h"
 #include "driver/gpio.h"
+#include "esp_private/gpio.h"
 #include "hal/gpio_hal.h"
 #include "esp_rom_gpio.h"
 
@@ -220,13 +221,13 @@ void master_free_device_bus(spi_device_handle_t spi)
 
 void spitest_gpio_output_sel(uint32_t gpio_num, int func, uint32_t signal_idx)
 {
-    gpio_hal_iomux_func_sel(GPIO_PIN_MUX_REG[gpio_num], func);
+    gpio_func_sel(gpio_num, func);
     esp_rom_gpio_connect_out_signal(gpio_num, signal_idx, 0, 0);
 }
 
 void spitest_gpio_input_sel(uint32_t gpio_num, int func, uint32_t signal_idx)
 {
-    gpio_hal_iomux_func_sel(GPIO_PIN_MUX_REG[gpio_num], func);
+    gpio_func_sel(gpio_num, func);
     esp_rom_gpio_connect_in_signal(gpio_num, signal_idx, 0);
 }
 
diff --git a/components/esp_driver_spi/test_apps/.build-test-rules.yml b/components/esp_driver_spi/test_apps/.build-test-rules.yml
index f2306768be..1639bbf5cd 100644
--- a/components/esp_driver_spi/test_apps/.build-test-rules.yml
+++ b/components/esp_driver_spi/test_apps/.build-test-rules.yml
@@ -3,8 +3,10 @@
     - esp_mm  # for cache
     - esp_driver_spi
     - esp_driver_gpio
+  depends_filepatterns:
+    - components/driver/test_apps/components/test_driver_utils/**/*
 
-components/esp_driver_spi/test_apps/spi/master:
+components/esp_driver_spi/test_apps/master:
   disable:
     - if: SOC_GPSPI_SUPPORTED != 1
   disable_test:
@@ -13,7 +15,7 @@ components/esp_driver_spi/test_apps/spi/master:
       reason: not supported # TODO: IDF-8942
   <<: *spi_depends_default
 
-components/esp_driver_spi/test_apps/spi/param:
+components/esp_driver_spi/test_apps/param:
   disable:
     - if: SOC_GPSPI_SUPPORTED != 1
   disable_test:
@@ -22,7 +24,7 @@ components/esp_driver_spi/test_apps/spi/param:
       reason: not supported # TODO: IDF-8942
   <<: *spi_depends_default
 
-components/esp_driver_spi/test_apps/spi/slave:
+components/esp_driver_spi/test_apps/slave:
   disable:
     - if: SOC_GPSPI_SUPPORTED != 1
   disable_test:
@@ -31,7 +33,7 @@ components/esp_driver_spi/test_apps/spi/slave:
       reason: not supported # TODO: IDF-8942
   <<: *spi_depends_default
 
-components/esp_driver_spi/test_apps/spi/slave_hd:
+components/esp_driver_spi/test_apps/slave_hd:
   disable:
     - if: SOC_GPSPI_SUPPORTED != 1
     - if: SOC_SPI_SUPPORT_SLAVE_HD_VER2 != 1
diff --git a/components/esp_driver_spi/test_apps/components/spi_bench_mark/CMakeLists.txt b/components/esp_driver_spi/test_apps/components/spi_bench_mark/CMakeLists.txt
new file mode 100644
index 0000000000..d5466bd3f7
--- /dev/null
+++ b/components/esp_driver_spi/test_apps/components/spi_bench_mark/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+idf_component_register(
+    INCLUDE_DIRS "include"
+)
diff --git a/components/esp_driver_spi/test_apps/components/spi_bench_mark/include/spi_performance.h b/components/esp_driver_spi/test_apps/components/spi_bench_mark/include/spi_performance.h
new file mode 100644
index 0000000000..7636ef0014
--- /dev/null
+++ b/components/esp_driver_spi/test_apps/components/spi_bench_mark/include/spi_performance.h
@@ -0,0 +1,86 @@
+/*
+ * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#pragma once
+
+#if CONFIG_IDF_TARGET_ESP32
+#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                            16*1000*1000
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                   15
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA            15
+#if !CONFIG_FREERTOS_SMP // IDF-5223
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                34      // TODO: IDF-5180
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA         30      // TODO: IDF-5180
+#else
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                50
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA         50
+#endif
+
+#elif CONFIG_IDF_TARGET_ESP32S2
+#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                            40*1000*1000
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                   15
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA            15
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                32
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA         30
+
+#elif CONFIG_IDF_TARGET_ESP32S3
+#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                            40*1000*1000
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                   15
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA            15
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                32
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA         30
+
+#elif CONFIG_IDF_TARGET_ESP32C2
+#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                            40*1000*1000
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                   23
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA            18
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                47
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA         42
+
+#elif CONFIG_IDF_TARGET_ESP32C3
+#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                            40*1000*1000
+#if !CONFIG_FREERTOS_SMP // IDF-5223
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                   15
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA            15
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                32
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA         30
+#else
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                   17
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA            17
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                60
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA         60
+#endif
+
+#elif CONFIG_IDF_TARGET_ESP32C6
+#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                            26*1000*1000
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                34
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                   17
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA         32
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA            15
+
+#elif CONFIG_IDF_TARGET_ESP32H2
+#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                            26*1000*1000
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                   32
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA            25
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                61
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA         54
+
+#elif CONFIG_IDF_TARGET_ESP32P4
+//TODO: IDF-8313 update after chips back and PLL setup
+#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                            10*1000*1000
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                1000
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                   1000
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA         1000
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA            1000
+
+#elif CONFIG_IDF_TARGET_ESP32C5
+#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                            40*1000*1000
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                27
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                   16
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA         24
+#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA            13
+
+#else
+#endif
diff --git a/components/esp_driver_spi/test_apps/spi/master/CMakeLists.txt b/components/esp_driver_spi/test_apps/master/CMakeLists.txt
similarity index 86%
rename from components/esp_driver_spi/test_apps/spi/master/CMakeLists.txt
rename to components/esp_driver_spi/test_apps/master/CMakeLists.txt
index 72e52621b3..a089345e26 100644
--- a/components/esp_driver_spi/test_apps/spi/master/CMakeLists.txt
+++ b/components/esp_driver_spi/test_apps/master/CMakeLists.txt
@@ -4,11 +4,6 @@ cmake_minimum_required(VERSION 3.16)
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)
 
-set(EXTRA_COMPONENT_DIRS
-    "$ENV{IDF_PATH}/tools/unit-test-app/components"
-    "$ENV{IDF_PATH}/components/driver/test_apps/components"
-)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(spi_master_test)
 
diff --git a/components/esp_driver_spi/test_apps/spi/master/README.md b/components/esp_driver_spi/test_apps/master/README.md
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/README.md
rename to components/esp_driver_spi/test_apps/master/README.md
diff --git a/components/esp_driver_spi/test_apps/spi/master/main/CMakeLists.txt b/components/esp_driver_spi/test_apps/master/main/CMakeLists.txt
similarity index 80%
rename from components/esp_driver_spi/test_apps/spi/master/main/CMakeLists.txt
rename to components/esp_driver_spi/test_apps/master/main/CMakeLists.txt
index f8d95ad31e..9b34511e99 100644
--- a/components/esp_driver_spi/test_apps/spi/master/main/CMakeLists.txt
+++ b/components/esp_driver_spi/test_apps/master/main/CMakeLists.txt
@@ -6,11 +6,10 @@ set(srcs
     "test_spi_bus_lock.c"
 )
 
-
 # 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_REQUIRES test_utils esp_driver_spi test_driver_utils spi_flash
+    PRIV_REQUIRES esp_driver_spi spi_flash
     WHOLE_ARCHIVE
 )
diff --git a/components/esp_driver_spi/test_apps/master/main/idf_component.yml b/components/esp_driver_spi/test_apps/master/main/idf_component.yml
new file mode 100644
index 0000000000..3e1127ae0f
--- /dev/null
+++ b/components/esp_driver_spi/test_apps/master/main/idf_component.yml
@@ -0,0 +1,7 @@
+dependencies:
+  test_utils:
+    path: ${IDF_PATH}/tools/unit-test-app/components/test_utils
+  test_driver_utils:
+    path: ${IDF_PATH}/components/driver/test_apps/components/test_driver_utils
+  spi_bench_mark:
+    path: ${IDF_PATH}/components/esp_driver_spi/test_apps/components/spi_bench_mark
diff --git a/components/esp_driver_spi/test_apps/spi/master/main/test_app_main.c b/components/esp_driver_spi/test_apps/master/main/test_app_main.c
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/main/test_app_main.c
rename to components/esp_driver_spi/test_apps/master/main/test_app_main.c
diff --git a/components/esp_driver_spi/test_apps/spi/master/main/test_spi_bus_lock.c b/components/esp_driver_spi/test_apps/master/main/test_spi_bus_lock.c
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/main/test_spi_bus_lock.c
rename to components/esp_driver_spi/test_apps/master/main/test_spi_bus_lock.c
diff --git a/components/esp_driver_spi/test_apps/spi/master/main/test_spi_master.c b/components/esp_driver_spi/test_apps/master/main/test_spi_master.c
similarity index 98%
rename from components/esp_driver_spi/test_apps/spi/master/main/test_spi_master.c
rename to components/esp_driver_spi/test_apps/master/main/test_spi_master.c
index 1375978d3a..24e30ff6b7 100644
--- a/components/esp_driver_spi/test_apps/spi/master/main/test_spi_master.c
+++ b/components/esp_driver_spi/test_apps/master/main/test_spi_master.c
@@ -22,6 +22,7 @@
 #include "esp_log.h"
 #include "test_utils.h"
 #include "test_spi_utils.h"
+#include "spi_performance.h"
 
 const static char TAG[] = "test_spi";
 
@@ -1416,7 +1417,8 @@ TEST_CASE("spi_speed", "[spi]")
         ESP_LOGI(TAG, "%.2lf", GET_US_BY_CCOUNT(t_flight_sorted[i]));
     }
 #ifndef CONFIG_SPIRAM
-    TEST_PERFORMANCE_LESS_THAN(SPI_PER_TRANS_NO_POLLING, "%d us", (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
+    printf("[Performance][%s]: %d us\n", "SPI_PER_TRANS_NO_POLLING", (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
+    TEST_ASSERT_LESS_THAN_INT(IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING, (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
 #endif
 
     //acquire the bus to send polling transactions faster
@@ -1433,7 +1435,8 @@ TEST_CASE("spi_speed", "[spi]")
         ESP_LOGI(TAG, "%.2lf", GET_US_BY_CCOUNT(t_flight_sorted[i]));
     }
 #ifndef CONFIG_SPIRAM
-    TEST_PERFORMANCE_LESS_THAN(SPI_PER_TRANS_POLLING, "%d us", (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
+    printf("[Performance][%s]: %d us\n", "SPI_PER_TRANS_POLLING", (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
+    TEST_ASSERT_LESS_THAN_INT(IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING, (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
 #endif
 
     //release the bus
@@ -1452,7 +1455,8 @@ TEST_CASE("spi_speed", "[spi]")
         ESP_LOGI(TAG, "%.2lf", GET_US_BY_CCOUNT(t_flight_sorted[i]));
     }
 #ifndef CONFIG_SPIRAM
-    TEST_PERFORMANCE_LESS_THAN(SPI_PER_TRANS_NO_POLLING_NO_DMA, "%d us", (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
+    printf("[Performance][%s]: %d us\n", "SPI_PER_TRANS_NO_POLLING_NO_DMA", (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
+    TEST_ASSERT_LESS_THAN_INT(IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA, (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
 #endif
 
     //acquire the bus to send polling transactions faster
@@ -1469,7 +1473,8 @@ TEST_CASE("spi_speed", "[spi]")
         ESP_LOGI(TAG, "%.2lf", GET_US_BY_CCOUNT(t_flight_sorted[i]));
     }
 #ifndef CONFIG_SPIRAM
-    TEST_PERFORMANCE_LESS_THAN(SPI_PER_TRANS_POLLING_NO_DMA, "%d us", (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
+    printf("[Performance][%s]: %d us\n", "SPI_PER_TRANS_POLLING_NO_DMA", (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
+    TEST_ASSERT_LESS_THAN_INT(IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA, (int)GET_US_BY_CCOUNT(t_flight_sorted[(TEST_TIMES + 1) / 2]));
 #endif
 
     //release the bus
diff --git a/components/esp_driver_spi/test_apps/spi/master/main/test_spi_sio.c b/components/esp_driver_spi/test_apps/master/main/test_spi_sio.c
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/main/test_spi_sio.c
rename to components/esp_driver_spi/test_apps/master/main/test_spi_sio.c
diff --git a/components/esp_driver_spi/test_apps/spi/master/partition_table_esp32_flash.csv b/components/esp_driver_spi/test_apps/master/partition_table_esp32_flash.csv
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/partition_table_esp32_flash.csv
rename to components/esp_driver_spi/test_apps/master/partition_table_esp32_flash.csv
diff --git a/components/esp_driver_spi/test_apps/spi/master/pytest_spi_master.py b/components/esp_driver_spi/test_apps/master/pytest_spi_master.py
similarity index 99%
rename from components/esp_driver_spi/test_apps/spi/master/pytest_spi_master.py
rename to components/esp_driver_spi/test_apps/master/pytest_spi_master.py
index 7315d363a3..88e58f9b29 100644
--- a/components/esp_driver_spi/test_apps/spi/master/pytest_spi_master.py
+++ b/components/esp_driver_spi/test_apps/master/pytest_spi_master.py
@@ -1,6 +1,5 @@
 # SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
-
 import pytest
 
 
diff --git a/components/esp_driver_spi/test_apps/spi/master/sdkconfig.ci.defaults b/components/esp_driver_spi/test_apps/master/sdkconfig.ci.defaults
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/sdkconfig.ci.defaults
rename to components/esp_driver_spi/test_apps/master/sdkconfig.ci.defaults
diff --git a/components/esp_driver_spi/test_apps/spi/master/sdkconfig.ci.freertos_compliance b/components/esp_driver_spi/test_apps/master/sdkconfig.ci.freertos_compliance
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/sdkconfig.ci.freertos_compliance
rename to components/esp_driver_spi/test_apps/master/sdkconfig.ci.freertos_compliance
diff --git a/components/esp_driver_spi/test_apps/spi/master/sdkconfig.ci.freertos_flash b/components/esp_driver_spi/test_apps/master/sdkconfig.ci.freertos_flash
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/sdkconfig.ci.freertos_flash
rename to components/esp_driver_spi/test_apps/master/sdkconfig.ci.freertos_flash
diff --git a/components/esp_driver_spi/test_apps/spi/master/sdkconfig.ci.iram_safe b/components/esp_driver_spi/test_apps/master/sdkconfig.ci.iram_safe
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/sdkconfig.ci.iram_safe
rename to components/esp_driver_spi/test_apps/master/sdkconfig.ci.iram_safe
diff --git a/components/esp_driver_spi/test_apps/spi/master/sdkconfig.ci.release b/components/esp_driver_spi/test_apps/master/sdkconfig.ci.release
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/sdkconfig.ci.release
rename to components/esp_driver_spi/test_apps/master/sdkconfig.ci.release
diff --git a/components/esp_driver_spi/test_apps/spi/master/sdkconfig.defaults b/components/esp_driver_spi/test_apps/master/sdkconfig.defaults
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/sdkconfig.defaults
rename to components/esp_driver_spi/test_apps/master/sdkconfig.defaults
diff --git a/components/esp_driver_spi/test_apps/spi/master/sdkconfig.defaults.esp32 b/components/esp_driver_spi/test_apps/master/sdkconfig.defaults.esp32
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/sdkconfig.defaults.esp32
rename to components/esp_driver_spi/test_apps/master/sdkconfig.defaults.esp32
diff --git a/components/esp_driver_spi/test_apps/spi/master/sdkconfig.defaults.esp32s2 b/components/esp_driver_spi/test_apps/master/sdkconfig.defaults.esp32s2
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/sdkconfig.defaults.esp32s2
rename to components/esp_driver_spi/test_apps/master/sdkconfig.defaults.esp32s2
diff --git a/components/esp_driver_spi/test_apps/spi/master/sdkconfig.defaults.esp32s3 b/components/esp_driver_spi/test_apps/master/sdkconfig.defaults.esp32s3
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/master/sdkconfig.defaults.esp32s3
rename to components/esp_driver_spi/test_apps/master/sdkconfig.defaults.esp32s3
diff --git a/components/esp_driver_spi/test_apps/spi/param/CMakeLists.txt b/components/esp_driver_spi/test_apps/param/CMakeLists.txt
similarity index 67%
rename from components/esp_driver_spi/test_apps/spi/param/CMakeLists.txt
rename to components/esp_driver_spi/test_apps/param/CMakeLists.txt
index 683bf0ee2c..83f0cb7142 100644
--- a/components/esp_driver_spi/test_apps/spi/param/CMakeLists.txt
+++ b/components/esp_driver_spi/test_apps/param/CMakeLists.txt
@@ -4,10 +4,5 @@ cmake_minimum_required(VERSION 3.16)
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)
 
-set(EXTRA_COMPONENT_DIRS
-    "$ENV{IDF_PATH}/tools/unit-test-app/components"
-    "$ENV{IDF_PATH}/components/driver/test_apps/components"
-)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(spi_param_test)
diff --git a/components/esp_driver_spi/test_apps/spi/param/README.md b/components/esp_driver_spi/test_apps/param/README.md
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/param/README.md
rename to components/esp_driver_spi/test_apps/param/README.md
diff --git a/components/esp_driver_spi/test_apps/spi/param/main/CMakeLists.txt b/components/esp_driver_spi/test_apps/param/main/CMakeLists.txt
similarity index 76%
rename from components/esp_driver_spi/test_apps/spi/param/main/CMakeLists.txt
rename to components/esp_driver_spi/test_apps/param/main/CMakeLists.txt
index 802e5b84a0..b2a85587ce 100644
--- a/components/esp_driver_spi/test_apps/spi/param/main/CMakeLists.txt
+++ b/components/esp_driver_spi/test_apps/param/main/CMakeLists.txt
@@ -9,6 +9,6 @@ set(srcs
 # the component can be registered as WHOLE_ARCHIVE
 idf_component_register(
     SRCS ${srcs}
-    PRIV_REQUIRES test_utils driver test_driver_utils esp_serial_slave_link
+    PRIV_REQUIRES esp_driver_spi
     WHOLE_ARCHIVE
 )
diff --git a/components/esp_driver_spi/test_apps/param/main/idf_component.yml b/components/esp_driver_spi/test_apps/param/main/idf_component.yml
new file mode 100644
index 0000000000..f4502bc824
--- /dev/null
+++ b/components/esp_driver_spi/test_apps/param/main/idf_component.yml
@@ -0,0 +1,9 @@
+dependencies:
+  test_utils:
+    path: ${IDF_PATH}/tools/unit-test-app/components/test_utils
+  test_driver_utils:
+    path: ${IDF_PATH}/components/driver/test_apps/components/test_driver_utils
+  spi_bench_mark:
+    path: ${IDF_PATH}/components/esp_driver_spi/test_apps/components/spi_bench_mark
+  esp_serial_slave_link:
+    path: ${IDF_PATH}/components/driver/test_apps/components/esp_serial_slave_link
diff --git a/components/esp_driver_spi/test_apps/spi/param/main/test_app_main.c b/components/esp_driver_spi/test_apps/param/main/test_app_main.c
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/param/main/test_app_main.c
rename to components/esp_driver_spi/test_apps/param/main/test_app_main.c
diff --git a/components/esp_driver_spi/test_apps/spi/param/main/test_spi_param.c b/components/esp_driver_spi/test_apps/param/main/test_spi_param.c
similarity index 99%
rename from components/esp_driver_spi/test_apps/spi/param/main/test_spi_param.c
rename to components/esp_driver_spi/test_apps/param/main/test_spi_param.c
index 5c8f44332d..e94994298a 100644
--- a/components/esp_driver_spi/test_apps/spi/param/main/test_spi_param.c
+++ b/components/esp_driver_spi/test_apps/param/main/test_spi_param.c
@@ -11,6 +11,7 @@
 #include "test_spi_utils.h"
 #include "driver/spi_master.h"
 #include "driver/spi_slave.h"
+#include "spi_performance.h"
 
 #if SOC_SPI_SUPPORT_SLAVE_HD_VER2
 #include "esp_serial_slave_link/essl_spi.h"
diff --git a/components/esp_driver_spi/test_apps/spi/param/pytest_spi_param.py b/components/esp_driver_spi/test_apps/param/pytest_spi_param.py
similarity index 99%
rename from components/esp_driver_spi/test_apps/spi/param/pytest_spi_param.py
rename to components/esp_driver_spi/test_apps/param/pytest_spi_param.py
index 4a1d8d7e56..fa1c3f86ad 100644
--- a/components/esp_driver_spi/test_apps/spi/param/pytest_spi_param.py
+++ b/components/esp_driver_spi/test_apps/param/pytest_spi_param.py
@@ -1,6 +1,5 @@
 # SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
-
 import pytest
 
 
diff --git a/components/esp_driver_spi/test_apps/spi/param/sdkconfig.defaults b/components/esp_driver_spi/test_apps/param/sdkconfig.defaults
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/param/sdkconfig.defaults
rename to components/esp_driver_spi/test_apps/param/sdkconfig.defaults
diff --git a/components/esp_driver_spi/test_apps/spi/slave/CMakeLists.txt b/components/esp_driver_spi/test_apps/slave/CMakeLists.txt
similarity index 86%
rename from components/esp_driver_spi/test_apps/spi/slave/CMakeLists.txt
rename to components/esp_driver_spi/test_apps/slave/CMakeLists.txt
index 7cc8d06266..272b5680b6 100644
--- a/components/esp_driver_spi/test_apps/spi/slave/CMakeLists.txt
+++ b/components/esp_driver_spi/test_apps/slave/CMakeLists.txt
@@ -4,11 +4,6 @@ cmake_minimum_required(VERSION 3.16)
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)
 
-set(EXTRA_COMPONENT_DIRS
-    "$ENV{IDF_PATH}/tools/unit-test-app/components"
-    "$ENV{IDF_PATH}/components/driver/test_apps/components"
-)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(spi_slave_test)
 
diff --git a/components/esp_driver_spi/test_apps/spi/slave/README.md b/components/esp_driver_spi/test_apps/slave/README.md
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/slave/README.md
rename to components/esp_driver_spi/test_apps/slave/README.md
diff --git a/components/esp_driver_spi/test_apps/spi/slave/main/CMakeLists.txt b/components/esp_driver_spi/test_apps/slave/main/CMakeLists.txt
similarity index 81%
rename from components/esp_driver_spi/test_apps/spi/slave/main/CMakeLists.txt
rename to components/esp_driver_spi/test_apps/slave/main/CMakeLists.txt
index 58b237b180..3c0adce084 100644
--- a/components/esp_driver_spi/test_apps/spi/slave/main/CMakeLists.txt
+++ b/components/esp_driver_spi/test_apps/slave/main/CMakeLists.txt
@@ -10,6 +10,6 @@ set(srcs
 # the component can be registered as WHOLE_ARCHIVE
 idf_component_register(
     SRCS ${srcs}
-    PRIV_REQUIRES test_utils driver test_driver_utils spi_flash
+    PRIV_REQUIRES esp_driver_spi spi_flash
     WHOLE_ARCHIVE
 )
diff --git a/components/esp_driver_spi/test_apps/slave/main/idf_component.yml b/components/esp_driver_spi/test_apps/slave/main/idf_component.yml
new file mode 100644
index 0000000000..7a92181a68
--- /dev/null
+++ b/components/esp_driver_spi/test_apps/slave/main/idf_component.yml
@@ -0,0 +1,5 @@
+dependencies:
+  test_utils:
+    path: ${IDF_PATH}/tools/unit-test-app/components/test_utils
+  test_driver_utils:
+    path: ${IDF_PATH}/components/driver/test_apps/components/test_driver_utils
diff --git a/components/esp_driver_spi/test_apps/spi/slave/main/test_app_main.c b/components/esp_driver_spi/test_apps/slave/main/test_app_main.c
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/slave/main/test_app_main.c
rename to components/esp_driver_spi/test_apps/slave/main/test_app_main.c
diff --git a/components/esp_driver_spi/test_apps/spi/slave/main/test_spi_slave.c b/components/esp_driver_spi/test_apps/slave/main/test_spi_slave.c
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/slave/main/test_spi_slave.c
rename to components/esp_driver_spi/test_apps/slave/main/test_spi_slave.c
diff --git a/components/esp_driver_spi/test_apps/spi/slave/main/test_spi_slave_queue.c b/components/esp_driver_spi/test_apps/slave/main/test_spi_slave_queue.c
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/slave/main/test_spi_slave_queue.c
rename to components/esp_driver_spi/test_apps/slave/main/test_spi_slave_queue.c
diff --git a/components/esp_driver_spi/test_apps/spi/slave/pytest_spi_slave.py b/components/esp_driver_spi/test_apps/slave/pytest_spi_slave.py
similarity index 99%
rename from components/esp_driver_spi/test_apps/spi/slave/pytest_spi_slave.py
rename to components/esp_driver_spi/test_apps/slave/pytest_spi_slave.py
index f468b8d4df..e3637da358 100644
--- a/components/esp_driver_spi/test_apps/spi/slave/pytest_spi_slave.py
+++ b/components/esp_driver_spi/test_apps/slave/pytest_spi_slave.py
@@ -1,6 +1,5 @@
 # SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
-
 import pytest
 
 
diff --git a/components/esp_driver_spi/test_apps/spi/slave/sdkconfig.ci.defaults b/components/esp_driver_spi/test_apps/slave/sdkconfig.ci.defaults
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/slave/sdkconfig.ci.defaults
rename to components/esp_driver_spi/test_apps/slave/sdkconfig.ci.defaults
diff --git a/components/esp_driver_spi/test_apps/spi/slave/sdkconfig.ci.iram_safe b/components/esp_driver_spi/test_apps/slave/sdkconfig.ci.iram_safe
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/slave/sdkconfig.ci.iram_safe
rename to components/esp_driver_spi/test_apps/slave/sdkconfig.ci.iram_safe
diff --git a/components/esp_driver_spi/test_apps/spi/slave/sdkconfig.defaults b/components/esp_driver_spi/test_apps/slave/sdkconfig.defaults
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/slave/sdkconfig.defaults
rename to components/esp_driver_spi/test_apps/slave/sdkconfig.defaults
diff --git a/components/esp_driver_spi/test_apps/spi/slave_hd/CMakeLists.txt b/components/esp_driver_spi/test_apps/slave_hd/CMakeLists.txt
similarity index 67%
rename from components/esp_driver_spi/test_apps/spi/slave_hd/CMakeLists.txt
rename to components/esp_driver_spi/test_apps/slave_hd/CMakeLists.txt
index 810b90fb6c..858e0cd4eb 100644
--- a/components/esp_driver_spi/test_apps/spi/slave_hd/CMakeLists.txt
+++ b/components/esp_driver_spi/test_apps/slave_hd/CMakeLists.txt
@@ -4,10 +4,5 @@ cmake_minimum_required(VERSION 3.16)
 # "Trim" the build. Include the minimal set of components, main, and anything it depends on.
 set(COMPONENTS main)
 
-set(EXTRA_COMPONENT_DIRS
-    "$ENV{IDF_PATH}/tools/unit-test-app/components"
-    "$ENV{IDF_PATH}/components/driver/test_apps/components"
-)
-
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(spi_slave_hd_test)
diff --git a/components/esp_driver_spi/test_apps/spi/slave_hd/README.md b/components/esp_driver_spi/test_apps/slave_hd/README.md
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/slave_hd/README.md
rename to components/esp_driver_spi/test_apps/slave_hd/README.md
diff --git a/components/esp_driver_spi/test_apps/spi/slave_hd/main/CMakeLists.txt b/components/esp_driver_spi/test_apps/slave_hd/main/CMakeLists.txt
similarity index 75%
rename from components/esp_driver_spi/test_apps/spi/slave_hd/main/CMakeLists.txt
rename to components/esp_driver_spi/test_apps/slave_hd/main/CMakeLists.txt
index 12e108533d..6b88715166 100644
--- a/components/esp_driver_spi/test_apps/spi/slave_hd/main/CMakeLists.txt
+++ b/components/esp_driver_spi/test_apps/slave_hd/main/CMakeLists.txt
@@ -9,6 +9,6 @@ set(srcs
 # the component can be registered as WHOLE_ARCHIVE
 idf_component_register(
     SRCS ${srcs}
-    PRIV_REQUIRES test_utils driver test_driver_utils esp_serial_slave_link sdmmc
+    PRIV_REQUIRES esp_driver_spi
     WHOLE_ARCHIVE
 )
diff --git a/components/esp_driver_spi/test_apps/slave_hd/main/idf_component.yml b/components/esp_driver_spi/test_apps/slave_hd/main/idf_component.yml
new file mode 100644
index 0000000000..518a1d6833
--- /dev/null
+++ b/components/esp_driver_spi/test_apps/slave_hd/main/idf_component.yml
@@ -0,0 +1,7 @@
+dependencies:
+  test_utils:
+    path: ${IDF_PATH}/tools/unit-test-app/components/test_utils
+  test_driver_utils:
+    path: ${IDF_PATH}/components/driver/test_apps/components/test_driver_utils
+  esp_serial_slave_link:
+    path: ${IDF_PATH}/components/driver/test_apps/components/esp_serial_slave_link
diff --git a/components/esp_driver_spi/test_apps/spi/slave_hd/main/test_app_main.c b/components/esp_driver_spi/test_apps/slave_hd/main/test_app_main.c
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/slave_hd/main/test_app_main.c
rename to components/esp_driver_spi/test_apps/slave_hd/main/test_app_main.c
diff --git a/components/esp_driver_spi/test_apps/spi/slave_hd/main/test_spi_slave_hd.c b/components/esp_driver_spi/test_apps/slave_hd/main/test_spi_slave_hd.c
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/slave_hd/main/test_spi_slave_hd.c
rename to components/esp_driver_spi/test_apps/slave_hd/main/test_spi_slave_hd.c
diff --git a/components/esp_driver_spi/test_apps/spi/slave_hd/pytest_spi_slave_hd.py b/components/esp_driver_spi/test_apps/slave_hd/pytest_spi_slave_hd.py
similarity index 99%
rename from components/esp_driver_spi/test_apps/spi/slave_hd/pytest_spi_slave_hd.py
rename to components/esp_driver_spi/test_apps/slave_hd/pytest_spi_slave_hd.py
index 054c842dd9..6bcdb80f80 100644
--- a/components/esp_driver_spi/test_apps/spi/slave_hd/pytest_spi_slave_hd.py
+++ b/components/esp_driver_spi/test_apps/slave_hd/pytest_spi_slave_hd.py
@@ -1,6 +1,5 @@
 # SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
-
 import pytest
 
 
diff --git a/components/esp_driver_spi/test_apps/spi/slave_hd/sdkconfig.defaults b/components/esp_driver_spi/test_apps/slave_hd/sdkconfig.defaults
similarity index 100%
rename from components/esp_driver_spi/test_apps/spi/slave_hd/sdkconfig.defaults
rename to components/esp_driver_spi/test_apps/slave_hd/sdkconfig.defaults
diff --git a/components/idf_test/include/esp32/idf_performance_target.h b/components/idf_test/include/esp32/idf_performance_target.h
index 9d53efd10c..c222734ef4 100644
--- a/components/idf_test/include/esp32/idf_performance_target.h
+++ b/components/idf_test/include/esp32/idf_performance_target.h
@@ -28,17 +28,6 @@
 #define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP                               90000
 #define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP                              1900000
 
-#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                                        16*1000*1000
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                               15
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA                        15
-#if !CONFIG_FREERTOS_SMP // IDF-5223
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                            34      // TODO: IDF-5180
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA                     30      // TODO: IDF-5180
-#else
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                            50
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA                     50
-#endif
-
 // 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/idf_test/include/esp32c2/idf_performance_target.h b/components/idf_test/include/esp32c2/idf_performance_target.h
index 916caf4eca..ecf20664e8 100644
--- a/components/idf_test/include/esp32c2/idf_performance_target.h
+++ b/components/idf_test/include/esp32c2/idf_performance_target.h
@@ -27,12 +27,6 @@
 #define IDF_PERFORMANCE_MAX_ECDSA_P192_VERIFY_OP                                32000
 #define IDF_PERFORMANCE_MAX_ECDSA_P256_VERIFY_OP                                49000
 
-#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                                        40*1000*1000
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                               23
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA                        18
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                            47
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA                     42
-
 // 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/idf_test/include/esp32c3/idf_performance_target.h b/components/idf_test/include/esp32c3/idf_performance_target.h
index a59a6ab7c8..f7b04ca663 100644
--- a/components/idf_test/include/esp32c3/idf_performance_target.h
+++ b/components/idf_test/include/esp32c3/idf_performance_target.h
@@ -20,23 +20,6 @@
 #define IDF_PERFORMANCE_MAX_RSA_3072KEY_PUBLIC_OP                               45000
 #define IDF_PERFORMANCE_MAX_RSA_3072KEY_PRIVATE_OP                              670000
 
-#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                                        40*1000*1000
-#if !CONFIG_FREERTOS_SMP // IDF-5223
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                               15
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA                        15
-#else
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                               17
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA                        17
-#endif
-
-#if !CONFIG_FREERTOS_SMP // IDF-5223
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                            32
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA                     30
-#else
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                            60
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA                     60
-#endif
-
 // 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/idf_test/include/esp32c5/idf_performance_target.h b/components/idf_test/include/esp32c5/idf_performance_target.h
index c6a6eb8979..dd3f635e54 100644
--- a/components/idf_test/include/esp32c5/idf_performance_target.h
+++ b/components/idf_test/include/esp32c5/idf_performance_target.h
@@ -5,9 +5,3 @@
  */
 
 #pragma once
-
-#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                                        40*1000*1000
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                            27
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                               16
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA                     24
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA                        13
diff --git a/components/idf_test/include/esp32c6/idf_performance_target.h b/components/idf_test/include/esp32c6/idf_performance_target.h
index 7fa8f6cd94..5ca63dcaa4 100644
--- a/components/idf_test/include/esp32c6/idf_performance_target.h
+++ b/components/idf_test/include/esp32c6/idf_performance_target.h
@@ -17,12 +17,6 @@
 #define IDF_PERFORMANCE_MAX_ECDSA_P192_VERIFY_OP                                18000
 #define IDF_PERFORMANCE_MAX_ECDSA_P256_VERIFY_OP                                27000
 
-#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                                        26*1000*1000
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                            34
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                               17
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA                     32
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA                        15
-
 #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
diff --git a/components/idf_test/include/esp32h2/idf_performance_target.h b/components/idf_test/include/esp32h2/idf_performance_target.h
index aed083a057..0351794760 100644
--- a/components/idf_test/include/esp32h2/idf_performance_target.h
+++ b/components/idf_test/include/esp32h2/idf_performance_target.h
@@ -28,12 +28,6 @@
 #define IDF_PERFORMANCE_MAX_ECDSA_P192_VERIFY_OP                                44000
 #define IDF_PERFORMANCE_MAX_ECDSA_P256_VERIFY_OP                                67000
 
-#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                                        26*1000*1000
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                               32
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA                        25
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                            61
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA                     54
-
 // 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/idf_test/include/esp32p4/idf_performance_target.h b/components/idf_test/include/esp32p4/idf_performance_target.h
index d1efc6b4af..ae02683c52 100644
--- a/components/idf_test/include/esp32p4/idf_performance_target.h
+++ b/components/idf_test/include/esp32p4/idf_performance_target.h
@@ -4,13 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-//TODO: IDF-8313 update after chips back and PLL setup
-#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                                        10*1000*1000
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                            1000
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                               1000
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA                     1000
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA                        1000
-
 /* Spinlock performance on esp32p4 is slower. May need to adjust these values once IDF-7898 is fixed */
 #define IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP                     380
 #define IDF_PERFORMANCE_MAX_FREERTOS_SPINLOCK_CYCLES_PER_OP_UNICORE             135
diff --git a/components/idf_test/include/esp32s2/idf_performance_target.h b/components/idf_test/include/esp32s2/idf_performance_target.h
index 51693fb76c..07baf2ca51 100644
--- a/components/idf_test/include/esp32s2/idf_performance_target.h
+++ b/components/idf_test/include/esp32s2/idf_performance_target.h
@@ -23,12 +23,6 @@
 #define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP                               62000
 #define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP                              1850000
 
-#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                                        40*1000*1000
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                               15
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA                        15
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                            32
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA                     30
-
 #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
diff --git a/components/idf_test/include/esp32s3/idf_performance_target.h b/components/idf_test/include/esp32s3/idf_performance_target.h
index f987259f76..9f485b382c 100644
--- a/components/idf_test/include/esp32s3/idf_performance_target.h
+++ b/components/idf_test/include/esp32s3/idf_performance_target.h
@@ -21,12 +21,6 @@
 #define IDF_PERFORMANCE_MAX_RSA_4096KEY_PUBLIC_OP                               80000
 #define IDF_PERFORMANCE_MAX_RSA_4096KEY_PRIVATE_OP                              2500000
 
-#define IDF_PERFORMANCE_MAX_SPI_CLK_FREQ                                        40*1000*1000
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING                               15
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_POLLING_NO_DMA                        15
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING                            32
-#define IDF_PERFORMANCE_MAX_SPI_PER_TRANS_NO_POLLING_NO_DMA                     30
-
 // 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