Skip to content

Commit 63873a1

Browse files
Yuval Peressnashif
authored andcommitted
tests: basicmath: Migrate to new ztest register functionality
Simplify the running and creation of the basicmath benchmark suites. Using the ztest register functionality, each benchmark registers and is run from a single call in main.c. Signed-off-by: Yuval Peress <[email protected]>
1 parent 27f6a5e commit 63873a1

File tree

5 files changed

+36
-81
lines changed

5 files changed

+36
-81
lines changed

tests/benchmarks/cmsis_dsp/basicmath/src/f32.c

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -348,18 +348,12 @@ void test_benchmark_vec_dot_prod_f32(void)
348348
TC_PRINT(BENCHMARK_TYPE " = %u\n", timespan);
349349
}
350350

351-
void benchmark_basicmath_f32(void)
352-
{
353-
ztest_test_suite(basicmath_f32_benchmark,
354-
ztest_unit_test(test_benchmark_vec_add_f32),
355-
ztest_unit_test(test_benchmark_vec_sub_f32),
356-
ztest_unit_test(test_benchmark_vec_mult_f32),
357-
ztest_unit_test(test_benchmark_vec_abs_f32),
358-
ztest_unit_test(test_benchmark_vec_negate_f32),
359-
ztest_unit_test(test_benchmark_vec_offset_f32),
360-
ztest_unit_test(test_benchmark_vec_scale_f32),
361-
ztest_unit_test(test_benchmark_vec_dot_prod_f32)
362-
);
363-
364-
ztest_run_test_suite(basicmath_f32_benchmark);
365-
}
351+
ztest_register_test_suite(basicmath_f32_benchmark, NULL,
352+
ztest_unit_test(test_benchmark_vec_add_f32),
353+
ztest_unit_test(test_benchmark_vec_sub_f32),
354+
ztest_unit_test(test_benchmark_vec_mult_f32),
355+
ztest_unit_test(test_benchmark_vec_abs_f32),
356+
ztest_unit_test(test_benchmark_vec_negate_f32),
357+
ztest_unit_test(test_benchmark_vec_offset_f32),
358+
ztest_unit_test(test_benchmark_vec_scale_f32),
359+
ztest_unit_test(test_benchmark_vec_dot_prod_f32));

tests/benchmarks/cmsis_dsp/basicmath/src/main.c

Lines changed: 0 additions & 21 deletions
This file was deleted.

tests/benchmarks/cmsis_dsp/basicmath/src/q15.c

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -276,18 +276,12 @@ void test_benchmark_vec_dot_prod_q15(void)
276276
TC_PRINT(BENCHMARK_TYPE " = %u\n", timespan);
277277
}
278278

279-
void benchmark_basicmath_q15(void)
280-
{
281-
ztest_test_suite(basicmath_q15_benchmark,
282-
ztest_unit_test(test_benchmark_vec_add_q15),
283-
ztest_unit_test(test_benchmark_vec_sub_q15),
284-
ztest_unit_test(test_benchmark_vec_mult_q15),
285-
ztest_unit_test(test_benchmark_vec_abs_q15),
286-
ztest_unit_test(test_benchmark_vec_negate_q15),
287-
ztest_unit_test(test_benchmark_vec_offset_q15),
288-
ztest_unit_test(test_benchmark_vec_scale_q15),
289-
ztest_unit_test(test_benchmark_vec_dot_prod_q15)
290-
);
291-
292-
ztest_run_test_suite(basicmath_q15_benchmark);
293-
}
279+
ztest_register_test_suite(basicmath_q15_benchmark, NULL,
280+
ztest_unit_test(test_benchmark_vec_add_q15),
281+
ztest_unit_test(test_benchmark_vec_sub_q15),
282+
ztest_unit_test(test_benchmark_vec_mult_q15),
283+
ztest_unit_test(test_benchmark_vec_abs_q15),
284+
ztest_unit_test(test_benchmark_vec_negate_q15),
285+
ztest_unit_test(test_benchmark_vec_offset_q15),
286+
ztest_unit_test(test_benchmark_vec_scale_q15),
287+
ztest_unit_test(test_benchmark_vec_dot_prod_q15));

tests/benchmarks/cmsis_dsp/basicmath/src/q31.c

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -340,18 +340,12 @@ void test_benchmark_vec_dot_prod_q31(void)
340340
TC_PRINT(BENCHMARK_TYPE " = %u\n", timespan);
341341
}
342342

343-
void benchmark_basicmath_q31(void)
344-
{
345-
ztest_test_suite(basicmath_q31_benchmark,
346-
ztest_unit_test(test_benchmark_vec_add_q31),
347-
ztest_unit_test(test_benchmark_vec_sub_q31),
348-
ztest_unit_test(test_benchmark_vec_mult_q31),
349-
ztest_unit_test(test_benchmark_vec_abs_q31),
350-
ztest_unit_test(test_benchmark_vec_negate_q31),
351-
ztest_unit_test(test_benchmark_vec_offset_q31),
352-
ztest_unit_test(test_benchmark_vec_scale_q31),
353-
ztest_unit_test(test_benchmark_vec_dot_prod_q31)
354-
);
355-
356-
ztest_run_test_suite(basicmath_q31_benchmark);
357-
}
343+
ztest_register_test_suite(basicmath_q31_benchmark, NULL,
344+
ztest_unit_test(test_benchmark_vec_add_q31),
345+
ztest_unit_test(test_benchmark_vec_sub_q31),
346+
ztest_unit_test(test_benchmark_vec_mult_q31),
347+
ztest_unit_test(test_benchmark_vec_abs_q31),
348+
ztest_unit_test(test_benchmark_vec_negate_q31),
349+
ztest_unit_test(test_benchmark_vec_offset_q31),
350+
ztest_unit_test(test_benchmark_vec_scale_q31),
351+
ztest_unit_test(test_benchmark_vec_dot_prod_q31));

tests/benchmarks/cmsis_dsp/basicmath/src/q7.c

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -276,18 +276,12 @@ void test_benchmark_vec_dot_prod_q7(void)
276276
TC_PRINT(BENCHMARK_TYPE " = %u\n", timespan);
277277
}
278278

279-
void benchmark_basicmath_q7(void)
280-
{
281-
ztest_test_suite(basicmath_q7_benchmark,
282-
ztest_unit_test(test_benchmark_vec_add_q7),
283-
ztest_unit_test(test_benchmark_vec_sub_q7),
284-
ztest_unit_test(test_benchmark_vec_mult_q7),
285-
ztest_unit_test(test_benchmark_vec_abs_q7),
286-
ztest_unit_test(test_benchmark_vec_negate_q7),
287-
ztest_unit_test(test_benchmark_vec_offset_q7),
288-
ztest_unit_test(test_benchmark_vec_scale_q7),
289-
ztest_unit_test(test_benchmark_vec_dot_prod_q7)
290-
);
291-
292-
ztest_run_test_suite(basicmath_q7_benchmark);
293-
}
279+
ztest_register_test_suite(basicmath_q7_benchmark, NULL,
280+
ztest_unit_test(test_benchmark_vec_add_q7),
281+
ztest_unit_test(test_benchmark_vec_sub_q7),
282+
ztest_unit_test(test_benchmark_vec_mult_q7),
283+
ztest_unit_test(test_benchmark_vec_abs_q7),
284+
ztest_unit_test(test_benchmark_vec_negate_q7),
285+
ztest_unit_test(test_benchmark_vec_offset_q7),
286+
ztest_unit_test(test_benchmark_vec_scale_q7),
287+
ztest_unit_test(test_benchmark_vec_dot_prod_q7));

0 commit comments

Comments
 (0)