From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 901AC42B14 for ; Wed, 14 Sep 2022 09:36:25 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E86B668BA9B; Wed, 14 Sep 2022 12:36:21 +0300 (EEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A97A468B726 for ; Wed, 14 Sep 2022 12:36:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1663148179; x=1694684179; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=LaEFKWcoQ/YZWrLkziXCXkdVXLIoWin8e+Nm6JEDAuI=; b=R2KDw+vxsUSXbGo83fnFO0jh+aaAZTrcpBLmA0DEvfhHD4Dg+qeeznkU YbtpMs7V+35pZ6z1lqenjb3NUoc+qSg4GJdmMwMU6V6AFKk/7HXT+f/zw 6DBBCQf1DeXWpd9syYZSsF+Nes70gWUH5OQdnuKVd3SFR683UBxnGqJqp xlyCSQkjt4Wv9jBpKMBVnpc6e35+cZuTH9aSJxxAstzJhVEkFOIunqj61 ZkHjZyRhPU38kbLuFrDlcGLvdXj6oqE6NdOInFLHsBPxqvsYExys6TSWP IScbWPug3kX6GlfVeDBsb/k3eLg925wYejoucC5bKCu0Ic1guHaYg8JST A==; X-IronPort-AV: E=McAfee;i="6500,9779,10469"; a="362347267" X-IronPort-AV: E=Sophos;i="5.93,315,1654585200"; d="scan'208";a="362347267" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Sep 2022 02:36:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,315,1654585200"; d="scan'208";a="647321530" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orsmga008.jf.intel.com with ESMTP; 14 Sep 2022 02:36:12 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 14 Sep 2022 02:36:12 -0700 Received: from fmsmsx608.amr.corp.intel.com (10.18.126.88) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Wed, 14 Sep 2022 02:36:11 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx608.amr.corp.intel.com (10.18.126.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Wed, 14 Sep 2022 02:36:11 -0700 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (104.47.56.49) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Wed, 14 Sep 2022 02:36:11 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GwlKiuT5ao282h3Ty8WXqd58uNcJYZGIW/uvstO7+abe+k9kMCoFf7Ze7dOOZJMMThaR0mFZ6buUgRxvLCMz7y/OBHbV5PfpG5vIoLqoFZ6UQPzG1a+pz7HEohqNI8ia+Hr0DXj/zuhW9kp12vAxTWaTSkNqH2HKTgmBEuvi00p1Hsl2Ey/ktK4RtGdD/iifBKlaZIs0lB5wuTqPYprUvHibcQoP3ubl3P+Tx5xxNx4FfIf0ucUAFeTIc777lAIxwP9rXMLrtrLArHAlOJcz3c+nTyFpGiRkCxbIban/gE43iw/QdGm5+GwXhAYDlPe+kqkP4cWLjgzAq6BotyzE9Q== 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=Fru38DdnPpgXH/Do6knurKMBJaIu/03B0w5Q0gE3Htw=; b=kK8BloM0IW/Scg4jS1t/adBUz3hua9X/6znI7oNjL6SSl3Yca6LidyBY0JntAF9kpUXgDKICzMGvBj7Y6lVYtwgK++DzzKk7SZ2EKHo4nzEzNVEcSR2O99I1JlLxsDaqXLLEDHHdwGamGG4ilxZsalNF3UQm3Go62vUJ4aLAntBqaDAIXSl9/t7ejF/XpjTqJxNHt8IgFHsc2NSkNCC4ghVFTmwzDd+hFYTJmV3Qa7//8mwbDBspIzaVvBHkI9Np9meZlctVwwzl0FhFryamkRcGz3BVhAJTUfbFZ31hmOz9iq8L9/ef00tdFWnkMjhjyRAiSNLEKeq6X7reXgtArw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from BN6PR11MB1746.namprd11.prod.outlook.com (2603:10b6:404:fb::20) by DS7PR11MB6149.namprd11.prod.outlook.com (2603:10b6:8:9e::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Wed, 14 Sep 2022 09:36:04 +0000 Received: from BN6PR11MB1746.namprd11.prod.outlook.com ([fe80::3d60:779d:f20c:c43b]) by BN6PR11MB1746.namprd11.prod.outlook.com ([fe80::3d60:779d:f20c:c43b%4]) with mapi id 15.20.5612.022; Wed, 14 Sep 2022 09:36:04 +0000 From: "Wang, Bin" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v4] libavfilter/x86/vf_convolution: add sobel filter optimization and unit test with intel AVX512 VNNI Thread-Index: AQHYwoWvHr7Wo8pbbkGSfUrYRaCEwa3etIOA Date: Wed, 14 Sep 2022 09:36:04 +0000 Message-ID: References: <20220907062641.23091-1-bin.wang@intel.com> In-Reply-To: <20220907062641.23091-1-bin.wang@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.500.17 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BN6PR11MB1746:EE_|DS7PR11MB6149:EE_ x-ms-office365-filtering-correlation-id: 9e30d272-9691-47fb-d80e-08da96348b5b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ypVxfTam1hnszQNtpxGHuUj9mMBOkO61oa7fEmWpHGgFpaTeQhbjW91maITEX7jnvkrHvwK7lMpKv+pefnDugnJsh2UpHcxr/3wK+IjforSNnEEn5L8mjhlHWITZbJKttyNLi0zadbkhfQOHGI2QG8ubDBFMNC3ovi+Q2TsoImuuH8iHN5bmNbZ/UqZgQTAXJJ6ugeKe9LzwHadLjS7X3uSqzS7vAXv7YElo4TMYladjZNe7GFSYorQT7DpO8IbwKPAqGcMqekap5Nc9/SzUAJsSWtLsreg7qyP2EPf0M4EMD0nwrjFZfFD1efxOiBbHqaDw7rqnZPNuT77JTR/uG1+J/+N9JqS5lc3HtDbdJ4WrcoD+xeg4zN2bdGNLmlRBVAXL9RqS3FeaLnbhswoTPSmW98a8xIAvnaYZnZ8q6V3fYzPF3Clbw3NcCcru2VRWd8bCWjNfUwK1ZoNpllZywwznJGJa9Xzg+MgmMdcW1g3VZ+LgkvG4LGvZdkvpwKSrHwyiFiEvcXmQbTJrQqBr8ViaCoFV0XdUgDXZ1LDL+VD94OvveuOmV2rZcajtd6L5SWyAe6arRpHvAhkgMuXimzhDdTR8aWtPmfl2Lu3dJGKMUDZUMuZsHg94jvO3z4LuX8AMtPfL8RDiAFfbjmRnCr0iGFbFG7sydu6PR5ms2Fsmwayla+QMISaDvJ8WWyTyPYP7shJ7eI4Twk82p5N6DW/58tODa87tiFRXSgm5a/ea2nuOKqlI17dt/6YmGFvoQ4H3dQY3BPg7Vjl+lrt5qMtUFRSaI7muomcVCsFhQBg= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN6PR11MB1746.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(39860400002)(376002)(396003)(346002)(366004)(136003)(451199015)(5660300002)(6916009)(33656002)(71200400001)(316002)(186003)(122000001)(82960400001)(26005)(38070700005)(38100700002)(8936002)(86362001)(83380400001)(2906002)(6506007)(7696005)(53546011)(478600001)(9686003)(66556008)(55016003)(30864003)(8676002)(52536014)(66946007)(66446008)(66476007)(76116006)(41300700001)(64756008)(2004002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?v6HiLvC2WT7IeYChDubwureHOaJPQoasFEjqYhFczrney35BreadFbt6hWE6?= =?us-ascii?Q?1neWXdUoCvwWWDSflTvcPgP7K81+p2lVP6Skm07/4npLCmAdLSixZU+8ZmrH?= =?us-ascii?Q?rX1vyTxyuMxI8bHndqOYO+AoB/TDZ6A2KknfWLC9seD7w+x/Y9MZZdbJrmKT?= =?us-ascii?Q?SoTxPTtVIi7jIBiuc92viwJxFnX2r69cytkXIzC+o/KRIDoPykx/sORp36rG?= =?us-ascii?Q?chuX08duIjOBI9adigS2Bu3gaqU5EHFBpm9KACZfMAZH7iwCRIsMmlk4Z66X?= =?us-ascii?Q?rpJkW9vN4d4Ul4GXCKEjHoCOcobS5hiWEeiZIEzUrjByz0kLf71cGhpstDQ0?= =?us-ascii?Q?GTuVvRcd2ui4zNW1KkxdsakEm7SnBjG2v/EiydvDAbU7C68Z6qTVIVHWt/vW?= =?us-ascii?Q?RkWExlFYIfUXm263iIfa/ccwQ05pRCBkJrsfKsKek4g3N4ElLakYLRxImWIw?= =?us-ascii?Q?C+us/fr7H5scuMtNaYJWOMng1u3BprKHHdCXQ2R8e5yCFwGu5EZA04QM+XLZ?= =?us-ascii?Q?pW2eyJVr0HxNtxmPQhVQTP7+SMRUjJDcrrHi7Q5j6mE2GyN9gbLf8Ai4VujZ?= =?us-ascii?Q?dQvk2+G1SJb2EUUC6tC8SZvWng2HfjWwyqshXmpV/s+Dm74iQVMLRxfog8h/?= =?us-ascii?Q?mBnl0lg2nkmQaWsHNARXRLkE/QolWncoQvOcT0wDvP6KDb1lZnm5f7dvZ/R6?= =?us-ascii?Q?3lOw2NUcUbea7Ad3jYcIrdCr5VIu2WRNXiqA4Qy2f2cv0K2fNs+Y/BjUZ7Ud?= =?us-ascii?Q?QPTgWp2QefyYrxuJAwNYNAN+qrS1z0JAdO66Fnpvo1y6aPAPhzOs4dJQV/rK?= =?us-ascii?Q?s8jo1iGHDiug8jG8VRM7KUmlc9yYcbCJ7jk9NqKzYZNV+tSz/IC8E4bDyiCO?= =?us-ascii?Q?k9A8wBG8Sse09+e8ium917ib86mkdsgXn7+FCSIXmgsa1XCjNJ+KOYNwIFWd?= =?us-ascii?Q?hHAHluQBajyaOrH+6NXBXmheed3Z7Uapk+dpvDErO4fjlwz2GzNhsw2wH80k?= =?us-ascii?Q?LlNzjGmOjpPdQildwWQ4LnDVI/IdRyNi5jP5RUPethHfzX06zHL221/IFJX9?= =?us-ascii?Q?5OLaNR5JL40ET/dGHQT5XUICCYG9mE9wwrge6yCDkqVa07jOoi0F4Wxqe3gY?= =?us-ascii?Q?Rudjzfbo/BeZCknlj8fuv/9DYyzoBP6AEOGBTJCV1sY8E69mp2huHX8JorzQ?= =?us-ascii?Q?zSCIb94RBY33pX+wryvRXUpnOad6YXadzSceEQdDSxquF/Mq9ZKnNHVm2mP1?= =?us-ascii?Q?RHyPnXn3D32hd5jT55RLv0chEgH4lJ+17kn/Q+chCwDM6QpB6UOROVXvMrRX?= =?us-ascii?Q?JJZFWi0ITNPWabMX6m6qYXxeWNFhKHpesVN7hadUVSQBoiV4j76p5ll7UZV7?= =?us-ascii?Q?cUtT3yY7XjaC5JmuVShOjGQam+byOej+O+h/i7PqoSDCPrhmaPk1MJBFCpKB?= =?us-ascii?Q?f1lCT52CeUAo2UcEQf5OpF52KRxB1SP93k04ydkvYmR9UaKUlX1zKrbC+FBp?= =?us-ascii?Q?jYraeqZ+qUf4zUav3Nz0E6LDhnTczUTNa3nVYwRMwv5Si9pN1DuuTGFBCEtv?= =?us-ascii?Q?lK7WSNSMP8JQhivQrwnFxvb2kIVT5+wilhBYFfjA?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR11MB1746.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e30d272-9691-47fb-d80e-08da96348b5b X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Sep 2022 09:36:04.6395 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 86yJ2R8L0kzuDFNEboG/fVIPhc3NaF/3TkibMpUxdkG5nFxL0MK66oT3VpBVnBaxOxMU/eeNCE/crOjDZB4vdQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR11MB6149 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v4] libavfilter/x86/vf_convolution: add sobel filter optimization and unit test with intel AVX512 VNNI 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: -----Original Message----- From: Wang, Bin Sent: Wednesday, September 7, 2022 2:27 PM To: ffmpeg-devel@ffmpeg.org Cc: Wang, Bin Subject: [FFmpeg-devel] [PATCH v4] libavfilter/x86/vf_convolution: add sobel filter optimization and unit test with intel AVX512 VNNI From: bwang30 This commit enabled assembly code with intel AVX512 VNNI and added unit test for sobel filter sobel_c: 4537 sobel_avx512icl 2136 Signed-off-by: bwang30 --- libavfilter/convolution.h | 2 + libavfilter/vf_convolution.c | 23 ++++ libavfilter/x86/vf_convolution.asm | 150 ++++++++++++++++++++++++++ libavfilter/x86/vf_convolution_init.c | 18 ++++ tests/checkasm/Makefile | 1 + tests/checkasm/checkasm.c | 3 + tests/checkasm/checkasm.h | 1 + tests/checkasm/vf_convolution.c | 103 ++++++++++++++++++ 8 files changed, 301 insertions(+) create mode 100644 tests/checkasm/vf_convolution.c diff --git a/libavfilter/convolution.h b/libavfilter/convolution.h index 88aabe9a20..4520ad13e0 100644 --- a/libavfilter/convolution.h +++ b/libavfilter/convolution.h @@ -61,4 +61,6 @@ typedef struct ConvolutionContext { } ConvolutionContext; void ff_convolution_init_x86(ConvolutionContext *s); +void ff_sobel_init_x86(ConvolutionContext *s); void +ff_convolution_init(ConvolutionContext *s, const char *filter_name); #endif diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index 9a9c099e6d..0eeaaa9fc3 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -874,6 +874,9 @@ static int param_init(AVFilterContext *ctx) if (s->depth > 8) for (p = 0; p < s->nb_planes; p++) s->filter[p] = filter16_sobel; +#if CONFIG_CONVOLUTION_FILTER && ARCH_X86_64 + ff_sobel_init_x86(s); +#endif } else if (!strcmp(ctx->filter->name, "kirsch")) { if (s->depth > 8) for (p = 0; p < s->nb_planes; p++) @@ -887,6 +890,26 @@ static int param_init(AVFilterContext *ctx) return 0; } +void ff_convolution_init(ConvolutionContext *s, const char +*filter_name) { + if (!strcmp(filter_name, "sobel")) { + for (int i = 0; i < 4; i++) { + s->filter[i] = filter_sobel; + s->copy[i] = !((1 << i) & s->planes); + s->size[i] = 3; + s->setup[i] = setup_3x3; + s->rdiv[i] = s->scale; + s->bias[i] = s->delta; + } + if (s->depth > 8) + for (int i = 0; i < 4; i++) + s->filter[i] = filter16_sobel; #if +CONFIG_CONVOLUTION_FILTER && ARCH_X86_64 + ff_sobel_init_x86(s); +#endif + } +} + static int config_input(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; diff --git a/libavfilter/x86/vf_convolution.asm b/libavfilter/x86/vf_convolution.asm index 754d4d1064..a95d5ad499 100644 --- a/libavfilter/x86/vf_convolution.asm +++ b/libavfilter/x86/vf_convolution.asm @@ -22,6 +22,18 @@ SECTION_RODATA half: dd 0.5 +data_p1: dd 1 +data_n1: dd -1 +data_p2: dd 2 +data_n2: dd -2 + +ALIGN 64 +sobel_perm: db 0, 16, 32, 48, 1, 17, 33, 49, 2, 18, 34, 50, 3, 19, 35, 51 + db 4, 20, 36, 52, 5, 21, 37, 53, 6, 22, 38, 54, 7, 23, 39, 55 + db 8, 24, 40, 56, 9, 25, 41, 57, 10, 26, 42, 58, 11, 27, 43, 59 + db 12, 28, 44, 60, 13, 29, 45, 61, 14, 30, 46, 62, 15, 31, +47, 63 +sobel_mulA: db -1, 1, -2, 2 +sobel_mulB: db 1, -1, 2, -2 SECTION .text @@ -154,3 +166,141 @@ cglobal filter_3x3, 4, 15, 7, dst, width, rdiv, bias, matrix, ptr, c0, c1, c2, c INIT_XMM sse4 FILTER_3X3 %endif + +%macro SOBEL_MUL 2 + movzx ptrd, byte [c%1q + xq] + imul ptrd, [%2] + add rd, ptrd +%endmacro + +%macro SOBEL_ADD 1 + movzx ptrd, byte [c%1q + xq] + add rd, ptrd +%endmacro + +; void filter_sobel_avx512(uint8_t *dst, int width, +; float scale, float delta, const int *const matrix, +; const uint8_t *c[], int peak, int radius, +; int dstride, int stride) +%macro FILTER_SOBEL 0 +%if UNIX64 +cglobal filter_sobel, 4, 15, 7, dst, width, matrix, ptr, c0, c1, c2, +c3, c4, c5, c6, c7, c8, r, x %else cglobal filter_sobel, 4, 15, 7, dst, +width, rdiv, bias, matrix, ptr, c0, c1, c2, c3, c4, c5, c6, c7, c8, r, +x %endif %if WIN64 + SWAP xmm0, xmm2 + SWAP xmm1, xmm3 + mov r2q, matrixmp + mov r3q, ptrmp + DEFINE_ARGS dst, width, matrix, ptr, c0, c1, c2, c3, c4, c5, c6, +c7, c8, r, x %endif + movsxdifnidn widthq, widthd + VBROADCASTSS m0, xmm0 + VBROADCASTSS m1, xmm1 + pxor m6, m6 + mov c0q, [ptrq + 0*gprsize] + mov c1q, [ptrq + 1*gprsize] + mov c2q, [ptrq + 2*gprsize] + mov c3q, [ptrq + 3*gprsize] + mov c4q, [ptrq + 4*gprsize] + mov c5q, [ptrq + 5*gprsize] + mov c6q, [ptrq + 6*gprsize] + mov c7q, [ptrq + 7*gprsize] + mov c8q, [ptrq + 8*gprsize] + + xor xq, xq + cmp widthq, mmsize/4 + jl .loop2 + + mov rq, widthq + and rq, mmsize/4-1 + sub widthq, rq + + mova m6, [sobel_perm] +.loop1: + pxor m4, m4 + pxor m5, m5 + + movu xm3, [c2q + xq] + pmovzxbd m5, [c0q + xq] + vinserti32x4 ym3, [c6q + xq], 1 + pmovzxbd m4, [c8q + xq] + vinserti32x4 m2, m3, [c1q + xq], 2 + vinserti32x4 m3, [c5q + xq], 2 + vinserti32x4 m2, [c7q + xq], 3 + vinserti32x4 m3, [c3q + xq], 3 + vpermb m2, m6, m2 + psubd m4, m5 + vpermb m3, m6, m3 + mova m5, m4 + vpdpbusd m4, m2, [sobel_mulA] {1to16} + vpdpbusd m5, m3, [sobel_mulB] {1to16} + + cvtdq2ps m4, m4 + mulps m4, m4 + + cvtdq2ps m5, m5 + VFMADD231PS m4, m5, m5 + + sqrtps m4, m4 + fmaddps m4, m4, m0, m1 + cvttps2dq m4, m4 + vpmovusdb [dstq + xq], m4 + + add xq, mmsize/4 + cmp xq, widthq + jl .loop1 + + add widthq, rq + cmp xq, widthq + jge .end + +.loop2: + xor rd, rd + pxor m4, m4 + + ;Gx + SOBEL_MUL 0, data_n1 + SOBEL_MUL 1, data_n2 + SOBEL_MUL 2, data_n1 + SOBEL_ADD 6 + SOBEL_MUL 7, data_p2 + SOBEL_ADD 8 + + cvtsi2ss xmm4, rd + mulss xmm4, xmm4 + + xor rd, rd + ;Gy + SOBEL_MUL 0, data_n1 + SOBEL_ADD 2 + SOBEL_MUL 3, data_n2 + SOBEL_MUL 5, data_p2 + SOBEL_MUL 6, data_n1 + SOBEL_ADD 8 + + cvtsi2ss xmm5, rd + fmaddss xmm4, xmm5, xmm5, xmm4 + + sqrtps xmm4, xmm4 + fmaddss xmm4, xmm4, xmm0, xmm1 ;sum = sum * rdiv + bias + cvttps2dq xmm4, xmm4 ; trunc to integer + packssdw xmm4, xmm4 + packuswb xmm4, xmm4 + movd rd, xmm4 + mov [dstq + xq], rb + + add xq, 1 + cmp xq, widthq + jl .loop2 +.end: + RET +%endmacro + +%if ARCH_X86_64 +%if HAVE_AVX512ICL_EXTERNAL +INIT_ZMM avx512icl +FILTER_SOBEL +%endif +%endif diff --git a/libavfilter/x86/vf_convolution_init.c b/libavfilter/x86/vf_convolution_init.c index b78a47d02b..52a3d28991 100644 --- a/libavfilter/x86/vf_convolution_init.c +++ b/libavfilter/x86/vf_convolution_init.c @@ -29,6 +29,11 @@ void ff_filter_3x3_sse4(uint8_t *dst, int width, const uint8_t *c[], int peak, int radius, int dstride, int stride, int size); +void ff_filter_sobel_avx512icl(uint8_t *dst, int width, + float scale, float delta, const int *const matrix, + const uint8_t *c[], int peak, int radius, + int dstride, int stride, int size); + av_cold void ff_convolution_init_x86(ConvolutionContext *s) { #if ARCH_X86_64 @@ -44,3 +49,16 @@ av_cold void ff_convolution_init_x86(ConvolutionContext *s) } #endif } + +av_cold void ff_sobel_init_x86(ConvolutionContext *s) { #if ARCH_X86_64 + int cpu_flags = av_get_cpu_flags(); + for (int i = 0; i < s->nb_planes; i++) { + if (s->depth == 8) { + if (EXTERNAL_AVX512ICL(cpu_flags)) + s->filter[i] = ff_filter_sobel_avx512icl; + } + } +#endif +} diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 1ac170491b..4e91547fde 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -44,6 +44,7 @@ AVFILTEROBJS-$(CONFIG_GBLUR_FILTER) += vf_gblur.o AVFILTEROBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o AVFILTEROBJS-$(CONFIG_THRESHOLD_FILTER) += vf_threshold.o AVFILTEROBJS-$(CONFIG_NLMEANS_FILTER) += vf_nlmeans.o +AVFILTEROBJS-$(CONFIG_CONVOLUTION_FILTER) += vf_convolution.o CHECKASMOBJS-$(CONFIG_AVFILTER) += $(AVFILTEROBJS-yes) diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index e56fd3850e..ae5e9d1143 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -191,6 +191,9 @@ static const struct { #if CONFIG_THRESHOLD_FILTER { "vf_threshold", checkasm_check_vf_threshold }, #endif + #if CONFIG_CONVOLUTION_FILTER + { "vf_convolution", checkasm_check_vf_convolution }, + #endif #endif #if CONFIG_SWSCALE { "sw_gbrp", checkasm_check_sw_gbrp }, diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index d7645d3730..71c722cf77 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -85,6 +85,7 @@ void checkasm_check_vf_eq(void); void checkasm_check_vf_gblur(void); void checkasm_check_vf_hflip(void); void checkasm_check_vf_threshold(void); +void checkasm_check_vf_convolution(void); void checkasm_check_vp8dsp(void); void checkasm_check_vp9dsp(void); void checkasm_check_videodsp(void); diff --git a/tests/checkasm/vf_convolution.c b/tests/checkasm/vf_convolution.c new file mode 100644 index 0000000000..a10da8b45e --- /dev/null +++ b/tests/checkasm/vf_convolution.c @@ -0,0 +1,103 @@ +/* + * 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 "libavfilter/avfilter.h" +#include "libavfilter/convolution.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/mem_internal.h" + +#define WIDTH 512 +#define HEIGHT 512 +#define SRC_STRIDE 512 +#define PIXELS (WIDTH * HEIGHT) + +#define randomize_buffers(buf, size) \ + do { \ + int j; \ + uint8_t *tmp_buf = (uint8_t *)buf;\ + for (j = 0; j< size; j++) \ + tmp_buf[j] = rnd() & 0xFF; \ + } while (0) + +static void check_sobel(const char * report_name) { + LOCAL_ALIGNED_32(uint8_t, src, [PIXELS]); + LOCAL_ALIGNED_32(uint8_t, dst_ref, [PIXELS]); + LOCAL_ALIGNED_32(uint8_t, dst_new, [PIXELS]); + const int height = WIDTH; + const int width = HEIGHT; + const int stride = SRC_STRIDE; + const int dstride = SRC_STRIDE; + int mode = 0; + const uint8_t *c[49]; + const int radius = 1; + const int bpc = 1; + const int step = mode == MATRIX_COLUMN ? 16 : 1; + const int slice_start = 0; + const int slice_end = height; + int y; + const int sizew = mode == MATRIX_COLUMN ? height : width; + float scale = 2; + float delta = 10; + + ConvolutionContext s; + + s.scale = scale; + s.delta = delta; + s.depth = 8; + s.nb_planes = 3; + ff_convolution_init(&s, "sobel"); + + declare_func(void, uint8_t *dst, int width, float scale, float delta, const int *const matrix, + const uint8_t *c[], int peak, int radius, int dstride, + int stride, int size); + + memset(dst_ref, 0, PIXELS); + memset(dst_new, 0, PIXELS); + randomize_buffers(src, PIXELS); + + if (check_func(s.filter[0], "%s", report_name)) { + for (y = slice_start; y < slice_end; y += step) { + const int xoff = mode == MATRIX_COLUMN ? (y - slice_start) * bpc : radius * bpc; + const int yoff = mode == MATRIX_COLUMN ? radius * dstride : + 0; + + s.setup[0](radius, c, src, stride, radius, width, y, height, bpc); + call_ref(dst_ref + yoff + xoff, sizew - 2 * radius, + scale, delta, NULL, c, 0, radius, + dstride, stride, slice_end - step); + call_new(dst_new + yoff + xoff, sizew - 2 * radius, + scale, delta, NULL, c, 0, radius, + dstride, stride, slice_end - step); + if (memcmp(dst_ref + yoff + xoff, dst_new + yoff + xoff, slice_end - step)) + fail(); + bench_new(dst_new + yoff + xoff, sizew - 2 * radius, + scale, delta, NULL, c, 0, radius, + dstride, stride, slice_end - step); + if (mode != MATRIX_COLUMN) + dst_ref += dstride; + } + } + +} + +void checkasm_check_vf_convolution(void) +{ + check_sobel("sobel"); + report("convolution:sobel"); +} -- 2.27.0 Any new comments on this patch v4, compared with patch v3, I achieved a 13% improvement with Henrik's great suggestion. Thanks Bin _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".