From patchwork Thu Jun 15 10:36:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5rKI5L2p5am3?= X-Patchwork-Id: 42100 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp670538pzb; Thu, 15 Jun 2023 03:37:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4zjHaOkuhbx1IgwsvDLR8f5dbHYIKVB4UFColig3fu08hi22NgPQQuXDFFrMybrrTYSyNz X-Received: by 2002:a17:907:3e84:b0:96f:a412:8b03 with SMTP id hs4-20020a1709073e8400b0096fa4128b03mr4677157ejc.5.1686825448944; Thu, 15 Jun 2023 03:37:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686825448; cv=none; d=google.com; s=arc-20160816; b=C1rytkaQFM6vRMeiKm0dbCduDoENLnpS+zZ27bqjHCngkp2OSh+XE3xetjUHDRaW4w qLCjm4C3/9QZ3g1nmWmlLemmpxh1KYigzeMRN7OEDj7n0pQtPUKxLrBzOF49eropvq4q ZRB00SFqPHuWVfDmAftyfGLOJBDhmefWUjY9Cwugozq0uDz5ixv0keaF4zCR0p6grNok iMkCga2aWLYvdx+hCB8eqNgL7qiE3VERSpYddz9CEbSPGQQOKlBWSyyp9yQF3cMsbZyp rmuHawmiBZLranNAbv5U4fYBf97a+YaQrSWhyaK+hswTPgspZ970TqSgH9QPppMQNA1g A9fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=AcmocrT6wouv1ilLgEi5Ho404cyfq2UKzpB/nnjHnG8=; b=Lt+CwoEUsMROJqoahIGDGgiig6iilqDDuju14sOuM7Ofoz1SmuyTs1FvQzR191WUXe /baFKn1JerbIYyBUmd43f22wfufylpXTi6WpqFPF9xTnJvpj47oYHSigVX7GUeno05Yc gf08gn0wL5ioXkwCX/1OVJjjqprz3ckaw1/SjoWSw5ibKlW372mrQ1y84pumFmMQhOdT BH3aCqBnoQK166l8WgOHTe0HFCx1DkS0OXOG8S1VcytL8REdWZuDHjH3Xi+xlpPy60Cz biwCPXGD4DldZSqF+R24ZTW0QSsAeASzn8NAijNfdx9Pc0uACgBkzu+7hAhHzFcsitam KX4w== 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 x15-20020a170906298f00b00982aace0211si477427eje.463.2023.06.15.03.37.28; Thu, 15 Jun 2023 03:37:28 -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 4C64D68C504; Thu, 15 Jun 2023 13:37:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from zg8tmty3ljk5ljewns4xndka.icoremail.net (zg8tmty3ljk5ljewns4xndka.icoremail.net [167.99.105.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1A2A168C4BD for ; Thu, 15 Jun 2023 13:36:52 +0300 (EEST) Received: from host042-ubuntu-1804.lxd (unknown [10.12.130.38]) by app1 (Coremail) with SMTP id EwgMCgDnhMS_6Ypk6XcmAA--.44896S7; Thu, 15 Jun 2023 18:36:51 +0800 (CST) From: Peiting Shen To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 10:36:42 +0000 Message-Id: <20230615103645.25778-4-shenpeiting@eswincomputing.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230615103645.25778-1-shenpeiting@eswincomputing.com> References: <20230615103645.25778-1-shenpeiting@eswincomputing.com> X-CM-TRANSID: EwgMCgDnhMS_6Ypk6XcmAA--.44896S7 X-Coremail-Antispam: 1UD129KBjvJXoWxWr47ZrW3Zr13Xr1DuF1fCrg_yoW5Aw18pr W3K343Zr4rJr9rC3ZxGF1rZFWYqF1FgFn5twnIv3WIyayqq34UJrnFyryYyryUXr97AF13 WF4akr13uw18trJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUB214x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JrWl82xGYIkIc2 x26xkF7I0E14v26r1I6r4UM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS 0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwCY02Avz4vE-syl42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1Y6r17MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjfU59N3UUUUU X-CM-SenderInfo: hvkh01phlwx03j6h245lqf0zpsxwx03jof0z/ Subject: [FFmpeg-devel] [PATCH 3/6] lavc/ac3dsp: RISC-V V ac3_sum_square_butterfly_int32 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: Shen Peiting MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EgLhYYGML3Mb From: Shen Peiting Scalar calculating int32 sum_square optimized by using RVV instructions Benchmarks on Spike(cycles): len=128 ac3_sum_square_butterfly_int32_c: 8497 ac3_sum_square_butterfly_int32_rvv: 258 len=1280 ac3_sum_square_butterfly_int32_c: 84529 ac3_sum_square_butterfly_int32_rvv: 2274 Co-Authored by: Yang Xiaojun Co-Authored by: Huang Xing Co-Authored by: Zeng Fanchen Signed-off-by: Shen Peiting --- libavcodec/riscv/ac3dsp_init.c | 8 +++++ libavcodec/riscv/ac3dsp_rvv.S | 53 ++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/libavcodec/riscv/ac3dsp_init.c b/libavcodec/riscv/ac3dsp_init.c index a4e75a7541..4fd4abe83e 100644 --- a/libavcodec/riscv/ac3dsp_init.c +++ b/libavcodec/riscv/ac3dsp_init.c @@ -26,6 +26,10 @@ void ff_ac3_exponent_min_rvv(uint8_t *exp, int num_reuse_blocks, int nb_coefs); void ff_float_to_fixed24_rvv(int32_t *dst, const float *src, unsigned int len); +void ff_ac3_sum_square_butterfly_int32_rvv(int64_t sum[4], + const int32_t *coef0, + const int32_t *coef1, + int len); av_cold void ff_ac3dsp_init_riscv(AC3DSPContext *c) { @@ -35,6 +39,10 @@ av_cold void ff_ac3dsp_init_riscv(AC3DSPContext *c) c->ac3_exponent_min = ff_ac3_exponent_min_rvv; c->float_to_fixed24 = ff_float_to_fixed24_rvv; } +#if (__riscv_xlen >= 64) + if (flags & AV_CPU_FLAG_RVV_I64) + c->sum_square_butterfly_int32 = ff_ac3_sum_square_butterfly_int32_rvv; +#endif #endif } diff --git a/libavcodec/riscv/ac3dsp_rvv.S b/libavcodec/riscv/ac3dsp_rvv.S index d98e72c12c..4e0d238f85 100644 --- a/libavcodec/riscv/ac3dsp_rvv.S +++ b/libavcodec/riscv/ac3dsp_rvv.S @@ -63,3 +63,56 @@ func ff_float_to_fixed24_rvv, zve32x bgtz a2, 1b ret endfunc + + +func ff_ac3_sum_square_butterfly_int32_rvv, zve64x + vsetvli t0, a3, e32, m2 + vle32.v v0, (a1) + vle32.v v2, (a2) + vadd.vv v4, v0, v2 + vsub.vv v6, v0, v2 + vwmul.vv v8, v0, v0 + vwmul.vv v12, v2, v2 + vwmul.vv v16, v4, v4 + vwmul.vv v20, v6, v6 + sub a3, a3, t0 + slli t0, t0, 2 + add a1, a1, t0 + add a2, a2, t0 + beq a3, x0, 2f +1: + vsetvli t0, a3, e32, m2 + vle32.v v0, (a1) + vle32.v v2, (a2) + vadd.vv v4, v0, v2 + vsub.vv v6, v0, v2 + vwmacc.vv v8, v0, v0 + vwmacc.vv v12, v2, v2 + vwmacc.vv v16, v4, v4 + vwmacc.vv v20, v6, v6 + sub a3, a3, t0 + slli t0, t0, 2 + add a1, a1, t0 + add a2, a2, t0 + bnez a3, 1b +2: + vsetvli t0, x0, e64, m4 + vmv.s.x v24, x0 + vmv.s.x v25, x0 + vmv.s.x v26, x0 + vmv.s.x v27, x0 + vredsum.vs v24, v8, v24 + vredsum.vs v25, v12, v25 + vredsum.vs v26, v16, v26 + vredsum.vs v27, v20, v27 + vsetivli t0, 1, e64, m1 + vse64.v v24, (a0) + addi a0, a0, 8 + vse64.v v25, (a0) + addi a0, a0, 8 + vse64.v v26, (a0) + addi a0, a0, 8 + vse64.v v27, (a0) + addi a0, a0, 8 + ret +endfunc