From patchwork Thu Jan 18 14:24:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wu Jianhua X-Patchwork-Id: 45652 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:968f:b0:199:de12:6fa6 with SMTP id hp15csp297081pzc; Thu, 18 Jan 2024 06:25:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IFO1usaNzL+lQmNi3xpvif+E7mN9Pphce6rJq4y3cHVwY04+p+xYjoWQPolPU1TQgM3xsVy X-Received: by 2002:a17:906:15c5:b0:a2a:ffb0:adbb with SMTP id l5-20020a17090615c500b00a2affb0adbbmr627163ejd.77.1705587946802; Thu, 18 Jan 2024 06:25:46 -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 gs9-20020a170906f18900b00a2809452f2fsi6743658ejb.826.2024.01.18.06.25.46; Thu, 18 Jan 2024 06:25:46 -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=g0fRhpAZ; 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 CCF9268D08E; Thu, 18 Jan 2024 16:24:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from JPN01-OS0-obe.outbound.protection.outlook.com (mail-os0jpn01olkn2084.outbound.protection.outlook.com [40.92.98.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9566668D07A for ; Thu, 18 Jan 2024 16:24:39 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NucJG7JtUKi0Hy5rl4l8jBfBo9wMLBJt22uXjj7WJc7W4uxAAJYF7/5wMcq4z/G4EaXXGn9z5HKN5mlLRb2Hni8/wb8/sdy99d0NQ12LupGwel9kPQ0SIvDyngxKSkfHs9nLskxD9TCty/vDDinfwrA8wzW411erfAGwmbsG7byN7JtvJMSxXE/dBur7VINhP7gJkfR/NxKLHAJ4pI/jBUr4W6h+tUnLuma681gcmn0S1MwhL8GkanSMGiok6x5BqUzGEYTIJaYRRtvlDuk8JjxKaPN19NRLJ3bHvYmAriCUBPLFA+gaoY6keH7xLofxNWrzXrGAUYgh817INqi3+A== 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=evb2JumdqDRyd1K8Ywq/rF23G7oCQiMX78i0+kzzYFf/01SWCHqtaB4DeQZnzwtdJEWTGN/snJw45qhR2+b7A67d3c7I6fx/fJAzvjYs1LhN683SRFGx0xQ0TIWz5h4ZwZUiXNmpckOhkT9h1kvuXLZkw94DEc/BTZMc7oFeDATaG0MWtSmqZw41KBIvIzBDsXziDYFstva4OoyYbf9ev5jNf3f2C7UO9Bq77BA5J6BtoEItEv1Mjol/nK2iUTYL+4lLyRxOxV+/2K94qb20xjh8aI46KpJXhvdOAr9R+/ROmKShgOBJ9KBvnCMCvEIlT2MstC2wgZ04vpgfnUGdsQ== 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=g0fRhpAZ8n6of75TOcIes2tAYe5WFIe/MdrFtSjWBFixMEZbN8b8FqFOgkJVXHroedz8m7vy+oiv22R6U7VPEz3i6dLWiCuK+RZXNiIXIoPGsLXw+znrsROZ8Et/fAdkrR2q3sE0rN54m8Mw683RNBgeSMPneud9rPwO9Akx4iKBp55Jx4BGkDkN5Q5eRhILD2c+l9RRSIbiInAIyFCm3EoOuG+ZeZYIvPD0dyth/i0VpwaqdnQsOu8rOiAwUZv3R8q9uw6bbQXvJoSSnUniEw/OU8wa6UNz/UzlgGigaciGOZ7/waL9+N38oLQNQ4GNU0VomTCIHPAFqVhtpCspSg== Received: from OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:186::5) by TYCP286MB2622.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:241::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Thu, 18 Jan 2024 14:24:25 +0000 Received: from OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM ([fe80::1bbf:406b:216:f56e]) by OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM ([fe80::1bbf:406b:216:f56e%7]) with mapi id 15.20.7202.024; Thu, 18 Jan 2024 14:24:25 +0000 From: toqsxw@outlook.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Jan 2024 22:24:04 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240118142404.68192-1-toqsxw@outlook.com> References: <20240118142404.68192-1-toqsxw@outlook.com> X-TMN: [Tg8zviRsTAYz4qMndY3STVVHvhHYHn2p] X-ClientProxiedBy: SI1PR02CA0009.apcprd02.prod.outlook.com (2603:1096:4:1f7::10) To OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:186::5) X-Microsoft-Original-Message-ID: <20240118142404.68192-8-toqsxw@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OSZP286MB2173:EE_|TYCP286MB2622:EE_ X-MS-Office365-Filtering-Correlation-Id: 2147c1a6-2697-4f43-376e-08dc18312c12 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dQj1q0eHFP8Y+hJ5sD171V4jVk7hci1MdJ1QGYcRwD28UyzxgJBpIuvJmBgzAccgFhljNnFW0Tygitp8Jc75tXYxVULVlKGCMKTCn4hUieOhticuo14WR7+N8zo46D3knymcll/Ua0w1o17alg60a8dCkCncLq5ci89eeyjDj/2uxorDam6Yt9xDdNttD4gDHCFLadsUNneB1uyP7xXku3/mu3lJILdEKogzNLL/VhvTCGFEAtiSw/p977Ue22zRnmA+NJ+WSm1rxEzd3kVbbuR6UzsQozbr8LUVcZ93XAH+GxXeb4aHYVmTjtsKBoGpl07MKTUlVTd9Kq4nZV47aVQ+W+3WaD7NQR7Hbwtph8QCvRzUSM1ybDJ4n+YkLgkj+YAwLxplQZDv8Qhk0KMsaaUQtgeK+nixbHeRENuGlVrJAbwBqBdH1P+IOnQD0gKrBjdu4ASoNirNo+eZPFkghtUG2NiGEzHgpVFBuyt/ANVuT9vu3agf/PxrBVam4fSu4HpkUf0htEftUTgiSqXqoUMmqoXY4atZtlI00PjByP+ZEdyIhEotehvRRlRlzhPV/GRtSaYdc0fCxDL1v9u78lLFQ0SuUe8PsdbgFVdZ3H5HEOv9LkiEE+wotYigLd8v X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rGJZNrecPrhWGrhxi7oqfD+xlc4nuiQaSwcaPSJjaSf+uTFvg4jqtGqRG6C1DbYGtqxS8nhMz2n5J/BCh4l2tcQ1HPCwQElagjLb0XzVkSMLAvgE/Oz2JCHEu4Cp4PgjZ+v6rmzeYQj3jduUGnjaugVo9oL8uuXZehbcA533zBr4TYqdYCTVh1neZjzYuxWKsUCkGharXUvjgqelZmwgTSNN/csJt60mZ07zdMd3kUigfkyZwsOsTHaHVfxBVVddlENKy2wdSE8jD6CQduLohA3qk24mpl65fhsIEj36Y7bxItR7B4B5Q99ZHDrtrKfsJAXFpKOfGActUIbv6EIlmjV8jTqDQgdge4326Uj+Iz+cPZ3FVPygLdcP6+MUnZVeLzs8m2JlRg/vl0i9wtsQcA78HzAb2Ndm3LhpSja0l/qFSQMot6XSuy1DvIh0UyCM6qyzt6QKpEe4LqWfzsD0YptD8q58Cl0fsMOVKBXR6TJwPqvD/4M7+f4iFs7h6L34XquTNohNdYtI3N9WSsMowjgqj6ze5AFOf3hDJyiYjQQuiLF4LARqQebK3cfo+MUtoqPsGYzkQG9FS0vo/4ieNdU4Oa4TqxpRVZr2lX91QlHw0+lMiMSgikXH0WVliprk7NqywoYzHtkZSNBLKmZA7GjqbbI7aHcwh/ZpYNCJqxz/ZS25qi4IDhpv7RhBKF1mmaHoAMmZtT7VHuHUpxKvjtwjLksZmv4cM32SSjHsfEjYCA+aiEYwR7diypsAJERP4RRN5Y3KkgXKiN+6WV+k2nbgBYtqMH1ZbvwUec/E+QKqI8EIaG/ZDp4Q8IoEjGNrsTfAmXEQmLjvYtecL1H4JGc+fkJA5i6WKp85biF4H3bFI8POTIlGaJcubgLrptbCaw3wK/fZoxDk0+VwulU3hAvwzQs//J3LtfkWlIqTjxwLfiTR21+ZaCY9usbMRD+kuMGzg7tJtUM/baZajpCt+y1UlH1F3pgaRwH3Nrtqb6jE12F6oQ6PZl+JHaD7/nu+pz39xC8ua9mEOUlUOObjIxfmFnawg9XdIJu2Tt5s4ayqiaNuhyJPyU+VlbTPiDq8mY+eZu6RGi2dLqjPTvRxqeDPklfZGmt7T5LoUJJtQjCJcmxOkcCapF9fczptiQfWJDmhiHZEcAJoZUlUxL5q+VfhnPyPJcUIgdwZHLoX+jYkoJk7rPid/VQp6N+QpgBydxVHAaCQ+Mi0ZZR1vF+m3maeWmVXTxD0e0zpxhmBMtU= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2147c1a6-2697-4f43-376e-08dc18312c12 X-MS-Exchange-CrossTenant-AuthSource: OSZP286MB2173.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2024 14:24:25.4845 (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: TYCP286MB2622 Subject: [FFmpeg-devel] [PATCH 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: KGgHjjA0JmPV 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(); }