From patchwork Fri May 24 20:04:40 2024 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: 49208 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:542:0:b0:460:55fa:d5ed with SMTP id 63csp1972140vqf; Fri, 24 May 2024 13:04:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXi9gDma06JL5YV2eQGrK4GW9sZIVN4W2xBSQV4ZLl0Oq9IEyT6AxQ3BZ7GhhemQXPBSkBbzuVDdDtDpf+Fpw660GL4esX9JDwVlw== X-Google-Smtp-Source: AGHT+IH4JJhJfryD5HQcFiCkoRddjGwB0AEj+KGKuC/13nHoxSYYxPW4BAbXkvBsYh+rLbnlie5E X-Received: by 2002:a2e:968c:0:b0:2e2:9416:a63f with SMTP id 38308e7fff4ca-2e95b27b963mr28727451fa.53.1716581091926; Fri, 24 May 2024 13:04:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716581091; cv=none; d=google.com; s=arc-20160816; b=KEh/bIoF2dERDVzC6fIce6FRbXKCwTuY8J5qmqNDvs9W/qDEvdWjBWeMN5Y1CeL68/ Y9xDOTZyCfcI3IfSyu0nZaMQiMvMvoe4ycivtIU+Cb6sL8IU1Hjayh0EVBNG9NWGoGiO m5ls7+vTAdNjvL6z3yXkpGwHWAN1U3njRM6u0zY89Umt+gKXf5o52xebAfhhLsI1Frt1 qTCujko8x8+Sy6GKJLWzMDQas3FahVFzgZIwoRQyI0NLWfLPEFu91OZMrDvhHL+V0zSO Xt3kJ+N4y6uHvIZ0xIZJfpHZXFDUJm53dehqVs5LO9jl+XSd2VJV7+oN201HvLsBNJpx ju7Q== 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:message-id:date:to:from :delivered-to; bh=hN6cIlsej+otzQ4DUEs1mVHwbcgZ+F+bTnaptG5MQYQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=PVQfxAvB07RG4zW0R4cH/frEhj1UTMcT4CCWk5Yn2FGn4WW3MhuCfDX/0Qtfffpmch aoz+qVp547mjRNNX8jLdBrEyTykBJCI1FPsNhNKiE3yj4pFLHNL/9g8ge6WNrQVe4yEi jeN+pX9kyP3gDeG3B/aaD2D0vslY4X/3YsTXv2amJ4ktrpkSn1d+JP8/uLDlV0lua6WV y4wGZ8h185vgSJktnbyHVsMsDCSVAahO9jK5TURekerGKsxTtfivSa29y0MIZUeMkkBF rjVUz2zZKWsCKuXA3MTKO3wo2a8mijnX7sefk2zIq0dzRceVudVYHTxjNxn/H3tf/OiB G8ZQ==; dara=google.com 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 4fb4d7f45d1cf-57862ebf1absi449309a12.84.2024.05.24.13.04.50; Fri, 24 May 2024 13:04:51 -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 E25A768D580; Fri, 24 May 2024 23:04:47 +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 1576468CCDC for ; Fri, 24 May 2024 23:04:41 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id 84E6AC006E for ; Fri, 24 May 2024 23:04:40 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 May 2024 23:04:40 +0300 Message-ID: <20240524200440.37456-1-remi@remlab.net> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] WIP: lavc/flacdsp: R-V Zvl256b lpc33 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: ECstTpt6Gzgq flac_lpc_33_13_c: 499.7 flac_lpc_33_13_rvv_i64: 197.7 flac_lpc_33_16_c: 601.5 flac_lpc_33_16_rvv_i64: 195.2 flac_lpc_33_29_c: 1011.5 flac_lpc_33_29_rvv_i64: 300.7 flac_lpc_33_32_c: 1099.0 flac_lpc_33_32_rvv_i64: 296.7 --- libavcodec/riscv/flacdsp_init.c | 7 +++++-- libavcodec/riscv/flacdsp_rvv.S | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/libavcodec/riscv/flacdsp_init.c b/libavcodec/riscv/flacdsp_init.c index 830ae36534..861276be28 100644 --- a/libavcodec/riscv/flacdsp_init.c +++ b/libavcodec/riscv/flacdsp_init.c @@ -31,6 +31,8 @@ void ff_flac_lpc32_rvv(int32_t *decoded, const int coeffs[32], int pred_order, int qlevel, int len); void ff_flac_lpc32_rvv_simple(int32_t *decoded, const int coeffs[32], int pred_order, int qlevel, int len); +void ff_flac_lpc33_rvv(int64_t *, const int32_t *, const int coeffs[32], + int pred_order, int qlevel, int len); void ff_flac_wasted32_rvv(int32_t *, int shift, int len); void ff_flac_wasted33_rvv(int64_t *, const int32_t *, int shift, int len); void ff_flac_decorrelate_indep2_16_rvv(uint8_t **out, int32_t **in, @@ -76,9 +78,10 @@ av_cold void ff_flacdsp_init_riscv(FLACDSPContext *c, enum AVSampleFormat fmt, # if (__riscv_xlen >= 64) if (flags & AV_CPU_FLAG_RVV_I64) { - if (vlenb > 16) + if (vlenb > 16) { c->lpc32 = ff_flac_lpc32_rvv_simple; - else + c->lpc33 = ff_flac_lpc33_rvv; + } else c->lpc32 = ff_flac_lpc32_rvv; } # endif diff --git a/libavcodec/riscv/flacdsp_rvv.S b/libavcodec/riscv/flacdsp_rvv.S index 0e10940f74..ea42f8bea4 100644 --- a/libavcodec/riscv/flacdsp_rvv.S +++ b/libavcodec/riscv/flacdsp_rvv.S @@ -103,6 +103,33 @@ func ff_flac_lpc32_rvv_simple, zve64x, zbb ret endfunc + +func ff_flac_lpc33_rvv, zve64x, zbb + vtype_vli t0, a3, t1, e64, ta, ma + vsetvl zero, a3, t0 + vmv.s.x v0, zero + sh2add a1, a3, a1 + vle32.v v24, (a2) + sub a5, a5, a3 + vle64.v v16, (a0) + sh3add a0, a3, a0 + vsext.vf2 v8, v24 +1: + vmul.vv v24, v8, v16 + lw t0, (a1) + addi a1, a1, 4 + vredsum.vs v24, v24, v0 + addi a5, a5, -1 + vmv.x.s t1, v24 + sra t1, t1, a4 + add t0, t0, t1 + vslide1down.vx v16, v16, t0 + sd t0, (a0) + addi a0, a0, 8 + bnez a5, 1b + + ret +endfunc #endif func ff_flac_wasted32_rvv, zve32x