From patchwork Wed May 29 17:15:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uk7b@foxmail.com X-Patchwork-Id: 49359 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8f0d:0:b0:460:55fa:d5ed with SMTP id i13csp805564vqu; Wed, 29 May 2024 10:17:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV0+xrnNf2dDhFfpdfqc25vKFEvq8yuC4CwysoA8SlAAYkgOysUHe92waOUvfRCOxb/Ta27poDnDUTgZQu/xoz6fvJDqRdj17hmvQ== X-Google-Smtp-Source: AGHT+IHTT0pqTmoUH9nnyqr8EY26nRdJiugmdSlDUVIhWNzM/g9Q9OZaHQLZCUtzbQBZ2oQ7tSOP X-Received: by 2002:a17:906:af0e:b0:a59:beb4:62b8 with SMTP id a640c23a62f3a-a642d5a388bmr245152866b.21.1717003027748; Wed, 29 May 2024 10:17:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717003027; cv=none; d=google.com; s=arc-20160816; b=QHm7TVEqiWCQ05INkTJw0JEfp6LhpAMOXWL1ueTwKcb9y0jErXXPl5+5pAcrVyWbNi vftExA66kYMnCQspCZ2/V6pzFx2JTP659vhBM6LnePyRIIi2ZMk0MEpHfFcVqert7Dda IoYB/Wy+LFMaMSJ5YU/jn3mkK3Y7ZXCuckKqq8KJISMXDEdWdpPX5RtlAeELeo3HynIl FraAnffR1aVoCSbnKBmR0sEggD+kX/FcmFeC50zl0taf5Xeo4Af84DGEx3v1CAlDsoA2 OB1V4+58ReiSeU2OuzpvTh2A7/1FZNbKPq2v5XXAOx7th1+HyMtHTN7CtI71tguNnBgZ 4FRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=EcVuutWJeVAbGrBZlP15lyGbq/o/mDYz8FgDSD5UemQ=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=sG8rt7H0MdYgC+XLlnIVnGjTax4MqU4OCGkMrjdHlab0a6n/RLMHuQ/hS0dcg/HxXM vGb6swGtbFJJQ5WK9bhFTNoqa7RMImfe0wRALeT4Lcrs94eKIbmCBfASfzEd5FTx79w9 ZfLGo88Ld3iquLLDxBO+CzOKWa5pHv+cWgFo5iN8fp9whbRrV255I/3JePTZOoHr5Co0 FJLpYzlrgk1co/4NKErlgnNNIjyAi3K8yyY1Vpram2De+vp8Ji6sDr0Xjy4cADy18/ml 8TAhZ8DFX6PJDgoW9h5mm/qUhXzKCBPDzRcCO5dRvdO5pxtie3UaM6cp7EEwWgdnF1BE wTDQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ByrHV34S; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a626c800623si643805666b.10.2024.05.29.10.17.07; Wed, 29 May 2024 10:17:07 -0700 (PDT) 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=@foxmail.com header.s=s201512 header.b=ByrHV34S; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 14EC968D55F; Wed, 29 May 2024 20:16:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD14968D522 for ; Wed, 29 May 2024 20:16:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1717002975; bh=D5eLV379Yya45RL2Wb2NCyH2eQSxrTgo1ghIpwOZdGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ByrHV34Sfdtvvk4Ew27osd+dJCArAHErgubnezE/kl2q9SsPJCquk+a8lq0nUAfuW RtxCMsc67SmTEkBZ4OhcD1cB9orQOQQL0Y8Xn8qf9lX70pikpC01yD7/K7+8FQF0M+ n7jPoP0mHYLx6H+LfUjQleyJINMciTe65aFL03cc= Received: from localhost.localdomain ([42.86.114.86]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 40A88E50; Thu, 30 May 2024 01:16:10 +0800 X-QQ-mid: xmsmtpt1717002974tf366sdgq Message-ID: X-QQ-XMAILINFO: MtZ4zLDUQmWf/tRfr4+FxTqx6bw+9GFJP16+H73ucEbwKgTUW06LoeUFX5hC1F 297AbYHwLshXELf0SfnH99j8LxBJrNAr+ObDVYQKGSD/zkuLNhajGAcWw9EK0jXyV2ie6xQqqhW/ +SJRPuXNXYjr+/27dDezgfZ4VpQguVRdd1mEXI0lGKC+8/E98XPa9ea1Fs41+XYEZelIF5qWuLxj ba8Nqgc2RNlACBFz5RUNQJNNXiUfUAtdFjLC5ni4HAephJQPPrEJtZZNVuPypPH55Wtgr/GgwLsn TBaiGJaxlPT2DzS/EOYuscenmrWWUrC7nL+UuCj912TrBCkCduYQv/+HcOeh1kIhaWjlHQLRJUeT FPBxqlBj9CzmwfYvan7w2CIBRp2eXCbuU5bUBFOtvh2yQCA890ikucuIBsqTXqby58a3MTNqCYo/ qt0/86C9fsBZxZQoAa6oZOQEME6r1/x8UL7krFppt1gzk+vVTuIxDXq5BsmUOaUl+yfZJSA8KrEc O9HoEk1SBwBHDSC2vZYpRhMWWrTh96ElF/u2OpSOVZI8kKVOn9KH6Ikth+RHK1XWdJMTR04tzNqU mOTooL2L6le+8HPZ5RVKNwR9jGQ08rUBia1jV671UgMxruPluRLzk3BPa9B9sy0CeXHXYoE4H1Uy DTVWDiaFpfsppUey+io9MxGjY3mMHNbAhF0Q/Q1eE/WbWCLCV0U/4ZlyqG6xAiTp3cQsV10HVsjI hqtYmLVK7yr4aiaUy0fIP4XqzqMsID4ihUXR37fUH8LNizrYxIlRsBr4c2e+Eeo+o0lETXY9wUUg JEdAMmYBIdvENJSUgKHAj8rlF3L/ZfVS2oyXSI3cvWNpTFN/mRdBt7BxF0SjQ4ycK48Um/7lC0Lt pFGqpy+0ZctyJSZMNvt74sGi0EGgraww== X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 May 2024 01:15:40 +0800 X-OQ-MSGID: <20240529171540.911099-5-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240529171540.911099-1-uk7b@foxmail.com> References: <20240529171540.911099-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 5/5] lavc/vp9dsp: R-V V mc tap hv 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: sunyuechi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: gKW5PQhlB3ig From: sunyuechi C908 X60 vp9_avg_8tap_smooth_4hv_8bpp_c : 32.0 28.2 vp9_avg_8tap_smooth_4hv_8bpp_rvv_i32 : 15.0 13.2 vp9_avg_8tap_smooth_8hv_8bpp_c : 98.0 86.2 vp9_avg_8tap_smooth_8hv_8bpp_rvv_i32 : 23.7 21.0 vp9_avg_8tap_smooth_16hv_8bpp_c : 355.5 297.0 vp9_avg_8tap_smooth_16hv_8bpp_rvv_i32 : 62.7 41.2 vp9_avg_8tap_smooth_32hv_8bpp_c : 1273.0 1099.7 vp9_avg_8tap_smooth_32hv_8bpp_rvv_i32 : 133.7 119.2 vp9_avg_8tap_smooth_64hv_8bpp_c : 4933.0 4240.5 vp9_avg_8tap_smooth_64hv_8bpp_rvv_i32 : 506.7 227.0 vp9_put_8tap_smooth_4hv_8bpp_c : 30.2 27.0 vp9_put_8tap_smooth_4hv_8bpp_rvv_i32 : 14.5 12.7 vp9_put_8tap_smooth_8hv_8bpp_c : 91.2 81.2 vp9_put_8tap_smooth_8hv_8bpp_rvv_i32 : 22.7 20.2 vp9_put_8tap_smooth_16hv_8bpp_c : 329.2 277.7 vp9_put_8tap_smooth_16hv_8bpp_rvv_i32 : 44.7 40.0 vp9_put_8tap_smooth_32hv_8bpp_c : 1183.7 1022.7 vp9_put_8tap_smooth_32hv_8bpp_rvv_i32 : 130.7 116.5 vp9_put_8tap_smooth_64hv_8bpp_c : 4502.7 3954.5 vp9_put_8tap_smooth_64hv_8bpp_rvv_i32 : 496.0 224.7 --- libavcodec/riscv/vp9_mc_rvv.S | 75 ++++++++++++++++++++++++++++++++++ libavcodec/riscv/vp9dsp_init.c | 8 ++++ 2 files changed, 83 insertions(+) diff --git a/libavcodec/riscv/vp9_mc_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S index 53dd833dac..fed698c802 100644 --- a/libavcodec/riscv/vp9_mc_rvv.S +++ b/libavcodec/riscv/vp9_mc_rvv.S @@ -323,6 +323,77 @@ func ff_\op\()_vp9_8tap_\name\()_\len\()\type\()_rvv\vlen\(), zve32x endfunc .endm +#if __riscv_xlen == 64 +.macro epel_hv_once len, name, op + sub a2, a2, a3 + sub a2, a2, a3 + sub a2, a2, a3 + .irp n,0,2,4,6,8,10,12,14 + epel_load_inc v\n, \len, put, \name, h, 1, t + .endr + addi a4, a4, -1 +1: + addi a4, a4, -1 + epel_load v30, \len, \op, \name, v, 0, s + vse8.v v30, (a0) + vmv.v.v v0, v2 + vmv.v.v v2, v4 + vmv.v.v v4, v6 + vmv.v.v v6, v8 + vmv.v.v v8, v10 + vmv.v.v v10, v12 + vmv.v.v v12, v14 + epel_load v14, \len, put, \name, h, 1, t + add a2, a2, a3 + add a0, a0, a1 + bnez a4, 1b + epel_load v30, \len, \op, \name, v, 0, s + vse8.v v30, (a0) +.endm + +.macro epel_hv op, name, len, vlen +func ff_\op\()_vp9_8tap_\name\()_\len\()hv_rvv\vlen\(), zve32x + addi sp, sp, -64 + .irp n,0,1,2,3,4,5,6,7 + sd s\n, \n\()<<3(sp) + .endr +.if \len == 64 && \vlen < 256 + addi sp, sp, -48 + .irp n,0,1,2,3,4,5 + sd a\n, \n\()<<3(sp) + .endr +.endif +.ifc \op,avg + csrwi vxrm, 0 +.endif + epel_filter \name, h, t + epel_filter \name, v, s +.if \vlen < 256 + vsetvlstatic8 \len, a6, 32, m2 +.else + vsetvlstatic8 \len, a6, 64, m2 +.endif + epel_hv_once \len, \name, \op +.if \len == 64 && \vlen < 256 + .irp n,0,1,2,3,4,5 + ld a\n, \n\()<<3(sp) + .endr + addi sp, sp, 48 + addi a0, a0, 32 + addi a2, a2, 32 + epel_filter \name, h, t + epel_hv_once \len, \name, \op +.endif + .irp n,0,1,2,3,4,5,6,7 + ld s\n, \n\()<<3(sp) + .endr + addi sp, sp, 64 + + ret +endfunc +.endm +#endif + .irp len, 64, 32, 16, 8, 4 copy_avg \len .irp op, put, avg @@ -331,6 +402,10 @@ endfunc epel \len, \op, \name, \type, 128 epel \len, \op, \name, \type, 256 .endr + #if __riscv_xlen == 64 + epel_hv \op, \name, \len, 128 + epel_hv \op, \name, \len, 256 + #endif .endr .endr .endr diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index 5f759e6bc8..6b39ad8ee0 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -118,6 +118,10 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp) if (flags & AV_CPU_FLAG_RVB_ADDR) { init_subpel2(0, 0, 1, v, put, 128); init_subpel2(1, 0, 1, v, avg, 128); +# if __riscv_xlen == 64 + init_subpel2(0, 1, 1, hv, put, 128); + init_subpel2(1, 1, 1, hv, avg, 128); +# endif } } @@ -128,6 +132,10 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp) if (flags & AV_CPU_FLAG_RVB_ADDR) { init_subpel2(0, 0, 1, v, put, 256); init_subpel2(1, 0, 1, v, avg, 256); +# if __riscv_xlen == 64 + init_subpel2(0, 1, 1, hv, put, 256); + init_subpel2(1, 1, 1, hv, avg, 256); +# endif } } }