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 A02A344393 for ; Wed, 7 Sep 2022 12:33:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92FE568BB93; Wed, 7 Sep 2022 15:33:20 +0300 (EEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 671B168BAAA for ; Wed, 7 Sep 2022 15:33:13 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662553999; x=1694089999; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=UlTY3bsKDvjP50B/Z6EcqaRHND6qt14f7lVm/7lvOe0=; b=B7eoGEVANDlmRs9uhwtJTr78hwaSZrNp+v5g9feVVRNGxdVBHY3SKbvP 2VOAnYR7wEMqO7ztt77lOWv8nVcVjzrnc6RTMzZ5xBAMrrcn/9NnIZSno bihGPi//Kne48ro5NRoYji5kcou1pc/oTm5420xUVYMU2dIDQJYzbFfSf PFKKuRbQUux3gyv89KDaJ5YhCTTpU2dQqPJfQzh5e69qdVpVxNc/NdGnW OQhbrudd07/vwMlEMoFnc4gwvNHlCqaJY5MWMIS8FXyKiIe7X2nBOEM39 Mm7+NpEwhhdaDubXGDa2FoHoHE6IahrTA1u9lNsskfOHjLAG088xHuodQ w==; X-IronPort-AV: E=McAfee;i="6500,9779,10462"; a="296857504" X-IronPort-AV: E=Sophos;i="5.93,296,1654585200"; d="scan'208";a="296857504" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2022 05:33:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,296,1654585200"; d="scan'208";a="790031242" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga005.jf.intel.com with ESMTP; 07 Sep 2022 05:33:10 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) 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; Wed, 7 Sep 2022 05:33:10 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) 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, 7 Sep 2022 05:33:10 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.48) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Wed, 7 Sep 2022 05:33:10 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BxBqNCQbvN5oUgpIYN6uf9KsBTHSgZjZlWXukl2d+tLLrrSf10z6ThxwbyUpvDS9yXim5tpWv06o5Np137mkOCA0WR/0GVV93NIX/wvT6OYotKQBQBifQcnnYQLccNSgpGn1wyjlYYr14NfVAdZ6/9fF0Mz0Lsb2F4Ju8DIjzLO/CK5T3AZaz02W1ioK/yqx3CL96NaeV/KtVy2dq96XuVV/B3Ixo/nc4/8t+CBw7mLKZBxxx5mjMnV8dana8O98X+UPQ8JKtcse57Eve/RBovjd5eSnAH7nOei4TCGTqz8SSdQ2vcNEmOf7XqWFIbTX3h+DiMLd4DvHtO9hisvE+Q== 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=niPXEjRBFHhmGvOsl4wrEchsWK9OOfZWGmweC+BmlYM=; b=FRbW3pKd7GXdpLGDLyf6zf3tI3IjzJ04DdSA17wwE9zkuDfv0jVuoG1YhbQzNfvQEGQ/aKPqAcWwqBF+8WJj+ORNRn2g5e736CEE6Z7BYOi6DcsnkE0oC0vsa4NnAxYJSYZNwW2i4vkYG2EwEni7iO0hD7yf38MY0HEH40+B6gWm8Xi4oZRiELTBNGJNpKEPC9wPt3y2GZFNIWBoWpUR3n8naOfvV1nvKu7KQk7IUnv68S7JNzk3xsqjyKAPJ6VpwZBdt/oyfT9tiJViFZ2L7ggfoQnqqt9+caM2HGA3j9jtN3224xb47UsSbOJjN6gaBQXRqUryFrCKL5qXS7I8JQ== 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 BYAPR11MB3415.namprd11.prod.outlook.com (2603:10b6:a03:81::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.14; Wed, 7 Sep 2022 12:33:06 +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; Wed, 7 Sep 2022 12:33:06 +0000 From: "Wang, Bin" To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH v3] libavfilter/x86/vf_convolution: add sobel filter optimization and unit test with intel AVX512 VNNI Thread-Index: AQHYtsxfXeiNV03auUi2i8zxAsZ8tq3SdBeAgAGIiXA= Date: Wed, 7 Sep 2022 12:33:06 +0000 Message-ID: References: <20220823082250.19340-1-bin.wang@intel.com> In-Reply-To: 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: 28cf46cc-26ed-4674-7199-08da90cd1d8e x-ms-traffictypediagnostic: BYAPR11MB3415:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 92iwAPIafY1AB3AOEFXrMdxUDgJSkNw/topen0g75YCjtqp2qlBpdBk9nbszRheGKabzylV00DohHq1Be4JrfAXPRLOS1twpAVGHc5iZTpB6NZdPYDJWmMEjaez1i3sFW2AVaA9KQAqnM68gz/19t/n05y6U/PsBYqCUkRkjYeo7y9CgyAJVUCsurRfGRLEFikksYZb493SbYbHfR+lXbnKhFiRZiYZVdLG0NQOh3yzSXmsFx7KiTvEcKBsOOa1jW9H7naaL7oCobM41pi/wUbAQeHXsffldLEP28A9MWYgKOm2NfkLW309xr4bJzMTq+LIEls3NJlk+BVcsEV46+jYWnRkiPHxlOhtqMtBnSjzSIeM394oAWXgSV0tE0GGODJkrXoNGpFWDBAXVm8Jt+IkLIfwMtPuG0lifHjZI+THv50gl5KVpgHA2BCAsqKGiwmCsr3PHA2wZcLvjQXd39PXV5u4QP3RNUoi2POzyq+WY2LuzxDQZcaEDXkXqrtAZJKMlQl9g2Q9Pg6vxxmeSBi9MfQUCL+iWA33CwAwQBYSw8WL2V6jfbvOq6kaCdLli3M2vV/LmI8TtlOHFFcjBGxv6b2cfCa+Kw+Gvf1ypZREm68/J9j6HvIqMocPs3vqo1hT0Jby9bXsf3bXlDje4oLiUg0wVKmiljPRoJvaiZy8k9+wBlNPPCJszrVrpbvC+Zbw1c5t8GEFOhrh30/D29Us/NAd0Dg3QHB783toCm5Sq4ffNWS1KFSN60Al6xUKUHc2iqQ/KsIqHWIc7szWm9/0X9W4OXV58JHBSqABTB+IsXvabwepDp8XxePmzsefb 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)(39860400002)(396003)(366004)(376002)(136003)(346002)(5660300002)(52536014)(30864003)(71200400001)(33656002)(122000001)(8936002)(2906002)(83380400001)(55016003)(66446008)(38100700002)(64756008)(38070700005)(76116006)(66946007)(66476007)(8676002)(66556008)(82960400001)(53546011)(6506007)(6916009)(7696005)(86362001)(316002)(478600001)(186003)(9686003)(966005)(41300700001)(26005)(2004002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?q6C1X8uO8QnpOyzU0YMaTSCgzCONTlGUMguSkExV/26IN5FJm2okcC+IvkyK?= =?us-ascii?Q?ank0yqWYtjTZ62GxBXQAWpOSwJnicXPiRYF5f3lCgu23jwJa6Wcf66D7MuEV?= =?us-ascii?Q?ltOMiWeGqzbn19fXBVc5/6nK+wqtRx0Z8V4FzXKP7WXMKadG/dvl/kmBXjkB?= =?us-ascii?Q?W4Tnq6mkgi/f/CDlYXldZM5ydAkmSNCPhlvJ0NgZbzioWKTE4nwu7XQclUn1?= =?us-ascii?Q?f2fy+J4inhFn5UpouxaN7XJOwuyK9f3C6pX0eMhX0kcr5d5WGShuUxJ2sCFo?= =?us-ascii?Q?UqallsFkhO2GW6YeIgYgNITqNQ/Dz10Fz6w8oioHPd3uKAcouhswd6wfmMVW?= =?us-ascii?Q?j9B65sA0S3MYWqvnM7g0U+azKexpGHnwXLLDT9T341R6XglWQcc0BM15RkZ4?= =?us-ascii?Q?gEejSh5uAv8m9MAc39hZ9dO/lPKFePwa/sJU6P7VDLNH1xekrGzP7Nvv5WnN?= =?us-ascii?Q?MNWBVYh1MTJyxT304LgjVmj+vcRnMs4I0uTDaUMF+mmCZUbRzE2AMIdnXmFD?= =?us-ascii?Q?Yu6crC2q0hhExPylhq95JcqrwhkJZYzpiSGF+v8hhLKvuT9/+zgIta5WG+QA?= =?us-ascii?Q?aJXpV628oCrtIwxJ05Quf4fM3l9U2KaV0pHg0MFPEjgzgr+3OtCyyvaS1uC0?= =?us-ascii?Q?B+JDV7vw2gYmvt/T2eUCV60HhcvFGlNbJzmri+p4yTGi62z9okQ31xw6UT39?= =?us-ascii?Q?CuhrHa2REyW5xDnZsyyZJDzn5k71JD3Xmd5hc8nqf8BN8gDm66v5Pk5gi/Fz?= =?us-ascii?Q?yW+mnmoT9gQdsBOrN3RhYM4lobhRJLUh1AcY99SN3YkxpvGtXruwdExB2aBj?= =?us-ascii?Q?BIK9D1Yl9UnoduTscS2w17x8gUxYCeMIjl3IqDcv538dL2n/DbMVzcSaD2cB?= =?us-ascii?Q?9G6h9Idv1AWevwvN5rVZwKB5U7Y9M7EDPo6eNUgP3jb2x23GcOup3kvq+Nbz?= =?us-ascii?Q?dQKUtXai05cF77M/cVfogPSjO6M46mNKQ237v1K566PhU7JKzsgG/znUnP1t?= =?us-ascii?Q?bZjEuxf2QO1QY2xsE7GYJpAHYuqZBpw1stl1nrBr7wr9YUCTuBYtVCttk0f8?= =?us-ascii?Q?kBh2FNuKQjtFb1YUj7somINmXAaYCl82LZy/sSNH0OU/h3euwdgLsKrbjcsR?= =?us-ascii?Q?GWFvl4hX1tnLrVqYNM2Xp5+UbNuS9bJWEQRIQmldvtr4iGE1HqkuEihTkov/?= =?us-ascii?Q?PBE86rJFsb4tC7SJx2i2KIJdRF8/PdFn64Qf/eFfShRncDARnuR6qN0W8j7N?= =?us-ascii?Q?DaXp9qkySbG+2aj9OQlMsTGTYikeI1vKk40IFGYyCnnd0RsR+MguJVlvOGBe?= =?us-ascii?Q?s9DAMe/6slaHF+MYVn2LW9nrCR3vZUx19eyhDIkR8nJHd2yHAXPgIyqE+SvN?= =?us-ascii?Q?GC8py71wOkgHg+MCU2ZyVFQLkNBiJwWUBSwAku+B2L0j0WONHYrAfqrqzm+J?= =?us-ascii?Q?jekzLvApMZST0WCVjW/YOSKJ47Pno6gIBMXYkJX56yLA4bpZFOud43hUAO8n?= =?us-ascii?Q?m7dMfYfFL1VvgbU+FaKcpRuZ+SeklLaD98TG1Ww5op7fqa4K/OZNHHRH/Gd7?= =?us-ascii?Q?+FKJbV8dEVV4oHtrPopm2Di6CI0UoTvHNKA53ZjF?= 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: 28cf46cc-26ed-4674-7199-08da90cd1d8e X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Sep 2022 12:33:06.4603 (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: Zrdxj373VDkJibsIH0nU1kJecfq2wZ/mkNOLhKLRf0XXLo7DrJ2LcWdra+3DfzQq8G+UlUqBuUzE++Mu7BnB7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3415 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: ffmpeg-devel On Behalf Of Henrik Gramner Sent: Tuesday, September 6, 2022 9:02 PM To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH v3] libavfilter/x86/vf_convolution: add sobel filter optimization and unit test with intel AVX512 VNNI On Tue, Aug 23, 2022 at 10:43 AM wrote: > +.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 > + > [...] > + > + ;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 This could probably be improved by doing something along the lines of (untested, but you get the idea): 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 [...] mova m6, [sobel_perm] .loop1: 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} > + mulps m4, m0 ; sum *= scale > + addps m4, m1 ; sum += delta fmaddps m4, m4, m0, m1 > + vpmovusdb xmm4, m4 > + movdqu [dstq + xq], xmm4 vpmovusdb [dstq + xq], m4 > + mulss xmm5, xmm5 ; b1 * b1 > + addss xmm4, xmm5 fmaddss xmm4, xmm5, xmm5, xmm4 > + mulss xmm4, xmm0 ; sum *= rdiv > + addss xmm4, xmm1 ; sum += bias fmaddss xmm4, xmm4, xmm0, xmm1 > + > + 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 > > _______________________________________________ > 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". Thanks for the great advice! After applying the optimized instructions, I got a nearly 13% improvement (from 2470 to 2136), patch v4 is here: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20220907062641.23091-1-bin.wang@intel.com/ 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".