From patchwork Tue May 14 18:33:59 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: 48876 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a48:b0:1af:fc2d:ff5a with SMTP id zu8csp1144239pzb; Tue, 14 May 2024 11:34:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUd3W77/TBbeHqadPLTK8Lqe/T83kPOxQjT7XobSCOsawjn9qmgjRAreyPvg5LBFqgb1jDr3eVGHrY7mDYwX20hCDYEj9AxeiBl8A== X-Google-Smtp-Source: AGHT+IGYeikL4UhobLH14RmkODRglTmuiAWGScClB/0wEX+Ju4Z5hOpRmYMGY2nUjaTxeQ/n8kid X-Received: by 2002:a50:d793:0:b0:570:5bcc:f749 with SMTP id 4fb4d7f45d1cf-5734d67f3ccmr11730129a12.29.1715711666514; Tue, 14 May 2024 11:34:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715711666; cv=none; d=google.com; s=arc-20160816; b=KohutJ2Q/IzqUnAEZCSBHX7pl/6XgwMixxEnFEk+55pNoihXg66+QL5wPnb1pjBAP4 DSi0DwtJARpAncsXD9l5/ACSZjti7sqV7t06Kg+uhNHpKOl2bvrIzSUzyJOrAym9fhYs +bEIJIM0aD8NS+V6/r2o82MSffLUem6ZnZgCMSkcSHA0E3O2Rt6TGp8twPKeJhi9+oyz MT0aABK9YlFqc1jFxToVwYYHg6GVWaRpDUnK/C3JWmrZinE29qQJjhFECcVtmJeCGclX BFLDoL+VELZhyzXQl1d8oNJggdFoC0nnGyH2yXFkwkgrDMe+/bn//sJDDrBtHs9vU4Py 8F1Q== 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=RxXs7TJzlvDhTylRp09JkLz82PNR4nM4BdP+pXK9YsA=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=FbR0M3HS5zS4Sos9CtD8GGNel3BXXSEri+TuK6wnPZ0vo0iSGDZ8HSbq6sP9Bbxxk7 2XafESt2znfYMUXEcDpM2QatyJ6xHXmSMPwRnJDKafQj1jxG1DtKhl19kLC72wW6ahKM I5RHUWQQBQTDH4wKfMNmO2LjAh/IGHbpFN7bZnTvVlmUtCIienhGwMGYgHPf/ViYrKaN WtKrudcP7uy2yiX7CYPijDNyWR5KrfjHA7Slfg4IGsxm+4SUxIvc8riD1p/WBGjwfBQe z0Nj9BqiMY0Wo3dqpxifqgJcbZFbrZZrdijPMQ7mngQd2g+5im2gIzCP9+QJOCp871ih ct9w==; 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=Eg6uAv5+; 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-5733c32741asi6546296a12.372.2024.05.14.11.34.25; Tue, 14 May 2024 11:34:26 -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=Eg6uAv5+; 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 C417768D72B; Tue, 14 May 2024 21:34:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-205.mail.qq.com (out203-205-221-205.mail.qq.com [203.205.221.205]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77FAC68D6DA for ; Tue, 14 May 2024 21:34:11 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715711642; bh=XPdEdFAlFj6pUZ6kO8vTh3PKsjyFtjUoBia2kBRRppg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Eg6uAv5+jt+aiqzeBanfzE/21opxukiGPGPzuj/+8/KMDVfUpVdVJLLH4AsfzbI0r gR+jDHt2QRxQkM7O2jMUn7GetiYE1zWLBqDD9ud2JRcDi3BHkEnrXLPpQn12haDn7Y nsKAVejEdPT206YNbOZy7qvOMg8tgMwp5KhimVbY= Received: from localhost.localdomain ([42.56.223.122]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 880ADC94; Wed, 15 May 2024 02:34:00 +0800 X-QQ-mid: xmsmtpt1715711640tiio88bgp Message-ID: X-QQ-XMAILINFO: NEoGzTA04D+5dnXiv8ECkCNSM6/32ZFkhDKAoiR9Sp4PzMlLVZd4pszB0cF1yN J6BX0HKc94bYms5h/iU2mbjQPjrn0Kso8mYJ3bEyAbFBSBge+JP3wheBVULX5nP/k6iEKw513SdN BBREGfiPN7PRb1cCyaLgJmq6WXbnd0j7GuI+xXG9YzXosYYWc+6ooVAFmm6Y9or4nYcGn/x4kJEM hD2FJrtZGccv+KYOBvGsaLPaKY3qONUPhNLLQiYNaHJ8f9NAQUYdFRjVsoE8VruNOfaoFnshOriJ H28HLVVIfq6if55mm32X1FBvCXMOtoJJEcneiYbWgvE0dAbw82cgkyhVl9GBfOzVpzNYRkWn2o8w JGxDTbJZb32lo4DQpvluTOQDvoaaCJ7h6RFXQgHJcd36tjdCN+xhe+wC92kXzhFsFaWXpUCIpoEn SQbpoPUynfOn+uxe0bvWic+MT87G1EiVqgGWc9iFDeZyaX7YHXEyGAD70QUTZPEPa9C75U3knUbG owMPT+J3qXcLaVbTtH1M8PID7Vuh2ZwiRAOaSPGnUT+VY8N/BO/O9kAPRIjFyc0BazRyMs+iILwz Z85RubQ+4Sr8hPny3GPeXhuTMPQ7o9h1QIHqNYsTF/QmZPkua8QA2ePpLoDODC0gi8LW8aOQy+Dw vWlhkXfCMLQXuVv8wrINwosOPUjGQ6OJx+hWcApxSkOcJDAVl4Nx2iy+6CNxnlbmvLt8Evj7Km1l y4AJoK55X0H7hOrHP+Yr9X3uSkSC5eNkz8k9UcsSr0zAs1MBc5Nl9ziHc5hXr9VGeGTUpbhKQlKB ICVwPrDdnoMfXL5BeStjEkRDaug4GNaevHGcBXbWgN2M/ctlXC02hhfGeIFpVMOojtYOy2RnGJxi HjGQcYXMnRLDn49xNV/nLvbwyEw5lTvqDXlBV8jHn4MagDh51v9ws= X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 May 2024 02:33:59 +0800 X-OQ-MSGID: <20240514183359.4160378-1-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <50463370.9Eisx7YSRc@basile.remlab.net> References: <50463370.9Eisx7YSRc@basile.remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 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: 8jrZBxkfWMnQ 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 | 123 +++++++++++++++++++++++++++++++ libavcodec/riscv/vp9dsp.h | 8 ++ libavcodec/riscv/vp9dsp_init.c | 4 + 3 files changed, 135 insertions(+) diff --git a/libavcodec/riscv/vp9_intra_rvv.S b/libavcodec/riscv/vp9_intra_rvv.S index ca156d65cd..5fb546c12d 100644 --- a/libavcodec/riscv/vp9_intra_rvv.S +++ b/libavcodec/riscv/vp9_intra_rvv.S @@ -173,3 +173,126 @@ func ff_h_8x8_rvv, zve32x ret endfunc + +.macro tm_sum4 dst1, dst2, dst3, dst4, top, n1 + lbu t1, \n1(a2) + lbu t2, (\n1-1)(a2) + lbu t3, (\n1-2)(a2) + lbu t4, (\n1-3)(a2) + sub t1, t1, a4 + sub t2, t2, a4 + sub t3, t3, a4 + sub t4, t4, a4 + vadd.vx \dst1, \top, t1 + vadd.vx \dst2, \top, t2 + vadd.vx \dst3, \top, t3 + vadd.vx \dst4, \top, t4 +.endm + +func ff_tm_32x32_rvv, zve32x + lbu a4, -1(a3) + li t5, 32 + + .macro tm_sum32 offset + vsetvli zero, t5, e16, m4, ta, ma + vle8.v v8, (a3) + vzext.vf2 v28, v8 + + tm_sum4 v0, v4, v8, v12, v28, \offset + tm_sum4 v16, v20, v24, v28, v28, (\offset-4) + + .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 + tm_sum32 23 + tm_sum32 15 + tm_sum32 7 + + 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_sum4 v0, v2, v4, v6, v30, 15 + tm_sum4 v8, v10, v12, v14, v30, 11 + tm_sum4 v16, v18, v20, v22, v30, 7 + tm_sum4 v24, v26, v28, v30, v30, 3 + + .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_sum4 v16, v17, v18, v19, v28, 7 + tm_sum4 v20, v21, v22, v23, v28, 3 + + .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_sum4 v16, v17, v18, v19, v28, 3 + + .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 eab3e9cb0a..184fadbaf7 100644 --- a/libavcodec/riscv/vp9dsp_init.c +++ b/libavcodec/riscv/vp9dsp_init.c @@ -89,6 +89,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