From patchwork Fri Sep 27 17:09:30 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: 51877 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp562848vqb; Fri, 27 Sep 2024 10:21:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXdtIiDnC3afMq0mHWBU1NnvTpeQeQLeefUUuhU5297UKoaYrIo+XqRdXwcconkb4r99zkdRDLqYPjzOyikWTlX@gmail.com X-Google-Smtp-Source: AGHT+IF2pIgpfCqByYO21SSjIVqryp9xsOpHMOMJEaFnfyWvSwl+P2epS6zj+TfENQzn9KhVh+DK X-Received: by 2002:a05:6512:108b:b0:536:53c2:8177 with SMTP id 2adb3069b0e04-5398c30a293mr7930e87.9.1727457671907; Fri, 27 Sep 2024 10:21:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727457671; cv=none; d=google.com; s=arc-20240605; b=DlwMjQ+Aa+4AdDvTh9xE5V7I5p73iPfB7RBR+67TpDe+74ZzJe8OR25ONdWO6eu9Cr WRxmPERpMn0ZtWF6BOegR3A+B0Vo8S/q1zg6LNhmjheAKmQHOXK/VPwjZ9wT0sZtxIOn E881gSz0luZj5D3FifrfTrttFle9vV+x/hBWez0ZLNJ9eO2HpkjrSUsC3yqLovh8YdVX Wvrb4YVKOebfXg21iv6bCjcmE5erCYpfYxUaYYvzrpMZD35ioU2XSk6+ENu2dH4OmMrc 0Q09jZjS8ggrdxonKNIgBGi8uLTLpW/tOSne9J9QccU0+M0yrCE+/CALuoSTPVo+LPA2 VzYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:date:to:from:message-id :dkim-signature:delivered-to; bh=7CRKrLwtEM/wWycnNqSU1vTzCuwNYMoqzmjt9yzcWrc=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=KdBreZRPFIEiFezHQWhGA7/NNeoJIGIcE+WqschgkXkLO9P0nuaYk9Cpxpk4HDh5y0 RFaVDbqDgpG9uple4L1jE2mxpecWAX6GcI06QFkyjuHmKPRwKSRBj0tO91ZJ2zpg9qPO p1/5LOp7ax5JYZ2Nz9q5yC+PcepKm0OjEimmEnUHUp5kPIhrHICZTKGwS66ICRS2NOcD 1k6xKVsPpklSumzvs69umEcaTl0j0K3hB7BH54y9VZq7ih73J1wwwo96NU7Z22eokPx8 1WBOqUztxNNgJBGZknTG/w2y8hP1Fw8TQN+pia14EubUOsjJdK07yg8iZ8UgGWMeDKuR Dy7g==; 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=BSU+6rR9; 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 2adb3069b0e04-538a0460a0esi763820e87.622.2024.09.27.10.21.10; Fri, 27 Sep 2024 10:21:11 -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=BSU+6rR9; 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 5DBAA68DDFF; Fri, 27 Sep 2024 20:11:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from xmbghk7.mail.qq.com (xmbghk7.mail.qq.com [43.163.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7656368DD9E for ; Fri, 27 Sep 2024 20:09:45 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1727456973; bh=teBs0oH7B1jnDNmJZFlrelMVPs//4dHTIymOkoEcPnU=; h=From:To:Cc:Subject:Date; b=BSU+6rR9yGu83TiDM4/D765hgirI6pJbHB24PvGUx2zYxaKNiEOcuhpZe2GD87CyE 7zDSqalTm1qxdiULm4uCcMKiXyLdZaSTz3deIxMO5DSfep9I+a0McJrw+WhHVisZRL hyz9barYCgwbHlE/Smji3ttEh12JXIX6K9AhjrCs= Received: from localhost.localdomain ([42.58.231.173]) by newxmesmtplogicsvrszgpua4-0.qq.com (NewEsmtp) with SMTP id 26004483; Sat, 28 Sep 2024 01:09:32 +0800 X-QQ-mid: xmsmtpt1727456972tp6hfbcl7 Message-ID: X-QQ-XMAILINFO: MIAHdi1iQo+zAIsSvx/ELmxqYHrdhPrpdaS4zB4aW8NB+deGa0iAb+AgA0oB8B 1sllr+WO6h0pdnzLYy/U95Mc/TzQWFZ65NbwcdzyCka3M1eXABdyDw1WIEYDz/ynKSnZpgTdQk7z mdmojtYjD9/xAX8Uz6t02SNDFIWNqU2dos2OZ/HNKZA1+7OXQkQn5t7aPwDKYUbZZV8cEv2Ek8UK eoCwlrQta6RPwjN/P15Rz7LhPwel3/KfhxqbVbxcjYL59xHVNGOGkGWJoikmzuTbu4nI+wxBSUkl d3To59QwECo7wcQGBllp5qbG6iPh5q+c5LZ7kWqRPkFj9jqQlx7QMrKmOqFbJcMA+7wh9WuYZ/7u 357GPtAOb7J8hptaBV73FGmQVCl/u61+GcsxgxYwf5MK0vN1X615nHu2OKwaZNU90LWbYy2lUsjh vRvB7PU6LKChNWszrJAirJmzYNt/iBMigqBGIvbNik2u5OztHzo0AZcAKjXvzLpc+LfkBlipvGJA uIwgLZ4jbOi6sUqlNvdNdCUA05z5vM+5YH/oYK/8CNjA8Fqigj7e3l9MovI20jvLGcI0rKJ4ttic lmZe6Kd9mZpXzEIascG6KogKRpmAkODMnSh0u8OMLLR0i5w6k9Aq9WfUqsd1dSDswpD9u22/2vM6 j8vO0R3dlGB0Fm+rz5vn5bSGXSjrK3XUXa/duEcFaWRFX+ctyO0ANYmgSV1ks0rV3SIMLJHlg6Yw 5RWISFK6BhZstG995pz3yBO3IV0yJY5FYBcwFKh+O+MpE3cxuzflXYhVzmB/bXkk9qzHMzBqwWi9 bHsqLqvRYF7E8o9vvtJTd9VEWzQrETgizIf18uecBnSaJKBEtmVYckpkNBYKh+xqn6HdP72sR25X vkfimMOaszxo4LKe20exIWi4iUPt/mz55WBEhoPeVnO6T6oBXtaZWo0W+pxMH7TGdGbaSFrp2Av/ U0m0lPt+CFudt/Rv7kckD7olYWdxEP6R1I83xdKw481Cb3GAJ8HQ== X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Sep 2024 01:09:30 +0800 X-OQ-MSGID: <20240927170930.808704-1-uk7b@foxmail.com> X-Mailer: git-send-email 2.46.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/vvc_mc: R-V V dmvr 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: 2/vswang59kg From: sunyuechi k230 banana_f3 dmvr_8_12x20_c: 628.5 ( 1.00x) 624.1 ( 1.00x) dmvr_8_12x20_rvv_i32: 137.5 ( 4.57x) 92.9 ( 6.72x) dmvr_8_20x12_c: 609.7 ( 1.00x) 655.4 ( 1.00x) dmvr_8_20x12_rvv_i32: 146.7 ( 4.16x) 82.4 ( 7.95x) dmvr_8_20x20_c: 998.7 ( 1.00x) 1092.9 ( 1.00x) dmvr_8_20x20_rvv_i32: 221.0 ( 4.52x) 144.9 ( 7.54x) dmvr_h_8_12x20_c: 2008.0 ( 1.00x) 1999.2 ( 1.00x) dmvr_h_8_12x20_rvv_i32: 285.7 ( 7.03x) 207.4 ( 9.64x) dmvr_h_8_20x12_c: 1989.5 ( 1.00x) 2009.7 ( 1.00x) dmvr_h_8_20x12_rvv_i32: 322.7 ( 6.16x) 176.2 (11.41x) dmvr_h_8_20x20_c: 3304.2 ( 1.00x) 3342.9 ( 1.00x) dmvr_h_8_20x20_rvv_i32: 526.5 ( 6.28x) 290.6 (11.50x) dmvr_hv_8_12x20_c: 3609.7 ( 1.00x) 3603.4 ( 1.00x) dmvr_hv_8_12x20_rvv_i32: 554.2 ( 6.51x) 467.9 ( 7.70x) dmvr_hv_8_20x12_c: 3637.5 ( 1.00x) 3624.4 ( 1.00x) dmvr_hv_8_20x12_rvv_i32: 489.5 ( 7.43x) 342.6 (10.58x) dmvr_hv_8_20x20_c: 6794.7 ( 1.00x) 5936.9 ( 1.00x) dmvr_hv_8_20x20_rvv_i32: 785.7 ( 8.65x) 561.4 (10.58x) dmvr_v_8_12x20_c: 2156.0 ( 1.00x) 2155.2 ( 1.00x) dmvr_v_8_12x20_rvv_i32: 295.0 ( 7.31x) 207.4 (10.39x) dmvr_v_8_20x12_c: 2137.5 ( 1.00x) 2165.7 ( 1.00x) dmvr_v_8_20x12_rvv_i32: 322.7 ( 6.62x) 186.7 (11.60x) dmvr_v_8_20x20_c: 3554.2 ( 1.00x) 3593.2 ( 1.00x) dmvr_v_8_20x20_rvv_i32: 535.7 ( 6.63x) 290.6 (12.36x) --- libavcodec/riscv/vvc/vvc_mc_rvv.S | 141 +++++++++++++++++++++++++++++ libavcodec/riscv/vvc/vvcdsp_init.c | 22 +++++ 2 files changed, 163 insertions(+) diff --git a/libavcodec/riscv/vvc/vvc_mc_rvv.S b/libavcodec/riscv/vvc/vvc_mc_rvv.S index 18532616d9..a5e20cbc67 100644 --- a/libavcodec/riscv/vvc/vvc_mc_rvv.S +++ b/libavcodec/riscv/vvc/vvc_mc_rvv.S @@ -285,3 +285,144 @@ endfunc func_w_avg 128 func_w_avg 256 #endif + +func dmvr zve32x, zbb, zba + lpad 0 + li t0, 4 +1: + add t1, a1, a2 + addi t4, a0, 128*2 + add t2, t1, a2 + addi t5, a0, 128*2*2 + add t3, t2, a2 + addi t6, a0, 128*2*3 + vle8.v v0, (a1) + vle8.v v4, (t1) + vle8.v v8, (t2) + vle8.v v12, (t3) + addi a3, a3, -4 + vwmulu.vx v16, v0, t0 + vwmulu.vx v20, v4, t0 + vwmulu.vx v24, v8, t0 + vwmulu.vx v28, v12, t0 + vse16.v v16, (a0) + vse16.v v20, (t4) + vse16.v v24, (t5) + vse16.v v28, (t6) + sh2add a1, a2, a1 + add a0, a0, 128*2*4 + bnez a3, 1b + ret +endfunc + +.macro dmvr_h_v mn, type + lla t4, ff_vvc_inter_luma_dmvr_filters + sh1add t4, \mn, t4 + lbu t5, (t4) + lbu t6, 1(t4) +1: +.ifc \type,h + addi t0, a1, 1 + addi t1, a1, 2 +.else + add t0, a1, a2 + add t1, t0, a2 +.endif + vle8.v v0, (a1) + vle8.v v4, (t0) + vle8.v v8, (t1) + addi a3, a3, -2 + vzext.vf2 v12, v0 + vzext.vf2 v16, v4 + vzext.vf2 v20, v8 + addi t2, a0, 128*2 + vmul.vx v12, v12, t5 + vmul.vx v24, v16, t5 + vmacc.vx v12, t6, v16 + vmacc.vx v24, t6, v20 + vadd.vi v12, v12, 2 + vadd.vi v24, v24, 2 + vsra.vi v12, v12, 2 + vsra.vi v24, v24, 2 + vse16.v v12, (a0) + vse16.v v24, (t2) + add a0, a0, 128*4 + sh1add a1, a2, a1 + bnez a3, 1b + ret +.endm + +func dmvr_h zve32x, zbb, zba + lpad 0 + dmvr_h_v a4, h +endfunc + +func dmvr_v zve32x, zbb, zba + lpad 0 + dmvr_h_v a5, v +endfunc + +.macro dmvr_load_h dst, filter0, filter1 + addi a6, a1, 1 + vle8.v \dst, (a1) + vle8.v v2, (a6) + vzext.vf2 v4, \dst + vzext.vf2 v8, v2 + vmul.vx \dst, v4, \filter0 + vmacc.vx \dst, \filter1, v8 + vadd.vi \dst, \dst, 1 << (2 - 1) + vsra.vi \dst, \dst, 2 +.endm + +func dmvr_hv zve32x, zbb, zba + lpad 0 + lla t0, ff_vvc_inter_luma_dmvr_filters + sh1add t1, a4, t0 + sh1add t2, a5, t0 + lbu t3, (t1) // filter[mx][0] + lbu t4, 1(t1) // filter[mx][1] + lbu t5, (t2) // filter[my][0] + lbu t6, 1(t2) // filter[my][1] + dmvr_load_h v12, t3, t4 + add a1, a1, a2 +1: + vmul.vx v28, v12, t5 + addi a3, a3, -1 + dmvr_load_h v12, t3, t4 + vmacc.vx v28, t6, v12 + vadd.vi v28, v28, 1 << (4 - 1) + vsra.vi v28, v28, 4 + vse16.v v28, (a0) + add a1, a1, a2 + addi a0, a0, 128*2 + bnez a3, 1b + ret +endfunc + +.macro func_dmvr vlen, name +func ff_vvc_\name\()_8_rvv_\vlen\(), zve32x, zbb, zba + lpad 0 + li t0, 20 + beq a6, t0, DMVR20\vlen\name + .ifc \name, dmvr + vsetvlstatic8 12, \vlen + .else + vsetvlstatic16 12, \vlen + .endif + j \name +DMVR20\vlen\name: + .ifc \name, dmvr + vsetvlstatic8 20, \vlen + .else + vsetvlstatic16 20, \vlen + .endif + j \name +endfunc +.endm + +.irp vlen,256,128 +func_dmvr \vlen, dmvr +func_dmvr \vlen, dmvr_h +func_dmvr \vlen, dmvr_v +func_dmvr \vlen, dmvr_hv +.endr diff --git a/libavcodec/riscv/vvc/vvcdsp_init.c b/libavcodec/riscv/vvc/vvcdsp_init.c index ac1e7dda7d..7df3ce58db 100644 --- a/libavcodec/riscv/vvc/vvcdsp_init.c +++ b/libavcodec/riscv/vvc/vvcdsp_init.c @@ -37,6 +37,26 @@ void bf(ff_vvc_w_avg, bd, opt)(uint8_t *dst, ptrdiff_t dst_stride, AVG_PROTOTYPES(8, rvv_128) AVG_PROTOTYPES(8, rvv_256) +#define DMVR_PROTOTYPES(bd, opt) \ +void ff_vvc_dmvr_##bd##_##opt(int16_t *dst, const uint8_t *src, ptrdiff_t src_stride, \ + int height, intptr_t mx, intptr_t my, int width); \ +void ff_vvc_dmvr_h_##bd##_##opt(int16_t *dst, const uint8_t *src, ptrdiff_t src_stride, \ + int height, intptr_t mx, intptr_t my, int width); \ +void ff_vvc_dmvr_v_##bd##_##opt(int16_t *dst, const uint8_t *src, ptrdiff_t src_stride, \ + int height, intptr_t mx, intptr_t my, int width); \ +void ff_vvc_dmvr_hv_##bd##_##opt(int16_t *dst, const uint8_t *src, ptrdiff_t src_stride, \ + int height, intptr_t mx, intptr_t my, int width); \ + +DMVR_PROTOTYPES(8, rvv_128) +DMVR_PROTOTYPES(8, rvv_256) + +#define DMVR_INIT(bd, opt) do { \ + c->inter.dmvr[0][0] = ff_vvc_dmvr_##bd##_##opt; \ + c->inter.dmvr[0][1] = ff_vvc_dmvr_h_##bd##_##opt; \ + c->inter.dmvr[1][0] = ff_vvc_dmvr_v_##bd##_##opt; \ + c->inter.dmvr[1][1] = ff_vvc_dmvr_hv_##bd##_##opt; \ +} while (0) + void ff_vvc_dsp_init_riscv(VVCDSPContext *const c, const int bd) { #if HAVE_RVV @@ -51,6 +71,7 @@ void ff_vvc_dsp_init_riscv(VVCDSPContext *const c, const int bd) # if (__riscv_xlen == 64) c->inter.w_avg = ff_vvc_w_avg_8_rvv_256; # endif + DMVR_INIT(8, rvv_256); break; default: break; @@ -63,6 +84,7 @@ void ff_vvc_dsp_init_riscv(VVCDSPContext *const c, const int bd) # if (__riscv_xlen == 64) c->inter.w_avg = ff_vvc_w_avg_8_rvv_128; # endif + DMVR_INIT(8, rvv_128); break; default: break;