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.
Unified · Split
| @@ -36,6 +36,15 @@ static const int offsets[] = {0, 255, -1 }; · 35 unmodified lines | ||
| 36 | 36 | #define SIZEOF_PIXEL ((bit_depth + 7) / 8) |
| 37 | 37 | #define BUF_SIZE (2 * MAX_PB_SIZE * (2 * 4 + MAX_PB_SIZE)) |
| 38 | 38 | |
| 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 | + | |
| 39 | 48 | #define randomize_buffers() \ |
| 40 | 49 | do { \ |
| 41 | 50 | uint32_t mask = pixel_mask[bit_depth - 8]; \ |
| @@ -78,7 +87,7 @@ static void checkasm_check_hevc_qpel(void) · 36 unmodified lines | ||
| 78 | 87 | LOCAL_ALIGNED_32(uint8_t, dst1, [BUF_SIZE]); |
| 79 | 88 | |
| 80 | 89 | HEVCDSPContext h; |
| 81 | − int size, bit_depth, i, j, row; | |
| 90 | + int size, bit_depth, i, j; | |
| 82 | 91 | declare_func(void, int16_t *dst, uint8_t *src, ptrdiff_t srcstride, |
| 83 | 92 | int height, intptr_t mx, intptr_t my, int width); |
| 84 | 93 | |
| @@ -102,12 +111,9 @@ static void checkasm_check_hevc_qpel(void) · 17 unmodified lines | ||
| 102 | 111 | randomize_buffers(); |
| 103 | 112 | call_ref(dstw0, src0, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); |
| 104 | 113 | 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"); | |
| 111 | 117 | bench_new(dstw1, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); |
| 112 | 118 | } |
| 113 | 119 | } |
| @@ -152,8 +158,9 @@ static void checkasm_check_hevc_qpel_uni(void) · 38 unmodified lines | ||
| 152 | 158 | call_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 153 | 159 | src1, sizes[size] * SIZEOF_PIXEL, |
| 154 | 160 | 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"); | |
| 157 | 164 | bench_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 158 | 165 | src1, sizes[size] * SIZEOF_PIXEL, |
| 159 | 166 | sizes[size], i, j, sizes[size]); |
| @@ -204,8 +211,9 @@ static void checkasm_check_hevc_qpel_uni_w(void) · 44 unmodified lines | ||
| 204 | 211 | call_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 205 | 212 | src1, sizes[size] * SIZEOF_PIXEL, |
| 206 | 213 | 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"); | |
| 209 | 217 | bench_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 210 | 218 | src1, sizes[size] * SIZEOF_PIXEL, |
| 211 | 219 | sizes[size], *denom, *wx, *ox, i, j, sizes[size]); |
| @@ -258,8 +266,9 @@ static void checkasm_check_hevc_qpel_bi(void) · 46 unmodified lines | ||
| 258 | 266 | call_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 259 | 267 | src1, sizes[size] * SIZEOF_PIXEL, |
| 260 | 268 | 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"); | |
| 263 | 272 | bench_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 264 | 273 | src1, sizes[size] * SIZEOF_PIXEL, |
| 265 | 274 | ref1, sizes[size], i, j, sizes[size]); |
| @@ -314,8 +323,9 @@ static void checkasm_check_hevc_qpel_bi_w(void) · 48 unmodified lines | ||
| 314 | 323 | call_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 315 | 324 | src1, sizes[size] * SIZEOF_PIXEL, |
| 316 | 325 | 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"); | |
| 319 | 329 | bench_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 320 | 330 | src1, sizes[size] * SIZEOF_PIXEL, |
| 321 | 331 | 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 | ||
| 341 | 351 | LOCAL_ALIGNED_32(uint8_t, dst1, [BUF_SIZE]); |
| 342 | 352 | |
| 343 | 353 | HEVCDSPContext h; |
| 344 | − int size, bit_depth, i, j, row; | |
| 354 | + int size, bit_depth, i, j; | |
| 345 | 355 | declare_func(void, int16_t *dst, uint8_t *src, ptrdiff_t srcstride, |
| 346 | 356 | int height, intptr_t mx, intptr_t my, int width); |
| 347 | 357 | |
| @@ -365,12 +375,9 @@ static void checkasm_check_hevc_epel(void) · 17 unmodified lines | ||
| 365 | 375 | randomize_buffers(); |
| 366 | 376 | call_ref(dstw0, src0, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); |
| 367 | 377 | 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"); | |
| 374 | 381 | bench_new(dstw1, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); |
| 375 | 382 | } |
| 376 | 383 | } |
| @@ -415,8 +422,9 @@ static void checkasm_check_hevc_epel_uni(void) · 38 unmodified lines | ||
| 415 | 422 | call_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 416 | 423 | src1, sizes[size] * SIZEOF_PIXEL, |
| 417 | 424 | 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"); | |
| 420 | 428 | bench_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 421 | 429 | src1, sizes[size] * SIZEOF_PIXEL, |
| 422 | 430 | sizes[size], i, j, sizes[size]); |
| @@ -467,8 +475,9 @@ static void checkasm_check_hevc_epel_uni_w(void) · 44 unmodified lines | ||
| 467 | 475 | call_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 468 | 476 | src1, sizes[size] * SIZEOF_PIXEL, |
| 469 | 477 | 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"); | |
| 472 | 481 | bench_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 473 | 482 | src1, sizes[size] * SIZEOF_PIXEL, |
| 474 | 483 | sizes[size], *denom, *wx, *ox, i, j, sizes[size]); |
| @@ -521,8 +530,9 @@ static void checkasm_check_hevc_epel_bi(void) · 46 unmodified lines | ||
| 521 | 530 | call_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 522 | 531 | src1, sizes[size] * SIZEOF_PIXEL, |
| 523 | 532 | 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"); | |
| 526 | 536 | bench_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 527 | 537 | src1, sizes[size] * SIZEOF_PIXEL, |
| 528 | 538 | ref1, sizes[size], i, j, sizes[size]); |
| @@ -577,8 +587,9 @@ static void checkasm_check_hevc_epel_bi_w(void) · 48 unmodified lines | ||
| 577 | 587 | call_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 578 | 588 | src1, sizes[size] * SIZEOF_PIXEL, |
| 579 | 589 | 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"); | |
| 582 | 593 | bench_new(dst1, sizes[size] * SIZEOF_PIXEL, |
| 583 | 594 | src1, sizes[size] * SIZEOF_PIXEL, |
| 584 | 595 | ref1, sizes[size], *denom, *wx, *wx, *ox, *ox, i, j, sizes[size]); |