From patchwork Mon Jan 22 17:46:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 45724 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp130681pzf; Mon, 22 Jan 2024 09:48:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IESR2/ze3Vrg7PE5p5y1MpQqLsfRRjsrd/9kaUo7UXWT+7kgUjPvRuGZMDJrFxtE/fQItK/ X-Received: by 2002:a05:6402:51d3:b0:55c:7350:98a7 with SMTP id r19-20020a05640251d300b0055c735098a7mr91319edd.27.1705945688443; Mon, 22 Jan 2024 09:48:08 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f16-20020a0564021e9000b0055c6562b2c3si425279edf.382.2024.01.22.09.48.08; Mon, 22 Jan 2024 09:48:08 -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=@outlook.com header.s=selector1 header.b=V+Li8AxD; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8576868D0F9; Mon, 22 Jan 2024 19:47:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from JPN01-TYC-obe.outbound.protection.outlook.com (mail-tycjpn01olkn2066.outbound.protection.outlook.com [40.92.99.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B0BF68D089 for ; Mon, 22 Jan 2024 19:47:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lKOOUBd3wjv1saD4S6ovDlZ+haj3s4SjF+iQLLnUlRn5rY3CTSdnOvBg6JFpxDXzXzVaJT9z/puJ375vEEbPbMJwHnck+n1qWjA3SlKltF4TchrmZkVm+Gjm8buXorxkPBZBZRGYw05He0Gfc/2ZDxuXjujo0bAMyCHLOTiyBIaGZ3Y/KFwLtekjqXCcG7D7ivPV2jW/qsxqyd22EoiLyP8eTLZufFnDmsxOtp7y1yyQDVG6GlbQ/qCzLlLCtHDyYwdEqzfXEAz1SRGN+Ib0AMMD0MTaQTPODm10HGFzki1idb6vUYKyEolJkXOC8tU0UwI6zngLZi5phmyHQ6s4DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cTQRBaCRGC5C6v+J0FtP0SeAXPgnVftQTwbk5pBby9M=; b=F2o5OikA8hAbrCrW2y0EUM7hoBZMihmJi/D4PysA+DhdrgeCQt4rkMO4s5z4i5zjcRuq9oxqlYckNbZSkBFJyWDtplHUGlgNheMchZMpdTrGGRj804ZzcYU2q64YRxNQbhizs4Knr/gBzydlQejRgFoVPECPjGIUl3sNH1fu2Vjw1ldG77kMAyWt9SYmVp1T88y4rBalurlYvN9Gr2t/5F73tj2zqKs/jwO9LpsJKE7s3S9grRe8MA1rEySi+bGEjYHzxZibNyjJxRgKNEB1X2Gj7l1+P8zyjxW6tHYrCglL8Of/hirmdZ8NbeE2K7izLA3CBj4Sg+ZmqiHv4o4CFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cTQRBaCRGC5C6v+J0FtP0SeAXPgnVftQTwbk5pBby9M=; b=V+Li8AxDANhcWYFkVkW4sEhBWgG33kmblJRSwsGTVEKJPS2p3DBmL+Kliu4xFCp/40WhDIKZnpx54B7x4Me3C6v+272dg5S8NoZ+yQ9z+ma8o61a6nsvNedw8vc6bXs2DCe+OTimT1LbYJLd+Fu1H9LsVnRvV+1gi6XAhghY1SalcNKwNXwx1NfwBejpupdXlRvSeYci1mnp0arIYfr9qSBFcj8ioaXpBB8OocEvN6VfOO0p/C1/Itnovf7WPciaP9uA9OaPnAEumPKbUHDpMvPPAh1nuXMqD8WQjOYHzg+mRxx3aQqnGVdGSUQyLgPRbXfjFna4usKSi873q7uAag== Received: from OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:186::5) by TYWP286MB1975.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:164::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.31; Mon, 22 Jan 2024 17:46:51 +0000 Received: from OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM ([fe80::86fc:6255:f4c1:a076]) by OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM ([fe80::86fc:6255:f4c1:a076%3]) with mapi id 15.20.7202.035; Mon, 22 Jan 2024 17:46:51 +0000 From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 23 Jan 2024 01:46:28 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240122174628.1206503-1-toqsxw@outlook.com> References: <20240122174628.1206503-1-toqsxw@outlook.com> X-TMN: [vOj70+50fyu8kUt5Jr+6SzllyKdiEPp/] X-ClientProxiedBy: KL1PR0401CA0027.apcprd04.prod.outlook.com (2603:1096:820:e::14) To OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:186::5) X-Microsoft-Original-Message-ID: <20240122174628.1206503-8-toqsxw@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OSZP286MB2173:EE_|TYWP286MB1975:EE_ X-MS-Office365-Filtering-Correlation-Id: bcb70e30-50fb-44a8-d9e1-08dc1b721d2a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R6CI7xW15OrmefJIzegl5G7tGbwPw1kmAYiopEytHt9TQfIwjBaoMXw7pgybgLYkBWDxax6BoBdx3Xy62wX38/l6bQj9lHNlQofHq7gybH37uGxynLGNvRpv+U2wxT6C62jp4qJhgEQR6DDwoT15TA2VP9o49c8CB54FjmH4R6m5C1T5b/pGrlohEr2zmp41fyWjoORuoQd0XqMlL31ygrchng2C3C28DHlmYSLjyXXWaawNWAbsHcyqx933fVoIbjLFejyXP7qy2WySe7UHEVMg3pqFbc55THSiaVgbjtikDBMKc82IKda7Qyc3VESk3/JVjSAEcXLfmcFA5DOCVbZ0Q0jViEL4IMUGweJHN4Xx7i3fQPSsOUNKdPGQVfmUbM5mUn4soXisTssUWJbYe7rRYhZkGO2wdoLwricW1vfyuOF07/yH783kKTqa/RBNFi3VGHSUV3CYfJR7r9SrtZ75sc2YzeLK3uJEeMtVAOFiylI5duI1aw/F3aKLCvkkirqh6Ho5uhOs9j9WuGcKaxBTd4u3nWn9DCNhIGH1jmw7c4/wCEUNgUZ+5nLTP6vIfxMpvv1Zv5ThD1v+TUZKro9bTwXkHR1iG3+7bEmIiv7weHX1p4KJp+JpfK526ICS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: t34bMIKUevO6Katb5cFwRg3ZjuSliA7AQIfJnK20KYX/DsSZqjHFxW1mgCFoxNQLiyLAtI9Voo7q5QKwaxX1d/uJpY/viFHJwt5KNR+WL/BRqGOSTuWXwgAegfd0qbe3wQFDwOuq5VxkRh6lwuhcAMcQBp3mP2ENvDg+tLvuEwEEWVEi3joOejPHG73SjI3flA+8M2Uj/jhJw40wYypUAvJmiDdk9AfJETaZrlORO0un5Kkej+CX3PQ9Qt7QRsLHIX5rjmBMMswoHtWsxtIVJkeD6tmHD3yNE8ZVmDFuBPXfIAT6GOfOizh+jkGTD6960LXLPDPguCuX+dSMAKbPp8czm6DfDy0365EyovmbavCWGmwDF/jTIBMk0oJrMXOFvH41XNpXfyouJDF7Mmo06wrzlq0TijRyKS49FH53x9CPPu9PZUVjf2Tf5LxIC6MwtyYMhw/i6T54dZA59OK5ZZgO+HpDo/AphK/aCh3MO8R4k10QyrKPp9YbT7rnMmWSI7bVNM+jCUHH32pyycefB8cuphKqEjER+e33ASIOIYO3qXNQWV2fBdj/vyWU02mTsNZu7e+UXJrCe6+mGgb3x2eGBszgYlpZ9jhN1kN2OYTtHlK+0O9JsUNHs/Mh+oZzdSWdaqgSDCzSlGSELB+b3Mm3H6vcjWRdzDnbX/h9yZTCVF5AKD9R1IWP0qRQIoeQhOSZIfm0rgWv4KaOIPH+J7MAAkm7qXdyTsaR4Tle3V7rrYCHfBr2xLQHnZNTkux3c4MVgzfZqKpea+N1pembM0xTkK9P2lodGwT3g3jvmtqa7OH0aEtpqHPVl+hwZpQxynIuzwfIBCywPJyUlN3AFZKbzFIgqBbVs4Zfon4QG6lInoTSljo1ni/qZE6E9Pzq9bkQU/9hmEU5/5kbPPFO1TZrudjNTpZBKiOXxNuMEBx2EkXekwbOfaDO4RT02qQlk8D3hPPqXeD/ImsV/VdmL+59jEhXELoVtVRfv0itx2TuX4V4/Xf128Y69ITkNAVgR8XLFLM6YzM/PCscnWUot980c1UBnlkLc87/nqXyE/FW8i1lUWXn15wOO8irXQ3zL+nkzq8imjl9947DFtsLM3kDyw9CxvHnMBVFUl8/cycwmkDJZU2uKEsAxvEhYVTpinaXGPvXQa6+BrG/6bWfDlWc2yH4ocwGUJkyCt5jbquZsBhyCMAPQmEMKTnP1WaZKvCqA2zCUSrENAKRyL6TzUCt6lhBKqZJ6hHESYm90gM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bcb70e30-50fb-44a8-d9e1-08dc1b721d2a X-MS-Exchange-CrossTenant-AuthSource: OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jan 2024 17:46:51.1683 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYWP286MB1975 Subject: [FFmpeg-devel] [PATCH v3 8/8] tests/checkasm/vvc_mc: add check_avg 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: Wu Jianhua Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cUkLy5I1JNtb From: Wu Jianhua Signed-off-by: Wu Jianhua --- tests/checkasm/vvc_mc.c | 64 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/tests/checkasm/vvc_mc.c b/tests/checkasm/vvc_mc.c index 711280deec..8adb00573f 100644 --- a/tests/checkasm/vvc_mc.c +++ b/tests/checkasm/vvc_mc.c @@ -35,6 +35,7 @@ static const uint32_t pixel_mask[] = { 0xffffffff, 0x03ff03ff, 0x0fff0fff, 0x3fff3fff, 0xffffffff }; static const int sizes[] = { 2, 4, 8, 16, 32, 64, 128 }; +#define SIZEOF_PIXEL ((bit_depth + 7) / 8) #define PIXEL_STRIDE (MAX_CTU_SIZE * 2) #define EXTRA_BEFORE 3 #define EXTRA_AFTER 4 @@ -261,10 +262,73 @@ static void check_put_vvc_chroma_uni(void) report("put_uni_chroma"); } +#define AVG_SRC_BUF_SIZE (MAX_CTU_SIZE * MAX_CTU_SIZE) +#define AVG_DST_BUF_SIZE (MAX_PB_SIZE * MAX_PB_SIZE * 2) + +static void check_avg(void) +{ + LOCAL_ALIGNED_32(int16_t, src00, [AVG_SRC_BUF_SIZE]); + LOCAL_ALIGNED_32(int16_t, src01, [AVG_SRC_BUF_SIZE]); + LOCAL_ALIGNED_32(int16_t, src10, [AVG_SRC_BUF_SIZE]); + LOCAL_ALIGNED_32(int16_t, src11, [AVG_SRC_BUF_SIZE]); + LOCAL_ALIGNED_32(uint8_t, dst0, [AVG_DST_BUF_SIZE]); + LOCAL_ALIGNED_32(uint8_t, dst1, [AVG_DST_BUF_SIZE]); + VVCDSPContext c; + + for (int bit_depth = 8; bit_depth <= 12; bit_depth += 2) { + randomize_avg_src((uint8_t*)src00, (uint8_t*)src10, AVG_SRC_BUF_SIZE * sizeof(int16_t)); + randomize_avg_src((uint8_t*)src01, (uint8_t*)src11, AVG_SRC_BUF_SIZE * sizeof(int16_t)); + ff_vvc_dsp_init(&c, bit_depth); + for (int h = 2; h <= MAX_CTU_SIZE; h *= 2) { + for (int w = 2; w <= MAX_CTU_SIZE; w *= 2) { + { + declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dst_stride, + const int16_t *src0, const int16_t *src1, int width, int height); + if (check_func(c.inter.avg, "avg_%d_%dx%d", bit_depth, w, h)) { + memset(dst0, 0, AVG_DST_BUF_SIZE); + memset(dst1, 0, AVG_DST_BUF_SIZE); + call_ref(dst0, MAX_CTU_SIZE * SIZEOF_PIXEL, src00, src01, w, h); + call_new(dst1, MAX_CTU_SIZE * SIZEOF_PIXEL, src10, src11, w, h); + if (memcmp(dst0, dst1, DST_BUF_SIZE)) + fail(); + if (w == h) + bench_new(dst0, MAX_CTU_SIZE * SIZEOF_PIXEL, src00, src01, w, h); + } + } + { + declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dst_stride, + const int16_t *src0, const int16_t *src1, int width, int height, + int denom, int w0, int w1, int o0, int o1); + { + const int denom = rnd() % 8; + const int w0 = rnd() % 256 - 128; + const int w1 = rnd() % 256 - 128; + const int o0 = rnd() % 256 - 128; + const int o1 = rnd() % 256 - 128; + if (check_func(c.inter.w_avg, "w_avg_%d_%dx%d", bit_depth, w, h)) { + memset(dst0, 0, AVG_DST_BUF_SIZE); + memset(dst1, 0, AVG_DST_BUF_SIZE); + + call_ref(dst0, MAX_CTU_SIZE * SIZEOF_PIXEL, src00, src01, w, h, denom, w0, w1, o0, o1); + call_new(dst1, MAX_CTU_SIZE * SIZEOF_PIXEL, src10, src11, w, h, denom, w0, w1, o0, o1); + if (memcmp(dst0, dst1, DST_BUF_SIZE)) + fail(); + if (w == h) + bench_new(dst0, MAX_CTU_SIZE * SIZEOF_PIXEL, src00, src01, w, h, denom, w0, w1, o0, o1); + } + } + } + } + } + } + report("avg"); +} + void checkasm_check_vvc_mc(void) { check_put_vvc_luma(); check_put_vvc_luma_uni(); check_put_vvc_chroma(); check_put_vvc_chroma_uni(); + check_avg(); }