From patchwork Mon May 13 16:59:26 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: 48862 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp466037pzb; Mon, 13 May 2024 10:00:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXZJZncnnJ0xa0ZtU365BIqRdQn4SHFe0ZY58CtgyyiNM2H19XxXn2WhoRXSsS7lyP9Xl74zSkNIcta97DjLePEklUQ1evfP2q3BQ== X-Google-Smtp-Source: AGHT+IE3zxxIY3PKxteJp7DJGLwA1kHzVZ2cxT5HeuCx9F66g5ITUvGmc1sQLdwBluqOwtR0Pczh X-Received: by 2002:a05:6402:1a49:b0:572:cfa4:57ea with SMTP id 4fb4d7f45d1cf-5734d70991cmr6067620a12.4.1715619659085; Mon, 13 May 2024 10:00:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715619659; cv=none; d=google.com; s=arc-20160816; b=K35Ws9vHFl0pHhKOgrGurNQ6YOCMcz3sZMlUWtqNcTxbf45pHFUvm29SpaJzSt0WH5 KqCosaTFPEDcJWTrv5GRqvRpWlcpyCCK86YHeO5HBzuaffNXLqwzdpAY0OfdrAvPCQt9 g9XYP/okW3iZhXsOGBp0TajKulmn620mMHVdZnXWexdXhTb1nKymLBzyD0VoVzrxcwae 7kmOKK9DuepPnY6D0DbFFdYqw2SYZ2shdtwVWSrDXPjHxtP2S2rblQTCXsPly1A28GDQ jx34hDEFsXOKxqnAWPx2fA+SpSi2uU3G3rgSpZPp4NYBh3+BeCMNvtc6DXQWWtYQpLpA 68LQ== 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=JBWnpFLu4Y36WF8sGfuByROOGhQ7SHoBa6vUfZ5hlDQ=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=FUKnDDY5wQv0ufMYFEolC7tJVmvSa7RYdzsQDLUtCdm/3RePeWXsDmXAM9OA/bgV70 3Tu6IQS20IcnZt54Z3bJbT98itglWNFa0vpWSJKQHdmOrn+iF0JYg+q7MJZ+RFC8piUv lPjkmbCkj5xuCIndJWElkfPBgVLJhy4NRIyjn1sydbt7pZtm0/p4M3cB2IU5z+tpXrYa eBBjDHU+7DaFWqk7J2rYRmAf+CUJcNuV81+U0CJrvPYm6cWvkllYtiaYngRV4ugZPRmA zVKTwtcTEmuvinBhRvRmQuLE7pszVgxng2ZgHiG3rFfLqtPq4fTHfZIrRl7Ojz0WLVTK ONZA==; 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=CFk9u+mr; 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 4fb4d7f45d1cf-573456fb06dsi4511789a12.179.2024.05.13.10.00.53; Mon, 13 May 2024 10:00:59 -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=CFk9u+mr; 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 9878A68D119; Mon, 13 May 2024 20:00:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C674568D56F for ; Mon, 13 May 2024 19:59:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715619583; bh=aAqD/Njsm3EuOH9OY/T1Ch6/OjLHj51O8EBcr2iNecY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CFk9u+mr25OBR2hHHQel4fUfPanq6j5pMm93KZIG95MizvDoZfN0PHUNheRGPFJY2 NVYQmlYLi5o5REjgjDVg35MNB30iKf7ayGhRwGhaUFyoLmgeozxEOUPcioD6QSmNkD 72genVu8qQaFzTsF7v8bN0y+sk8YGqCzblkmgJVk= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id EE3A4485; Tue, 14 May 2024 00:59:35 +0800 X-QQ-mid: xmsmtpt1715619583tzv25akxl Message-ID: X-QQ-XMAILINFO: OKKHiI6c9SH3v3POLo0vp158HJ9nMXsZukbM7Kzaknza0emuHfDInwzVUHhhzv NKaveyNKO02WaoDKfkikKNJa2b69gMXLHYKddbUXzlMLQFbFmP2+3I4LQMAYi0MYPwlt5bTtRtBB ZZ2QACs92zPsqnlM5YZOCwy44A5QjHPlFSjELfsOMX9D/vnReUOwVK/pMU1DWdxcP5saGPM8FaSd SzhfYu+W4W/LPtwIBlEjNCt8cJjWF9dweWJ+/od4fTZTFNfaYLb+As9miDXa4+h5Wn+r2WfJGlmL ujLINoj2HYTwnltc6RzdocmTcn5J1Jz14svAyXL5UjlbkH3vNvMyXlmfV8Jfwyrhq6hdKo6NIcPz 4FdsdNcUqS7yyR7tjUauIsckZ5znn2JP7flu2B2nbwIbMZU3RwPkYkGt7kIeJi3NQoaZkTnh1ykm NNS6GiRtfyl+Cy3CUwfmuenM6S6Ku/+/Gcd3+E4RqXM43Sp/m7LMsD/cEuce6dWQoGwmFVIwWuS+ q4A/1hbVYAQQ2/mCP/nDTOkUR5q22Sqlja4kRNNOGwb+7v8k0T5Tq1ErLnZeCiZC6/2HlMGMe5Xc fIV/9gjIpZPUoASz49PXG4Tv6FCUI+GwwdwCtWUV/lY6VHjs6GqtZYdm2rTg68zoxvfGM6z1M8jM YmPPuBykvtdN0EGVXAfqf6gDM7Iddy1gQ+Nz/Rr/Gkvnrx52rurg+wpQaDBmgqHWnhRI2Z+KGvfb SzAX0kcuQpjsnfw2cnbp3owUj6+dD4PP825h0f9kAR28R7tRop7Dfb/wPoTCkWNUGIIyoESCpV6T rmEclLq1VvmxmfnbS2q/Tl/ArNjZxV6t2AU34HeUloMpnKp1r3ZlOVXOKDTm+03ngbeO0NtcjUmg y+7R4Qkve1ocxsVT68XTMZ64+W/cRBn+eotKd6cczbIMzMrrd+Mc145S8TJDODNwVpt3iqymmgAT cOGNJXJFSgv+sVP+uo4g== X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 May 2024 00:59:26 +0800 X-OQ-MSGID: <20240513165926.1467967-9-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513165926.1467967-1-uk7b@foxmail.com> References: <20240513165926.1467967-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 9/9] 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: uA1giY+xJ0ef 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 22ae194367..958460d165 100644 --- a/libavcodec/riscv/vp9_mc_rvv.S +++ b/libavcodec/riscv/vp9_mc_rvv.S @@ -362,6 +362,77 @@ func ff_\op\()_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\()_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 @@ -373,6 +444,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 f3e9302a73..cc5878f414 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 } } }