From patchwork Fri Mar 11 07:52:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Jianhua" X-Patchwork-Id: 34663 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1471932nkb; Thu, 10 Mar 2022 23:53:00 -0800 (PST) X-Google-Smtp-Source: ABdhPJwfilB8CkfMhqwXnpBgoPfj9b3+n+NPEzde31zbpOZx/ipU4rt3kwsuz4yxHSac+WLy1MAE X-Received: by 2002:a17:906:b1d0:b0:6cf:7f39:50e0 with SMTP id bv16-20020a170906b1d000b006cf7f3950e0mr7700295ejb.760.1646985180119; Thu, 10 Mar 2022 23:53:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646985180; cv=none; d=google.com; s=arc-20160816; b=cr5xnX44pRejfLP1LJQNkHEPseazkEJWiqH+NhTFz5B0KgaPAFiEZ6TFK00p9uwjFi I6yEf6IxTCLEDi6ID422i180w4T9CtxazkwIvFMIU6qJ8wCIvuxTNMLtAtlZNjXHQOd1 f4Yh3MrMvOc7bsU3zWZg7D0dGy7XqvGVMZhpp2PwuwbauXMqk6X2GKwRdnb0BfrIazfB UhnB4IpS6SVZh5SU7TrdiH64cuIuSpOx67bcwXvCkg6T6OFPcdRl111B/MbB/liptuVe ZJNfPUnGgp+l8/tTKdiQZndO0LTsu0GqzP8IrlNtY8es5910rcFJ4kJxpHVG6pGMz5aP w6Cg== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=GwjY9cjjC8MlWFA1brRARLsWcxYJWrdIdzWQ/mghacw=; b=qDgLF91LJ/dtg4iSvc1Q7jycsypyAwv6ZY3NireOPJPAAPxLFZPZEmQMm9bHCpCZdo ptGGTvG3xMK0zpvbmJoaDvJ/IWHyGjq3nUu4Z0bQAH6Ttjt1L8T8wexfUy2UlDGW6ePD yOR3EOBl55kS300xGH/qGAKGIG7q9NbuMi2OcJK23E+ulW/cTJeR7CegnUPJEzZXFHRs Tg8S4kdNUdEcxKKg1Bb4A0viLuTfbfijIPC9axrFJsumJKzOPpLwBlLFiYLQhku8pCGX P7oa45ZrKdIUFICSycsTVUwbckl/qPLrtbcxa2pQgJxj8M2C77QfCmapuYuv89kzyA10 RV+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=I0NVOOMa; 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 v29-20020a50a45d000000b0041593c729a5si4483486edb.468.2022.03.10.23.52.59; Thu, 10 Mar 2022 23:53:00 -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=I0NVOOMa; 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 9183168B1A5; Fri, 11 Mar 2022 09:52:37 +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 A9FF568B174 for ; Fri, 11 Mar 2022 09:52:30 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646985155; x=1678521155; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=UJ/jvzL4qYRDYw3MwyLVaKyJnGSTwxA+B1NZ8jsxto0=; b=I0NVOOMak0XsxNRRkH92qNpRchfDbuTLX9+ERaZypEzS74UZ0FVTpI8i 3qFliaKeEs3WU6H5IFXAdjnYmPkIC77yvntJWxvSZFXUES0zjmd/dKEkw 2BCSwPMABn+8gQac6rCeC9P0R81TedWunwaY64mhat6HELMOx1XhEjdsM +tR3GzA6B2cMMzrfzQtcs94ZT1lux9GRB34sbgmu31hfAZfNPrk12kljJ z3/idccKYJ068Oln48rrOIHusAZ8hIp+7MmdMWcurigdKeWxa1GkoKNyu EYKgZhgUxiHLtDAG67RZx1ueoGEAbX+ADIFj6FTj8fT4F6z8XBE/D5cA0 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10282"; a="341950695" X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="341950695" 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:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="712767082" 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:21 -0800 From: jianhua.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 15:52:11 +0800 Message-Id: <20220311075213.49925-3-jianhua.wu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220311075213.49925-1-jianhua.wu@intel.com> References: <20220311075213.49925-1-jianhua.wu@intel.com> Subject: [FFmpeg-devel] [PATCH v2 3/5] avcodec/x86/hevc_mc: add qpel_h4_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: 4VzJCk5zKhHT From: Wu Jianhua ff_hevc_put_hevc_qpel_h4_8_sse4 993694 ff_hevc_put_hevc_qpel_h4_8_avx512icl 686647 Signed-off-by: Wu Jianhua --- libavcodec/x86/hevc_mc.asm | 9 +++++++++ libavcodec/x86/hevcdsp.h | 1 + libavcodec/x86/hevcdsp_init.c | 1 + 3 files changed, 11 insertions(+) diff --git a/libavcodec/x86/hevc_mc.asm b/libavcodec/x86/hevc_mc.asm index 4e39cdd7fe..ff59ae3509 100644 --- a/libavcodec/x86/hevc_mc.asm +++ b/libavcodec/x86/hevc_mc.asm @@ -87,6 +87,7 @@ QPEL_TABLE 12, 4, w, sse4 QPEL_TABLE 8,16, b, avx2 QPEL_TABLE 10, 8, w, avx2 +QPEL_TABLE 4, 1, b, avx512icl_h QPEL_TABLE 8, 1, b, avx512icl_h QPEL_TABLE 8, 1, d, avx512icl_v QPEL_TABLE 16, 1, b, avx512icl_h @@ -1754,7 +1755,12 @@ cglobal hevc_put_hevc_qpel_h%1_%2, 5, 6, 8, dst, src, srcstride, height, mx, tmp QPEL_LOAD_SHUF 2, 3 .loop: QPEL_H_LOAD_COMPUTE 6, src +%if %1 == 4 + vpmovdw xm6, m6 + movq [dstq], xm6 +%else vpmovdw [dstq], m6 +%endif LOOP_END dst, src, srcstride RET %endmacro @@ -1822,6 +1828,9 @@ cglobal hevc_put_hevc_qpel_hv%1_%2, 6, 7, 27, dst, src, srcstride, height, mx, m %if ARCH_X86_64 %if HAVE_AVX512ICL_EXTERNAL +INIT_XMM avx512icl +HEVC_PUT_HEVC_QPEL_AVX512ICL 4, 8 + INIT_YMM avx512icl HEVC_PUT_HEVC_QPEL_AVX512ICL 8, 8 HEVC_PUT_HEVC_QPEL_HV_AVX512ICL 8, 8 diff --git a/libavcodec/x86/hevcdsp.h b/libavcodec/x86/hevcdsp.h index 6e3fc01ad0..51ffdc9628 100644 --- a/libavcodec/x86/hevcdsp.h +++ b/libavcodec/x86/hevcdsp.h @@ -233,6 +233,7 @@ WEIGHTING_PROTOTYPES(8, sse4); WEIGHTING_PROTOTYPES(10, sse4); WEIGHTING_PROTOTYPES(12, sse4); +void ff_hevc_put_hevc_qpel_h4_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_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_h16_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); diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c index a73c2e2bd9..58b91459ed 100644 --- a/libavcodec/x86/hevcdsp_init.c +++ b/libavcodec/x86/hevcdsp_init.c @@ -879,6 +879,7 @@ 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[1][0][1] = ff_hevc_put_hevc_qpel_h4_8_avx512icl; c->put_hevc_qpel[3][0][1] = ff_hevc_put_hevc_qpel_h8_8_avx512icl; c->put_hevc_qpel[5][0][1] = ff_hevc_put_hevc_qpel_h16_8_avx512icl; c->put_hevc_qpel[3][1][1] = ff_hevc_put_hevc_qpel_hv8_8_avx512icl;