From patchwork Thu Aug 5 08:26:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 29267 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp193374ioh; Thu, 5 Aug 2021 01:27:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJbXIRIunddRcdM6W1oOvIfx/MU83mfFjJBg1FLf3IjPeHaNvJ6w6D+HzkfxRtsFMfntUf X-Received: by 2002:a05:6402:702:: with SMTP id w2mr4933430edx.149.1628152024736; Thu, 05 Aug 2021 01:27:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628152024; cv=none; d=google.com; s=arc-20160816; b=WthLbMdrBelo89LvdSHYCJ3a3HB0Ca8kZk0t/Y92osA39jR9XwAZVIRb5PVxmlKJn/ AUgzjDzDhNbf35zMMC82Y6VndM5DMXnZwMgF5TdsI43ebHPLn6hpFTaUcSVNpxqf/Lov RundcOAx3UDUIr0kBHnzL02LqPiKyxFwQRMazAWD2x7jRHgEsOAJGMQIG4g+WL8GoAAh 7Q69/1n7Bvi4QLTWQ7dsjniHX934mFEhwJIxjTB6pOl3Meuew14UO9T+7Lwf99OOGphr ngYhXttezUjspLSIy2dIfmH8hKGMdHgL5ZvLwQllZn7Jge/Dn5UtRSiMx4NOns23BUNA 3pug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:dkim-signature:delivered-to; bh=dZpryJBMZUnUe5bEOv8//di6XE4DTvSxfvpPyeJByIc=; b=LVYkTg+LJx1O72hr0AHxiEt87kXkzQJGj91aThBoVKgAGeDpTCHmjrghxNs3V+fbO7 aGwginyEJ6kJaxsyVKlK4BK3j6ER6nLXUYZMh7ZTe3f7qUFB8jPJKttg9UvF1NHhjF7I wwOufmnvqDDAO8RaeiyXQ/nkGaAH9zAJELd6pvc/SN8GyOg8orlk0j51XZKOjo6CPaza CRFVWH1/rHOJTfQzl46SfRVwXbmSfsSJFV/XQiqDX5pUsXd60w1pINOSwkkVnCRwz+fl iKe7Ni0cZfZIKZ8kv/op//rmuakxF6U+eYh8NJdMT9POX2Z2Nclqm462K12PZ64KIfPZ D0pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm2 header.b=d3NLupzM; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=EZ6ehUs4; 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 g18si5268904ejp.458.2021.08.05.01.27.04; Thu, 05 Aug 2021 01:27:04 -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=@itanimul.li header.s=fm2 header.b=d3NLupzM; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=EZ6ehUs4; 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 622A768A3E8; Thu, 5 Aug 2021 11:27:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC54F6802FF for ; Thu, 5 Aug 2021 11:26:54 +0300 (EEST) Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 118625C0131 for ; Thu, 5 Aug 2021 04:26:53 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Thu, 05 Aug 2021 04:26:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=14T0AxHW6tE48xKNbUYODopkJt /ZkW+dTeYn6//hNZE=; b=d3NLupzMl0s0AxpQMvHvWWR9J0oELdbsUDoxjzC/UX 2pXJXqnkZ2p5i56R+PHI0kaBr9ecUDpN+vp8LQduDYxZso0ysD+yZibiOD/OddCn KYlYHOb0F/1qoJmRQdXu4NqSrysxxEgvNquj7fmNcGQ1rmOBYBocQDI5+nvVQnhX h26yxztvzGUy0P16EVJ9IeHJ9lGraznfZzKDdyeXOLsRahzruuSQ9K0gzTZNY+hy W7jJeRHSgY6rFjQDxSUOAYWo/ChcqMTezOm4ewbTci8WkdO1P/dZOEswIkvXkLAA rcFDtNcZkEfgJb3E2R7h7OwPwlY8kD4FAdxvNrb2MT4A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=14T0AxHW6tE48xKNb UYODopkJt/ZkW+dTeYn6//hNZE=; b=EZ6ehUs4clYmCPmZuIOtYyo3fphQ5zo90 fIGkO4Pw1nAk/dTPqXNfUBWl0KWSuHr5IHkR4VyCdV5jMtm/TWFMrHORpZsJGJ1P 4ML4dZ3ktZnC+eEaXehB+zv8bxLJvLIrKI57qnSGsSGeBNJqJ7WuUKxMWOWNwhny nwxEuEu35TL08ilH5laExgtCA/EZxcMHOIch5RtJQGPgY0K4gF9owZNPrUuelZoU WBmkaDwZie7PU5dneVPxQjpaKVdV7CzaNgMRcUTNgK2vnnrrUzL8Wy+fXdEc7CZv I59ZTzCdNRYCtvj39VS/w0G8QUvvhbbUtN54hqGrOMaF43vnsHREw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrieelgddtgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhulhdr lhhiqeenucggtffrrghtthgvrhhnpeeutefgtdeuvdejjeejvdetleffueehtdeftedugf elhfejueektedvvddtveeiieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhep mhgrihhlfhhrohhmpehjuggvkhesihhtrghnihhmuhhlrdhlih X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 5 Aug 2021 04:26:52 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 10:26:48 +0200 Message-Id: <20210805082650.32639-1-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] checkasm: collapse hevc pel tests 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +3K+I/ElWbTi Also add to `make fate-checkasm' target. Signed-off-by: J. Dekker --- tests/checkasm/checkasm.c | 11 +---------- tests/checkasm/checkasm.h | 11 +---------- tests/checkasm/hevc_pel.c | 34 ++++++++++++++++++++++++---------- tests/fate/checkasm.mak | 1 + 4 files changed, 27 insertions(+), 30 deletions(-) diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index be5c17cd2a..b1353f7cbe 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -116,16 +116,7 @@ static const struct { #if CONFIG_HEVC_DECODER { "hevc_add_res", checkasm_check_hevc_add_res }, { "hevc_idct", checkasm_check_hevc_idct }, - { "hevc_qpel", checkasm_check_hevc_qpel }, - { "hevc_qpel_uni", checkasm_check_hevc_qpel_uni }, - { "hevc_qpel_uni_w", checkasm_check_hevc_qpel_uni_w }, - { "hevc_qpel_bi", checkasm_check_hevc_qpel_bi }, - { "hevc_qpel_bi_w", checkasm_check_hevc_qpel_bi_w }, - { "hevc_epel", checkasm_check_hevc_epel }, - { "hevc_epel_uni", checkasm_check_hevc_epel_uni }, - { "hevc_epel_uni_w", checkasm_check_hevc_epel_uni_w }, - { "hevc_epel_bi", checkasm_check_hevc_epel_bi }, - { "hevc_epel_bi_w", checkasm_check_hevc_epel_bi_w }, + { "hevc_pel", checkasm_check_hevc_pel }, { "hevc_sao", checkasm_check_hevc_sao }, #endif #if CONFIG_HUFFYUV_DECODER diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index b747ed1986..68b0697d3e 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -61,16 +61,7 @@ void checkasm_check_h264pred(void); void checkasm_check_h264qpel(void); void checkasm_check_hevc_add_res(void); void checkasm_check_hevc_idct(void); -void checkasm_check_hevc_qpel(void); -void checkasm_check_hevc_qpel_uni(void); -void checkasm_check_hevc_qpel_uni_w(void); -void checkasm_check_hevc_qpel_bi(void); -void checkasm_check_hevc_qpel_bi_w(void); -void checkasm_check_hevc_epel(void); -void checkasm_check_hevc_epel_uni(void); -void checkasm_check_hevc_epel_uni_w(void); -void checkasm_check_hevc_epel_bi(void); -void checkasm_check_hevc_epel_bi_w(void); +void checkasm_check_hevc_pel(void); void checkasm_check_hevc_sao(void); void checkasm_check_huffyuvdsp(void); void checkasm_check_jpeg2000dsp(void); diff --git a/tests/checkasm/hevc_pel.c b/tests/checkasm/hevc_pel.c index 4d1545e467..ec24309081 100644 --- a/tests/checkasm/hevc_pel.c +++ b/tests/checkasm/hevc_pel.c @@ -65,7 +65,7 @@ static const int offsets[] = {0, 255, -1 }; #define src0 (buf0 + 2 * 4 * MAX_PB_SIZE) /* hevc qpel functions read data from negative src pointer offsets */ #define src1 (buf1 + 2 * 4 * MAX_PB_SIZE) -void checkasm_check_hevc_qpel(void) +static void checkasm_check_hevc_qpel(void) { LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); @@ -109,7 +109,7 @@ void checkasm_check_hevc_qpel(void) report("qpel"); } -void checkasm_check_hevc_qpel_uni(void) +static void checkasm_check_hevc_qpel_uni(void) { LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); @@ -150,7 +150,7 @@ void checkasm_check_hevc_qpel_uni(void) report("qpel_uni"); } -void checkasm_check_hevc_qpel_uni_w(void) +static void checkasm_check_hevc_qpel_uni_w(void) { LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); @@ -198,7 +198,7 @@ void checkasm_check_hevc_qpel_uni_w(void) report("qpel_uni_w"); } -void checkasm_check_hevc_qpel_bi(void) +static void checkasm_check_hevc_qpel_bi(void) { LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); @@ -242,7 +242,7 @@ void checkasm_check_hevc_qpel_bi(void) report("qpel_bi"); } -void checkasm_check_hevc_qpel_bi_w(void) +static void checkasm_check_hevc_qpel_bi_w(void) { LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); @@ -294,7 +294,7 @@ void checkasm_check_hevc_qpel_bi_w(void) report("qpel_bi_w"); } -void checkasm_check_hevc_epel(void) +static void checkasm_check_hevc_epel(void) { LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); @@ -338,7 +338,7 @@ void checkasm_check_hevc_epel(void) report("epel"); } -void checkasm_check_hevc_epel_uni(void) +static void checkasm_check_hevc_epel_uni(void) { LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); @@ -379,7 +379,7 @@ void checkasm_check_hevc_epel_uni(void) report("epel_uni"); } -void checkasm_check_hevc_epel_uni_w(void) +static void checkasm_check_hevc_epel_uni_w(void) { LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); @@ -427,7 +427,7 @@ void checkasm_check_hevc_epel_uni_w(void) report("epel_uni_w"); } -void checkasm_check_hevc_epel_bi(void) +static void checkasm_check_hevc_epel_bi(void) { LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); @@ -471,7 +471,7 @@ void checkasm_check_hevc_epel_bi(void) report("epel_bi"); } -void checkasm_check_hevc_epel_bi_w(void) +static void checkasm_check_hevc_epel_bi_w(void) { LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); @@ -522,3 +522,17 @@ void checkasm_check_hevc_epel_bi_w(void) } report("epel_bi_w"); } + +void checkasm_check_hevc_pel(void) +{ + checkasm_check_hevc_qpel(); + checkasm_check_hevc_qpel_uni(); + checkasm_check_hevc_qpel_uni_w(); + checkasm_check_hevc_qpel_bi(); + checkasm_check_hevc_qpel_bi_w(); + checkasm_check_hevc_epel(); + checkasm_check_hevc_epel_uni(); + checkasm_check_hevc_epel_uni_w(); + checkasm_check_hevc_epel_bi(); + checkasm_check_hevc_epel_bi_w(); +} diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index 3108fcd510..cec6d28286 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -16,6 +16,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \ fate-checkasm-h264qpel \ fate-checkasm-hevc_add_res \ fate-checkasm-hevc_idct \ + fate-checkasm-hevc_pel \ fate-checkasm-hevc_sao \ fate-checkasm-jpeg2000dsp \ fate-checkasm-llviddsp \ From patchwork Thu Aug 5 08:26:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 29265 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp193443ioh; Thu, 5 Aug 2021 01:27:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfOoon4XIkKwZhiUuLgFHc3IumNCzbPfcJqdx2hW/agq8LbAHS1LG6xfuhCmXfvG5tFvmO X-Received: by 2002:a17:907:2bd0:: with SMTP id gv16mr3754321ejc.49.1628152033839; Thu, 05 Aug 2021 01:27:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628152033; cv=none; d=google.com; s=arc-20160816; b=TeUg1JxqO9QUzzmBDS7STLmMdvUXTpF6LJh/M7oES1ixMENI3tM3kBOSRCyemP4iNt mOlGEEi/rpC3iWLMLIsUMOY6PBEmPAIJqkrUUfcG34VgxALAUpsaVZcg0BpaJvwptOex 9U5TRpy3AGlsHXuuZI9bFnMEdtYuodQrNk7911SUEQ41X/NbuLN9qLwl1I9hfFAuco3n t2dgxFxZ3D8xBLGb2cvtvOrMVqnv04I3edaH61siW6UMHTe9Bek7MFHT3Ob9jZAsQwKd FHmgfL6Q8CXZcUt9pHsorCZ52+RrKZjV/cRXgn6pRXEPMOOw0t+dpxADFTYK3wk44xmK IikQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:dkim-signature:delivered-to; bh=K1XIOPNg5iKy0vBuZoFUqBFpzY0dYFEgYBWRXtO0M9w=; b=nK41KJ9GfdpgOiareXsi7H5tjcUcnBXFfutTKaKF5mQdxvSIiwhjQvAfbHLTT+T5+L BhZHZTED7bf+FNMNpiH1g0kJ8CAUK3QwBNlsxievdjfwzABtJmPbsvgWy9krpZRUnJbQ 4XCWGQSypp1H7sDkMj3TkmRfihEoazO1FZMD4rpiYDY/nvAwUAgzFyHfdtdN7atqnrnl MaCs6oBro5RiCajdosSpr3nENbVHf0oGglHlfnlrD6jppwiZatqon/Pe3kOTL2lDSqmV KQoL/102AtoQd9XDC0AgWAIx3VqairmblAw8zOPYiBYydXNjHKenOBMicmcvV47RS52U qy6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm2 header.b=AwTlrBB1; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=CZQPfb7h; 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 dn4si5540586ejc.239.2021.08.05.01.27.13; Thu, 05 Aug 2021 01:27:13 -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=@itanimul.li header.s=fm2 header.b=AwTlrBB1; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=CZQPfb7h; 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 9851168A467; Thu, 5 Aug 2021 11:27:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF23268A314 for ; Thu, 5 Aug 2021 11:26:54 +0300 (EEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id CA3435C013A for ; Thu, 5 Aug 2021 04:26:53 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 05 Aug 2021 04:26:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=OINCedgx9RNH6 Fg5cn62J6wOUTt7cauyi/Z96GTYQ5w=; b=AwTlrBB1J3ap5IcGCZniMVbzd4iEF GW6ODwzNV7rimeyqhzFhW+xvQbfS91XBlPhbWdk9+KOITi9gHGJ7kTHleqhha7FT nWmIuuHDv/fD0kY+CsysRKF4Ru3jLX193Tar9ufQ76eJSbnjy7bPLI6Xg8DPGHBm RtNw9TBcBAqcF/NQc8+BCbc+n9lFyF5dgivW15QuqT9zoI8PkE2jKjQ7DIp63BYK 7Syi82z7uAhWbmRGnWY0UBDFSaECi3taSig5sa4gF/j1uS05KwjYhXMZcOF+UWch hWYN11np4Rtxqs9VcsIIsucRJ7t8U1BCGLUUENC/5SUXtWut5eGK9H2zA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=OINCedgx9RNH6Fg5cn62J6wOUTt7cauyi/Z96GTYQ5w=; b=CZQPfb7h N0Eqo9oRwf1RTKe6T5DSdjiLPcBjobqY4kIqd1cHz4Hp/iADDq1CYEcZOTVH3yff 8weNFvhAimxd4pvEBDA2tADMjE0x2EfB5HlcLdGC7FdzbrBp7Xtf1cLqMs/UareA XqnHLX4U50VQJsIQ1hD0XMu1blWuyDzpPnoC8AzLFZf4ztgAM/T2a8QCz59EKYVY qW5qDLVVpYfhk642ngRiK/GoScmGut+af7MvbMHtRKMohtCcLs4JjP9J1Oc5UrF+ boJ7m/U/p+/zgDcyDv1DHQTUE009y4Q5L9sqW+WRdDliFwaAMjbxNi3unvwr2slD BDIe8V3Ux4Ln1Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrieelgddtgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhu lhdrlhhiqeenucggtffrrghtthgvrhhnpeegvdfhffduudegheevieekieeffefgveffke dtheekieefhfevueetueefhfetteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehjuggvkhesihhtrghnihhmuhhlrdhlih X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 5 Aug 2021 04:26:53 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 10:26:49 +0200 Message-Id: <20210805082650.32639-2-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20210805082650.32639-1-jdek@itanimul.li> References: <20210805082650.32639-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] checkasm: add h264 chroma 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YwIkR4GBbJo/ Signed-off-by: J. Dekker --- tests/checkasm/Makefile | 1 + tests/checkasm/checkasm.c | 3 + tests/checkasm/checkasm.h | 1 + tests/checkasm/h264chroma.c | 109 ++++++++++++++++++++++++++++++++++++ tests/fate/checkasm.mak | 1 + 5 files changed, 115 insertions(+) create mode 100644 tests/checkasm/h264chroma.c What should I do for other codecs here, or just ignore non-h264? diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 4ef5fa87da..41222c3827 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -6,6 +6,7 @@ AVCODECOBJS-$(CONFIG_BSWAPDSP) += bswapdsp.o AVCODECOBJS-$(CONFIG_FLACDSP) += flacdsp.o AVCODECOBJS-$(CONFIG_FMTCONVERT) += fmtconvert.o AVCODECOBJS-$(CONFIG_G722DSP) += g722dsp.o +AVCODECOBJS-$(CONFIG_H264CHROMA) += h264chroma.o AVCODECOBJS-$(CONFIG_H264DSP) += h264dsp.o AVCODECOBJS-$(CONFIG_H264PRED) += h264pred.o AVCODECOBJS-$(CONFIG_H264QPEL) += h264qpel.o diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index b1353f7cbe..154c4a5c01 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -104,6 +104,9 @@ static const struct { #if CONFIG_G722DSP { "g722dsp", checkasm_check_g722dsp }, #endif + #if CONFIG_H264CHROMA + { "h264chroma", checkasm_check_h264chroma }, + #endif #if CONFIG_H264DSP { "h264dsp", checkasm_check_h264dsp }, #endif diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 68b0697d3e..ac2f22af05 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -56,6 +56,7 @@ void checkasm_check_flacdsp(void); void checkasm_check_float_dsp(void); void checkasm_check_fmtconvert(void); void checkasm_check_g722dsp(void); +void checkasm_check_h264chroma(void); void checkasm_check_h264dsp(void); void checkasm_check_h264pred(void); void checkasm_check_h264qpel(void); diff --git a/tests/checkasm/h264chroma.c b/tests/checkasm/h264chroma.c new file mode 100644 index 0000000000..0bd333327d --- /dev/null +++ b/tests/checkasm/h264chroma.c @@ -0,0 +1,109 @@ +/* + * Copyright (c) 2015 Henrik Gramner + * Copyright (c) 2021 J. Dekker + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include +#include "checkasm.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/h264chroma.h" +#include "libavutil/common.h" +#include "libavutil/internal.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/mem_internal.h" + +// static const int codec_ids[4] = { AV_CODEC_ID_H264, AV_CODEC_ID_VP8, AV_CODEC_ID_RV40, AV_CODEC_ID_SVQ3 }; +static const uint32_t pixel_mask[3] = { 0xffffffff, 0x01ff01ff, 0x03ff03ff }; + +#define SIZEOF_PIXEL ((bit_depth + 7) / 8) +#define BUF_SIZE (3 * 16 * 17) + +#define randomize_buffers() \ + do { \ + uint32_t mask = pixel_mask[bit_depth - 8]; \ + int i; \ + for (i = 0; i < BUF_SIZE; i += 4) { \ + uint32_t r = rnd() & mask; \ + AV_WN32A(buf0 + i, r); \ + AV_WN32A(buf1 + i, r); \ + } \ + } while (0) + +#define src0 (buf0 + 4 * 16) /* Offset to allow room for top and left */ +#define src1 (buf1 + 4 * 16) + +static void check_avg() +{ + int i, bit_depth, x, y; + LOCAL_ALIGNED_16(uint8_t, buf0, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, buf1, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, dst0, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, dst1, [BUF_SIZE]); + H264ChromaContext h; + + declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y); + for (bit_depth = 8; bit_depth <= 10; bit_depth++) { + ff_h264chroma_init(&h, bit_depth); + for (i = 0; i < 4; i++) { + if (check_func(h.avg_h264_chroma_pixels_tab[i], "avg_chroma_mc%d_%d", 1 << (3 - i), bit_depth)) { + randomize_buffers(); + x = rnd() & 0x7; y = rnd() & 0x7; + call_ref(dst0, src0, 8, 4, x, y); + call_new(dst1, src1, 8, 4, x, y); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(dst1, src1, 8, 4, x, y); + } + } + } +} + +static void check_put() +{ + int i, bit_depth, x, y; + LOCAL_ALIGNED_16(uint8_t, buf0, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, buf1, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, dst0, [BUF_SIZE]); + LOCAL_ALIGNED_16(uint8_t, dst1, [BUF_SIZE]); + H264ChromaContext h; + + declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, ptrdiff_t stride, int h, int x, int y); + for (bit_depth = 8; bit_depth <= 10; bit_depth++) { + ff_h264chroma_init(&h, bit_depth); + for (i = 0; i < 4; i++) { + if (check_func(h.put_h264_chroma_pixels_tab[i], "put_chroma_mc%d_%d", 1 << (3 - i), bit_depth)) { + randomize_buffers(); + x = rnd() & 0x7; y = rnd() & 0x7; + call_ref(dst0, src0, 8, 4, x, y); + call_new(dst1, src1, 8, 4, x, y); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(dst1, src1, 8, 4, x, y); + } + } + } +} + +void checkasm_check_h264chroma(void) +{ + check_avg(); + report("avg"); + check_put(); + report("put"); +} diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index cec6d28286..449f8f89f9 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -11,6 +11,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \ fate-checkasm-float_dsp \ fate-checkasm-fmtconvert \ fate-checkasm-g722dsp \ + fate-checkasm-h264chroma \ fate-checkasm-h264dsp \ fate-checkasm-h264pred \ fate-checkasm-h264qpel \ From patchwork Thu Aug 5 08:26:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Dekker" X-Patchwork-Id: 29280 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp193547ioh; Thu, 5 Aug 2021 01:27:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyG8SxsifFDFvG7U68up6rw1LmjJOCJHelc00sKEqhQCS/4hKlJ4PDW+KLB8lK+StbAslsp X-Received: by 2002:a05:6402:b82:: with SMTP id cf2mr4931281edb.71.1628152044152; Thu, 05 Aug 2021 01:27:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628152044; cv=none; d=google.com; s=arc-20160816; b=Hxq5cZ3zswc4i+bjdr4YgdjwPICSg3PuJkSl5nXcfSs1Dm8YJwqC3ahCCNowIwfahR czLk5xs/8N9t5tuwUMWQQBfVTI7aiLon2dNkct3rpRbhhSgdcWqV3TfvOqopgMrn6jSf tvwQahYn9K4zRKuIQj5MemQpZbYrslJYLntP0S9gpk06n2nUjI3kBhal5iOL+ftil/gS PXhjahXn6aESOVsjHwiiSW87L4FquKYkBKzPjKWt0GTzIInzmvnPbYlSYKc3HuDc0VfY CDgOiR5zTWodEQWpSLxAoY5InkfF7xM+Zuom8G5SQeUJt4jPnbDY8ulgnVI+emEnBk75 d/hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:dkim-signature:delivered-to; bh=l9tyvMzAeF0Sbw11uK/LfN6gZHCIuVmRMVfVx6gCu0E=; b=wQGhcFLPdrsXYxQ5RLABgNqjBaJgDEijO77NvdPOA81OFwHki4wuEi2Ed+J9S9N4Dv m27D1rWrMyIxya482qB6wvhCYRRSExGWx7/JBPdthox7pYiH8vrYXcpmjA2gvnVuZn0T dhZBFfePDm6TZHaE6GiO8efUzl74moZDcaNSGrcxSRiTO/cZWY7AzJpvb6X4a4A/U9N+ h4V1zGdwftYOK1I0oDJILxN5MXOLDmlLN6Yrkm9VFOkHjtQDDMrjcOHWv13JohUZ1w6n 9WgmQzAyVGH61mHVDCfBFRAVhhDHn4/3pndpE9D7KkaqsV6v+LqppOaQPB6aqDWjVsUs YAcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm2 header.b=S+0DEvA+; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=YHU49zcL; 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 p11si5167064ejo.734.2021.08.05.01.27.23; Thu, 05 Aug 2021 01:27:24 -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=@itanimul.li header.s=fm2 header.b=S+0DEvA+; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=YHU49zcL; 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 B2F5D68A348; Thu, 5 Aug 2021 11:27:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73B536802FF for ; Thu, 5 Aug 2021 11:26:55 +0300 (EEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 9BAAE5C014F for ; Thu, 5 Aug 2021 04:26:54 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 05 Aug 2021 04:26:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=N7MhHDkojZOvM XdsKVjHyJ5mNPZkV+fMPM16akuuzIk=; b=S+0DEvA+P5aM3ZpLrsWEnC+cTZpuy mnHRjOfVrqaDA7VZBwc35XVtqQ6urIlCtF3ueEBdW8D6YCYRoqzdJeKwEt/UFgu8 zLcUu4b2JswBAR0FHyll1wxWd7KqFdRM5n6Gemcwq+dLVuoMhngQMBkxcnJzOb7c EcqCKAWVvf7D80aLha5MG9sHRv2LpQOK8pTq7jJZ6NAuvl180iRa+xtixWbambmd VGEUzFc5s0dSXJ/T8llOKdXLHawrnNl6EU3AeMKuCN0o34KHmmEDXrIZAnpkxIeG vI6fBMKSB+ZTJvMGn3lEt7GfwVHZKdtCZZHlwkzzit6nyPo5o/rZmQs2A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=N7MhHDkojZOvMXdsKVjHyJ5mNPZkV+fMPM16akuuzIk=; b=YHU49zcL +X1Ji44ysKV6SC3T7khx3KLFwlv49uK2XFwt+YnQnxMC/ubwgD0E7cyeZcaAfh2k 7wDcvXQLmtrtxyApn26y2wzgFpKHz/eju0XtfutHV8VSPH+JgGllWqxHBTZBiZoR PayKCSdlpwbMUncHVfqn2YxyjAiMUOVIHjsfudFbso8uSQV1X6O9CTFPwBGSLA55 XRoUTDI82XdfAMrk4+wW+hTPm8TFhU3I0ZPJWm1oa/NICalTuyNQ05rVT+ko9Epg VowiR5WFODP62a6FwWbQ34C7fZZjlG25/7qNVuOL7nHSljS3cz8RB7Fb5u/4Z8q5 XhBg9CQq6lcP9g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvtddrieelgddtgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpedflfdrucffvghkkhgvrhdfuceojhguvghksehithgrnhhimhhu lhdrlhhiqeenucggtffrrghtthgvrhhnpeegvdfhffduudegheevieekieeffefgveffke dtheekieefhfevueetueefhfetteenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehjuggvkhesihhtrghnihhmuhhlrdhlih X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Thu, 5 Aug 2021 04:26:53 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Aug 2021 10:26:50 +0200 Message-Id: <20210805082650.32639-3-jdek@itanimul.li> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20210805082650.32639-1-jdek@itanimul.li> References: <20210805082650.32639-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] checkasm: add hevc_deblock tests 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yHEucK/irfRr Signed-off-by: J. Dekker --- 0001-checkasm-add-hevc_deblock-tests.patch | 186 +++++++++++++++++++++ tests/checkasm/Makefile | 2 +- tests/checkasm/checkasm.c | 1 + tests/checkasm/checkasm.h | 1 + tests/checkasm/hevc_deblock.c | 126 ++++++++++++++ tests/fate/checkasm.mak | 1 + 6 files changed, 316 insertions(+), 1 deletion(-) create mode 100644 0001-checkasm-add-hevc_deblock-tests.patch create mode 100644 tests/checkasm/hevc_deblock.c diff --git a/0001-checkasm-add-hevc_deblock-tests.patch b/0001-checkasm-add-hevc_deblock-tests.patch new file mode 100644 index 0000000000..29441e53f6 --- /dev/null +++ b/0001-checkasm-add-hevc_deblock-tests.patch @@ -0,0 +1,186 @@ +From a8b2d2259cb8ca5e30b2efae8aa8813eaa768615 Mon Sep 17 00:00:00 2001 +From: "J. Dekker" +Date: Mon, 28 Jun 2021 04:46:49 +0200 +Subject: [PATCH] checkasm: add hevc_deblock tests + +Signed-off-by: J. Dekker +--- + tests/checkasm/Makefile | 2 +- + tests/checkasm/checkasm.c | 1 + + tests/checkasm/checkasm.h | 1 + + tests/checkasm/hevc_deblock.c | 126 ++++++++++++++++++++++++++++++++++ + 4 files changed, 129 insertions(+), 1 deletion(-) + create mode 100644 tests/checkasm/hevc_deblock.c + +diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile +index 4ef5fa87da..481a96e36e 100644 +--- a/tests/checkasm/Makefile ++++ b/tests/checkasm/Makefile +@@ -24,7 +24,7 @@ AVCODECOBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuvdsp.o + AVCODECOBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dsp.o + AVCODECOBJS-$(CONFIG_OPUS_DECODER) += opusdsp.o + AVCODECOBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o +-AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_add_res.o hevc_idct.o hevc_sao.o hevc_pel.o ++AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_add_res.o hevc_deblock.o hevc_idct.o hevc_sao.o hevc_pel.o + AVCODECOBJS-$(CONFIG_UTVIDEO_DECODER) += utvideodsp.o + AVCODECOBJS-$(CONFIG_V210_DECODER) += v210dec.o + AVCODECOBJS-$(CONFIG_V210_ENCODER) += v210enc.o +diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c +index eb9e2cd677..1fe67007cc 100644 +--- a/tests/checkasm/checkasm.c ++++ b/tests/checkasm/checkasm.c +@@ -115,6 +115,7 @@ static const struct { + #endif + #if CONFIG_HEVC_DECODER + { "hevc_add_res", checkasm_check_hevc_add_res }, ++ { "hevc_deblock", checkasm_check_hevc_deblock }, + { "hevc_idct", checkasm_check_hevc_idct }, + { "hevc_qpel", checkasm_check_hevc_qpel }, + { "hevc_qpel_uni", checkasm_check_hevc_qpel_uni }, +diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h +index b747ed1986..8ecb4f0cf0 100644 +--- a/tests/checkasm/checkasm.h ++++ b/tests/checkasm/checkasm.h +@@ -60,6 +60,7 @@ void checkasm_check_h264dsp(void); + void checkasm_check_h264pred(void); + void checkasm_check_h264qpel(void); + void checkasm_check_hevc_add_res(void); ++void checkasm_check_hevc_deblock(void); + void checkasm_check_hevc_idct(void); + void checkasm_check_hevc_qpel(void); + void checkasm_check_hevc_qpel_uni(void); +diff --git a/tests/checkasm/hevc_deblock.c b/tests/checkasm/hevc_deblock.c +new file mode 100644 +index 0000000000..98f612921b +--- /dev/null ++++ b/tests/checkasm/hevc_deblock.c +@@ -0,0 +1,126 @@ ++/* ++ * This file is part of FFmpeg. ++ * ++ * FFmpeg is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * FFmpeg is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License along ++ * with FFmpeg; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ */ ++ ++#include ++ ++#include "libavutil/intreadwrite.h" ++#include "libavutil/mem_internal.h" ++ ++#include "libavcodec/avcodec.h" ++#include "libavcodec/hevcdsp.h" ++ ++#include "checkasm.h" ++ ++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_OFFSET (BUF_STRIDE * BUF_LINES) ++#define BUF_SIZE (BUF_STRIDE * BUF_LINES + BUF_OFFSET * 2) ++ ++#define randomize_buffers(buf0, buf1, size) \ ++ do { \ ++ uint32_t mask = pixel_mask[(bit_depth - 8) >> 1]; \ ++ int k; \ ++ for (k = 0; k < size; k += 4) { \ ++ uint32_t r = rnd() & mask; \ ++ AV_WN32A(buf0 + k, r); \ ++ AV_WN32A(buf1 + k, r); \ ++ } \ ++ } while (0) ++ ++ ++static void check_deblock_luma(HEVCDSPContext h, int bit_depth) ++{ ++ int32_t tc[2] = { 1, 1 }; ++ uint8_t no_p[2] = { 0, 0 }; ++ uint8_t no_q[2] = { 0, 0 }; ++ int beta = rnd() & (0x40 - 1); ++ LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); ++ LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); ++ ++ declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *pix, ptrdiff_t stride, int beta, int32_t *tc, uint8_t *no_p, uint8_t *no_q); ++ ++ randomize_buffers(buf0, buf1, BUF_SIZE); ++ if (check_func(h.hevc_h_loop_filter_luma, "hevc_h_loop_filter_luma_%d", bit_depth)) { ++ call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); ++ call_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); ++ if (memcmp(buf0, buf1, BUF_SIZE)) ++ fail(); ++ bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); ++ } ++ ++ randomize_buffers(buf0, buf1, BUF_SIZE); ++ if (check_func(h.hevc_v_loop_filter_luma, "hevc_v_loop_filter_luma_%d", bit_depth)) { ++ call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); ++ call_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); ++ if (memcmp(buf0, buf1, BUF_SIZE)) ++ fail(); ++ bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); ++ } ++} ++ ++static void check_deblock_chroma(HEVCDSPContext h, int bit_depth) ++{ ++ int32_t tc[2] = { 1, 1 }; ++ 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_emms(AV_CPU_FLAG_MMX, void, uint8_t *pix, ptrdiff_t stride, int32_t *tc, uint8_t *no_p, uint8_t *no_q); ++ ++ randomize_buffers(buf0, buf1, BUF_SIZE); ++ if (check_func(h.hevc_h_loop_filter_chroma, "hevc_h_loop_filter_chroma_%d", bit_depth)) { ++ call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); ++ call_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); ++ if (memcmp(buf0, buf1, BUF_SIZE)) ++ fail(); ++ bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); ++ } ++ ++ randomize_buffers(buf0, buf1, BUF_SIZE); ++ if (check_func(h.hevc_v_loop_filter_chroma, "hevc_v_loop_filter_chroma_%d", bit_depth)) { ++ call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); ++ call_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); ++ if (memcmp(buf0, buf1, BUF_SIZE)) ++ fail(); ++ bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); ++ } ++} ++ ++void checkasm_check_hevc_deblock(void) ++{ ++ int bit_depth; ++ ++ for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) { ++ HEVCDSPContext h; ++ ++ ff_hevc_dsp_init(&h, bit_depth); ++ check_deblock_luma(h, bit_depth); ++ } ++ report("deblock_luma"); ++ ++ 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("deblock_chroma"); ++} +-- +2.30.1 (Apple Git-130) + diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 41222c3827..862142d8e6 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -25,7 +25,7 @@ AVCODECOBJS-$(CONFIG_HUFFYUV_DECODER) += huffyuvdsp.o AVCODECOBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dsp.o AVCODECOBJS-$(CONFIG_OPUS_DECODER) += opusdsp.o AVCODECOBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o -AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_add_res.o hevc_idct.o hevc_sao.o hevc_pel.o +AVCODECOBJS-$(CONFIG_HEVC_DECODER) += hevc_add_res.o hevc_deblock.o hevc_idct.o hevc_sao.o hevc_pel.o AVCODECOBJS-$(CONFIG_UTVIDEO_DECODER) += utvideodsp.o AVCODECOBJS-$(CONFIG_V210_DECODER) += v210dec.o AVCODECOBJS-$(CONFIG_V210_ENCODER) += v210enc.o diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index 154c4a5c01..a1e8c4d92e 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -118,6 +118,7 @@ static const struct { #endif #if CONFIG_HEVC_DECODER { "hevc_add_res", checkasm_check_hevc_add_res }, + { "hevc_deblock", checkasm_check_hevc_deblock }, { "hevc_idct", checkasm_check_hevc_idct }, { "hevc_pel", checkasm_check_hevc_pel }, { "hevc_sao", checkasm_check_hevc_sao }, diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index ac2f22af05..386ecbf69a 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -61,6 +61,7 @@ void checkasm_check_h264dsp(void); void checkasm_check_h264pred(void); void checkasm_check_h264qpel(void); void checkasm_check_hevc_add_res(void); +void checkasm_check_hevc_deblock(void); void checkasm_check_hevc_idct(void); void checkasm_check_hevc_pel(void); void checkasm_check_hevc_sao(void); diff --git a/tests/checkasm/hevc_deblock.c b/tests/checkasm/hevc_deblock.c new file mode 100644 index 0000000000..98f612921b --- /dev/null +++ b/tests/checkasm/hevc_deblock.c @@ -0,0 +1,126 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include + +#include "libavutil/intreadwrite.h" +#include "libavutil/mem_internal.h" + +#include "libavcodec/avcodec.h" +#include "libavcodec/hevcdsp.h" + +#include "checkasm.h" + +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_OFFSET (BUF_STRIDE * BUF_LINES) +#define BUF_SIZE (BUF_STRIDE * BUF_LINES + BUF_OFFSET * 2) + +#define randomize_buffers(buf0, buf1, size) \ + do { \ + uint32_t mask = pixel_mask[(bit_depth - 8) >> 1]; \ + int k; \ + for (k = 0; k < size; k += 4) { \ + uint32_t r = rnd() & mask; \ + AV_WN32A(buf0 + k, r); \ + AV_WN32A(buf1 + k, r); \ + } \ + } while (0) + + +static void check_deblock_luma(HEVCDSPContext h, int bit_depth) +{ + int32_t tc[2] = { 1, 1 }; + uint8_t no_p[2] = { 0, 0 }; + uint8_t no_q[2] = { 0, 0 }; + int beta = rnd() & (0x40 - 1); + LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); + LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); + + declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *pix, ptrdiff_t stride, int beta, int32_t *tc, uint8_t *no_p, uint8_t *no_q); + + randomize_buffers(buf0, buf1, BUF_SIZE); + if (check_func(h.hevc_h_loop_filter_luma, "hevc_h_loop_filter_luma_%d", bit_depth)) { + call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + call_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + } + + randomize_buffers(buf0, buf1, BUF_SIZE); + if (check_func(h.hevc_v_loop_filter_luma, "hevc_v_loop_filter_luma_%d", bit_depth)) { + call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + call_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, beta, tc, no_p, no_q); + } +} + +static void check_deblock_chroma(HEVCDSPContext h, int bit_depth) +{ + int32_t tc[2] = { 1, 1 }; + 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_emms(AV_CPU_FLAG_MMX, void, uint8_t *pix, ptrdiff_t stride, int32_t *tc, uint8_t *no_p, uint8_t *no_q); + + randomize_buffers(buf0, buf1, BUF_SIZE); + if (check_func(h.hevc_h_loop_filter_chroma, "hevc_h_loop_filter_chroma_%d", bit_depth)) { + call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + call_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + } + + randomize_buffers(buf0, buf1, BUF_SIZE); + if (check_func(h.hevc_v_loop_filter_chroma, "hevc_v_loop_filter_chroma_%d", bit_depth)) { + call_ref(buf0 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + call_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + if (memcmp(buf0, buf1, BUF_SIZE)) + fail(); + bench_new(buf1 + BUF_OFFSET, BUF_STRIDE, tc, no_p, no_q); + } +} + +void checkasm_check_hevc_deblock(void) +{ + int bit_depth; + + for (bit_depth = 8; bit_depth <= 12; bit_depth += 2) { + HEVCDSPContext h; + + ff_hevc_dsp_init(&h, bit_depth); + check_deblock_luma(h, bit_depth); + } + report("deblock_luma"); + + 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("deblock_chroma"); +} diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index 449f8f89f9..a300caad08 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -16,6 +16,7 @@ FATE_CHECKASM = fate-checkasm-aacpsdsp \ fate-checkasm-h264pred \ fate-checkasm-h264qpel \ fate-checkasm-hevc_add_res \ + fate-checkasm-hevc_deblock \ fate-checkasm-hevc_idct \ fate-checkasm-hevc_pel \ fate-checkasm-hevc_sao \