feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

sdio: fix random unit test performance failure

Browse Source 
The tests used to measure the throughput by FreeRTOS
`xTaskGetTickCount()`. The rounding error can be quite big, compared to
total measurement time (1350 ms for 4-bit mode).

This commit use `esp_timer_get_time()` instead to measure typical time,
which is in microseconds. Moreover, to get rid of the time error from
cache miss, `ccomp_timer_*` are used to get the cache compensated time
to measure the throughput used for unit test performance assertion.
This commit is contained in:
Michael (XIAO Xufeng)
2020-05-08 22:03:53 +08:00
parent 5425ef85ce
commit 69d9e0eadc
1 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
components/driver/test/test_sdio.c
View File

@@ -20,6 +20,7 @@
#include "esp_log.h" #include "esp_log.h"
#include "driver/spi_common.h" #include "driver/spi_common.h"
#include "soc/soc_caps.h" #include "soc/soc_caps.h"
#include "ccomp_timer.h"
#if defined(SOC_SDMMC_HOST_SUPPORTED) && defined(SOC_SDIO_SLAVE_SUPPORTED) #if defined(SOC_SDMMC_HOST_SUPPORTED) && defined(SOC_SDIO_SLAVE_SUPPORTED)
#include "driver/sdio_slave.h" #include "driver/sdio_slave.h"
@@ -362,7 +363,6 @@ static void log_performance_tohost(uint32_t speed, const sdio_test_config_t* con
break; break;
} }
} }
ESP_LOGI(MASTER_TAG, "Throughput: %.2lf MB/s", speed/1000.);
} }
static void test_tp_tohost_master(essl_handle_t handle, const sdio_test_config_t* config) static void test_tp_tohost_master(essl_handle_t handle, const sdio_test_config_t* config)
@@ -377,8 +377,12 @@ static void test_tp_tohost_master(essl_handle_t handle, const sdio_test_config_t
int remain_length = expected_length; int remain_length = expected_length;
int offset = 0; int offset = 0;
// Two counters are used. The `esp_timer_get_time()` is for the typical time, and the
// `ccomp_timer` is for performance test to reduce influence caused by cache miss.
int64_t pre_us = esp_timer_get_time();
err = ccomp_timer_start();
assert(err == ESP_OK);
// though the flow is the same, the check of config->check_data influences the throughput much, put it outside // though the flow is the same, the check of config->check_data influences the throughput much, put it outside
uint32_t pre = xTaskGetTickCount();
if (config->check_data) { if (config->check_data) {
do { do {
size_t rcv_len; size_t rcv_len;
@@ -416,11 +420,15 @@ static void test_tp_tohost_master(essl_handle_t handle, const sdio_test_config_t
remain_length -= rcv_len; remain_length -= rcv_len;
} while (remain_length > 0); } while (remain_length > 0);
} }
uint32_t end = xTaskGetTickCount(); int64_t c_time_ms = ccomp_timer_stop()/1000;
int64_t end_us = esp_timer_get_time();
uint32_t total_time_ms = (end-pre)*portTICK_PERIOD_MS; uint32_t total_time_ms = (end_us - pre_us)/1000;
uint32_t throughput_byte_per_ms = expected_length / total_time_ms; ESP_LOGI(MASTER_TAG, "test done, total time: %d ms (%d ms compensated), bytes transferred: %d", total_time_ms, (int)c_time_ms, expected_length);
ESP_LOGI(MASTER_TAG, "test done, total time: %d ms, bytes transferred: %d", total_time_ms, expected_length);
uint32_t throughput_byte_per_ms = expected_length / c_time_ms;
ESP_LOGI(MASTER_TAG, "Throughput: compensated %.2lf MB/s, typical %.2lf MB/s",
throughput_byte_per_ms/1000., expected_length/(total_time_ms*1000.));
log_performance_tohost(throughput_byte_per_ms, config); log_performance_tohost(throughput_byte_per_ms, config);
send_finish_test(handle); send_finish_test(handle);
@@ -441,7 +449,6 @@ static void log_performance_frhost(uint32_t speed, const sdio_test_config_t* con
break; break;
} }
} }
ESP_LOGI(MASTER_TAG, "Throughput: %.2lf MB/s", speed/1000.);
} }
static void test_tp_frhost_master(essl_handle_t handle, const sdio_test_config_t* config) static void test_tp_frhost_master(essl_handle_t handle, const sdio_test_config_t* config)
@@ -454,7 +461,12 @@ static void test_tp_frhost_master(essl_handle_t handle, const sdio_test_config_t
int remain_length = expected_length; int remain_length = expected_length;
int offset = 0; int offset = 0;
uint32_t pre = xTaskGetTickCount();
// Two counters are used. The `esp_timer_get_time()` is for the typical time, and the
// `ccomp_timer` is for performance test to reduce influence caused by cache miss.
int64_t pre_us = esp_timer_get_time();
err = ccomp_timer_start();
assert(err == ESP_OK);
do { do {
int send_len; int send_len;
uint8_t* send_start; uint8_t* send_start;
@@ -468,11 +480,15 @@ static void test_tp_frhost_master(essl_handle_t handle, const sdio_test_config_t
offset += send_len; offset += send_len;
} while (remain_length > 0); } while (remain_length > 0);
uint32_t end = xTaskGetTickCount(); int64_t c_time_ms = ccomp_timer_stop()/1000;
int64_t end_us = esp_timer_get_time();
uint32_t total_time_ms = (end-pre)*portTICK_PERIOD_MS; uint32_t total_time_ms = (end_us - pre_us)/1000;
uint32_t throughput_byte_per_ms = expected_length / total_time_ms; ESP_LOGI(MASTER_TAG, "test done, total time: %d ms (%d ms compensated), bytes transferred: %d", total_time_ms, (int)c_time_ms, expected_length);
ESP_LOGI(MASTER_TAG, "test done, total time: %d ms, bytes transferred: %d", total_time_ms, expected_length);
uint32_t throughput_byte_per_ms = expected_length / c_time_ms;
ESP_LOGI(MASTER_TAG, "Throughput: compensated %.2lf MB/s, typical %.2lf MB/s",
throughput_byte_per_ms/1000., expected_length/(total_time_ms*1000.));
log_performance_frhost(throughput_byte_per_ms, config); log_performance_frhost(throughput_byte_per_ms, config);
send_finish_test(handle); send_finish_test(handle);