From patchwork Fri Mar 11 07:52:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Jianhua" X-Patchwork-Id: 34665 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1472094nkb; Thu, 10 Mar 2022 23:53:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZE0IhV6gep4SH5Z+oTjigyf727Jstdl5mYVt0p4o5vrSgB5XDsNU+tWnYD3TfzeJJH0EP X-Received: by 2002:a17:906:a210:b0:6d5:9fa:11ce with SMTP id r16-20020a170906a21000b006d509fa11cemr7979408ejy.172.1646985200784; Thu, 10 Mar 2022 23:53:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646985200; cv=none; d=google.com; s=arc-20160816; b=UvRZr/E0MP2SAam7w9PLk9RHg/+q3BRDTND/fnSDQ+J8mXfFoFguLlw0f9HUmDLbWt Uf+7hJV0Z92Z/LtZE7Og6s6INJ6nicHe9adI4KSeT27ymQUIHIxsJT5qss8V2iMdlzQV ATWj8V69FP4OtOKI6xeB3lVBszeIqc6xW6zx0jdYYF/T16QQI2lm2GGyoVvZrojs5NEh +5ZkUaRSb/8w0KDiGvcAcTLzUcYNgQDO0UAfNRGZFpspHvQClgQZjq9FTh4SpFwJGTlZ ODZ92co9qW15yyaElbkGZolDZx463S6YFGTPXEN4fpTSK50O5NEdjvECm5LNpOJuGqz9 6CiA== 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=m/bDLVLpDddS+2U7NaSxh5Evo/w6oz8urE/8AkNPp7Y=; b=jlrSt4P+N3j1unFG9zPpoYY8FKfQ3I2ge/EeCgWaphj3tNUJJ2Z0cVV19rHQPPeovF 6Qt2ei31QteVVB+76llbdOiEoyiOT+GL/WAXSLhDLS2oT+phG2sOtRct1uR+8/DLAHhr JdZoxdpDp+niuDa2O/zq4Psv/uA0JTDJPux8+2DHR27GoyH0bPmmHlNTGzsbrA0V1+8F /VmcbmIeEI+qRhu1Ukkhmb2xyV6RTLPj9rtQQtXvPO1/55WhKki/XCaz2TjuMCVvnwsr +aKu3d1xCzXfLUu3g3XOvg9aELbHM+p25baURlzvZOdyvf0EBJ6F3zBtJiql9qqxvygC GD3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=fiOGuhBA; 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 q27-20020a1709066b1b00b00697f95a67ffsi4437689ejr.578.2022.03.10.23.53.20; Thu, 10 Mar 2022 23:53:20 -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=fiOGuhBA; 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 BC63868B1D4; Fri, 11 Mar 2022 09:52:41 +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 2EFE368B1AD for ; Fri, 11 Mar 2022 09:52:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646985158; x=1678521158; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=p8Up5C9s98CuM4nJVHMW0wrL/0muKvLFXbscob50wLs=; b=fiOGuhBAwWjKdygoFrF9DOYSglHV1N4oksYn2WNxDDomTMT7TFmn62Y3 xzqt70uWCxsDCf08sRcaqRSv0sgjZh5jUmn4FZYfADWb2UGU7YGBXR08x uvsVAEm3K1RUcrvCntKxI1jmAPyy9vZPzExQxlYer9ytb8ZEYyh4dazJL Ov1Mbyur0OqWYDE919UKqbEg9R2z4QkuGiUDqT9RHqD4RUp6En41eXpiP 0DYwn9J5ArrcI+MvmaruEYSa9V0yRZYkpmGeBlDOhGx8/zn2DxXxu2CkY QehsaXAcia6ozPCDVZ1jTjION0SUXElVAOUBOcwcDkKpNlKwKPUcZOIJW Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10282"; a="341950697" X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="341950697" 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:25 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,173,1643702400"; d="scan'208";a="712767094" 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:24 -0800 From: jianhua.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 15:52:13 +0800 Message-Id: <20220311075213.49925-5-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 5/5] avcodec/x86/hevc_mc: add qpel_h64_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: PWMooPgpLwly From: Wu Jianhua ff_hevc_put_hevc_qpel_h64_8_sse4 56782981 ff_hevc_put_hevc_qpel_h64_8_avx2 40097816 ff_hevc_put_hevc_qpel_h64_8_avx512icl 25488576 Signed-off-by: Wu Jianhua --- libavcodec/x86/hevc_mc.asm | 10 +++++++++- libavcodec/x86/hevcdsp.h | 1 + libavcodec/x86/hevcdsp_init.c | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/hevc_mc.asm b/libavcodec/x86/hevc_mc.asm index fc3faac376..c07948dd9b 100644 --- a/libavcodec/x86/hevc_mc.asm +++ b/libavcodec/x86/hevc_mc.asm @@ -92,6 +92,7 @@ QPEL_TABLE 8, 1, b, avx512icl_h QPEL_TABLE 8, 1, d, avx512icl_v QPEL_TABLE 16, 1, b, avx512icl_h QPEL_TABLE 32, 1, b, avx512icl_h +QPEL_TABLE 64, 1, b, avx512icl_h pb_qpel_shuffle_index: db 0, 1, 2, 3 db 1, 2, 3, 4 @@ -1767,9 +1768,15 @@ cglobal hevc_put_hevc_qpel_h%1_%2, 5, 6, 8, dst, src, srcstride, height, mx, tmp %else vpmovdw [dstq], m6 %endif -%if %1 == 32 +%if %1 > 16 QPEL_H_LOAD_COMPUTE 7, src, 16 vpmovdw [dstq + 32], m7 +%endif +%if %1 > 32 + QPEL_H_LOAD_COMPUTE 6, src, 32 + QPEL_H_LOAD_COMPUTE 7, src, 48 + vpmovdw [dstq + 64], m6 + vpmovdw [dstq + 96], m7 %endif LOOP_END dst, src, srcstride RET @@ -1848,6 +1855,7 @@ HEVC_PUT_HEVC_QPEL_HV_AVX512ICL 8, 8 INIT_ZMM avx512icl HEVC_PUT_HEVC_QPEL_AVX512ICL 16, 8 HEVC_PUT_HEVC_QPEL_AVX512ICL 32, 8 +HEVC_PUT_HEVC_QPEL_AVX512ICL 64, 8 %endif %endif diff --git a/libavcodec/x86/hevcdsp.h b/libavcodec/x86/hevcdsp.h index 8d3c3cc75f..24e35bc032 100644 --- a/libavcodec/x86/hevcdsp.h +++ b/libavcodec/x86/hevcdsp.h @@ -237,6 +237,7 @@ void ff_hevc_put_hevc_qpel_h4_8_avx512icl(int16_t *dst, uint8_t *_src, ptrdiff_t 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_h32_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_h64_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 ce5902c693..f3061bda84 100644 --- a/libavcodec/x86/hevcdsp_init.c +++ b/libavcodec/x86/hevcdsp_init.c @@ -883,6 +883,7 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth) 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[7][0][1] = ff_hevc_put_hevc_qpel_h32_8_avx512icl; + c->put_hevc_qpel[9][0][1] = ff_hevc_put_hevc_qpel_h64_8_avx512icl; c->put_hevc_qpel[3][1][1] = ff_hevc_put_hevc_qpel_hv8_8_avx512icl; } } else if (bit_depth == 10) {