From patchwork Wed Aug 17 20:31:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 37330 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp301895pzh; Wed, 17 Aug 2022 13:32:31 -0700 (PDT) X-Google-Smtp-Source: AA6agR6w8vPjKsQEH3Ll2gN0PPIYlp0zwXPfiZzighTohjR4JZWj9Jyp142AS4Pcw7enQkn3aklI X-Received: by 2002:a17:907:3f98:b0:730:cfce:9c0f with SMTP id hr24-20020a1709073f9800b00730cfce9c0fmr17884157ejc.475.1660768351666; Wed, 17 Aug 2022 13:32:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660768351; cv=none; d=google.com; s=arc-20160816; b=Al7hxIa33gbb2bJ9UcFKjQV/Cy/vIxHRbVRve1T1g1iqsp4620LRWrRZjDyjCaz+xn iSmcpS3tjmnxtzE6afBHCbpbOWYVaHJWVZn/FAh1/XUyMA6W9NHjfOhvH/8Myoy7TTnR cTHPsNEZt5zzd6AXVW9+vJ6NDYs3tjXRsC8qvy0xdcgq0qg796wwmQ5JrOBJYlv6p7rt NH25xdBSFTWV9Ar5ya8oi6sNjLIlfS+sl8zUTB7uWqS+nacEWY0HdnaeQkhDc0EBVOkK 2fLl3ll96nRi3g6b/TpBuX40vKV4Psbowq2xoVh/0OC9YctfSIFGJPVCEr0DVw3c5UJG aerg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=tW3JTWhn+8lIpp0yoURW/457nusLbV4hSMS7a4vEYdw=; b=F2m738DiejfsM6Dp6Bvo6YVwhbyhiEzcLfFlUZBMpeNLZB7jsRNqJsOMwdcZfJL7Ll s9dYnXpdPlClMneZ+T4Z06uI6Ue4r7nz0YQ/vnVK2gIJUg+JLK0rZyOvtKuKch672hMN LOQ/QH6h2CCIZvUm68DhKKA6ASC641VYaGlovuLVQKf+GsawNS5FNipQBqj0a6yzvVho KCCsGu7BFxB9189BEKoEDuBAFgOs7rHOKKsGhWLGXhBehfdwHzL5qu/q9539umHDsLF5 Jp32fS2fpz0KlMOt1gssZlbzbSkG/Q+AkFdPMabLwd36BNK5s7E3sF2bHoNqAbxwPrgo xf1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=iejBwVTx; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e10-20020a170906314a00b0072f6a9d159dsi13183459eje.173.2022.08.17.13.32.11; Wed, 17 Aug 2022 13:32:31 -0700 (PDT) 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=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=iejBwVTx; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0AECD68B900; Wed, 17 Aug 2022 23:31:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 245F768B373 for ; Wed, 17 Aug 2022 23:31:52 +0300 (EEST) Received: by mail-lf1-f46.google.com with SMTP id d14so20410946lfl.13 for ; Wed, 17 Aug 2022 13:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=0JMPAevZJCHsfHZMuOAEQe8yq5SaoZ32xd7JDsfNBJY=; b=iejBwVTxIa4z9rSiQXWWJDCPpILfgsVICsDeqI+bmvnn7MenPKpE+7FSNRfP9vLuwH nmDbJqM6zOjAsJcHCDBLWs2QYjECSDCLZDKCu3cD3TZsI00kpSMZYup+HB82dpqv61Yc Epkk9mbyJJAr7qjxu7r/0fWvHgx/H9UpPpmBzKpw0NCyBzvGCjTgOkDeiiaHXP+ydNu6 Xpojquy3keOhORuI1rk43Yv1JcpiIb1jH9++mjm3ucI5wXvvn8MQgqu+GLGgPciQNQXr jtLDBtxm25m+ISx+QFnEwlAuMLUPLH44fhltre/6aBiKh2k+Z0U5TmtpTW/b8WcYivXY vutw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=0JMPAevZJCHsfHZMuOAEQe8yq5SaoZ32xd7JDsfNBJY=; b=1akY0/JabzdgioyQihYrSR3O5oHwZ7rJEQZB9/N2LkFs+0yA5hTZ/azdNS62+/yi7X FpGegMjFZXcGraSWhVcxHpjGUtrnLkAYKW8qVqqqRUFu8lVHRCDU5z9hSvW22yaodKyf MwY05Hh7pVCRDhMBVrfkTS/MSTK/QWadV2X+wbqPZxXBZ/3nkhu7+TEaqzQ+svHnMDXn lCjE+7FZ2yg03+GII+5SzJ3mVuQUqYYa7VUxNEDvN+1Yhv3Ybkmh8S2f5uNxcHyV8EDx pByCXN15wBMiE+ZBs9GpY/WKAKthdmy/cDeSg5BbYhnOGXdT6CS3MaCyn3+jecedH8Zo 8RBQ== X-Gm-Message-State: ACgBeo3Dy9mm8pcxfPYGqUEKmALugQOZzuuCY92WPeRNU1f+bNrQX+GC NyAluzVoZsT2YJ+/AzVwAZsZOksHLfJOqM48 X-Received: by 2002:ac2:4a88:0:b0:48b:95cd:a2dc with SMTP id l8-20020ac24a88000000b0048b95cda2dcmr8732118lfp.203.1660768311994; Wed, 17 Aug 2022 13:31:51 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id h6-20020a2ea486000000b0025e57b40009sm2378363lji.89.2022.08.17.13.31.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 13:31:51 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Aug 2022 23:31:46 +0300 Message-Id: <20220817203147.1957322-1-martin@martin.st> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] checkasm: sw_scale: Fix the difference printing for approximate functions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: =?utf-8?q?Martin_Storsj=C3=B6?= , Alan Kelly Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M/3MUP6SKYG2 Don't stop directly at the first differing pixel, but find the one that differs by more than the expected accuracy. Also print the failing value in check_yuv2yuvX. Signed-off-by: Martin Storsjö --- tests/checkasm/sw_scale.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/checkasm/sw_scale.c b/tests/checkasm/sw_scale.c index cbe4460a99..d72506ed86 100644 --- a/tests/checkasm/sw_scale.c +++ b/tests/checkasm/sw_scale.c @@ -77,10 +77,10 @@ static void print_data(uint8_t *p, size_t len, size_t offset) } } -static size_t show_differences(uint8_t *a, uint8_t *b, size_t len) +static size_t show_differences(uint8_t *a, uint8_t *b, size_t len, int accuracy) { for (size_t i = 0; i < len; i++) { - if (a[i] != b[i]) { + if (abs(a[i] - b[i]) > accuracy) { size_t offset_of_mismatch = i; size_t offset; if (i >= 8) i-=8; @@ -141,7 +141,7 @@ static void check_yuv2yuv1(int accurate) if (cmp_off_by_n(dst0, dst1, dstW * sizeof(dst0[0]), accurate ? 0 : 2)) { fail(); printf("failed: yuv2yuv1_%d_%di_%s\n", offset, dstW, accurate_str); - fail_offset = show_differences(dst0, dst1, LARGEST_INPUT_SIZE * sizeof(dst0[0])); + fail_offset = show_differences(dst0, dst1, LARGEST_INPUT_SIZE * sizeof(dst0[0]), accurate ? 0 : 2); printf("failing values: src: 0x%04x dither: 0x%02x dst-c: %02x dst-asm: %02x\n", (int) src_pixels[fail_offset], (int) dither[(fail_offset + fail_offset) & 7], @@ -169,6 +169,7 @@ static void check_yuv2yuvX(int accurate) static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; const int INPUT_SIZES = sizeof(input_sizes)/sizeof(input_sizes[0]); const char *accurate_str = (accurate) ? "accurate" : "approximate"; + size_t fail_offset; declare_func_emms(AV_CPU_FLAG_MMX, void, const int16_t *filter, int filterSize, const int16_t **src, uint8_t *dest, @@ -224,7 +225,12 @@ static void check_yuv2yuvX(int accurate) if (cmp_off_by_n(dst0, dst1, LARGEST_INPUT_SIZE * sizeof(dst0[0]), accurate ? 0 : 2)) { fail(); printf("failed: yuv2yuvX_%d_%d_%d_%s\n", filter_sizes[fsi], osi, dstW, accurate_str); - show_differences(dst0, dst1, LARGEST_INPUT_SIZE * sizeof(dst0[0])); + fail_offset = show_differences(dst0, dst1, LARGEST_INPUT_SIZE * sizeof(dst0[0]), accurate ? 0 : 2); + printf("failing values: src: 0x%04x dither: 0x%02x dst-c: %02x dst-asm: %02x\n", + (int) src_pixels[fail_offset], + (int) dither[(fail_offset + osi) & 7], + (int) dst0[fail_offset], + (int) dst1[fail_offset]); } if(dstW == LARGEST_INPUT_SIZE) bench_new((const int16_t*)vFilterData, filter_sizes[fsi], src, dst1, dstW - osi, dither, osi);