[FFmpeg-cvslog] checkasm/hevc_add_res: prepare test data only if the fuction is not tested

Linjie Fu git at videolan.org
Fri Mar 27 14:42:12 EET 2020


ffmpeg | branch: master | Linjie Fu <linjie.fu at intel.com> | Mon Mar  9 22:54:59 2020 +0800| [69b9548dd63dfbe97a19ca9b93488cebe80f6ef9] | committer: Anton Khirnov

checkasm/hevc_add_res: prepare test data only if the fuction is not tested

check_func will return NULL for functions that have already been tested. If
the func is tested and skipped (which happens several times), there is no
need to prepare data(randomize_buffers and memcpy).

Move relative code in compare_add_res(), prepare data and do check only if
the function is not tested.

Signed-off-by: Linjie Fu <linjie.fu at intel.com>
Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69b9548dd63dfbe97a19ca9b93488cebe80f6ef9
---

 tests/checkasm/hevc_add_res.c | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/tests/checkasm/hevc_add_res.c b/tests/checkasm/hevc_add_res.c
index e92c6b427b..a68d5745c8 100644
--- a/tests/checkasm/hevc_add_res.c
+++ b/tests/checkasm/hevc_add_res.c
@@ -42,31 +42,38 @@
             AV_WN16A(buf + j * 2, rnd() & 0x3FF); \
     } while (0)
 
-static void check_add_res(HEVCDSPContext h, int bit_depth)
+static void compare_add_res(int size, ptrdiff_t stride)
 {
-    int i;
     LOCAL_ALIGNED_32(int16_t, res0, [32 * 32]);
     LOCAL_ALIGNED_32(int16_t, res1, [32 * 32]);
     LOCAL_ALIGNED_32(uint8_t, dst0, [32 * 32 * 2]);
     LOCAL_ALIGNED_32(uint8_t, dst1, [32 * 32 * 2]);
 
+    declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, int16_t *res, ptrdiff_t stride);
+
+    randomize_buffers(res0, size);
+    randomize_buffers2(dst0, size);
+    memcpy(res1, res0, sizeof(*res0) * size);
+    memcpy(dst1, dst0, sizeof(int16_t) * size);
+
+    call_ref(dst0, res0, stride);
+    call_new(dst1, res1, stride);
+    if (memcmp(dst0, dst1, size))
+        fail();
+    bench_new(dst1, res1, stride);
+}
+
+static void check_add_res(HEVCDSPContext h, int bit_depth)
+{
+    int i;
+
     for (i = 2; i <= 5; i++) {
         int block_size = 1 << i;
         int size = block_size * block_size;
         ptrdiff_t stride = block_size << (bit_depth > 8);
-        declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, int16_t *res, ptrdiff_t stride);
-
-        randomize_buffers(res0, size);
-        randomize_buffers2(dst0, size);
-        memcpy(res1, res0, sizeof(*res0) * size);
-        memcpy(dst1, dst0, sizeof(int16_t) * size);
 
         if (check_func(h.add_residual[i - 2], "hevc_add_res_%dx%d_%d", block_size, block_size, bit_depth)) {
-            call_ref(dst0, res0, stride);
-            call_new(dst1, res1, stride);
-            if (memcmp(dst0, dst1, size))
-                fail();
-            bench_new(dst1, res1, stride);
+            compare_add_res(size, stride);
         }
     }
 }



More information about the ffmpeg-cvslog mailing list