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 313F644326 for ; Tue, 6 Sep 2022 07:29:58 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 78E1668BA5C; Tue, 6 Sep 2022 10:29:55 +0300 (EEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0666368A6B5 for ; Tue, 6 Sep 2022 10:29:47 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662449393; x=1693985393; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=SmeNIaeIGEo7b+VfPwOP/NBZ8BvhFP+oCRDFqV1GpLM=; b=QxrXyrEfxO9YOj7wYrOcHz0dOw3VS/QVQnUEI/5qMnfZKSYwG+rVAooK v8zcyMd/ARrHBGDu4Ikd8qyrty9NzTYOG0xfej25RHJbasFYrkZlexjce FaVupT5Blpu3rrAJJ7IoG/nSxyt2ErdSQem/I74B5H8ghoWMGW7EGwSmG HR/bpZSOQWWi21y6CQCmyUmYjEVE0817nNcThktiljwVTYch3HVI5nQzV D8dREHiwJSA02xqwGJGfcJFUK6SGIzyxSJpaFy9x57O3ryDM3BIQb8s1K RIC6qOk+NqRU+WXGU7rC6a7sE0g3WQSAz4Zs0AbvhVdAySHjcV0Xcshcb g==; X-IronPort-AV: E=McAfee;i="6500,9779,10461"; a="276264883" X-IronPort-AV: E=Sophos;i="5.93,293,1654585200"; d="scan'208";a="276264883" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Sep 2022 00:29:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,293,1654585200"; d="scan'208";a="789589398" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga005.jf.intel.com with ESMTP; 06 Sep 2022 00:29:45 -0700 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 6 Sep 2022 00:29:45 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Tue, 6 Sep 2022 00:29:42 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31 via Frontend Transport; Tue, 6 Sep 2022 00:29:42 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.42) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Tue, 6 Sep 2022 00:29:42 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ke27K0qDgDPx7hUmRbz2Drjpik/S6y41jVK/RP8T+6STil5LpBCBzh72dLP33rviCrsLSP1zQkudXi1RyVTND5BaD+C1XT2RMrAim0BfuEB/v52PJVbAnTrASCrQRTNK9/KhAAmn9WEJEhtXipZYEgW6YNY/bspPTBzbtPEcMcFqAsKyRjiNIOdWlruyGsrTlhPWkxmtvL6aUJwCZY/YRB8VYa8SaX8YHAc6ikiRNrhXGg7x27Tbac+HRBEwfu/SRuQgnLUhF7KyRo34Ls4nyjbjtzotC63l+j63klWeP+Y5tEWbyFSwwl0txY7AdDZhU7qy2/3G2lA4h0oawdS4ow== 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=QjyFna1sKDMK3RbksapBtjmEodMQA7wFjm5OmGWPaVQ=; b=Ye6ZKltfTs8X8EIMJlSDoK3bEFJm7pbmZ/zJ5dijEWDCNoaWDAVMXNI4/pAHiwIf7ckwmJP/n0M2z2CgD8/ob86tizkRJ3sA3EyTtzhRUmCK8GtIfJVCppGjLgqI11GycE318Mbv7p8G+9lr7WmTj4g8x2MDjnUBTMFUHFxbBri3mvCrXPMy0wxxIsxAoje0+HFiD8A0qYcqQiZN6HkN6sIJB+RF99qDPE1p4eMQDs4B0K1yR3kVSMYCghfWtBpGXA68I7NPfCDj7kF05QHNDZZl4Lx1XtVtzUBB1xMo3IpQiI077iHNkvL8PTtAAMmFNAR+P+m+lrGH2w6UeZeIJA== 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 SN6PR11MB2992.namprd11.prod.outlook.com (2603:10b6:805:d4::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.17; Tue, 6 Sep 2022 07:29:40 +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.5588.016; Tue, 6 Sep 2022 07:29:40 +0000 From: "Wang, Bin" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH v3] libavfilter/x86/vf_convolution: add sobel filter optimization and unit test with intel AVX512 VNNI Thread-Index: AQHYtsxfXeiNV03auUi2i8zxAsZ8tq3SFjKw Date: Tue, 6 Sep 2022 07:29:40 +0000 Message-ID: References: <20220823082250.19340-1-bin.wang@intel.com> In-Reply-To: <20220823082250.19340-1-bin.wang@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7b309c45-43d9-4156-c312-08da8fd98f7b x-ms-traffictypediagnostic: SN6PR11MB2992:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: nONV+t7d2ngq6lmL5H9fuf+FyJZ+3SpIqkcuRWLAszAB2csYWZNmDozDnt0SU+6wnT8LuAilSdxK9fnOiwmffev+VqX8aMXYpDWekcp42Xo1gP3w86aJtJmLE8PtE6LDdJMoxM3TkULQyFqMJsZCnm0ag1T7oCrwk32vlkSWPDx8j8cMbVtSZl2DhFFfwwi4EzqX/+dxM6+PZbCao1ERMIC8nSuzLKZbRqDUPnNmSaUbBVbuwV013RRLCC26OPVEKe0BJ5WWvo3Wgcqykr9J0J3pY5xtrnmM0M+II+7HfUzzVwc6PMUYCp08yOZ2bruS0B8tkEK8JkiCXbzSJ03RW212w9kR3Vdnba/vEIB/+rBO5sRERXNOQOt2oFQRI39IhcgnFZnSYluNAhMPYHbR8sFnZYubZYGGBNLd9UHg0Gz+EyRjy/AC2R27yahUO/TaWVqgMHWaOMxjraHiS8UHcMRSRK3I3Aoy5LEzHXf3QmwJSHmZPNOMk45GSnHLj66ZExU5hYWENIZlZ85Rh7m90RHrU/xsFmZcVoiUdjobnxgYppstT9XR4T2mZVbAHgErNIckQxbyXNqOEv13++pdHRnw3jAU1N1E+C2EvFE2v/KGuUapPI2VkO6VKV5UP6tZt2rYCbz+cddYt2CDruJ/0jczSCsi5yiGpUsHG6OUcjgXg1bfr4xn939cM6lQ3ts0Py/JKMeOUq7ZFwNzdyc+eXsSfi0hGySM7kLC5HB4BEMjT1cxPbByk8b1MNsfsPi4/IukG2m+BeBaJbKEfowqdD7SyEF1Mk4khJfKVq3Qtkc= 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:(13230016)(346002)(136003)(39860400002)(376002)(366004)(396003)(478600001)(71200400001)(8676002)(7696005)(9686003)(26005)(6506007)(66556008)(55016003)(66946007)(66476007)(64756008)(66446008)(2906002)(41300700001)(38070700005)(316002)(33656002)(86362001)(6916009)(53546011)(122000001)(38100700002)(82960400001)(76116006)(186003)(5660300002)(30864003)(52536014)(83380400001)(8936002)(2004002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?aLdQ4HbRBIV6kMFkoRt55Eap7hT4EqQkqllJC3mV9uPYwt1T8O09/pyGBQj8?= =?us-ascii?Q?3Np3Zk2U7A5wkDMvftFBU/H5rA05FIP4YEpytzDF3KxKDIb/uTErk4EpqjSx?= =?us-ascii?Q?stYjId6BCAmscCt4Xx/vz7+/rHA3/5gDC13vPoz5055YXGKQfBmcNQ/YoZRb?= =?us-ascii?Q?ZQsnlDcsJeUXB8BFvV8MLVFazUkvHgrcTo/k9Vf7Eu8omVL8h4Kus/9ZDwHY?= =?us-ascii?Q?VKN0Pvb31nNrTYWyfzbLFVMQHs3mOLXdsHvmqY5n5ogO2GlbLI+OSR5OZyxl?= =?us-ascii?Q?KmfzwnoO9msfE//dWPytcNegPkpDY+o96lYOivd9fJ3kzE1v3Yv57krrJfIN?= =?us-ascii?Q?odWUI+Ujqox/c3t72sJMSkEhHjcMLgnL5fWgiGJryuNpnuaGKG2ZCH2IrwFM?= =?us-ascii?Q?vuG5eJo55/mqY1cPqaQ/NNhbiBokcIbq0j/NX1LbgjIOtZVTLzmxDATzS5Kz?= =?us-ascii?Q?D3X9L12RgLyFFezrEuVndWnr7E/XES07CKkNqvW+nJj056EVHLmgW+1Iis6w?= =?us-ascii?Q?h0BTs5HntSCm/JHx20RnNjKVfdr6XZ2ZlSeDmHxzGjK2ONbjIHPagL6n5gvl?= =?us-ascii?Q?6SoOk0LNpZrjDaIemDuIB/Cn+IUThLscX42FEPLdH7vjM+TIYXDTFXyxouRT?= =?us-ascii?Q?AibTrCjRGmghBvcrB1KJ2i8Fz7kMgm8CoA5AAyiMoPOadWy4in/JnLZ64XVG?= =?us-ascii?Q?8M7/eofbqsibcWmaN1ZStdwf7kKT47+l87ZryGq9SFW/CKS9N5SkzExAgMVr?= =?us-ascii?Q?zwrw61tFqlmYsxKiAvNDj6EF52bY6e0BPb9crLS7vJvw7m1Y8zYvJhDjG3SB?= =?us-ascii?Q?KBfsKEiXUaMFm+9+yb91DoD9ZUrVtqcYv2PgDfmeFn1olaRjrDBNPxDHitiW?= =?us-ascii?Q?XqWdMY5fNvbD4XPySKg65GNIBgYzhQdrSYYeqdAP9epLoV4Rti6LImNYZH7N?= =?us-ascii?Q?c2rXAtwohhpo6R5zzODBd0ne1XrtMl8ABzN6v/habtnBtJnO2x8vPUOYN6d6?= =?us-ascii?Q?cnoK4inJ5yQs9oOMQZw/BV6pGO+f8WCVXcVr8zX7zTeH+nvmX180YFISjOs/?= =?us-ascii?Q?hfH928YuWMegjE5AyoxUd+i9S/mP7+u1mGAijECbqqVfhrVCzBuGNuMahCD0?= =?us-ascii?Q?IvQcwF2feH2vDZ8Mn+te3y6BF0JMF90h5GtTixWxToOusz+YhoDgdM4GVcKg?= =?us-ascii?Q?8OtFBIDXDVMrLFT9etJWjNlBbmNjDgYwY+K98HLy68gBz0OZlu9PJwtwyvZB?= =?us-ascii?Q?hLfkLyvKl//V8KeTOmJzK0iTowpzpO3pAv2zbydGYDPBHClGmBM00Cbm6m2x?= =?us-ascii?Q?feP8Zkh8FgaNlf0sQE81m3il35+mTtjQdG4nK++xZV1ejA1av6JCzKTFPX6G?= =?us-ascii?Q?zraNqoGx9j7g5TwqZxZYwjtaAlQe0rqamiYDK7N8j/mTChCSs5TuW3LAhRx7?= =?us-ascii?Q?octY6g9emo8iZMn0CSVr5pHM6DyrAFm6Y9ZCnqDzBoegefFHH67B9zOQwqwR?= =?us-ascii?Q?KJLKAW8UyeBf0Oe9Mo1KQ2xoV5cAaRXikI2ZEceHxvXe7PuHOn3/RU4s91hd?= =?us-ascii?Q?AloMGCodOovF6dw8LXX64B8Z3c60eckeFnqpVEzn?= 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: 7b309c45-43d9-4156-c312-08da8fd98f7b X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Sep 2022 07:29:40.4118 (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: 2szJOiGMI1L6vxr18ugxRePugKBFpRzEVT6VHToU7F3ZsCLXCk7h3fF8CVAUI8TV9buOLDnmXwGWxKUgNAcE2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR11MB2992 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH v3] 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: Tuesday, August 23, 2022 4:23 PM To: ffmpeg-devel@ffmpeg.org Cc: Wang, Bin Subject: [FFmpeg-devel] [PATCH v3] 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 2470 Signed-off-by: bwang30 --- libavfilter/convolution.h | 2 + libavfilter/vf_convolution.c | 23 ++++ libavfilter/x86/vf_convolution.asm | 162 ++++++++++++++++++++++++++ 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, 313 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..8ad2452418 100644 --- a/libavfilter/x86/vf_convolution.asm +++ b/libavfilter/x86/vf_convolution.asm @@ -22,6 +22,10 @@ SECTION_RODATA half: dd 0.5 +data_p1: dd 1 +data_n1: dd -1 +data_p2: dd 2 +data_n2: dd -2 SECTION .text @@ -154,3 +158,161 @@ 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_16 3 + movd xmm2, [%2] + VPBROADCASTD m2, xmm2 + movdqu xmm3, [c%1q + xq] + vpmovzxbd m3, xmm3 + vpdpbusd m%3, m3, m2 +%endmacro + +%macro SOBEL_ADD_16 2 + movdqu xmm3, [c%1q + xq] + vpmovzxbd m3, xmm3 + vpaddd m%2, m3 +%endmacro + + +%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 + +.loop1: + pxor m4, m4 + pxor m5, m5 + + ;Gx + SOBEL_MUL_16 0, data_n1, 4 + SOBEL_MUL_16 1, data_n2, 4 + SOBEL_MUL_16 2, data_n1, 4 + SOBEL_ADD_16 6, 4 + SOBEL_MUL_16 7, data_p2, 4 + SOBEL_ADD_16 8, 4 + + cvtdq2ps m4, m4 + mulps m4, m4 + + ;Gy + SOBEL_MUL_16 0, data_n1, 5 + SOBEL_ADD_16 2, 5 + SOBEL_MUL_16 3, data_n2, 5 + SOBEL_MUL_16 5, data_p2, 5 + SOBEL_MUL_16 6, data_n1, 5 + SOBEL_ADD_16 8, 5 + + cvtdq2ps m5, m5 + VFMADD231PS m4, m5, m5 + + sqrtps m4, m4 + mulps m4, m0 ; sum *= scale + addps m4, m1 ; sum += delta + cvttps2dq m4, m4 + vpmovusdb xmm4, m4 + movdqu [dstq + xq], xmm4 + + 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 + mulss xmm5, xmm5 ; b1 * b1 + addss xmm4, xmm5 + + sqrtps xmm4, xmm4 + mulss xmm4, xmm0 ; sum *= rdiv + addss xmm4, xmm1 ; sum += 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 comments on the patch? 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".