From patchwork Tue Dec 5 11:41:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 44916 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9153:b0:181:818d:5e7f with SMTP id x19csp265063pzc; Tue, 5 Dec 2023 03:42:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IHOeG6I5+5PAoYSkr7BEgeFRkoO8hIKAFgoJRUFgHvrdp9JGwRTu/XXJ7vf5UGJ8WFlJGa+ X-Received: by 2002:a50:c251:0:b0:54c:c733:2949 with SMTP id t17-20020a50c251000000b0054cc7332949mr1666932edf.47.1701776550564; Tue, 05 Dec 2023 03:42:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701776550; cv=none; d=google.com; s=arc-20160816; b=Kr81mXHLCmrtg1qZuP+Lj9zH0ZU8oGtGypVJfUnSpq4n1u1viluBjIwCoYxEshZTiC yqPm29vOV1uNRP+DcK3UHIciyoSVKYCvxjSV3n+e48y6CVZTIUZQPJ6GXtkgDHLrI0RE iR6ZgvQLAKwmcb+2x7JEASjKPxdWVot3E2qe4OUZeECMfGTR460Dib8JEYXHrrqPAIGG MTPitG0WlyLzn/y/9KK+ts78zzXmObCGEpIUIe00L4nvkX0BjZx/fIP6VF3wOruNAWUU U4pP1kSoJtaiW7zZCbObZNjP44JYFuXRFlt3mxnhyXriFi69imZdrZWJrYyIYWKcvWFJ J6Cg== 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 :feedback-id:dkim-signature:dkim-signature:delivered-to; bh=LtDMTvWesgSjSOYGRFltnZInME0Uz8cQX0aREoUWJ80=; fh=GfBBmqbl6ZM9ubcqhHlDWzIYlsrWIdawVKnFRUGLWxA=; b=HcULlVHoF4BvBFeTu7Imc+mVuCx8/B0/BBOSn6Jbh/6cWh6IfCEb2oWXIyJECi5IkQ 3WVljsPQETF4YT1eKp1r+oyeZoIR+MHCcz8SUz3yZkOm+HHjFt5qmDRLnpWK3dCAezR9 FGPHBwO8smT9V/maEArRRLmu0gzPWsFpaaBCHk72GnwAUMktC6IETrMu/FHTIoT/wsr0 qHsuMFoDLBSNXg6Afsic+zVvWtY1BNvAuC+GN1ZRpZ1tEkKBPxS2CzftlN2xU/MKEMXp oLrYGNeBbi6cTEDMRpzvPG+QCXGTu0660q2UQN3Q7B6s+WZeWwpAFQTlJuDp1f1CEO1U 0z0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm2 header.b=IlVlxLFE; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=wRFusQnv; 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 v29-20020a50d09d000000b0054c6a3c08b7si808610edd.79.2023.12.05.03.42.29; Tue, 05 Dec 2023 03:42:30 -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=@itanimul.li header.s=fm2 header.b=IlVlxLFE; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm1 header.b=wRFusQnv; 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 137F468C867; Tue, 5 Dec 2023 13:42:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02A0168BDB6 for ; Tue, 5 Dec 2023 13:42:19 +0200 (EET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id AAE835C0099; Tue, 5 Dec 2023 06:42:18 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Tue, 05 Dec 2023 06:42:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm2; t=1701776538; x=1701862938; bh=VByahtKMan vxOVX52nxs5YDDebHc7HHj+z9UTlywiWk=; b=IlVlxLFE9IN0BgclWPU8qfm/Lf EbKJqJY1uUiGa35SZOIc1sxucFNWVqCDj5TLaEfjN8SPOjlD2L/0oWKTtn6gy3wf SSXXSucMmDT1GMhFU0kIDR1JIamp1Vs6Tj7iGzZqxwMk4iLafWtV7sInoMbzFXiQ i4q1aan/KAdEsQ/ZvA78eZ9BRE0dRdMOrKfCPd0c1pV2lScuAc3CIH+4fd9d4fer t3dZ0GsRrBCsQeQ5k2qe3DcCukXyYWCXB+9EThvZfjGcS1HdSEMBbUbefrYEbDJb 9DPCbJrDdCRJrV5JREv6tojBlxzE0yH40XqZYpRlTBC89qrK4rp02S5QqAKw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1701776538; x=1701862938; bh=VByahtKManvxO VX52nxs5YDDebHc7HHj+z9UTlywiWk=; b=wRFusQnvrb4x+QHlfXt/MmwJF8Xct NnN+M22wo72dCHC4FwrhxDfuKjlcoft+MoXQEjKmDnBp+fZxUvdb1LUnzk20NYzz UUrpw5EJx/aVlYKxfKS8RAPn4a/8bmpka2h9l0GVofimeJIqo7ZRwHhixExf1JSv JV02eBxVcR2GMlvbud94CCVQJGzGXK0EdVMrbK1kKrUHnn9Tebr385nCdcxDBP3C FiScrbvnhFZYFMZEkDa+hZuCi9okDe775uCplqANfI45T4rsbV8MTf3YHhvjWVcG AVQ6zlmMztAsfyjkb4B7Oc4OPdZoJTglbUyU86x2GghFtg0b1KVj44u5g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudejkedgfedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhu lhdrlhhiqeenucggtffrrghtthgvrhhnpeejtefhhfefhfehveefleejleffkeekkeeuvd duffekudejgfdtffehleelhfdvueenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehjuggvkhesihhtrghnihhmuhhlrdhlih X-ME-Proxy: Feedback-ID: i84994747:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 5 Dec 2023 06:42:17 -0500 (EST) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Dec 2023 12:41:46 +0100 Message-Id: <20231205114146.7936-1-jdek@itanimul.li> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] checkasm/hevc_deblock: add luma test 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: martin@martin.st Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eKatD9nOULtU Signed-off-by: J. Dekker --- tests/checkasm/hevc_deblock.c | 110 ++++++++++++++++++++++++++++++++-- 1 file changed, 106 insertions(+), 4 deletions(-) Yes, this only supports 8bit. 10/12bit should be trivial, will add if this looks reasonable (I checked code paths using gdb, and as far as I can tell it does test all three). Tested on known good x86 asm. diff --git a/tests/checkasm/hevc_deblock.c b/tests/checkasm/hevc_deblock.c index 66fc8d5646..3f970a470a 100644 --- a/tests/checkasm/hevc_deblock.c +++ b/tests/checkasm/hevc_deblock.c @@ -29,8 +29,8 @@ static const uint32_t pixel_mask[3] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff }; #define SIZEOF_PIXEL ((bit_depth + 7) / 8) -#define BUF_STRIDE (8 * 2) -#define BUF_LINES (8) +#define BUF_STRIDE (16 * 2) +#define BUF_LINES (16) #define BUF_OFFSET (BUF_STRIDE * BUF_LINES) #define BUF_SIZE (BUF_STRIDE * BUF_LINES + BUF_OFFSET * 2) @@ -88,14 +88,116 @@ static void check_deblock_chroma(HEVCDSPContext *h, int bit_depth) } } +// line zero +#define P3 buf[-4 * xstride] +#define P2 buf[-3 * xstride] +#define P1 buf[-2 * xstride] +#define P0 buf[-1 * xstride] +#define Q0 buf[0 * xstride] +#define Q1 buf[1 * xstride] +#define Q2 buf[2 * xstride] +#define Q3 buf[3 * xstride] + +// line three. used only for deblocking decision +#define TP3 buf[-4 * xstride + 3 * ystride] +#define TP2 buf[-3 * xstride + 3 * ystride] +#define TP1 buf[-2 * xstride + 3 * ystride] +#define TP0 buf[-1 * xstride + 3 * ystride] +#define TQ0 buf[0 * xstride + 3 * ystride] +#define TQ1 buf[1 * xstride + 3 * ystride] +#define TQ2 buf[2 * xstride + 3 * ystride] +#define TQ3 buf[3 * xstride + 3 * ystride] + +static void randomize_luma_buffers(int type, uint8_t *buf, ptrdiff_t xstride, ptrdiff_t ystride) +{ + int i; + buf += BUF_OFFSET; + switch (type) { + case 0: // strong + for (i = 0; i < 16; i++) { + P3 = P2 = P1 = P0 = 64; + Q0 = Q1 = Q2 = Q3 = 80; + buf += ystride; + } + break; + case 1: // weak + for (i = 0; i < 16; i++) { + P3 = P2 = 60; P1 = P0 = 64; + Q0 = Q1 = 74; Q2 = Q3 = 80; + buf += ystride; + } + break; + case 2: // none + for (i = 0; i < 16; i++) { + for (int j = -8; j < 8; j++) { + buf[j * xstride + i * ystride] = rnd(); + } + } + break; + } +} + +static void check_deblock_luma(HEVCDSPContext *h, int bit_depth) +{ + const char *type; + const char *types[3] = { "strong", "normal", "skip" }; + int beta; + int32_t tc[2] = { 0, 0 }; + // no_p, no_q can only be { 0,0 } for the simpler assembly (non *_c + // variant) functions, see deblocking_filter_CTB() in hevc_filter.c + uint8_t no_p[2] = { 0, 0 }; + uint8_t no_q[2] = { 0, 0 }; + LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); + LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); + + declare_func(void, uint8_t *pix, ptrdiff_t stride, int beta, int32_t *tc, uint8_t *no_p, uint8_t *no_q); + + for (int j = 0; j < 3; j++) { + beta = (j == 3) ? 0 : 32; // beta easy way to turn off filtering + type = types[j]; + + // see betatable[] in hevc_filter.c + tc[0] = (rnd() & 63) + (rnd() & 1); + tc[1] = (rnd() & 63) + (rnd() & 1); + + if (check_func(h->hevc_h_loop_filter_luma, "hevc_h_loop_filter_luma%d_%s", bit_depth, type)) { + for (int i = 0; i < 4; i++) { + randomize_luma_buffers(j, buf0, 16, 1); + memcpy(buf1, buf0, BUF_SIZE); + + call_ref(buf0 + BUF_OFFSET, 16, beta, tc, no_p, no_q); + call_new(buf1 + BUF_OFFSET, 16, beta, tc, no_p, no_q); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + } + bench_new(buf1 + BUF_OFFSET, 16, beta, tc, no_p, no_q); + } + + if (check_func(h->hevc_v_loop_filter_luma, "hevc_v_loop_filter_luma%d_%s", bit_depth, type)) { + for (int i = 0; i < 4; i++) { + randomize_luma_buffers(j, buf0, 1, 16); + memcpy(buf1, buf0, BUF_SIZE); + + call_ref(buf0 + BUF_OFFSET, 16, beta, tc, no_p, no_q); + call_new(buf1 + BUF_OFFSET, 16, beta, tc, no_p, no_q); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + } + bench_new(buf1 + BUF_OFFSET, 16, beta, tc, no_p, no_q); + } + } +} + void checkasm_check_hevc_deblock(void) { + HEVCDSPContext h; int bit_depth; - for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) { - HEVCDSPContext h; ff_hevc_dsp_init(&h, bit_depth); check_deblock_chroma(&h, bit_depth); } report("chroma"); + ff_hevc_dsp_init(&h, 8); + check_deblock_luma(&h, 8); + report("luma"); }