From patchwork Mon Nov 13 20:00:33 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: 44655 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a5:b0:181:818d:5e7f with SMTP id q37csp1547573pzg; Mon, 13 Nov 2023 12:00:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmbepaEFHMCXiqPBg6LMPsXuAlJqyTWVgx5eF5grFvNBNVdKfiog+i8t3jtuoUToUFOG3l X-Received: by 2002:a17:906:f2d6:b0:9ba:3af4:333e with SMTP id gz22-20020a170906f2d600b009ba3af4333emr4962189ejb.14.1699905656087; Mon, 13 Nov 2023 12:00:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699905656; cv=none; d=google.com; s=arc-20160816; b=A2bemfFOpyruz7hV5uroFoMS5VehSLvtvmLPDB7lwraqk63NLvzZHg26xVoVZtnw2w xiQMktQmjxjiQQga5nCmyG46FYgPsFJkBiNkJbYVVyHMqOhPJ5fmXDY/zlqaBJe9HzJQ xk/5scY4SZMBxxEvAzyx0i5ab5M6cQpHadThwnjlfvy4Rcq5Relit2w0wJO+vo7H2SMs 79R63upRxBkWcPnE/o1b1WxaJg9XXRDvgHceAo+xWJ602Qg6o2cuh+geZfTa4/yfTcdn 9oCw+yO6hPTceDQTAluvb6orxVElFjUXR4rQcPHGfzziJlmS/Ec0ZTN8C/wxQ2OY20Fc RDTQ== 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=IEdU2yCWPBF43Xyafa9RYiyyoxC9UupQ19KJdZ9cx6A=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=VLYcvvUeQj/RpkVRwhwQLZMPRnAOVKhaifMS1n3XkYbu51gJofFFWfPyOxAIkPTe0g N32809e7Es7gWruoQO8YAHb40+zElYYbp5aWfj+mpI+XNvZLpyF5EMnDWo3BDNZiggr6 g/scabb5Icq5rGrOil0lqfP5DNn+q9n8s5A18WmiDQnSVweNjV9FTGt1QGVj+izhH8kI urFLgr/EJg+vw6xu+o7+kzm/Qvc6iTNDq2AjCPcWBjhmrkCJMrV/f7y1WCRU9TENaQxZ Pgq3FQ+M7CGuog6c8teoJJhD0tYdMSRuG8Xcff1CekOXOWj6qnA7v7VM5VheVxX2spHo txTg== 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 p20-20020a17090635d400b009e4c5d49130si3045969ejb.877.2023.11.13.12.00.54; Mon, 13 Nov 2023 12:00:56 -0800 (PST) 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 A465568CD10; Mon, 13 Nov 2023 22:00:41 +0200 (EET) 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 8A21D68CD0E for ; Mon, 13 Nov 2023 22:00:34 +0200 (EET) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 1EF07C0088 for ; Mon, 13 Nov 2023 22:00:34 +0200 (EET) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Nov 2023 22:00:33 +0200 Message-ID: <20231113200033.21708-2-remi@remlab.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231113200033.21708-1-remi@remlab.net> References: <20231113200033.21708-1-remi@remlab.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/flacdsp: R-V V decorrelate_ms packed 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: u64/vpBUm4Hs flac_decorrelate_ms_16_c: 585.5 flac_decorrelate_ms_16_rvv_i32: 263.0 flac_decorrelate_ms_32_c: 584.7 flac_decorrelate_ms_32_rvv_i32: 250.0 --- libavcodec/riscv/flacdsp_init.c | 6 ++++ libavcodec/riscv/flacdsp_rvv.S | 49 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/libavcodec/riscv/flacdsp_init.c b/libavcodec/riscv/flacdsp_init.c index a3415d6d55..0e7be25d98 100644 --- a/libavcodec/riscv/flacdsp_init.c +++ b/libavcodec/riscv/flacdsp_init.c @@ -28,10 +28,14 @@ void ff_flac_decorrelate_ls_16_rvv(uint8_t **out, int32_t **in, int channels, int len, int shift); void ff_flac_decorrelate_rs_16_rvv(uint8_t **out, int32_t **in, int channels, int len, int shift); +void ff_flac_decorrelate_ms_16_rvv(uint8_t **out, int32_t **in, + int channels, int len, int shift); void ff_flac_decorrelate_ls_32_rvv(uint8_t **out, int32_t **in, int channels, int len, int shift); void ff_flac_decorrelate_rs_32_rvv(uint8_t **out, int32_t **in, int channels, int len, int shift); +void ff_flac_decorrelate_ms_32_rvv(uint8_t **out, int32_t **in, + int channels, int len, int shift); av_cold void ff_flacdsp_init_riscv(FLACDSPContext *c, enum AVSampleFormat fmt, int channels) @@ -44,10 +48,12 @@ av_cold void ff_flacdsp_init_riscv(FLACDSPContext *c, enum AVSampleFormat fmt, case AV_SAMPLE_FMT_S16: c->decorrelate[1] = ff_flac_decorrelate_ls_16_rvv; c->decorrelate[2] = ff_flac_decorrelate_rs_16_rvv; + c->decorrelate[3] = ff_flac_decorrelate_ms_16_rvv; break; case AV_SAMPLE_FMT_S32: c->decorrelate[1] = ff_flac_decorrelate_ls_32_rvv; c->decorrelate[2] = ff_flac_decorrelate_rs_32_rvv; + c->decorrelate[3] = ff_flac_decorrelate_ms_32_rvv; break; } } diff --git a/libavcodec/riscv/flacdsp_rvv.S b/libavcodec/riscv/flacdsp_rvv.S index c70ad8fcb0..616565ed7e 100644 --- a/libavcodec/riscv/flacdsp_rvv.S +++ b/libavcodec/riscv/flacdsp_rvv.S @@ -69,6 +69,32 @@ func ff_flac_decorrelate_rs_16_rvv, zve32x ret endfunc +func ff_flac_decorrelate_ms_16_rvv, zve32x + ld a0, (a0) + ld a2, 8(a1) + ld a1, (a1) +1: + vsetvli t0, a3, e32, m8, ta, ma + vle32.v v8, (a2) + sub a3, a3, t0 + vle32.v v0, (a1) + sh2add a1, t0, a1 + vsra.vi v16, v8, 1 + sh2add a2, t0, a2 + vsub.vv v24, v0, v16 + vadd.vv v16, v24, v8 + vsll.vx v8, v24, a4 + vsll.vx v0, v16, a4 + vsetvli zero, zero, e16, m4, ta, ma + vncvt.x.x.w v0, v0 + vncvt.x.x.w v4, v8 + vsseg2e16.v v0, (a0) + sh2add a0, t0, a0 + bnez a3, 1b + + ret +endfunc + func ff_flac_decorrelate_ls_32_rvv, zve32x ld a0, (a0) ld a2, 8(a1) @@ -110,4 +136,27 @@ func ff_flac_decorrelate_rs_32_rvv, zve32x ret endfunc + +func ff_flac_decorrelate_ms_32_rvv, zve32x + ld a0, (a0) + ld a2, 8(a1) + ld a1, (a1) +1: + vsetvli t0, a3, e32, m4, ta, ma + vle32.v v4, (a2) + sub a3, a3, t0 + vle32.v v0, (a1) + sh2add a1, t0, a1 + vsra.vi v8, v4, 1 + sh2add a2, t0, a2 + vsub.vv v12, v0, v8 + vadd.vv v8, v12, v4 + vsll.vx v4, v12, a4 + vsll.vx v0, v8, a4 + vsseg2e32.v v0, (a0) + sh3add a0, t0, a0 + bnez a3, 1b + + ret +endfunc #endif