From patchwork Tue Mar 12 13:12:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 46996 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp1854378pzb; Tue, 12 Mar 2024 06:13:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVGSBuMzYugpjBKf9hhMDcIUa4LdHz/tiIqQQ5lroICLWioPRbe7AIGtCD9o9oZuot/+ZcIfDN2oLIDDbFvuqM1PebtSxbNQJp/lw== X-Google-Smtp-Source: AGHT+IEE7YsP0g168FYtXdlpun9LMk2VfB3aiuhCwzR4i3GGu5k6Wosvq3dsLEu+pirU7M+V5mN4 X-Received: by 2002:a17:906:5909:b0:a44:16dc:14e7 with SMTP id h9-20020a170906590900b00a4416dc14e7mr5691035ejq.11.1710249191755; Tue, 12 Mar 2024 06:13:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710249191; cv=none; d=google.com; s=arc-20160816; b=igKFlwj1eJ0ufM8RTDI/b5gUYkIn1CCFu8Cht1RbEQEgJXjhWjPz0Z6ETx+PqNRBDy 4KxYOz5llo108ruDZDui9kxWUv8wGkPYiKaj7NMyf9hU33h67JTMa2S1ViiGPmqn/yul Tuu/0iDWKGo2iW3dIy7ZtCh/I5u6O3Zn797nphvyF91m3paUcDYbrfUGZnwE9kbyZr0K xVKft7Ia8QUy9AOwM+sRXGADlP/D/tGCAx2Wr/f1aHpZv/HJp8DFHYqCDENb4YT5Keqs mMuUWKM/QApFiEZkvQWyZ5CKFCikCTXiR/tsTAaSZ4o6fFP8TVywIwqA+K2CuzIBkoEF EpdQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=ZrK7jIDK+iE/l/S+XQVqPbxYsBj/sM8hMHWAjmXR2uw=; fh=DRs4GoYGH1Ee5ERfKSLc+LBtFKtorfi5XrD3r13LPeM=; b=ZeFZy4K5WQxBbyjoCDK6NiWpSuYwpt93UWCBSHlvHryoGE9Reg/gbsowjxgIJo8zjE VNSZiemtASbBcr4qGKdAUJvlGx2JJgs//JM1IWYp45rUIaYhg40j5bRDCB2ElTGUG+dY pclRUPLQW6tTRa/mcQ2VqCYti1qVVrWWC4TiG7w+i1eVyvMpFOmOysWme1nblZYLRsVa jm2+XvU0A6/09vmCuM/Xvpvi4mDMSBa2r1jSiTYGib7rHIWtGqHzWeWYx+YJXEPVJ9MB vRGjwWp9xGW2M5Mw/LkEbBJ0jlBr/x5mRznmUebCsYHstZnRujtKx4LV+IqLspcceygv rWWA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20230601.gappssmtp.com header.s=20230601 header.b=3TJkQXDM; 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 gu9-20020a170906f28900b00a46169feba6si2489452ejb.308.2024.03.12.06.13.11; Tue, 12 Mar 2024 06:13:11 -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.20230601.gappssmtp.com header.s=20230601 header.b=3TJkQXDM; 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 94CC968D093; Tue, 12 Mar 2024 15:12:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f44.google.com (mail-lf1-f44.google.com [209.85.167.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64FF068D09E for ; Tue, 12 Mar 2024 15:12:33 +0200 (EET) Received: by mail-lf1-f44.google.com with SMTP id 2adb3069b0e04-512b3b04995so4406316e87.3 for ; Tue, 12 Mar 2024 06:12:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1710249152; x=1710853952; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q7nJ3FUODhmtJRv7TUhkiVwwcnawq4djRBndDgFW47c=; b=3TJkQXDMv8EOCb54UuA3qc4gWXVXYcRiXdD6gzyo9BUGof6VCzF32GaGGvpHdguLT+ soEgL6ehlT44ut560UyuXfdNnQsODLZZ66DA06VJ1bZ81NkZLa+BJwZyUfWyFIyTHTQc PYY/9uhnM9K4RwNRkVYqiclUs1Ze/2TpFAyPfgBBeoipz/leQfh0GYvDclHVvuvagNTX FVaInSRX9IOcKR+zwLq47jCwgzFXp6+Ful99C3y0XkWGN8n3JTsSqc1q8HQm4yi7Bujq RbzekzH6G173ssqca0lqYKR6UYvcsvpQpRCPLkOAv4FcfHuAmr1iZALrFI3dMCglTyop zAiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710249152; x=1710853952; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q7nJ3FUODhmtJRv7TUhkiVwwcnawq4djRBndDgFW47c=; b=q51SLedVID7YUDvLhUoP9QCJTA3kiMGL8kAq4D/ox8kjIjBO70PBzgwZNrM5duehcl Y+5RLCMtZhtRTJkAPf9hfahC90XqWfsUSMR1azxwxDn5APEAzRCqI+XT8Tci81CtbSHU 4OpdoWFqMBrj717j5NjswInbT0ya4W8n7P5hlV7j6sf5C7hAi+TTnaxKFtb+34psMhaq sY1Ue1FT6GwUzX3lkSB66QSOLL7JTxelaX6BputBNoaqiBUEMfvRU0dgd1MfJ32FL5NZ 73UkfRb8ELSnyyJOefwyJPaJNDA2Uj67WarWr4GpOe/DRSLJoPvyy27KWvAf42ICxV0v mHfg== X-Gm-Message-State: AOJu0Yy1wkUp60kd3Kz4MqZ21/aIS4rb9vUJiV6EYG4dHSVyWfE+eiJA 3wDUk7BINIDEU2BaQi0tIcyUYojIYOi2eDX5Ogrkx+z3uZXu1i3qci2Vw/aSr7qPRlzoTa9qOKj ObZtB X-Received: by 2002:ac2:4a6c:0:b0:513:bd01:381f with SMTP id q12-20020ac24a6c000000b00513bd01381fmr1008894lfp.31.1710249152723; Tue, 12 Mar 2024 06:12:32 -0700 (PDT) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id k10-20020a192d0a000000b00512f732399esm1600175lfj.53.2024.03.12.06.12.32 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 12 Mar 2024 06:12:32 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Mar 2024 15:12:29 +0200 Message-Id: <20240312131229.1551-4-martin@martin.st> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20240312131229.1551-1-martin@martin.st> References: <20240312131229.1551-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] checkasm: hevc_pel: Use checkasm_check for printing failing output 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: Logan Lyu , "J . Dekker" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: J+FTB8L2JYCU 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. --- tests/checkasm/hevc_pel.c | 71 ++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/tests/checkasm/hevc_pel.c b/tests/checkasm/hevc_pel.c index 73a4619978..ed22ec4f9d 100644 --- a/tests/checkasm/hevc_pel.c +++ b/tests/checkasm/hevc_pel.c @@ -36,6 +36,15 @@ static const int offsets[] = {0, 255, -1 }; #define SIZEOF_PIXEL ((bit_depth + 7) / 8) #define BUF_SIZE (2 * MAX_PB_SIZE * (2 * 4 + MAX_PB_SIZE)) +#define checkasm_check_pixel(buf1, stride1, buf2, stride2, ...) \ + ((bit_depth > 8) ? \ + checkasm_check(uint16_t, (const uint16_t*)buf1, stride1, \ + (const uint16_t*)buf2, stride2, \ + __VA_ARGS__) : \ + checkasm_check(uint8_t, (const uint8_t*) buf1, stride1, \ + (const uint8_t*) buf2, stride2, \ + __VA_ARGS__)) + #define randomize_buffers() \ do { \ uint32_t mask = pixel_mask[bit_depth - 8]; \ @@ -78,7 +87,7 @@ static void checkasm_check_hevc_qpel(void) LOCAL_ALIGNED_32(uint8_t, dst1, [BUF_SIZE]); HEVCDSPContext h; - int size, bit_depth, i, j, row; + int size, bit_depth, i, j; declare_func(void, int16_t *dst, uint8_t *src, ptrdiff_t srcstride, int height, intptr_t mx, intptr_t my, int width); @@ -102,12 +111,9 @@ static void checkasm_check_hevc_qpel(void) randomize_buffers(); call_ref(dstw0, src0, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); call_new(dstw1, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); - for (row = 0; row < size[sizes]; row++) { - if (memcmp(dstw0 + row * MAX_PB_SIZE, - dstw1 + row * MAX_PB_SIZE, - sizes[size] * sizeof(int16_t))) - fail(); - } + checkasm_check(int16_t, dstw0, MAX_PB_SIZE * sizeof(int16_t), + dstw1, MAX_PB_SIZE * sizeof(int16_t), + size[sizes], size[sizes], "dst"); bench_new(dstw1, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); } } @@ -152,8 +158,9 @@ static void checkasm_check_hevc_qpel_uni(void) call_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); - if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL)) - fail(); + checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL, + dst1, sizes[size] * SIZEOF_PIXEL, + size[sizes], size[sizes], "dst"); bench_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); @@ -204,8 +211,9 @@ static void checkasm_check_hevc_qpel_uni_w(void) call_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], *denom, *wx, *ox, i, j, sizes[size]); - if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL)) - fail(); + checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL, + dst1, sizes[size] * SIZEOF_PIXEL, + size[sizes], size[sizes], "dst"); bench_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], *denom, *wx, *ox, i, j, sizes[size]); @@ -258,8 +266,9 @@ static void checkasm_check_hevc_qpel_bi(void) call_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, ref1, sizes[size], i, j, sizes[size]); - if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL)) - fail(); + checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL, + dst1, sizes[size] * SIZEOF_PIXEL, + size[sizes], size[sizes], "dst"); bench_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, ref1, sizes[size], i, j, sizes[size]); @@ -314,8 +323,9 @@ static void checkasm_check_hevc_qpel_bi_w(void) call_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, ref1, sizes[size], *denom, *wx, *wx, *ox, *ox, i, j, sizes[size]); - if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL)) - fail(); + checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL, + dst1, sizes[size] * SIZEOF_PIXEL, + size[sizes], size[sizes], "dst"); bench_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, ref1, sizes[size], *denom, *wx, *wx, *ox, *ox, i, j, sizes[size]); @@ -341,7 +351,7 @@ static void checkasm_check_hevc_epel(void) LOCAL_ALIGNED_32(uint8_t, dst1, [BUF_SIZE]); HEVCDSPContext h; - int size, bit_depth, i, j, row; + int size, bit_depth, i, j; declare_func(void, int16_t *dst, uint8_t *src, ptrdiff_t srcstride, int height, intptr_t mx, intptr_t my, int width); @@ -365,12 +375,9 @@ static void checkasm_check_hevc_epel(void) randomize_buffers(); call_ref(dstw0, src0, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); call_new(dstw1, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); - for (row = 0; row < size[sizes]; row++) { - if (memcmp(dstw0 + row * MAX_PB_SIZE, - dstw1 + row * MAX_PB_SIZE, - sizes[size] * sizeof(int16_t))) - fail(); - } + checkasm_check(int16_t, dstw0, MAX_PB_SIZE * sizeof(int16_t), + dstw1, MAX_PB_SIZE * sizeof(int16_t), + size[sizes], size[sizes], "dst"); bench_new(dstw1, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); } } @@ -415,8 +422,9 @@ static void checkasm_check_hevc_epel_uni(void) call_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); - if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL)) - fail(); + checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL, + dst1, sizes[size] * SIZEOF_PIXEL, + size[sizes], size[sizes], "dst"); bench_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], i, j, sizes[size]); @@ -467,8 +475,9 @@ static void checkasm_check_hevc_epel_uni_w(void) call_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], *denom, *wx, *ox, i, j, sizes[size]); - if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL)) - fail(); + checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL, + dst1, sizes[size] * SIZEOF_PIXEL, + size[sizes], size[sizes], "dst"); bench_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, sizes[size], *denom, *wx, *ox, i, j, sizes[size]); @@ -521,8 +530,9 @@ static void checkasm_check_hevc_epel_bi(void) call_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, ref1, sizes[size], i, j, sizes[size]); - if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL)) - fail(); + checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL, + dst1, sizes[size] * SIZEOF_PIXEL, + size[sizes], size[sizes], "dst"); bench_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, ref1, sizes[size], i, j, sizes[size]); @@ -577,8 +587,9 @@ static void checkasm_check_hevc_epel_bi_w(void) call_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, ref1, sizes[size], *denom, *wx, *wx, *ox, *ox, i, j, sizes[size]); - if (memcmp(dst0, dst1, sizes[size] * sizes[size] * SIZEOF_PIXEL)) - fail(); + checkasm_check_pixel(dst0, sizes[size] * SIZEOF_PIXEL, + dst1, sizes[size] * SIZEOF_PIXEL, + size[sizes], size[sizes], "dst"); bench_new(dst1, sizes[size] * SIZEOF_PIXEL, src1, sizes[size] * SIZEOF_PIXEL, ref1, sizes[size], *denom, *wx, *wx, *ox, *ox, i, j, sizes[size]);