From patchwork Sat Oct 28 19:04:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 44419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dd83:b0:15d:8365:d4b8 with SMTP id kw3csp603951pzb; Sat, 28 Oct 2023 12:05:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFLSf6UChZLY69ZHqJ/tk77cVogeXL8TLJvblv15snInh5w7s4C9pkhElYfa+4S0AawXYXT X-Received: by 2002:a17:907:9347:b0:9be:2963:5671 with SMTP id bv7-20020a170907934700b009be29635671mr4881420ejc.69.1698519922575; Sat, 28 Oct 2023 12:05:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698519922; cv=none; d=google.com; s=arc-20160816; b=qgl8DkRQ/ECTQ1QZe2sn0/47DgFaR5hYWavzzBitYavTGk8ooKjHBjzFRtWc5EIYnP lXtQ/MQbonuiErX5R4oCLpKjX0R1BnbyYhwsWzLG5OhuvJa4siZU5PlbI6804wRXzbPC 39B4dbQOuIKW/tAr099ON2X9lorluQvczslfwv7cna+oqfYPf2LBTmUxJFfhaQRAtN6V Et/JwlK4yMTFE4WJ1nhO1ks4oSHVnRdSY/7SdRX//wiYRA6HUfPIIEUqNEON674XW3Jc xCQ3qVciVVwDAvhV3lduhLZcetz5iogvNuWpr7TqUgDndVzLAWAJ3VgDuVhs+WC5XFgf snvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=FUXSfds8LTLGNvHNorMtHqOqK7qd2C3nlitFteoBHy4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=EQUpRzjQyQAtW0HDVt/RZ48XGWEo5FZaqlT672HRlbgsRaSn8FgA9ba+iOyH6FJxNQ 4/MFNf6ABfOKW1VJuIDTCJCPBUFyOhrzaH9GzbUGblUpyxP6Ybrx71nEVAyEJ4gABs4s R58vvc5drC449JbR6qN4yKCfd4ibgEY50PgSscWYBXQjg+sMz9JMA50cq89BQI8yCnik K/UpsMMZQT9CgaSsncE+8C1gSpPmpMHSQ11kuatDfLSHZiShn7F+peDnNiQa6NNApGqp UftY4FGfaosLUu1vqSOh59vYXIFC/dyfJTykgewTftUqQVjN2puN+z97jGVKUSBPDQy8 v7gw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dl19-20020a170907945300b009a1bf6056dcsi1883658ejc.783.2023.10.28.12.05.22; Sat, 28 Oct 2023 12:05:22 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 24BE668CBDF; Sat, 28 Oct 2023 22:05:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 970C068CB27 for ; Sat, 28 Oct 2023 22:04:56 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 2CCA4C01A3 for ; Sat, 28 Oct 2023 22:04:56 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Oct 2023 22:04:54 +0300 Message-ID: <20231028190455.64807-3-remi@remlab.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231028190455.64807-1-remi@remlab.net> References: <20231028190455.64807-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/jpeg2000dsp: R-V V rct_int 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lmF/p+Y87CZT jpeg2000_rct_int_c: 2592.2 jpeg2000_rct_int_rvv_i32: 1154.2 --- libavcodec/riscv/jpeg2000dsp_init.c | 8 ++++++-- libavcodec/riscv/jpeg2000dsp_rvv.S | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/libavcodec/riscv/jpeg2000dsp_init.c b/libavcodec/riscv/jpeg2000dsp_init.c index 9415a22f79..e82ec47bde 100644 --- a/libavcodec/riscv/jpeg2000dsp_init.c +++ b/libavcodec/riscv/jpeg2000dsp_init.c @@ -24,13 +24,17 @@ #include "libavcodec/jpeg2000dsp.h" void ff_ict_float_rvv(void *src0, void *src1, void *src2, int csize); +void ff_rct_int_rvv(void *src0, void *src1, void *src2, int csize); av_cold void ff_jpeg2000dsp_init_riscv(Jpeg2000DSPContext *c) { #if HAVE_RVV int flags = av_get_cpu_flags(); - if ((flags & AV_CPU_FLAG_RVV_F32) && (flags & AV_CPU_FLAG_RVB_ADDR)) - c->mct_decode[FF_DWT97] = ff_ict_float_rvv; + if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR)) { + if (flags & AV_CPU_FLAG_RVV_F32) + c->mct_decode[FF_DWT97] = ff_ict_float_rvv; + c->mct_decode[FF_DWT53] = ff_rct_int_rvv; + } #endif } diff --git a/libavcodec/riscv/jpeg2000dsp_rvv.S b/libavcodec/riscv/jpeg2000dsp_rvv.S index d10ebd491f..10efe6b0db 100644 --- a/libavcodec/riscv/jpeg2000dsp_rvv.S +++ b/libavcodec/riscv/jpeg2000dsp_rvv.S @@ -47,3 +47,26 @@ func ff_ict_float_rvv, zve32f ret endfunc + +func ff_rct_int_rvv, zve32x +1: + vsetvli t0, a3, e32, m8, ta, ma + vle32.v v16, (a1) + sub a3, a3, t0 + vle32.v v24, (a2) + vle32.v v8, (a0) + vadd.vv v0, v16, v24 + vsra.vi v0, v0, 2 + vsub.vv v0, v8, v0 + vadd.vv v8, v0, v24 + vadd.vv v24, v0, v16 + vse32.v v8, (a0) + sh2add a0, t0, a0 + vse32.v v0, (a1) + sh2add a1, t0, a1 + vse32.v v24, (a2) + sh2add a2, t0, a2 + bnez a3, 1b + + ret +endfunc