From patchwork Tue May 7 07:36: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: 48611 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:6816:b0:1af:836d:81b3 with SMTP id wr22csp208771pzb; Tue, 7 May 2024 00:37:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUS73F5eb0xKVETmZF6N1M2k6N07Dg1yUCkaqhRB6+KQutSP2Q0qcrywXF70RDzlaembceLWkEC24kIUz2zSZP0i5OcxD3grvyFPA== X-Google-Smtp-Source: AGHT+IETLfPplddsdykr1UX6CTiHLP0bzWD955E/q90W78wfMBTg19wQssxv0Np0TU2d76HrUUww X-Received: by 2002:a19:ca4d:0:b0:513:ec32:aa89 with SMTP id h13-20020a19ca4d000000b00513ec32aa89mr8354217lfj.2.1715067438880; Tue, 07 May 2024 00:37:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715067438; cv=none; d=google.com; s=arc-20160816; b=JlO02RkgTkkSG+9kgtcYfglqyY4iaQAiAwrHdFd/dM6xzG+aZr+IUS94nDp/XSHn83 Phb37w2VVkFUFuLLpqH7zRyWZ8LL0gT45QMs3m8bvMHcpPY43lueS+j/h58DDu0Hgbj5 T+15eW8tAHTP1keu+2rumQn7jQdnuGr2u4o++/3eKnmc12UPMy2hoyG7BWRHvMOfvKC6 rZgyFpOQD2lVlo/yMTW7J5Fx4hu3MklYGj2Iz3SjhHDecmI7UnrS22AyTSf1gDHR1A9r jTeHfsHP74Lxgg8ybtE5KNciTpyW55+62/R7t5XQsK6BqAmB9gABN6DsFs3eIW0PibT/ O3tQ== 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=hXxk/+Z1IbJtVFfbHOHZP40enPYKD1CimmrNatnJfeI=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=VaFLQe45F1o+nbSMGt6jP9UQl8firhAn1nmchL1ZGQGQ4zovXw0K/Hs4ohL84vgT7i j1TLyWldeZo9enqGXmjQ/Q8gbqzGEsq6nAWvgzcgVBBsU7VyWZxwOPvKGHTUEoB5bMim 0IH6kLlPfDgxrTmNTPSKnUrWXYqQJ0naQ5X3TaH1CKKZM5WT55NLu7h8/B3n2wiZMtgu Uki45RJ1LlUF/P8umM90YJbXBK++gccibUMxTn9TeTQfsGU4puazKc8pZ02KR8zPpN3R v+j9Gx2zUwKqoG4cMWp4GuqjTBUmWqZEu9JA9PB6qi8uPs8go+ecw7VyrZoVKLmIswjL dgcg==; 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="xcQr5u9/"; 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 cm4-20020a170906f58400b00a59ebb2396csi535276ejd.105.2024.05.07.00.37.18; Tue, 07 May 2024 00:37:18 -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="xcQr5u9/"; 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 3EA9E68D73B; Tue, 7 May 2024 10:36:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-236.mail.qq.com (out203-205-221-236.mail.qq.com [203.205.221.236]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B300F68D722 for ; Tue, 7 May 2024 10:36:38 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715067388; bh=4x42jhR2lwqDokzvDVfGXOTttjce+yAReK5cTE0j2/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xcQr5u9/oT5wG8kPn++epsi4LNaShFT9VjAfe+u8ZJ5GkS0JLi+5hjuEz8xSa97cQ cvf6J6p8O/tVOskkRjkjkEm19bH+qcF/r9DF74HxYGAHxCVXWl1RnlcQ/N+pMYPaNX oFogSDi1XDEEvFk9JMSDe0OqnVwrSJgPcDqh2Pjk= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id 9188D283; Tue, 07 May 2024 15:36:24 +0800 X-QQ-mid: xmsmtpt1715067387turx29040 Message-ID: X-QQ-XMAILINFO: OC0C8720A+YSqdfRO80waKStyJYVUp5WULK3/t28+KGBnfeJCFx4vdDxoOaguH 1qelIVOAKtb3MaQ/vU60Mb7EvzUzw9O46Ilw6WAy0avsJd9MuAd7k67RM3/Qhmzj/O+ku24RRqKn dX96ixw+ndEDkNBcTNmg2XdLTVYcdG/pFmVQxnkaREZyZyJFVzrK5m39RqyiKCUSLlKIwCtqtQII zotXTLWfpQ9wlb2BdXklsjbrxLkq0kMSgeAfFlFcjfmfQ/lFl0hQiZ6bIkjxiSv9v2IU121ABY1i fD+K6Y10k2cmpVKelqL/kym5bUIeImxUdrQxdBE3mC2F/+giSnvHk+5fA7Dnf4j5tSba6L4kaB/c bwh9OYWUZn8M+bl9pgwlopB0hRwT0z7d4riBsLck3bKGXVx7JDQANCGj7dWUxdycfcS9gW/zBD8O xeVdmtS5vTxysqiMFvovGgRPAt0XTND6FFPDolx284TPSrI7ihfIkGmNzTs7V5BVIP3BIm+Wa3Ry 0OUxR2VshclHvHiyNkLAV1owdAvIIBi7mJ/UtD4LMz15QapCpOmtef6NTTONZCFCsbpHQPng915L FN71SLYdNpxjAnjDRAio4kIyGgjWJGBlj9lJ7RvN3iMF0jCcOid6d7TZXX490s5MS+Dhs4Y4kcjB VMgOMrTbGmrT9TsW91a8+dVP7UCgWQGJCKXR9kMWI4Aw0+qh8+JEN9YjQpjMLBMdmeUjzPCYaXcL RO4Sx1Pofyp7RedYrumTxnb3XrNbNds/jTzSpGkVCF4GiNoUi8dvb6vvDyzuKLWNzdsqLwWFPhBQ nkdnuLhrR7CRKzl8934kbKTN0Bhvu7RAstZS5+BHyE7ysi9XU6yZeGBoaPA8oReg7Udvt5rKMvWO Ze7lj+SCHvxHw/Hahb6NLj0rT7NGQ3gA== X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 May 2024 15:36:08 +0800 X-OQ-MSGID: <20240507073613.2871668-4-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240507073613.2871668-1-uk7b@foxmail.com> References: <20240507073613.2871668-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/9] lavc/vp9dsp: R-V V ipred tm 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: C01wD8hRU76B From: sunyuechi C908: vp9_tm_4x4_8bpp_c: 116.5 vp9_tm_4x4_8bpp_rvv_i32: 43.5 vp9_tm_8x8_8bpp_c: 416.2 vp9_tm_8x8_8bpp_rvv_i32: 86.0 vp9_tm_16x16_8bpp_c: 1665.5 vp9_tm_16x16_8bpp_rvv_i32: 187.2 vp9_tm_32x32_8bpp_c: 6974.2 vp9_tm_32x32_8bpp_rvv_i32: 625.7 --- libavcodec/riscv/vp9_intra_rvv.S | 141 +++++++++++++++++++++++++++++++ libavcodec/riscv/vp9dsp.h | 8 ++ libavcodec/riscv/vp9dsp_init.c | 4 + 3 files changed, 153 insertions(+) diff --git a/libavcodec/riscv/vp9_intra_rvv.S b/libavcodec/riscv/vp9_intra_rvv.S index dd9bc036e7..7a51aa2bf1 100644 --- a/libavcodec/riscv/vp9_intra_rvv.S +++ b/libavcodec/riscv/vp9_intra_rvv.S @@ -169,3 +169,144 @@ func ff_h_8x8_rvv, zve32x ret endfunc + +.macro tm_sum dst, top, offset + lbu t3, \offset(a2) + sub t3, t3, a4 + vadd.vx \dst, \top, t3 +.endm + +func ff_tm_32x32_rvv, zve32x + lbu a4, -1(a3) + li t5, 32 + + .macro tm_sum32 n1,n2,n3,n4,n5,n6,n7,n8 + vsetvli zero, t5, e16, m4, ta, ma + vle8.v v8, (a3) + vzext.vf2 v28, v8 + + tm_sum v0, v28, \n1 + tm_sum v4, v28, \n2 + tm_sum v8, v28, \n3 + tm_sum v12, v28, \n4 + tm_sum v16, v28, \n5 + tm_sum v20, v28, \n6 + tm_sum v24, v28, \n7 + tm_sum v28, v28, \n8 + + .irp n 0, 4, 8, 12, 16, 20, 24, 28 + vmax.vx v\n, v\n, zero + .endr + + vsetvli zero, zero, e8, m2, ta, ma + .irp n 0, 4, 8, 12, 16, 20, 24, 28 + vnclipu.wi v\n, v\n, 0 + vse8.v v\n, (a0) + add a0, a0, a1 + .endr + .endm + + tm_sum32 31, 30, 29, 28, 27, 26, 25, 24 + tm_sum32 23, 22, 21, 20, 19, 18, 17, 16 + tm_sum32 15, 14, 13, 12, 11, 10, 9, 8 + tm_sum32 7, 6, 5, 4, 3, 2, 1, 0 + + ret +endfunc + +func ff_tm_16x16_rvv, zve32x + vsetivli zero, 16, e16, m2, ta, ma + vle8.v v8, (a3) + vzext.vf2 v30, v8 + lbu a4, -1(a3) + + tm_sum v0, v30, 15 + tm_sum v2, v30, 14 + tm_sum v4, v30, 13 + tm_sum v6, v30, 12 + tm_sum v8, v30, 11 + tm_sum v10, v30, 10 + tm_sum v12, v30, 9 + tm_sum v14, v30, 8 + tm_sum v16, v30, 7 + tm_sum v18, v30, 6 + tm_sum v20, v30, 5 + tm_sum v22, v30, 4 + tm_sum v24, v30, 3 + tm_sum v26, v30, 2 + tm_sum v28, v30, 1 + tm_sum v30, v30, 0 + + .irp n 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30 + vmax.vx v\n, v\n, zero + .endr + + vsetvli zero, zero, e8, m1, ta, ma + .irp n 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28 + vnclipu.wi v\n, v\n, 0 + vse8.v v\n, (a0) + add a0, a0, a1 + .endr + vnclipu.wi v30, v30, 0 + vse8.v v30, (a0) + + ret +endfunc + +func ff_tm_8x8_rvv, zve32x + vsetivli zero, 8, e16, m1, ta, ma + vle8.v v8, (a3) + vzext.vf2 v28, v8 + lbu a4, -1(a3) + + tm_sum v16, v28, 7 + tm_sum v17, v28, 6 + tm_sum v18, v28, 5 + tm_sum v19, v28, 4 + tm_sum v20, v28, 3 + tm_sum v21, v28, 2 + tm_sum v22, v28, 1 + tm_sum v23, v28, 0 + + .irp n 16, 17, 18, 19, 20, 21, 22, 23 + vmax.vx v\n, v\n, zero + .endr + + vsetvli zero, zero, e8, mf2, ta, ma + .irp n 16, 17, 18, 19, 20, 21, 22 + vnclipu.wi v\n, v\n, 0 + vse8.v v\n, (a0) + add a0, a0, a1 + .endr + vnclipu.wi v24, v23, 0 + vse8.v v24, (a0) + + ret +endfunc + +func ff_tm_4x4_rvv, zve32x + vsetivli zero, 4, e16, mf2, ta, ma + vle8.v v8, (a3) + vzext.vf2 v28, v8 + lbu a4, -1(a3) + + tm_sum v16, v28, 3 + tm_sum v17, v28, 2 + tm_sum v18, v28, 1 + tm_sum v19, v28, 0 + + .irp n 16, 17, 18, 19 + vmax.vx v\n, v\n, zero + .endr + + vsetvli zero, zero, e8, mf4, ta, ma + .irp n 16, 17, 18 + vnclipu.wi v\n, v\n, 0 + vse8.v v\n, (a0) + add a0, a0, a1 + .endr + vnclipu.wi v24, v19, 0 + vse8.v v24, (a0) + + ret +endfunc diff --git a/libavcodec/riscv/vp9dsp.h b/libavcodec/riscv/vp9dsp.h index 0ad961c7e0..79330b4968 100644 --- a/libavcodec/riscv/vp9dsp.h +++ b/libavcodec/riscv/vp9dsp.h @@ -72,6 +72,14 @@ void ff_h_16x16_rvv(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, const uint8_t *a); void ff_h_8x8_rvv(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, const uint8_t *a); +void ff_tm_32x32_rvv(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, + const uint8_t *a); +void ff_tm_16x16_rvv(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, + const uint8_t *a); +void ff_tm_8x8_rvv(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, + const uint8_t *a); +void ff_tm_4x4_rvv(uint8_t *dst, ptrdiff_t stride, const uint8_t *l, + const uint8_t *a); #define VP9_8TAP_RISCV_RVV_FUNC(SIZE, type, type_idx) \ void ff_put_8tap_##type##_##SIZE##h_rvv(uint8_t *dst, ptrdiff_t dststride, \ diff --git a/libavcodec/riscv/vp9dsp_init.c b/libavcodec/riscv/vp9dsp_init.c index 7816b13fe0..8023c333db 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -62,6 +62,10 @@ static av_cold void vp9dsp_intrapred_init_riscv(VP9DSPContext *dsp, int bpp) dsp->intra_pred[TX_32X32][HOR_PRED] = ff_h_32x32_rvv; dsp->intra_pred[TX_16X16][HOR_PRED] = ff_h_16x16_rvv; dsp->intra_pred[TX_8X8][HOR_PRED] = ff_h_8x8_rvv; + dsp->intra_pred[TX_32X32][TM_VP8_PRED] = ff_tm_32x32_rvv; + dsp->intra_pred[TX_16X16][TM_VP8_PRED] = ff_tm_16x16_rvv; + dsp->intra_pred[TX_8X8][TM_VP8_PRED] = ff_tm_8x8_rvv; + dsp->intra_pred[TX_4X4][TM_VP8_PRED] = ff_tm_4x4_rvv; } #endif #endif