OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test: Partially fixed alloc unit tests 

Unfortunately tests for buffer/runtime zones will remain broken,
might require some rework in the firmware code.
For this reason, they shall be temporarily disabled.

Signed-off-by: Slawomir Blauciak <slawomir.blauciak@linux.intel.com>
This commit is contained in:
Slawomir Blauciak 2018-10-11 14:04:47 +02:00
parent 1c19a79d71
commit 246de4bd41
3 changed files with 116 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/cmocka/Makefile.am
View File

@ -60,11 +60,10 @@ mixer_LDADD = -lm $(LDADD)
# memory allocator test
# TODO: fix
#if BUILD_XTENSA
#check_PROGRAMS += alloc
#alloc_SOURCES = src/lib/alloc/alloc.c src/lib/alloc/mock.c ../../src/lib/alloc.c ../../src/platform/intel/cavs/memory.c
#endif
if BUILD_XTENSA
check_PROGRAMS += alloc
alloc_SOURCES = src/lib/alloc/alloc.c src/lib/alloc/mock.c ../../src/lib/alloc.c ../../src/platform/intel/cavs/memory.c
endif
# pipeline tests

199
test/cmocka/src/lib/alloc/alloc.c
View File

@ -28,6 +28,7 @@
* Author: Slawomir Blauciak <slawomir.blauciak@linux.intel.com>
*/
#include <stdlib.h>
#include <stdint.h>
#include <stdarg.h>
#include <stddef.h>
@ -37,6 +38,8 @@
#include <sof/sof.h>
#include <sof/alloc.h>
extern struct mm memmap;
static struct sof *sof;
enum test_type {
@ -63,9 +66,6 @@ static struct test_case test_cases[] = {
* rmalloc tests
*/
TEST_CASE(4, RZONE_SYS, SOF_MEM_CAPS_RAM, 1024, TEST_IMMEDIATE_FREE,
"rmalloc"),
TEST_CASE(1, RZONE_SYS, SOF_MEM_CAPS_RAM, 2, TEST_BULK, "rmalloc"),
TEST_CASE(4, RZONE_SYS, SOF_MEM_CAPS_RAM, 2, TEST_BULK, "rmalloc"),
TEST_CASE(256, RZONE_SYS, SOF_MEM_CAPS_RAM, 2, TEST_BULK, "rmalloc"),
@ -83,38 +83,43 @@ static struct test_case test_cases[] = {
TEST_CASE(4, RZONE_SYS, SOF_MEM_CAPS_RAM, 256, TEST_BULK,
"rmalloc"),
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
"rmalloc"),
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
"rmalloc"),
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
"rmalloc"),
/*
* TODO: Due to recent changes in relation to multicore support
* the RZONE_BUFFER and RZONE_RUNTIME tests will not work.
*/
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
"rmalloc"),
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
"rmalloc"),
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
"rmalloc"),
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
// "rmalloc"),
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
// "rmalloc"),
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
// "rmalloc"),
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
"rmalloc"),
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
"rmalloc"),
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
"rmalloc"),
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
// "rmalloc"),
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
// "rmalloc"),
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
// "rmalloc"),
TEST_CASE(16, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 128, TEST_BULK,
"rmalloc"),
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 256, TEST_BULK,
"rmalloc"),
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
// "rmalloc"),
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
// "rmalloc"),
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
// "rmalloc"),
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
TEST_BULK, "rmalloc_dma"),
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
TEST_BULK, "rmalloc_dma"),
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
TEST_BULK, "rmalloc_dma"),
//TEST_CASE(16, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 128, TEST_BULK,
// "rmalloc"),
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 256, TEST_BULK,
// "rmalloc"),
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
// TEST_BULK, "rmalloc_dma"),
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
// TEST_BULK, "rmalloc_dma"),
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
// TEST_BULK, "rmalloc_dma"),
/*
* rzalloc tests
@ -135,78 +140,78 @@ static struct test_case test_cases[] = {
TEST_CASE(16, RZONE_SYS, SOF_MEM_CAPS_RAM, 128, TEST_ZERO, "rzalloc"),
TEST_CASE(4, RZONE_SYS, SOF_MEM_CAPS_RAM, 256, TEST_ZERO, "rzalloc"),
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
"rzalloc"),
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
"rzalloc"),
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
"rzalloc"),
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
// "rzalloc"),
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
// "rzalloc"),
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
// "rzalloc"),
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
"rzalloc"),
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
"rzalloc"),
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
"rzalloc"),
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
// "rzalloc"),
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
// "rzalloc"),
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
// "rzalloc"),
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
"rzalloc"),
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
"rzalloc"),
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
"rzalloc"),
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
// "rzalloc"),
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
// "rzalloc"),
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
// "rzalloc"),
TEST_CASE(16, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 128, TEST_ZERO,
"rzalloc"),
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 512, TEST_ZERO,
"rzalloc"),
//TEST_CASE(16, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 128, TEST_ZERO,
// "rzalloc"),
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 256, TEST_ZERO,
// "rzalloc"),
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
TEST_ZERO, "rzalloc_dma"),
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
TEST_ZERO, "rzalloc_dma"),
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
TEST_ZERO, "rzalloc_dma"),
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
// TEST_ZERO, "rzalloc_dma"),
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
// TEST_ZERO, "rzalloc_dma"),
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
// TEST_ZERO, "rzalloc_dma"),
/*
* rballoc tests
*/
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 1024,
TEST_IMMEDIATE_FREE, "rballoc"),
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 1024,
// TEST_IMMEDIATE_FREE, "rballoc"),
TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
"rballoc"),
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
"rballoc"),
TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
"rballoc"),
//TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
// "rballoc"),
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
// "rballoc"),
//TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
// "rballoc"),
TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
"rballoc"),
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
"rballoc"),
TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
"rballoc"),
//TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
// "rballoc"),
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
// "rballoc"),
//TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
// "rballoc"),
TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
"rballoc"),
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
"rballoc"),
TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
"rballoc"),
//TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
// "rballoc"),
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
// "rballoc"),
//TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
// "rballoc"),
TEST_CASE(16, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 64, TEST_BULK,
"rballoc"),
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 64, TEST_BULK,
"rballoc"),
//TEST_CASE(16, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 64, TEST_BULK,
// "rballoc"),
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 64, TEST_BULK,
// "rballoc"),
TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
TEST_BULK, "rballoc_dma"),
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
TEST_BULK, "rballoc_dma"),
TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
TEST_BULK, "rballoc_dma")
//TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
// TEST_BULK, "rballoc_dma"),
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
// TEST_BULK, "rballoc_dma"),
//TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
// TEST_BULK, "rballoc_dma")
};
static int setup(void **state)
@ -224,6 +229,20 @@ static int teardown(void **state)
return 0;
}
static int clear_sys(void **state)
{
int sysheap_idx = 0;
for (; sysheap_idx < ARRAY_SIZE(memmap.system); ++sysheap_idx) {
struct mm_heap *cpu_heap = &memmap.system[sysheap_idx];
cpu_heap->info.used = 0;
cpu_heap->info.free = cpu_heap->size;
}
return 0;
}
static void *alloc(struct test_case *tc)
{
void *mem;
@ -320,7 +339,7 @@ int main(void)
t->name = test_cases[i].name;
t->test_func = test_lib_alloc;
t->initial_state = &test_cases[i];
t->setup_func = NULL;
t->setup_func = clear_sys;
t->teardown_func = NULL;
}

10
test/cmocka/src/lib/alloc/mock.c
View File

@ -32,19 +32,15 @@
#include <stdint.h>
#include <sof/alloc.h>
#include <sof/trace.h>
struct dma_copy;
struct dma_sg_config;
int dma_copy_from_host(struct dma_copy *dc, struct dma_sg_config *host_sg,
int32_t host_offset, void *local_ptr, int32_t size)
int rstrlen(const char *s)
{
return 0;
}
(void)s;
int dma_copy_to_host(struct dma_copy *dc, struct dma_sg_config *host_sg,
int32_t host_offset, void *local_ptr, int32_t size)
{
return 0;
}