From patchwork Sun Aug 25 11:40:08 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: 51139 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b3c7:0:b0:48e:c0f8:d0de with SMTP id g7csp1265722vqt; Sun, 25 Aug 2024 04:40:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVKWLKBeRwdwuZD9F4V78x71N1pZ8zOTNBsrQ57mtIB/ojwIFC+PtPKYMCnjS/NNmAMG7PlysVG/csEB6JpkwN3@gmail.com X-Google-Smtp-Source: AGHT+IE0/flc/SO1RQQcDfzFH8UVlEO4bqmGWIZYaEZydcuRC7xSNywW0MpGM7q6e5EV7K3v2kxB X-Received: by 2002:a05:6512:398a:b0:52f:413:30de with SMTP id 2adb3069b0e04-534387c477bmr2646742e87.7.1724586038114; Sun, 25 Aug 2024 04:40:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724586038; cv=none; d=google.com; s=arc-20160816; b=JuQpRmaKHr8zddCT/cuBYznTmuwailauaVdcHw21ZWODmLWOVhPlZGMAD1cWDo1KtC RN4E7LgkO0BYmZHoWurJOTDDdhOugxqzCWRjtBmCJdUSkKXy+jaHY6KO0IMmRyXkqPrF lFwS7grJxby8ZPKslIsAm5A1hlwqqfL8NYC1hDKiEtMooEjcWq1CA6gSDlybNoCZYHxP yGgWLBUeLN6sF5j2oT8gz87Dk/v/8aUfVT+9I6k9sMGDyNtYC5Uvg6FjR7ZbVo+qqlLy DrzTKrPGzxMwFw8SrDx7D/Y3c/v0HqvnznE4Y95gvyezvU/sVOuSkj6MKi279jwY77+/ fPyg== 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=skg7DA61/V4u9C8mDr/VuWdeWjIt9i8ABee8LmQ1ODY=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=uSsDlL6UVBMQUZvY/6k9MY9djE86rHy0tJFOfYbiC5261p6QUlIvna7GGLY/cDBGjU Sp3JDtauEhmHT2jLy4ZOJaTIQVgddgF47Uq5zXv80AL9sDQk4411KVWd1AVI/1av+V5s 3NTgdvjdcnZ2VJhTTm7eEa2Oocc/V2U12ZNtlbXamg/W71rMeG6RBG0gwAO2b5kYfzC9 RW+LIyPV5Z0XaI4vgrK4QCLfkWz2LhpsgGMzTmoJLq9AgClAvJa9MHaQnrGAWdoaomvW vzOkotO7LW5DSO8wA8VC7hdZ4DLzwvz1I7Pjl8ii1c40ackfak7eDBTBcgQTYnb5fEHc hFnA==; 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=x+O4soyR; 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-a868f4f823esi563064966b.834.2024.08.25.04.40.37; Sun, 25 Aug 2024 04:40:38 -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=x+O4soyR; 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 DF4E068DA0E; Sun, 25 Aug 2024 14:40:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4D6868D9A5 for ; Sun, 25 Aug 2024 14:40:23 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1724586014; bh=tECcZ0TrG+8zJL0q9S24mkyyc1qkaEtYoVL0SQo5ITA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=x+O4soyR3VfyieYXOdghDcCAu/vKPYKqmFVzNiDvjnLGnIlsf3NaZIROIe01bd96x 6Db8GAqBiZkDmVAGS6I1d0yJIbwC4Zdn3cqLJ3P46A9FBvPlpd3lczV1eVF6gVvJ7H awNL3QRXr5petzx594C1zSoevWjhhO3Xi5ebQYVI= Received: from localhost.localdomain ([42.57.186.183]) by newxmesmtplogicsvrszc13-0.qq.com (NewEsmtp) with SMTP id A0C3E473; Sun, 25 Aug 2024 19:40:12 +0800 X-QQ-mid: xmsmtpt1724586013t5mo9qiz4 Message-ID: X-QQ-XMAILINFO: MZChPk4K8ikNK4Cllzbp7SeHH7W3hMwGlJ25V1wXCl31s4xlpbtLPlViklrVxS yrKXQaQWqI6F/IYU7Um8tdu/nSWUaMhR7wB36JGcnDyZX6MMLCYPH7Jm2bWj2UF2ZtPxT7byqJGE tJZnG0fFX6pm/S/zUPWrySWSZw6EBA0r7eJgC0Gi3fWwKMcisof8O3v1hei48NjCxfWEwaofWD+C 3D6nY+H5L6PRzhUNnJgso0zSKAuKHpi0FsUP3hMQD8/QsKk5/KiJuNNRJvGATexYdCEvkENvPZjO bupyFpDW0Vf7illXVM7AKrtPFuDB0ZyrTylqgv2In97BV06xOaBd8sSTIO+EWssag11LoEjXqQOd iSrC+D0eg665BzGtm1eSOjo1AfzTMvuT2hjszgi3pQXnk/nAm5Uls3rCC6jNGBL+GnQlW0ZII9BC 9unXHLU7kS8hC0Hs7xRmRH3u4/bgnlJby4mJ8WE6hlIMvBVAe0tt3s67YOf1YLrQFxKjiPEWdpee JitMXz9Cw5p2qFtjQSh18LlCF0N3+pK9xLDpLakQ8nZKwkFP99AeC18qwhyYWfE5nF1MuqskFZWG EQ0OLSt9M3vX3uu7/nTm8GNPrOD9cvFQkPyZw7xjBZPwhpn6WHRRNNSzBfYrexwo8qcnYedk3eg2 brcnotinOOmjBU+XOBPibQfuDL67/8NUYBu7+Bv2V76uqqLw/8UARoedeS0RbgA2nVV0hx9PJX7x WiMZ48gpWgp4l3/TnnrEUtnggWo0OE4rlM1SCXGUwqQy/qutq4wDR7cLTGKpXK83a2M9VP0bI/P7 ObjL6mlu4MTFRlfD4crh96qxL6dZN2fFe0v8prdwVFF5IT3FOmDglyEsO5mZiYfVSiVH4R5JZHfL 3yx2ybGJqc2wYzX7369mH+N/G8hPgOECs4SwGLdS3M X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Aug 2024 19:40:08 +0800 X-OQ-MSGID: <20240825114008.1773717-2-uk7b@foxmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240825114008.1773717-1-uk7b@foxmail.com> References: <20240825114008.1773717-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] 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: 4gs6A4bzw4to From: sunyuechi C908 X60 vp9_avg_8tap_smooth_4hv_8bpp_c : 32.0 28.0 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.2 vp9_avg_8tap_smooth_16hv_8bpp_c : 355.7 297.0 vp9_avg_8tap_smooth_16hv_8bpp_rvv_i32 : 47.0 41.5 vp9_avg_8tap_smooth_32hv_8bpp_c : 1272.7 1099.7 vp9_avg_8tap_smooth_32hv_8bpp_rvv_i32 : 134.7 119.7 vp9_avg_8tap_smooth_64hv_8bpp_c : 4937.0 4224.2 vp9_avg_8tap_smooth_64hv_8bpp_rvv_i32 : 528.5 228.5 vp9_put_8tap_smooth_4hv_8bpp_c : 30.2 26.7 vp9_put_8tap_smooth_4hv_8bpp_rvv_i32 : 30.5 12.5 vp9_put_8tap_smooth_8hv_8bpp_c : 91.5 81.2 vp9_put_8tap_smooth_8hv_8bpp_rvv_i32 : 22.7 20.2 vp9_put_8tap_smooth_16hv_8bpp_c : 313.2 277.5 vp9_put_8tap_smooth_16hv_8bpp_rvv_i32 : 45.2 40.2 vp9_put_8tap_smooth_32hv_8bpp_c : 1166.7 1022.2 vp9_put_8tap_smooth_32hv_8bpp_rvv_i32 : 131.7 117.2 vp9_put_8tap_smooth_64hv_8bpp_c : 4560.5 3961.7 vp9_put_8tap_smooth_64hv_8bpp_rvv_i32 : 517.0 223.2 --- libavcodec/riscv/vp9_mc_rvv.S | 104 ++++++++++++++++++++++++++++----- libavcodec/riscv/vp9dsp_init.c | 8 +++ 2 files changed, 97 insertions(+), 15 deletions(-) diff --git a/libavcodec/riscv/vp9_mc_rvv.S b/libavcodec/riscv/vp9_mc_rvv.S index 32143b67e1..864ba8a02f 100644 --- a/libavcodec/riscv/vp9_mc_rvv.S +++ b/libavcodec/riscv/vp9_mc_rvv.S @@ -214,7 +214,7 @@ endfunc lh \regtype\()0, 0(\regtype\()0) .endm -.macro epel_load dst, len, op, name, type, from_mem, regtype +.macro epel_load dst, len, op, name, type, from_mem, regtype, t1=v0, t2=v2, t3=v4, t4=v6, t5=v8, t6=v10, t7=v12, t8=v14 .ifc \from_mem, 1 vle8.v v22, (a2) .ifc \type,v @@ -284,25 +284,25 @@ endfunc vwmulu.vx v20, v22, \regtype\()3 .else .ifc \name,smooth - vwmulu.vx v16, v8, \regtype\()4 - vwmaccu.vx v16, \regtype\()2, v4 - vwmaccu.vx v16, \regtype\()5, v10 - vwmaccsu.vx v16, \regtype\()6, v12 - vwmaccsu.vx v16, \regtype\()1, v2 + vwmulu.vx v16, \t5, \regtype\()4 + vwmaccu.vx v16, \regtype\()2, \t3 + vwmaccu.vx v16, \regtype\()5, \t6 + vwmaccsu.vx v16, \regtype\()6, \t7 + vwmaccsu.vx v16, \regtype\()1, \t2 .else - vwmulu.vx v16, v2, \regtype\()1 - vwmaccu.vx v16, \regtype\()6, v12 - vwmaccsu.vx v16, \regtype\()5, v10 - vwmaccsu.vx v16, \regtype\()2, v4 - vwmulu.vx v28, v8, \regtype\()4 + vwmulu.vx v16, \t2, \regtype\()1 + vwmaccu.vx v16, \regtype\()6, \t7 + vwmaccsu.vx v16, \regtype\()5, \t6 + vwmaccsu.vx v16, \regtype\()2, \t3 + vwmulu.vx v28, \t5, \regtype\()4 .endif - vwmaccsu.vx v16, \regtype\()0, v0 - vwmulu.vx v20, v6, \regtype\()3 + vwmaccsu.vx v16, \regtype\()0, \t1 + vwmulu.vx v20, \t4, \regtype\()3 .ifc \regtype,t - vwmaccsu.vx v16, a7, v14 + vwmaccsu.vx v16, a7, \t8 .else - vwmaccsu.vx v16, s7, v14 + vwmaccsu.vx v16, s7, \t8 .endif .endif @@ -355,6 +355,76 @@ func ff_\op\()_vp9_8tap_\name\()_\len\()\type\()_rvv\vlen\(), zve32x, zba endfunc .endm +#if __riscv_xlen == 64 +.macro epel_hv_body len,op,name,t1,t2,t3,t4,t5,t6,t7,t8 + epel_load v30, \len, \op, \name, t, 0, s, \t1,\t2,\t3,\t4,\t5,\t6,\t7,\t8 + vse8.v v30, (a0) + epel_load \t1, \len, put, \name, h, 1, t + add a2, a2, a3 + add a0, a0, a1 +.endm + +.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, -8 + epel_hv_body \len,\op,\name,v0,v2,v4,v6,v8,v10,v12,v14 + epel_hv_body \len,\op,\name,v2,v4,v6,v8,v10,v12,v14,v0 + epel_hv_body \len,\op,\name,v4,v6,v8,v10,v12,v14,v0,v2 + epel_hv_body \len,\op,\name,v6,v8,v10,v12,v14,v0,v2,v4 +.if \len > 4 + epel_hv_body \len,\op,\name,v8,v10,v12,v14,v0,v2,v4,v6 + epel_hv_body \len,\op,\name,v10,v12,v14,v0,v2,v4,v6,v8 + epel_hv_body \len,\op,\name,v12,v14,v0,v2,v4,v6,v8,v10 + epel_hv_body \len,\op,\name,v14,v0,v2,v4,v6,v8,v10,v12 +.endif + bgtz a4, 1b +.endm + +.macro epel_hv op, name, len, vlen +func ff_\op\()_vp9_8tap_\name\()_\len\()hv_rvv\vlen\(), zve32x, zba + lpad 0 + 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 + csrwi vxrm, 0 + epel_filter \name, h, t, a7 + epel_filter \name, v, s, s7 + vsetvlstatic8 \len, a6, 64, m2 + 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, a7 + 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 @@ -363,6 +433,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 4c645abfaf..11fb180997 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) init_subpel2(1, 1, 0, h, avg, 128); 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 } } if (vlenb >= 32) { @@ -126,6 +130,10 @@ static av_cold void vp9dsp_mc_init_riscv(VP9DSPContext *dsp, int bpp) init_subpel2(1, 1, 0, h, avg, 256); 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 } } }