alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

feat(cache): added psram stack test

Browse Source
This commit is contained in:
Armando 2023-07-17 12:27:08 +08:00 committed by Armando (Dou Yiwen)
parent 3b14a9d58e
commit 75cec2d58a
6 changed files with 123 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/esp_mm/test_apps/components/test_mm_utils/CMakeLists.txt Normal file
View File

@ -0,0 +1,4 @@
set(srcs "test_cache_utils.c")
idf_component_register(SRCS ${srcs}
INCLUDE_DIRS include)

32
components/esp_mm/test_apps/components/test_mm_utils/include/test_mm_utils.h Normal file
View File

@ -0,0 +1,32 @@
/*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
#include <esp_types.h>
#include "esp_err.h"
#include "esp_log.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* Set addr space dirty
*
* @param[in] vaddr_start start addr of the space
* @param[in] size size of the space
*
* @return
* - ESP_OK
* - ESP_ERR_INVALID_ARG: Currently no support for non-4B-aligned space
*/
esp_err_t test_set_buffer_dirty(intptr_t vaddr_start, size_t size);
#ifdef __cplusplus
}
#endif

28
components/esp_mm/test_apps/components/test_mm_utils/test_cache_utils.c Normal file
View File

@ -0,0 +1,28 @@
/*
* SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <string.h>
#include <inttypes.h>
#include "test_mm_utils.h"
const static char *TAG = "cache_utils";
esp_err_t test_set_buffer_dirty(intptr_t vaddr_start, size_t size)
{
if (((vaddr_start % 32) != 0) || ((size % 32) != 0)) {
ESP_LOGE(TAG, "addr not 4B aligned");
return ESP_ERR_INVALID_ARG;
}
uint32_t *vaddr = (uint32_t *)vaddr_start;
printf("vaddr: %p, size: 0x%zx\n", vaddr, size);
for (int i = 0; i < size / sizeof(uint32_t); i++) {
vaddr[i] = 0xcc;
}
return ESP_OK;
}

2
components/esp_mm/test_apps/mm/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# This is the project CMakeLists.txt file for the test subproject
cmake_minimum_required(VERSION 3.16)
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/components/esp_mm/test_apps/components")
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(mm_test)

2
components/esp_mm/test_apps/mm/main/CMakeLists.txt
View File

@ -10,5 +10,5 @@ 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_REQUIRES test_utils spi_flash esp_mm driver esp_timer
PRIV_REQUIRES unity esp_partition spi_flash esp_mm driver esp_timer test_mm_utils
WHOLE_ARCHIVE)

61
components/esp_mm/test_apps/mm/main/test_cache_msync.c
View File

@ -13,6 +13,7 @@
#include "unity.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "freertos/semphr.h"
#include "esp_rom_sys.h"
#include "esp_memory_utils.h"
#include "esp_heap_caps.h"
@ -21,6 +22,7 @@
#include "esp_timer.h"
#include "esp_partition.h"
#include "esp_flash.h"
#include "test_mm_utils.h"
const static char *TAG = "CACHE_TEST";
@ -28,13 +30,13 @@ const static char *TAG = "CACHE_TEST";
#define TEST_BUF {0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9}
#define TEST_OFFSET 0x100000
#if CONFIG_IDF_TARGET_ESP32S2
#define TEST_SYNC_START 0x3F500000
#define TEST_SYNC_SIZE 0xA80000
#define TEST_SYNC_START (0x3F500000 + TEST_OFFSET)
#elif CONFIG_IDF_TARGET_ESP32S3
#define TEST_SYNC_START 0x3C000000
#define TEST_SYNC_SIZE 0x2000000
#define TEST_SYNC_START (0x3C000000 + TEST_OFFSET)
#endif
#define TEST_SYNC_SIZE 0x8000
#define RECORD_TIME_PREPARE() uint32_t __t1, __t2
@ -205,3 +207,54 @@ TEST_CASE("test cache msync work with Flash operation when XIP from PSRAM", "[ca
TEST_ESP_OK(esp_timer_delete(timer));
}
#endif //#if CONFIG_SPIRAM_FETCH_INSTRUCTIONS && CONFIG_SPIRAM_RODATA
#if CONFIG_SPIRAM
/*---------------------------------------------------------------
Test esp_cache_msync with PSRAM stack
---------------------------------------------------------------*/
static void test_msync_on_psram(void *arg)
{
SemaphoreHandle_t test_semphr = *(SemaphoreHandle_t *)arg;
extern int _instruction_reserved_end;
extern int _rodata_reserved_end;
esp_rom_printf("_instruction_reserved_end: %p\n", &_instruction_reserved_end);
esp_rom_printf("_rodata_reserved_end: %p\n", &_rodata_reserved_end);
StackType_t *start_addr_stack = esp_cpu_get_sp();
TEST_ASSERT(esp_ptr_external_ram(start_addr_stack));
TEST_ESP_OK(test_set_buffer_dirty(TEST_SYNC_START, TEST_SYNC_SIZE));
uint32_t sync_time = 0;
RECORD_TIME_PREPARE();
printf("doing msync...\n");
RECORD_TIME_START();
TEST_ESP_OK(esp_cache_msync((void *)TEST_SYNC_START, 0x8000, ESP_CACHE_MSYNC_FLAG_INVALIDATE));
RECORD_TIME_END(sync_time);
printf("msync done\n");
uint32_t sync_time_us = GET_US_BY_CCOUNT(sync_time);
printf("sync_time_us: %"PRId32"\n", sync_time_us);
xSemaphoreGive(test_semphr);
vTaskDelete(NULL);
}
TEST_CASE("test cache msync work with PSRAM stack", "[cache]")
{
SemaphoreHandle_t test_semphr = xSemaphoreCreateBinary();
TEST_ASSERT(test_semphr);
int size_stack = 1024 * 4;
StackType_t *stack_for_task = (StackType_t *) heap_caps_calloc(1, size_stack, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
printf("init_task: current addr_stack = %p, stack_for_task = %p\n", esp_cpu_get_sp(), stack_for_task);
static StaticTask_t task_buf;
xTaskCreateStaticPinnedToCore(test_msync_on_psram, "test_msync_on_psram", size_stack, &test_semphr, 5, stack_for_task, &task_buf, 0);
xSemaphoreTake(test_semphr, portMAX_DELAY);
vSemaphoreDelete(test_semphr);
free(stack_for_task);
}
#endif //#if CONFIG_SPIRAM