From patchwork Sun Nov 19 03:39:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6188 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp2410093jah; Sat, 18 Nov 2017 19:40:11 -0800 (PST) X-Google-Smtp-Source: AGs4zMZyZ8rOQeLx8ni7M+lEHn0b2yvs+yJA9p7qaGLT6Rll6UufI8k2aJLCD61R72doFRASUocj X-Received: by 10.223.131.129 with SMTP id 1mr7759841wre.205.1511062811793; Sat, 18 Nov 2017 19:40:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511062811; cv=none; d=google.com; s=arc-20160816; b=NvE9FQwTvnvsOVI70nozpnCgMdAQICUHTHxa5l87IZbkPyMUARtHsOlBFMFpqP4g64 ALglxSd9gY1FZrhsmZQ4xCd7dOnSib4FOxnHC6pYmTndjYzryBC3bPA4kBx0e1urMlWu 0GM8Dso67/8F2ELocUizANCQ2yj6uYEZUPh5XfO1Hd74IXkBc8KQKfOuLf6nBeqfPSSr IXS/FL1KsbDvCI3l8i7eK/wvb1Ou/Hyl2ePYCifoyo9Mnku6rlNzbKRUiLe9YxaOi4jP 791X8FZHrCcincMHvW2lf8zSpkckoJVEWrAzWKmo+tNkih/vonsMaUAKhsZYxfu5XxY1 S36A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=Jn1BSq8qRvlbap5Sphu8bBITq8sjgwmY6Ej0ijz4LBI=; b=i4JaEMH1PC1QhtnrTs4fGYIuOEk3k0etCAsBNdEN11jv5mcRNKrMA4ETyy+mpNDRrg Zv4q+eeM+d+ANVPhmcd75PrXlfg6QuOKPcdwavmAvGrqge2k1xzJNJDkbvhdT+8Dyd41 PnXiX/a3GJV+r05VClTcYv5/DYIF2paNTlKNi3e2SZ372bMBjFcr7BmHQptcuXSeOd/l /qlaUJXQ/dQDJ9FLK67Wf9rSI7O8xFMmcoKMveQ2v8n4Crb3Ol3ll6O00X7+V1sp+Px9 9oNn47YJy76M05yolWpHGO6QYQoLACmI3kcLo3QphQsf2fwPc/rSIVWyT6+80TTdX8yB S8FA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rUad0KNe; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x130si5265512wmg.212.2017.11.18.19.40.10; Sat, 18 Nov 2017 19:40:11 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rUad0KNe; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 318BA68A17C; Sun, 19 Nov 2017 05:39:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E487768A141 for ; Sun, 19 Nov 2017 05:39:46 +0200 (EET) Received: by mail-qt0-f193.google.com with SMTP id a19so11282864qtb.3 for ; Sat, 18 Nov 2017 19:40:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=SjY7xRn9QBjwRqYKJhdMJ7pboHwK0kPDD5HDBzhwOiI=; b=rUad0KNeiDkQTmvvCNbUMc5zpXvX7vxNrwSZvVleYYgsMYLeCplH7t5r/tWLs7Bjtq 3mOHv5Rk1CWjMzy1+nSHNhj7PRIihwgI5YlBfPHxzTsBPzD1Ihoocvooh3HwKjAT3Sq/ VNZiiLsxNM8GnUwfPJLZ3o5r5pCxhfhKHoc32y+Mx00WL06SnMtUlRmkENd7w3JhmS0q U9yRkHLqb+xpc64zs3ZIDV5wk0AhBKfjqfYm5msLRoOX0H2BPw14Zz0yOECm0xBzseKN TwG2ezJh8/ybIa5/yrZ+Pj4oRxpicauupcr9Dj0B9pWnF9s/nkqWI2e3AZ0uQKCWI5bL h4bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=SjY7xRn9QBjwRqYKJhdMJ7pboHwK0kPDD5HDBzhwOiI=; b=WfwAys6vU2nr3+8kO4YWp+ksNWTRgUG4oJuNEU3uieyFb9aOQa8MeCLuIWCfjVkS3b YVlyLIVrQTE1WeNltT/LeIjslNiUEzNby6oMSrN7TryNOqsmwJkIoKLaC4E/FcLunrmn i1PBeYaoAYWUTCb/aTp8itEUfDTl6t9lG3VdkhEMz3rTIzI6jdm6oa2oS1lMey6Ywv3v KIpOOovuzLk0j8aIMFJF2bnu5lCZ3enFv0qQ6nTTuhLQjGTtK5jL5+uHKpS/eYSXHy8f 1AzoxAtWMLIqg/8V5Z9aur6IwNvUt8JGDYxK5LE+t/GxTCKozO+THMc1R39XyebG0zRl N2KA== X-Gm-Message-State: AJaThX6rEF1s/mVVcjMBI1Q0veqwU7KK7dHlNlC6As/3Nkv+pZDNWLeg Y5V3Lao9LxlUtpvSp59u1xR0tA== X-Received: by 10.200.0.81 with SMTP id i17mr15255690qtg.308.1511062802423; Sat, 18 Nov 2017 19:40:02 -0800 (PST) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id g47sm5059767qtc.69.2017.11.18.19.40.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Nov 2017 19:40:01 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Nov 2017 00:39:35 -0300 Message-Id: <20171119033937.9660-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH 1/3] checkasm/jpeg2000: refactor rct_int test X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- tests/checkasm/jpeg2000dsp.c | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/tests/checkasm/jpeg2000dsp.c b/tests/checkasm/jpeg2000dsp.c index 48559df085..4251f8982a 100644 --- a/tests/checkasm/jpeg2000dsp.c +++ b/tests/checkasm/jpeg2000dsp.c @@ -29,43 +29,42 @@ #define randomize_buffers() \ do { \ int i; \ - for (i = 0; i < BUF_SIZE; i += 4) { \ - uint32_t r = rnd(); \ - AV_WN32A(ref0 + i, r); \ - AV_WN32A(new0 + i, r); \ - r = rnd(); \ - AV_WN32A(ref1 + i, r); \ - AV_WN32A(new1 + i, r); \ - r = rnd(); \ - AV_WN32A(ref2 + i, r); \ - AV_WN32A(new2 + i, r); \ - } \ + for (i = 0; i < BUF_SIZE*3; i++) \ + src[i] = rnd(); \ } while (0) -static void check_mct(uint8_t *ref0, uint8_t *ref1, uint8_t *ref2, - uint8_t *new0, uint8_t *new1, uint8_t *new2) { +static void check_rct_int(void) +{ + LOCAL_ALIGNED_32(int32_t, src, [BUF_SIZE*3]); + LOCAL_ALIGNED_32(int32_t, ref, [BUF_SIZE*3]); + LOCAL_ALIGNED_32(int32_t, new, [BUF_SIZE*3]); + int32_t *ref0 = &ref[BUF_SIZE*0], *new0 = &new[BUF_SIZE*0]; + int32_t *ref1 = &ref[BUF_SIZE*1], *new1 = &new[BUF_SIZE*1]; + int32_t *ref2 = &ref[BUF_SIZE*2], *new2 = &new[BUF_SIZE*2]; + declare_func(void, void *src0, void *src1, void *src2, int csize); randomize_buffers(); - call_ref(ref0, ref1, ref2, BUF_SIZE / sizeof(int32_t)); - call_new(new0, new1, new2, BUF_SIZE / sizeof(int32_t)); - if (memcmp(ref0, new0, BUF_SIZE) || memcmp(ref1, new1, BUF_SIZE) || - memcmp(ref2, new2, BUF_SIZE)) + memcpy(ref, src, BUF_SIZE * 3 * sizeof(*src)); + memcpy(new, src, BUF_SIZE * 3 * sizeof(*src)); + call_ref(ref0, ref1, ref2, BUF_SIZE); + call_new(new0, new1, new2, BUF_SIZE); + if (memcmp(ref0, new0, BUF_SIZE * sizeof(*src)) || + memcmp(ref1, new1, BUF_SIZE * sizeof(*src)) || + memcmp(ref2, new2, BUF_SIZE * sizeof(*src))) fail(); - bench_new(new0, new1, new2, BUF_SIZE / sizeof(int32_t)); + memcpy(new, src, BUF_SIZE * 3 * sizeof(*src)); + bench_new(new0, new1, new2, BUF_SIZE); } void checkasm_check_jpeg2000dsp(void) { - LOCAL_ALIGNED_32(uint8_t, ref, [BUF_SIZE*3]); - LOCAL_ALIGNED_32(uint8_t, new, [BUF_SIZE*3]); Jpeg2000DSPContext h; ff_jpeg2000dsp_init(&h); if (check_func(h.mct_decode[FF_DWT53], "jpeg2000_rct_int")) - check_mct(&ref[BUF_SIZE*0], &ref[BUF_SIZE*1], &ref[BUF_SIZE*2], - &new[BUF_SIZE*0], &new[BUF_SIZE*1], &new[BUF_SIZE*2]); + check_rct_int(); report("mct_decode"); }