From patchwork Fri Mar 11 07:52:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Jianhua" X-Patchwork-Id: 34661 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1471760nkb; Thu, 10 Mar 2022 23:52:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwS9kUnbGKhc+8ItMG5OombeeRXXeUNkVdPVxEN09cdgTF82arH+gfmSjE310zEBnysyIEF X-Received: by 2002:a17:907:50a1:b0:6da:9f90:a55f with SMTP id fv33-20020a17090750a100b006da9f90a55fmr7676298ejc.36.1646985157403; Thu, 10 Mar 2022 23:52:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646985157; cv=none; d=google.com; s=arc-20160816; b=NSJ5ELRpgPHqI2Z7koDGz1wtGgq/Lxf1CgcP6S1Hr9p25nl3nU3Ms2lgR7MCvGBpul o8wVhGI7NCv0hjI14xu8W4T2U1Q57SsB4MAjzzJuMe0cQCjqlC/KpKz/CPsOGj4bNc0i DycHL/EP1kZ1G6NUBK7klvd8TYn/nxhrBsSxVoVG9eaqtvGxlwkf6hLmL2YuV50B7i+E YiIpA+BdLk/QnZTtjcjiZtWhdeRNwcNLsh2SIEU/iH8ZxkuRYuI5T7yPdJZeWpMuvKwm yynfycW94uSa04Z+4/7nlv9mPBtBJW4P58ndvrCx9hPV7TdD1oTUmSh813XXauBCwSKH AYfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=nBTEoc4UDRbD3LzEDxxE6q7Sta6pkWBvtS8LB/rV7Uk=; b=uULs+WrJz1bkR+pnqiPrs9DTMIqyEf31AuKJ581DEgmGZiElqj2b8LmVG6rwo3JNW0 mLYQrBr4uw/aZB6FW1/vCu7tRLp1UinxeEMQm7ZS2mt+O4dxeHhJheuXmXR/m+NPxa5o JnLthBhqQ1LP1VIfT/crUqsHVwSMBcmU0Ka9VNiH+rupoznpJkn7plU17cwUHlg6J7xE 3vUA+fMTVPaN0AaZ0X6m3nVqYgkGXZS1DI3zFq57WDQPSaU45gqYt7q0lb3tInBwseVA 8LuIBeOQZuLKPkY+lsvvsN0jcAdJR5zBRE6rwVf5TYk2ej75GNeyUo3jrqVfQOzcqrGi BeeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=k7t4sFuG; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bf4-20020a0564021a4400b0041602994aaesi4226837edb.33.2022.03.10.23.52.36; Thu, 10 Mar 2022 23:52:37 -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=@intel.com header.s=Intel header.b=k7t4sFuG; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 80B7468B155; Fri, 11 Mar 2022 09:52:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A6B2E68AF69 for ; Fri, 11 Mar 2022 09:52:24 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646985149; x=1678521149; h=from:to:cc:subject:date:message-id; bh=ccTQy+SIdhOwJjAjeL0Dz6qCKRwpl9uNJPKanYYGI6o=; b=k7t4sFuGwLruSt2XxwMf9Tq/fk/5+hOOcGy823Q+2Kjf5NKs5rbsV7kC XbYXBOgMQL787NygjF5uE8RD63Q12XllYh22b9HpNrj7hLYlXKJyBDq0G DrMpdSywrRC9SSQ1zGmFGO8nbTHqebvqHq/+Cnf3bCILqDXQfq7Sz9Ps+ OGtmugK+vD4u9J+1p9KqjfTZ/WO5qa6Nf56ySc/+PID8HzBoM2TkSaFWL vmFJNuHRmJOcC2QqMcs6VpuIfZMDTv8DBA1lMHPl3d/3XMvjnfa/0hiBr vqbaFBCS6OpoUk6lEaasUYbJaUBqiqb33cdkhIlbw4UuZsGJmhp53ioQZ w==; X-IronPort-AV: E=McAfee;i="6200,9189,10282"; a="341950691" X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="341950691" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Mar 2022 23:52:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="712767070" Received: from otc-skl-e5-server.sh.intel.com ([10.239.43.106]) by orsmga005.jf.intel.com with ESMTP; 10 Mar 2022 23:52:19 -0800 From: jianhua.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 15:52:09 +0800 Message-Id: <20220311075213.49925-1-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2 1/5] avcodec/x86/hevc_mc: add qpel_h8_8_avx512icl and qpel_hv8_8_avx512icl 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: m2hVTh9H6b6C From: Wu Jianhua This commit uses the instruction `vpdpbusd` introduced by AVX512 VNNI to calculate the horizontal filter. ff_hevc_put_hevc_qpel_h8_8_sse4 1039169 ff_hevc_put_hevc_qpel_h8_8_avx512icl 677153 ff_hevc_put_hevc_qpel_hv8_8_sse4 3603511 ff_hevc_put_hevc_qpel_hv8_8_avx512icl 2995354 Signed-off-by: Wu Jianhua --- libavcodec/x86/hevc_mc.asm | 137 ++++++++++++++++++++++++++++++++++ libavcodec/x86/hevcdsp.h | 3 + libavcodec/x86/hevcdsp_init.c | 4 + 3 files changed, 144 insertions(+) diff --git a/libavcodec/x86/hevc_mc.asm b/libavcodec/x86/hevc_mc.asm index ff6ed0711a..52fa3ec948 100644 --- a/libavcodec/x86/hevc_mc.asm +++ b/libavcodec/x86/hevc_mc.asm @@ -87,6 +87,26 @@ QPEL_TABLE 12, 4, w, sse4 QPEL_TABLE 8,16, b, avx2 QPEL_TABLE 10, 8, w, avx2 +QPEL_TABLE 8, 1, b, avx512icl_h +QPEL_TABLE 8, 1, d, avx512icl_v + +pb_qpel_shuffle_index: db 0, 1, 2, 3 + db 1, 2, 3, 4 + db 2, 3, 4, 5 + db 3, 4, 5, 6 + db 4, 5, 6, 7 + db 5, 6, 7, 8 + db 6, 7, 8, 9 + db 7, 8, 9, 10 + db 4, 5, 6, 7 + db 5, 6, 7, 8 + db 6, 7, 8, 9 + db 7, 8, 9, 10 + db 8, 9, 10, 11 + db 9, 10, 11, 12 + db 10, 11, 12, 13 + db 11, 12, 13, 14 + SECTION .text %define MAX_PB_SIZE 64 @@ -1670,3 +1690,120 @@ HEVC_PUT_HEVC_QPEL_HV 16, 10 %endif ;AVX2 %endif ; ARCH_X86_64 + +%macro QPEL_FILTER_H 5 +%define %%table hevc_qpel_filters_avx512icl_h_%1 +%assign %%offset 4 + dec %2q + shl %2q, 3 +%ifdef PIC + lea %5q, [%%table] + %define FILTER %5q +%else + %define FILTER %%table +%endif + vpbroadcastd m%3, [FILTER + %2q + 0*%%offset] + vpbroadcastd m%4, [FILTER + %2q + 1*%%offset] +%endmacro + +%macro QPEL_FILTER_V 5 + vpbroadcastd m%3, [%5 + %2q + 4*%4] +%endmacro + +%macro QPEL_LOAD_SHUF 2 + movu m%1, [pb_qpel_shuffle_index + 0] + movu m%2, [pb_qpel_shuffle_index + 32] +%endmacro + +; required: m0-m5 +; %1: dst register index +; %2: name for src +%macro QPEL_H_LOAD_COMPUTE 2 + pxor m%1, m%1 + movu xm4, [%2q - 3] + vpermb m5, m2, m4 + vpermb m4, m3, m4 + vpdpbusd m%1, m5, m0 + vpdpbusd m%1, m4, m1 +%endmacro + +%macro HEVC_PUT_HEVC_QPEL_AVX512ICL 2 +cglobal hevc_put_hevc_qpel_h%1_%2, 5, 6, 8, dst, src, srcstride, height, mx, tmp + QPEL_FILTER_H %1, mx, 0, 1, tmp + QPEL_LOAD_SHUF 2, 3 +.loop: + QPEL_H_LOAD_COMPUTE 6, src + vpmovdw [dstq], m6 + LOOP_END dst, src, srcstride + RET +%endmacro + +%macro HEVC_PUT_HEVC_QPEL_HV_AVX512ICL 2 +cglobal hevc_put_hevc_qpel_hv%1_%2, 6, 7, 27, dst, src, srcstride, height, mx, my, tmp +%assign %%shift 6 +%assign %%extra 7 + QPEL_FILTER_H %1, mx, 0, 1, tmp + QPEL_LOAD_SHUF 2, 3 + lea tmpq, [srcstrideq*3] + sub srcq, tmpq + sub myq, 1 + shl myq, 5 +%ifdef PIC +%define %%table hevc_qpel_filters_avx512icl_v_%1 + lea tmpq, [%%table] + %define FILTER tmpq +%else + %define FILTER %%table +%endif +%assign %%i 6 +%assign %%j 0 +%rep %1 + QPEL_FILTER_V %1, my, %%i, %%j, FILTER + %assign %%i %%i+1 + %assign %%j %%j+1 +%endrep +%rep %%extra + QPEL_H_LOAD_COMPUTE %%i, src + add srcq, srcstrideq +%assign %%i %%i+1 +%endrep +.loop: + QPEL_H_LOAD_COMPUTE %%i, src + vpmulld m22, m14, m6 + vpmulld m23, m15, m7 + vpmulld m24, m16, m8 + vpmulld m25, m17, m9 + vpaddd m26, m22, m23 + vpaddd m24, m25 + vpaddd m26, m24 + vpmulld m22, m18, m10 + vpmulld m23, m19, m11 + vpmulld m24, m20, m12 + vpmulld m25, m21, m13 + vpaddd m22, m22, m23 + vpaddd m24, m25 + vpaddd m26, m24 + vpaddd m22, m26 + mova m14, m15 + mova m15, m16 + mova m16, m17 + mova m17, m18 + mova m18, m19 + mova m19, m20 + mova m20, m21 + vpsrad m22, %%shift + vpmovdw [dstq], m22 + LOOP_END dst, src, srcstride + + RET +%endmacro + +%if ARCH_X86_64 +%if HAVE_AVX512ICL_EXTERNAL + +INIT_YMM avx512icl +HEVC_PUT_HEVC_QPEL_AVX512ICL 8, 8 +HEVC_PUT_HEVC_QPEL_HV_AVX512ICL 8, 8 + +%endif +%endif diff --git a/libavcodec/x86/hevcdsp.h b/libavcodec/x86/hevcdsp.h index 67be0a9059..5a495d2563 100644 --- a/libavcodec/x86/hevcdsp.h +++ b/libavcodec/x86/hevcdsp.h @@ -233,6 +233,9 @@ WEIGHTING_PROTOTYPES(8, sse4); WEIGHTING_PROTOTYPES(10, sse4); WEIGHTING_PROTOTYPES(12, sse4); +void ff_hevc_put_hevc_qpel_h8_8_avx512icl(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width); +void ff_hevc_put_hevc_qpel_hv8_8_avx512icl(int16_t *dst, uint8_t *_src, ptrdiff_t _srcstride, int height, intptr_t mx, intptr_t my, int width); + /////////////////////////////////////////////////////////////////////////////// // TRANSFORM_ADD /////////////////////////////////////////////////////////////////////////////// diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c index 8a3fa2744b..e51375ebc2 100644 --- a/libavcodec/x86/hevcdsp_init.c +++ b/libavcodec/x86/hevcdsp_init.c @@ -878,6 +878,10 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth) c->add_residual[3] = ff_hevc_add_residual_32_8_avx2; } + if (EXTERNAL_AVX512ICL(cpu_flags) && ARCH_X86_64) { + c->put_hevc_qpel[3][0][1] = ff_hevc_put_hevc_qpel_h8_8_avx512icl; + c->put_hevc_qpel[3][1][1] = ff_hevc_put_hevc_qpel_hv8_8_avx512icl; + } } else if (bit_depth == 10) { if (EXTERNAL_MMXEXT(cpu_flags)) { c->add_residual[0] = ff_hevc_add_residual_4_10_mmxext;