From patchwork Sat Jun 15 11:50:34 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: 49927 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp914057vqg; Sat, 15 Jun 2024 04:51:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXVf3d8bL3Mnc9DPW6qnZy6SWjFjdA2xFzWKg6WjGGbNDDrUm8poPpEl9llP64mXRe3yaANRXN/n0InFAfbuw0EDdU08kMBpW49fw== X-Google-Smtp-Source: AGHT+IFx4PYcQbgmfHlpnmrES5C40nY5QsBejunJ8jjqPxayl6VLj2n43XQ9RBZciI8vVTOAhgTh X-Received: by 2002:a50:99d7:0:b0:57c:bc44:8c9d with SMTP id 4fb4d7f45d1cf-57cbd6767bbmr3381983a12.1.1718452276981; Sat, 15 Jun 2024 04:51:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718452276; cv=none; d=google.com; s=arc-20160816; b=SM3VBUYODApnvDuBH7XMhFhGBixsUhTVVP9AtOsEpAMqeBTVqoCy2kJ1FaJbPLAr6a 6eGcDMqPt3ZXF9DT3sejcdfV06sFKo3kpMfzDUS0HPQWvQa5I6TSmTo1FeU+v8s4RIXA eSnLRYOZdzfObFCRCMZOeGmbPGAhzuxcO3KnOjGBfT4vHaez1r0pcZBTKtr03n8icB75 hvzlaFb7/Yh6bqAdD/pjZtkQsoSOYOx0D0NA4gdE99Mp9WblOLYcgCzKORmZzzdffPhY 5sAockGC70SCXBPD8n9Gv6GNlkWV9gNuHS2wSURYaqkNp4GrnSY0tIvjNR2RdZtduvwk 0Vsg== 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=h/h8LJiFu2Jjm4nirgU1uKynbtirt8pCmSl7V/JLaVI=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=Nkwe/KQ1aMd9RAm+AfVzE1SDkUr6OfYpPFVW9TjQc9mbz/TJ7umPFwl0iZWeyJVAHP +NzfPKQ5z76vVeHOmvjCuhBISzAE1TCbUXNSGSZOqqlJlGtOJmi4ExSNHe/Ba0j+KgRV B1HlYo2Lc4qCeeiefHd6iE8zOpu5t0p8m935bLgI2juvwBURtahvPrmBvRMgwV9nv6SD 91NKqMi7L+pVgF5VwLgb2YMKw2Q5aGHaG6Pj5+b6DBg2ZxvUZv72+8StvGMtXWsUeeVM ENazMfnOWwhg6+zlDErwBgDTIrwvg1eIWRv3N9qmA3HFCiXyTZ7/hP9i0/WtZaJwHoJ3 SrBA==; 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=wmX4ief3; 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-57cb7ea4ba1si2742981a12.238.2024.06.15.04.51.16; Sat, 15 Jun 2024 04:51:16 -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=wmX4ief3; 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 72F4B68CDB0; Sat, 15 Jun 2024 14:51:00 +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 B4EB068D5D0 for ; Sat, 15 Jun 2024 14:50:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1718452243; bh=P+ToEacD6kmkCnjWn7nzr/LjICbJdy1xlmcS1624ddA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wmX4ief3oTTsU2D2zLk6BGgyCgtR05ewfv1s0FQf+o88BfIRzoh7ynYMfi7sEJzwN lx9FmVM78v+1ph0bkXGIYa+fT56+Z27CBUptk6xyBpvQMBvhR3svb+oKWjxbTPWNrz hSQa+A5P+wTWefXh42PoCUMAQC6XbdixSbytrkR4= Received: from localhost.localdomain ([113.236.90.228]) by newxmesmtplogicsvrszb16-1.qq.com (NewEsmtp) with SMTP id CA804889; Sat, 15 Jun 2024 19:50:40 +0800 X-QQ-mid: xmsmtpt1718452242te9uxpnue Message-ID: X-QQ-XMAILINFO: MyirvGjpKb1j8VocI9PNFo8fmvbacJiF+IUIqvj/AG3Ix3Us67oHvAkmB2w4MU VXrFMEh3diEW8bNDeTfT+DU+uN//PBfYxUZ61paups/SC9k9iwYzNMfxyjX61l/BQNt0l9IMTUJ+ WcqnjaxP3viRP5/uZ2Fmu3Q4+K6V0XrGRx+1tnNCZ5GMHJ38B4kXNpMKqh7HuqKnDrbWX+atRD82 +LmL3rOtZD5mN2OCdg7d2k5b05E8m4z0mbdLHyS2rZZqtYiEQhv2OVAxO+LVYpsyntJvnmuoWyDI g7rCTc3/79T6srkvtBJa+qjaZ9iw8Qc+LGiwKS145YtIZsV7UFzKyF4AbgivYHmdqQuNMz1Q6QkS q32J2dy9WImJOTzHrZJhMrGQLA1eokLhWxM2qEaAAkbOtOXdO4dAtxzGckMO/PsFZUPsN62FckXD ok8E0ymYWRbZWcuwZj5y/8s1MK1rG/4ChhVQUMMP4gzYyZq/bcCIX1uvXYOX5xWPj7pPjbzr9NPz WT8sqW6EZmYsSEb/eRNcQ2YhiLz+ZETm1qzXeUZ/rbfBKOedMCTZ8BTN+4nRoRDdZjgCrQOOW1B7 cIgyQZTRuRZtJBFD7sSdaTCgXXwD6Y1nGgySzaLLLeWSTPlNm2kE6UCCVEOcnz8zB12MFbTIotvh 9tr2MGKOvnCnq06LB96XF569u6PMPslB5Ac6t8KPsg2NBtCu1goHvBhardaH9rPH0CuMnNBc7Q3d sXazEUPFYic23hnZYhZzF1qnkg1XOxKmUM4K9LGnxkrodQWf4FBQ2eFwiZ7GXklcTKetcK9mrz9T E7F1MFcnr2/Yf9Zwac7SL8zzfziVxNTgv/MyUoHfzc6YPqc4gc6zIfsJEbPxir79CKSRQfM0RtTQ vXz+ps3Dn3ppnBqKLhV4Pp9DaamwHkwUvyM2NCFGKaVessqbNlPMpfW3SE+Kza0XDNOs/frJ2mp1 0gYGL+FyA= X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jun 2024 19:50:34 +0800 X-OQ-MSGID: <20240615115034.3891490-4-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240615115034.3891490-1-uk7b@foxmail.com> References: <20240615115034.3891490-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 4/4] 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: 1+AyaAVK+M4u 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 | 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 5e81301aa5..474c9035ae 100644 --- a/libavcodec/riscv/vp9_mc_rvv.S +++ b/libavcodec/riscv/vp9_mc_rvv.S @@ -373,6 +373,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 @@ -381,6 +452,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 3669070fca..7b090c9889 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -119,6 +119,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 } } @@ -129,6 +133,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 } } }