Skip to content

Commit 32cf948

Browse files
lgirdwoodlgirdwood
authored
Merge pull request #481 from slawblauciak/test_fixes
test: Partially fixed alloc unit tests
2 parents 84e5353 + 246de4b commit 32cf948

3 files changed

Lines changed: 128 additions & 114 deletions

File tree

‎test/cmocka/Makefile.am‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,10 @@ mixer_LDADD = -lm $(LDADD)
6060

6161
# memory allocator test
6262

63-
# TODO: fix
64-
#if BUILD_XTENSA
65-
#check_PROGRAMS += alloc
66-
#alloc_SOURCES = src/lib/alloc/alloc.c src/lib/alloc/mock.c ../../src/lib/alloc.c ../../src/platform/intel/cavs/memory.c
67-
#endif
63+
if BUILD_XTENSA
64+
check_PROGRAMS += alloc
65+
alloc_SOURCES = src/lib/alloc/alloc.c src/lib/alloc/mock.c ../../src/lib/alloc.c ../../src/platform/intel/cavs/memory.c
66+
endif
6867

6968
# pipeline tests
7069

‎test/cmocka/src/lib/alloc/alloc.c‎

Lines changed: 121 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
* Author: Slawomir Blauciak <slawomir.blauciak@linux.intel.com>
2929
*/
3030

31+
#include <stdlib.h>
3132
#include <stdint.h>
3233
#include <stdarg.h>
3334
#include <stddef.h>
@@ -37,6 +38,8 @@
3738
#include <sof/sof.h>
3839
#include <sof/alloc.h>
3940

41+
extern struct mm memmap;
42+
4043
static struct sof *sof;
4144

4245
enum test_type {
@@ -63,9 +66,6 @@ static struct test_case test_cases[] = {
6366
* rmalloc tests
6467
*/
6568

66-
TEST_CASE(4, RZONE_SYS, SOF_MEM_CAPS_RAM, 1024, TEST_IMMEDIATE_FREE,
67-
"rmalloc"),
68-
6969
TEST_CASE(1, RZONE_SYS, SOF_MEM_CAPS_RAM, 2, TEST_BULK, "rmalloc"),
7070
TEST_CASE(4, RZONE_SYS, SOF_MEM_CAPS_RAM, 2, TEST_BULK, "rmalloc"),
7171
TEST_CASE(256, RZONE_SYS, SOF_MEM_CAPS_RAM, 2, TEST_BULK, "rmalloc"),
@@ -83,38 +83,43 @@ static struct test_case test_cases[] = {
8383
TEST_CASE(4, RZONE_SYS, SOF_MEM_CAPS_RAM, 256, TEST_BULK,
8484
"rmalloc"),
8585

86-
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
87-
"rmalloc"),
88-
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
89-
"rmalloc"),
90-
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
91-
"rmalloc"),
92-
93-
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
94-
"rmalloc"),
95-
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
96-
"rmalloc"),
97-
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
98-
"rmalloc"),
99-
100-
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
101-
"rmalloc"),
102-
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
103-
"rmalloc"),
104-
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
105-
"rmalloc"),
106-
107-
TEST_CASE(16, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 128, TEST_BULK,
108-
"rmalloc"),
109-
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 256, TEST_BULK,
110-
"rmalloc"),
86+
/*
87+
* TODO: Due to recent changes in relation to multicore support
88+
* the RZONE_BUFFER and RZONE_RUNTIME tests will not work.
89+
*/
11190

112-
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
113-
TEST_BULK, "rmalloc_dma"),
114-
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
115-
TEST_BULK, "rmalloc_dma"),
116-
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
117-
TEST_BULK, "rmalloc_dma"),
91+
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
92+
// "rmalloc"),
93+
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
94+
// "rmalloc"),
95+
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
96+
// "rmalloc"),
97+
98+
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
99+
// "rmalloc"),
100+
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
101+
// "rmalloc"),
102+
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
103+
// "rmalloc"),
104+
105+
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
106+
// "rmalloc"),
107+
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
108+
// "rmalloc"),
109+
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
110+
// "rmalloc"),
111+
112+
//TEST_CASE(16, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 128, TEST_BULK,
113+
// "rmalloc"),
114+
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 256, TEST_BULK,
115+
// "rmalloc"),
116+
117+
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
118+
// TEST_BULK, "rmalloc_dma"),
119+
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
120+
// TEST_BULK, "rmalloc_dma"),
121+
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
122+
// TEST_BULK, "rmalloc_dma"),
118123

119124
/*
120125
* rzalloc tests
@@ -135,78 +140,78 @@ static struct test_case test_cases[] = {
135140
TEST_CASE(16, RZONE_SYS, SOF_MEM_CAPS_RAM, 128, TEST_ZERO, "rzalloc"),
136141
TEST_CASE(4, RZONE_SYS, SOF_MEM_CAPS_RAM, 256, TEST_ZERO, "rzalloc"),
137142

138-
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
139-
"rzalloc"),
140-
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
141-
"rzalloc"),
142-
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
143-
"rzalloc"),
144-
145-
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
146-
"rzalloc"),
147-
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
148-
"rzalloc"),
149-
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
150-
"rzalloc"),
151-
152-
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
153-
"rzalloc"),
154-
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
155-
"rzalloc"),
156-
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
157-
"rzalloc"),
158-
159-
TEST_CASE(16, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 128, TEST_ZERO,
160-
"rzalloc"),
161-
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 512, TEST_ZERO,
162-
"rzalloc"),
163-
164-
TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
165-
TEST_ZERO, "rzalloc_dma"),
166-
TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
167-
TEST_ZERO, "rzalloc_dma"),
168-
TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
169-
TEST_ZERO, "rzalloc_dma"),
143+
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
144+
// "rzalloc"),
145+
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
146+
// "rzalloc"),
147+
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 2, TEST_ZERO,
148+
// "rzalloc"),
149+
150+
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
151+
// "rzalloc"),
152+
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
153+
// "rzalloc"),
154+
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 4, TEST_ZERO,
155+
// "rzalloc"),
156+
157+
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
158+
// "rzalloc"),
159+
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
160+
// "rzalloc"),
161+
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 8, TEST_ZERO,
162+
// "rzalloc"),
163+
164+
//TEST_CASE(16, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 128, TEST_ZERO,
165+
// "rzalloc"),
166+
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM, 256, TEST_ZERO,
167+
// "rzalloc"),
168+
169+
//TEST_CASE(1, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
170+
// TEST_ZERO, "rzalloc_dma"),
171+
//TEST_CASE(4, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
172+
// TEST_ZERO, "rzalloc_dma"),
173+
//TEST_CASE(256, RZONE_RUNTIME, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
174+
// TEST_ZERO, "rzalloc_dma"),
170175

171176
/*
172177
* rballoc tests
173178
*/
174179

175-
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 1024,
176-
TEST_IMMEDIATE_FREE, "rballoc"),
177-
178-
TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
179-
"rballoc"),
180-
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
181-
"rballoc"),
182-
TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
183-
"rballoc"),
184-
185-
TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
186-
"rballoc"),
187-
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
188-
"rballoc"),
189-
TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
190-
"rballoc"),
191-
192-
TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
193-
"rballoc"),
194-
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
195-
"rballoc"),
196-
TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
197-
"rballoc"),
198-
199-
TEST_CASE(16, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 64, TEST_BULK,
200-
"rballoc"),
201-
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 64, TEST_BULK,
202-
"rballoc"),
203-
204-
TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
205-
TEST_BULK, "rballoc_dma"),
206-
TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
207-
TEST_BULK, "rballoc_dma"),
208-
TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
209-
TEST_BULK, "rballoc_dma")
180+
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 1024,
181+
// TEST_IMMEDIATE_FREE, "rballoc"),
182+
183+
//TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
184+
// "rballoc"),
185+
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
186+
// "rballoc"),
187+
//TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 2, TEST_BULK,
188+
// "rballoc"),
189+
190+
//TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
191+
// "rballoc"),
192+
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
193+
// "rballoc"),
194+
//TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 4, TEST_BULK,
195+
// "rballoc"),
196+
197+
//TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
198+
// "rballoc"),
199+
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
200+
// "rballoc"),
201+
//TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 8, TEST_BULK,
202+
// "rballoc"),
203+
204+
//TEST_CASE(16, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 64, TEST_BULK,
205+
// "rballoc"),
206+
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM, 64, TEST_BULK,
207+
// "rballoc"),
208+
209+
//TEST_CASE(1, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
210+
// TEST_BULK, "rballoc_dma"),
211+
//TEST_CASE(4, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
212+
// TEST_BULK, "rballoc_dma"),
213+
//TEST_CASE(256, RZONE_BUFFER, SOF_MEM_CAPS_RAM | SOF_MEM_CAPS_DMA, 2,
214+
// TEST_BULK, "rballoc_dma")
210215
};
211216

212217
static int setup(void **state)
@@ -224,6 +229,20 @@ static int teardown(void **state)
224229
return 0;
225230
}
226231

232+
static int clear_sys(void **state)
233+
{
234+
int sysheap_idx = 0;
235+
236+
for (; sysheap_idx < ARRAY_SIZE(memmap.system); ++sysheap_idx) {
237+
struct mm_heap *cpu_heap = &memmap.system[sysheap_idx];
238+
239+
cpu_heap->info.used = 0;
240+
cpu_heap->info.free = cpu_heap->size;
241+
}
242+
243+
return 0;
244+
}
245+
227246
static void *alloc(struct test_case *tc)
228247
{
229248
void *mem;
@@ -320,7 +339,7 @@ int main(void)
320339
t->name = test_cases[i].name;
321340
t->test_func = test_lib_alloc;
322341
t->initial_state = &test_cases[i];
323-
t->setup_func = NULL;
342+
t->setup_func = clear_sys;
324343
t->teardown_func = NULL;
325344
}
326345

‎test/cmocka/src/lib/alloc/mock.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,15 @@
3232
#include <stdint.h>
3333

3434
#include <sof/alloc.h>
35+
#include <sof/trace.h>
3536

3637
struct dma_copy;
3738
struct dma_sg_config;
3839

39-
int dma_copy_from_host(struct dma_copy *dc, struct dma_sg_config *host_sg,
40-
int32_t host_offset, void *local_ptr, int32_t size)
40+
int rstrlen(const char *s)
4141
{
42-
return 0;
43-
}
42+
(void)s;
4443

45-
int dma_copy_to_host(struct dma_copy *dc, struct dma_sg_config *host_sg,
46-
int32_t host_offset, void *local_ptr, int32_t size)
47-
{
4844
return 0;
4945
}
5046

0 commit comments

Comments
 (0)