History

checkasm: hevc_pel: Use checkasm_check for printing failing output

This simplifies the code for checking the output, and can print the failing output (including a map of matching/mismatching elements) if checkasm is run with the -v/--verbose option.

Martin Storsjö committed 2 years ago

Commit 8ff4a4a1 parent 3ad3ada1 file · +41 −30Browse files

Unified · Split

tests/checkasm/hevc_pel.c+41−30
@@ -36,6 +36,15 @@ static const int offsets[] = {0, 255, -1 }; · 35 unmodified lines
3636 #define SIZEOF_PIXEL ((bit_depth + 7) / 8)
3737 #define BUF_SIZE (2 * MAX_PB_SIZE * (2 * 4 + MAX_PB_SIZE))
3838
39+#define checkasm_check_pixel(buf1, stride1, buf2, stride2, ...) \
40+ ((bit_depth > 8) ? \
41+ checkasm_check(uint16_t, (const uint16_t*)buf1, stride1, \
42+ (const uint16_t*)buf2, stride2, \
43+ __VA_ARGS__) : \
44+ checkasm_check(uint8_t, (const uint8_t*) buf1, stride1, \
45+ (const uint8_t*) buf2, stride2, \
46+ __VA_ARGS__))
47+
3948 #define randomize_buffers() \
4049 do { \
4150 uint32_t mask = pixel_mask[bit_depth - 8]; \
@@ -78,7 +87,7 @@ static void checkasm_check_hevc_qpel(void) · 36 unmodified lines
7887 LOCAL_ALIGNED_32(uint8_t, dst1, [BUF_SIZE]);
7988
8089 HEVCDSPContext h;
81− int size, bit_depth, i, j, row;
90+ int size, bit_depth, i, j;
8291 declare_func(void, int16_t *dst, uint8_t *src, ptrdiff_t srcstride,
8392 int height, intptr_t mx, intptr_t my, int width);
8493
@@ -102,12 +111,9 @@ static void checkasm_check_hevc_qpel(void) · 17 unmodified lines
102111 randomize_buffers();
103112 call_ref(dstw0, src0, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]);
104113 call_new(dstw1, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]);
105− for (row = 0; row < size[sizes]; row++) {
106− if (memcmp(dstw0 + row * MAX_PB_SIZE,
107− dstw1 + row * MAX_PB_SIZE,
108− sizes[size] * sizeof(int16_t)))
109− fail();
110− }
114+ checkasm_check(int16_t, dstw0, MAX_PB_SIZE * sizeof(int16_t),
115+ dstw1, MAX_PB_SIZE * sizeof(int16_t),
116+ size[sizes], size[sizes], "dst");
111117 bench_new(dstw1, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]);
112118 }
113119 }
@@ -152,8 +158,9 @@ static void checkasm_check_hevc_qpel_uni(void) · 38 unmodified lines
152158 call_new(dst1, sizes[size] * SIZEOF_PIXEL,
153159 src1, sizes[size] * SIZEOF_PIXEL,
154160 sizes[size], i, j, sizes[size]);
155− if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL))
156− fail();
161+ checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL,
162+ dst1, sizes[size] * SIZEOF_PIXEL,
163+ size[sizes], size[sizes], "dst");
157164 bench_new(dst1, sizes[size] * SIZEOF_PIXEL,
158165 src1, sizes[size] * SIZEOF_PIXEL,
159166 sizes[size], i, j, sizes[size]);
@@ -204,8 +211,9 @@ static void checkasm_check_hevc_qpel_uni_w(void) · 44 unmodified lines
204211 call_new(dst1, sizes[size] * SIZEOF_PIXEL,
205212 src1, sizes[size] * SIZEOF_PIXEL,
206213 sizes[size], *denom, *wx, *ox, i, j, sizes[size]);
207− if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL))
208− fail();
214+ checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL,
215+ dst1, sizes[size] * SIZEOF_PIXEL,
216+ size[sizes], size[sizes], "dst");
209217 bench_new(dst1, sizes[size] * SIZEOF_PIXEL,
210218 src1, sizes[size] * SIZEOF_PIXEL,
211219 sizes[size], *denom, *wx, *ox, i, j, sizes[size]);
@@ -258,8 +266,9 @@ static void checkasm_check_hevc_qpel_bi(void) · 46 unmodified lines
258266 call_new(dst1, sizes[size] * SIZEOF_PIXEL,
259267 src1, sizes[size] * SIZEOF_PIXEL,
260268 ref1, sizes[size], i, j, sizes[size]);
261− if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL))
262− fail();
269+ checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL,
270+ dst1, sizes[size] * SIZEOF_PIXEL,
271+ size[sizes], size[sizes], "dst");
263272 bench_new(dst1, sizes[size] * SIZEOF_PIXEL,
264273 src1, sizes[size] * SIZEOF_PIXEL,
265274 ref1, sizes[size], i, j, sizes[size]);
@@ -314,8 +323,9 @@ static void checkasm_check_hevc_qpel_bi_w(void) · 48 unmodified lines
314323 call_new(dst1, sizes[size] * SIZEOF_PIXEL,
315324 src1, sizes[size] * SIZEOF_PIXEL,
316325 ref1, sizes[size], *denom, *wx, *wx, *ox, *ox, i, j, sizes[size]);
317− if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL))
318− fail();
326+ checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL,
327+ dst1, sizes[size] * SIZEOF_PIXEL,
328+ size[sizes], size[sizes], "dst");
319329 bench_new(dst1, sizes[size] * SIZEOF_PIXEL,
320330 src1, sizes[size] * SIZEOF_PIXEL,
321331 ref1, sizes[size], *denom, *wx, *wx, *ox, *ox, i, j, sizes[size]);
@@ -341,7 +351,7 @@ static void checkasm_check_hevc_epel(void) · 19 unmodified lines
341351 LOCAL_ALIGNED_32(uint8_t, dst1, [BUF_SIZE]);
342352
343353 HEVCDSPContext h;
344− int size, bit_depth, i, j, row;
354+ int size, bit_depth, i, j;
345355 declare_func(void, int16_t *dst, uint8_t *src, ptrdiff_t srcstride,
346356 int height, intptr_t mx, intptr_t my, int width);
347357
@@ -365,12 +375,9 @@ static void checkasm_check_hevc_epel(void) · 17 unmodified lines
365375 randomize_buffers();
366376 call_ref(dstw0, src0, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]);
367377 call_new(dstw1, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]);
368− for (row = 0; row < size[sizes]; row++) {
369− if (memcmp(dstw0 + row * MAX_PB_SIZE,
370− dstw1 + row * MAX_PB_SIZE,
371− sizes[size] * sizeof(int16_t)))
372− fail();
373− }
378+ checkasm_check(int16_t, dstw0, MAX_PB_SIZE * sizeof(int16_t),
379+ dstw1, MAX_PB_SIZE * sizeof(int16_t),
380+ size[sizes], size[sizes], "dst");
374381 bench_new(dstw1, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]);
375382 }
376383 }
@@ -415,8 +422,9 @@ static void checkasm_check_hevc_epel_uni(void) · 38 unmodified lines
415422 call_new(dst1, sizes[size] * SIZEOF_PIXEL,
416423 src1, sizes[size] * SIZEOF_PIXEL,
417424 sizes[size], i, j, sizes[size]);
418− if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL))
419− fail();
425+ checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL,
426+ dst1, sizes[size] * SIZEOF_PIXEL,
427+ size[sizes], size[sizes], "dst");
420428 bench_new(dst1, sizes[size] * SIZEOF_PIXEL,
421429 src1, sizes[size] * SIZEOF_PIXEL,
422430 sizes[size], i, j, sizes[size]);
@@ -467,8 +475,9 @@ static void checkasm_check_hevc_epel_uni_w(void) · 44 unmodified lines
467475 call_new(dst1, sizes[size] * SIZEOF_PIXEL,
468476 src1, sizes[size] * SIZEOF_PIXEL,
469477 sizes[size], *denom, *wx, *ox, i, j, sizes[size]);
470− if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL))
471− fail();
478+ checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL,
479+ dst1, sizes[size] * SIZEOF_PIXEL,
480+ size[sizes], size[sizes], "dst");
472481 bench_new(dst1, sizes[size] * SIZEOF_PIXEL,
473482 src1, sizes[size] * SIZEOF_PIXEL,
474483 sizes[size], *denom, *wx, *ox, i, j, sizes[size]);
@@ -521,8 +530,9 @@ static void checkasm_check_hevc_epel_bi(void) · 46 unmodified lines
521530 call_new(dst1, sizes[size] * SIZEOF_PIXEL,
522531 src1, sizes[size] * SIZEOF_PIXEL,
523532 ref1, sizes[size], i, j, sizes[size]);
524− if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL))
525− fail();
533+ checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL,
534+ dst1, sizes[size] * SIZEOF_PIXEL,
535+ size[sizes], size[sizes], "dst");
526536 bench_new(dst1, sizes[size] * SIZEOF_PIXEL,
527537 src1, sizes[size] * SIZEOF_PIXEL,
528538 ref1, sizes[size], i, j, sizes[size]);
@@ -577,8 +587,9 @@ static void checkasm_check_hevc_epel_bi_w(void) · 48 unmodified lines
577587 call_new(dst1, sizes[size] * SIZEOF_PIXEL,
578588 src1, sizes[size] * SIZEOF_PIXEL,
579589 ref1, sizes[size], *denom, *wx, *wx, *ox, *ox, i, j, sizes[size]);
580− if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL))
581− fail();
590+ checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL,
591+ dst1, sizes[size] * SIZEOF_PIXEL,
592+ size[sizes], size[sizes], "dst");
582593 bench_new(dst1, sizes[size] * SIZEOF_PIXEL,
583594 src1, sizes[size] * SIZEOF_PIXEL,
584595 ref1, sizes[size], *denom, *wx, *wx, *ox, *ox, i, j, sizes[size]);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t