Skip to content

Commit ca5d698

Browse files
enjiamainashif
enjiamai
authored and
nashif
committed
tests: lib: move the cmsis_dsp transform test to new ztest API
Migrate the testsuite tests/lib/cmsis_dsp/transform to the new ztest API. Signed-off-by: Enjia Mai <[email protected]>
1 parent ccb3927 commit ca5d698

File tree

15 files changed

+696
-804
lines changed

15 files changed

+696
-804
lines changed

‎tests/lib/cmsis_dsp/transform/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ cmake_minimum_required(VERSION 3.20.0)
44
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
55
project(cmsis_dsp_transform)
66

7-
FILE(GLOB app_sources src/*.c)
8-
97
target_sources(app PRIVATE src/main.c)
108

119
target_sources_ifdef(

‎tests/lib/cmsis_dsp/transform/prj.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CONFIG_ZTEST=y
22
CONFIG_NEWLIB_LIBC=y
3+
CONFIG_ZTEST_NEW_API=y
34
CONFIG_CMSIS_DSP=y
45
CONFIG_CMSIS_DSP_TRANSFORM=y
56

‎tests/lib/cmsis_dsp/transform/prj_base.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
CONFIG_ZTEST=y
2+
CONFIG_ZTEST_NEW_API=y
23
CONFIG_NEWLIB_LIBC=y
34
CONFIG_CMSIS_DSP=y
45
CONFIG_CMSIS_DSP_TRANSFORM=y

‎tests/lib/cmsis_dsp/transform/src/cf16.c‎

Lines changed: 73 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -55,58 +55,76 @@ static void test_arm_cfft_f16_cmplx(
5555
test_arm_cfft_f16_cmplx_backend(false, input, ref, length);
5656
}
5757

58-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, noisy_16,
58+
DEFINE_TEST_VARIANT3(transform_cf16,
59+
arm_cfft_f16_cmplx, noisy_16,
5960
in_cfft_noisy_16, ref_cfft_noisy_16, 32);
6061

61-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, noisy_32,
62+
DEFINE_TEST_VARIANT3(transform_cf16,
63+
arm_cfft_f16_cmplx, noisy_32,
6264
in_cfft_noisy_32, ref_cfft_noisy_32, 64);
6365

64-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, noisy_64,
66+
DEFINE_TEST_VARIANT3(transform_cf16,
67+
arm_cfft_f16_cmplx, noisy_64,
6568
in_cfft_noisy_64, ref_cfft_noisy_64, 128);
6669

67-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, noisy_128,
70+
DEFINE_TEST_VARIANT3(transform_cf16,
71+
arm_cfft_f16_cmplx, noisy_128,
6872
in_cfft_noisy_128, ref_cfft_noisy_128, 256);
6973

70-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, noisy_256,
74+
DEFINE_TEST_VARIANT3(transform_cf16,
75+
arm_cfft_f16_cmplx, noisy_256,
7176
in_cfft_noisy_256, ref_cfft_noisy_256, 512);
7277

73-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, noisy_512,
78+
DEFINE_TEST_VARIANT3(transform_cf16,
79+
arm_cfft_f16_cmplx, noisy_512,
7480
in_cfft_noisy_512, ref_cfft_noisy_512, 1024);
7581

76-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, noisy_1024,
82+
DEFINE_TEST_VARIANT3(transform_cf16,
83+
arm_cfft_f16_cmplx, noisy_1024,
7784
in_cfft_noisy_1024, ref_cfft_noisy_1024, 2048);
7885

79-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, noisy_2048,
86+
DEFINE_TEST_VARIANT3(transform_cf16,
87+
arm_cfft_f16_cmplx, noisy_2048,
8088
in_cfft_noisy_2048, ref_cfft_noisy_2048, 4096);
8189

82-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, noisy_4096,
90+
DEFINE_TEST_VARIANT3(transform_cf16,
91+
arm_cfft_f16_cmplx, noisy_4096,
8392
in_cfft_noisy_4096, ref_cfft_noisy_4096, 8192);
8493

85-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, step_16,
94+
DEFINE_TEST_VARIANT3(transform_cf16,
95+
arm_cfft_f16_cmplx, step_16,
8696
in_cfft_step_16, ref_cfft_step_16, 32);
8797

88-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, step_32,
98+
DEFINE_TEST_VARIANT3(transform_cf16,
99+
arm_cfft_f16_cmplx, step_32,
89100
in_cfft_step_32, ref_cfft_step_32, 64);
90101

91-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, step_64,
102+
DEFINE_TEST_VARIANT3(transform_cf16,
103+
arm_cfft_f16_cmplx, step_64,
92104
in_cfft_step_64, ref_cfft_step_64, 128);
93105

94-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, step_128,
106+
DEFINE_TEST_VARIANT3(transform_cf16,
107+
arm_cfft_f16_cmplx, step_128,
95108
in_cfft_step_128, ref_cfft_step_128, 256);
96109

97-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, step_256,
110+
DEFINE_TEST_VARIANT3(transform_cf16,
111+
arm_cfft_f16_cmplx, step_256,
98112
in_cfft_step_256, ref_cfft_step_256, 512);
99113

100-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, step_512,
114+
DEFINE_TEST_VARIANT3(transform_cf16,
115+
arm_cfft_f16_cmplx, step_512,
101116
in_cfft_step_512, ref_cfft_step_512, 1024);
102117

103-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, step_1024,
118+
DEFINE_TEST_VARIANT3(transform_cf16,
119+
arm_cfft_f16_cmplx, step_1024,
104120
in_cfft_step_1024, ref_cfft_step_1024, 2048);
105121

106-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, step_2048,
122+
DEFINE_TEST_VARIANT3(transform_cf16,
123+
arm_cfft_f16_cmplx, step_2048,
107124
in_cfft_step_2048, ref_cfft_step_2048, 4096);
108125

109-
DEFINE_TEST_VARIANT3(arm_cfft_f16_cmplx, step_4096,
126+
DEFINE_TEST_VARIANT3(transform_cf16,
127+
arm_cfft_f16_cmplx, step_4096,
110128
in_cfft_step_4096, ref_cfft_step_4096, 8192);
111129

112130
static void test_arm_cifft_f16_cmplx(
@@ -115,100 +133,76 @@ static void test_arm_cifft_f16_cmplx(
115133
test_arm_cfft_f16_cmplx_backend(true, input, ref, length);
116134
}
117135

118-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, noisy_16,
136+
DEFINE_TEST_VARIANT3(transform_cf16,
137+
arm_cifft_f16_cmplx, noisy_16,
119138
in_cifft_noisy_16, in_cfft_noisy_16, 32);
120139

121-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, noisy_32,
140+
DEFINE_TEST_VARIANT3(transform_cf16,
141+
arm_cifft_f16_cmplx, noisy_32,
122142
in_cifft_noisy_32, in_cfft_noisy_32, 64);
123143

124-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, noisy_64,
144+
DEFINE_TEST_VARIANT3(transform_cf16,
145+
arm_cifft_f16_cmplx, noisy_64,
125146
in_cifft_noisy_64, in_cfft_noisy_64, 128);
126147

127-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, noisy_128,
148+
DEFINE_TEST_VARIANT3(transform_cf16,
149+
arm_cifft_f16_cmplx, noisy_128,
128150
in_cifft_noisy_128, in_cfft_noisy_128, 256);
129151

130-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, noisy_256,
152+
DEFINE_TEST_VARIANT3(transform_cf16,
153+
arm_cifft_f16_cmplx, noisy_256,
131154
in_cifft_noisy_256, in_cfft_noisy_256, 512);
132155

133-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, noisy_512,
156+
DEFINE_TEST_VARIANT3(transform_cf16,
157+
arm_cifft_f16_cmplx, noisy_512,
134158
in_cifft_noisy_512, in_cfft_noisy_512, 1024);
135159

136-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, noisy_1024,
160+
DEFINE_TEST_VARIANT3(transform_cf16,
161+
arm_cifft_f16_cmplx, noisy_1024,
137162
in_cifft_noisy_1024, in_cfft_noisy_1024, 2048);
138163

139-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, noisy_2048,
164+
DEFINE_TEST_VARIANT3(transform_cf16,
165+
arm_cifft_f16_cmplx, noisy_2048,
140166
in_cifft_noisy_2048, in_cfft_noisy_2048, 4096);
141167

142-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, noisy_4096,
168+
DEFINE_TEST_VARIANT3(transform_cf16,
169+
arm_cifft_f16_cmplx, noisy_4096,
143170
in_cifft_noisy_4096, in_cfft_noisy_4096, 8192);
144171

145-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, step_16,
172+
DEFINE_TEST_VARIANT3(transform_cf16,
173+
arm_cifft_f16_cmplx, step_16,
146174
in_cifft_step_16, in_cfft_step_16, 32);
147175

148-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, step_32,
176+
DEFINE_TEST_VARIANT3(transform_cf16,
177+
arm_cifft_f16_cmplx, step_32,
149178
in_cifft_step_32, in_cfft_step_32, 64);
150179

151-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, step_64,
180+
DEFINE_TEST_VARIANT3(transform_cf16,
181+
arm_cifft_f16_cmplx, step_64,
152182
in_cifft_step_64, in_cfft_step_64, 128);
153183

154-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, step_128,
184+
DEFINE_TEST_VARIANT3(transform_cf16,
185+
arm_cifft_f16_cmplx, step_128,
155186
in_cifft_step_128, in_cfft_step_128, 256);
156187

157-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, step_256,
188+
DEFINE_TEST_VARIANT3(transform_cf16,
189+
arm_cifft_f16_cmplx, step_256,
158190
in_cifft_step_256, in_cfft_step_256, 512);
159191

160-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, step_512,
192+
DEFINE_TEST_VARIANT3(transform_cf16,
193+
arm_cifft_f16_cmplx, step_512,
161194
in_cifft_step_512, in_cfft_step_512, 1024);
162195

163-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, step_1024,
196+
DEFINE_TEST_VARIANT3(transform_cf16,
197+
arm_cifft_f16_cmplx, step_1024,
164198
in_cifft_step_1024, in_cfft_step_1024, 2048);
165199

166-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, step_2048,
200+
DEFINE_TEST_VARIANT3(transform_cf16,
201+
arm_cifft_f16_cmplx, step_2048,
167202
in_cifft_step_2048, in_cfft_step_2048, 4096);
168203

169-
DEFINE_TEST_VARIANT3(arm_cifft_f16_cmplx, step_4096,
204+
DEFINE_TEST_VARIANT3(transform_cf16,
205+
arm_cifft_f16_cmplx, step_4096,
170206
in_cifft_step_4096, in_cfft_step_4096, 8192);
171207

172-
void test_transform_cf16(void)
173-
{
174-
ztest_test_suite(transform_cf16,
175-
ztest_unit_test(test_arm_cfft_f16_cmplx_noisy_16),
176-
ztest_unit_test(test_arm_cifft_f16_cmplx_noisy_16),
177-
ztest_unit_test(test_arm_cfft_f16_cmplx_noisy_32),
178-
ztest_unit_test(test_arm_cifft_f16_cmplx_noisy_32),
179-
ztest_unit_test(test_arm_cfft_f16_cmplx_noisy_64),
180-
ztest_unit_test(test_arm_cifft_f16_cmplx_noisy_64),
181-
ztest_unit_test(test_arm_cfft_f16_cmplx_noisy_128),
182-
ztest_unit_test(test_arm_cifft_f16_cmplx_noisy_128),
183-
ztest_unit_test(test_arm_cfft_f16_cmplx_noisy_256),
184-
ztest_unit_test(test_arm_cifft_f16_cmplx_noisy_256),
185-
ztest_unit_test(test_arm_cfft_f16_cmplx_noisy_512),
186-
ztest_unit_test(test_arm_cifft_f16_cmplx_noisy_512),
187-
ztest_unit_test(test_arm_cfft_f16_cmplx_noisy_1024),
188-
ztest_unit_test(test_arm_cifft_f16_cmplx_noisy_1024),
189-
ztest_unit_test(test_arm_cfft_f16_cmplx_noisy_2048),
190-
ztest_unit_test(test_arm_cifft_f16_cmplx_noisy_2048),
191-
ztest_unit_test(test_arm_cfft_f16_cmplx_noisy_4096),
192-
ztest_unit_test(test_arm_cifft_f16_cmplx_noisy_4096),
193-
ztest_unit_test(test_arm_cfft_f16_cmplx_step_16),
194-
ztest_unit_test(test_arm_cifft_f16_cmplx_step_16),
195-
ztest_unit_test(test_arm_cfft_f16_cmplx_step_32),
196-
ztest_unit_test(test_arm_cifft_f16_cmplx_step_32),
197-
ztest_unit_test(test_arm_cfft_f16_cmplx_step_64),
198-
ztest_unit_test(test_arm_cifft_f16_cmplx_step_64),
199-
ztest_unit_test(test_arm_cfft_f16_cmplx_step_128),
200-
ztest_unit_test(test_arm_cifft_f16_cmplx_step_128),
201-
ztest_unit_test(test_arm_cfft_f16_cmplx_step_256),
202-
ztest_unit_test(test_arm_cifft_f16_cmplx_step_256),
203-
ztest_unit_test(test_arm_cfft_f16_cmplx_step_512),
204-
ztest_unit_test(test_arm_cifft_f16_cmplx_step_512),
205-
ztest_unit_test(test_arm_cfft_f16_cmplx_step_1024),
206-
ztest_unit_test(test_arm_cifft_f16_cmplx_step_1024),
207-
ztest_unit_test(test_arm_cfft_f16_cmplx_step_2048),
208-
ztest_unit_test(test_arm_cifft_f16_cmplx_step_2048),
209-
ztest_unit_test(test_arm_cfft_f16_cmplx_step_4096),
210-
ztest_unit_test(test_arm_cifft_f16_cmplx_step_4096)
211-
);
212-
213-
ztest_run_test_suite(transform_cf16);
214-
}
208+
ZTEST_SUITE(transform_cf16, NULL, NULL, NULL, NULL, NULL);

0 commit comments

Comments
 (0)