From patchwork Sat Apr 6 14:26:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47886 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1559965pzd; Sat, 6 Apr 2024 07:26:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVIkmCdbMNsE0xuE9OvjQ6uykFN1Tpw812lriFuXA7ooN2T/pvwvGuRiptavHvgHRVCArtdXCu9vj3tHlHwoqY5PaXMC1KaUr1Xow== X-Google-Smtp-Source: AGHT+IE6/sno67ZlRv2NKXMAa8ECfzoU6wUIS9/uIVYfzAzLvuTTL74FZxgi5zd3bZXbrwWgpHjI X-Received: by 2002:a19:8c1b:0:b0:515:cd31:5604 with SMTP id o27-20020a198c1b000000b00515cd315604mr2716632lfd.3.1712413599658; Sat, 06 Apr 2024 07:26:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712413599; cv=none; d=google.com; s=arc-20160816; b=IuDVNi18DObcxkovcgAELN72wzNi9qUM5ph9ZhDJVXjvpxr9KUPPNUY22mi3FPyyC6 H5xOFwFhSesTLJdLEvMUHjuO+a/F/Vivf1624TtzLlKk9OEuFAwqu8e4ObIuycAZc4D6 CIdolXIkhCr1evU3LCBxQP6dC95lb644OKngcbEAVlxiaNZHquIeR3Gt0dzcGhMK8kV0 1rfnNDBRxp4GzSA9wKjFZmwk4PRxou8mCeIFcx59Hm0pRWlFbztBHJGzANNTPwAOyT7e 8+xkzQFOnZSmuAuBm+N2XWjbdPm3whNYbHykcdCL8Ig630ztwz3hdTqIrl5kMXzxhfYb uEWQ== 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:in-reply-to:content-language:references:to:from :user-agent:mime-version:date:message-id:dkim-signature:delivered-to; bh=/as70NHbeliFPkjyuU9eCtm1aoKsRd50diu+3EAwK9k=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=azYmuIWb2t6x/3lrWRGcR93ITR02TUDkrACvvkHzojYsizhuiGYykSsm0ZROWTc07w B1b2crST7s4RJaiZB1qt+EwIQ1YSSh5uznjepXYINK1XwwHxz9xd+OOptwjVbEFTKD68 89hC1illRxjbEjXuEPhndemra9CsFsLZI8JFEInuVqixFHasoj5b0hLtK0bekEiMCiKv MkEURYISsHv5Y7esXJ3tl6mqTKDBPOFtYTGFQZycZOi5bFo7kxRFsOy7xfBHxVoMJbxv EZTw1XHru0ec8ACauQ7ahDxXuieU11oWqUWQ4i6fezCqzCPnQ6z8SPvLnPKo1Gj7kn2M q1Gg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@geoffhill.org header.s=20220510 header.b="AKmN/57J"; 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=geoffhill.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p19-20020a170906b21300b00a51ad56dc7esi1280190ejz.278.2024.04.06.07.26.39; Sat, 06 Apr 2024 07:26:39 -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=@geoffhill.org header.s=20220510 header.b="AKmN/57J"; 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=geoffhill.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A7C4F68D112; Sat, 6 Apr 2024 17:26:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from riki.gfrh.net (riki.gfrh.net [52.40.11.205]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD9BD68D0EE for ; Sat, 6 Apr 2024 17:26:18 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1712413573; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ANhTYx+xlnQtopRFs1lvaf7OLitGC8GPxh7fHyaDnV0=; b=AKmN/57JEnj8GGWbd0u/FVKzeBmlSG3ngM4G7SMV/hg+VUf1YIB/vacgT0tiBQ+cKr2RgT m17OZc0IjmfjdHHWyw32E1sUM05HwHvhC168eCaieAryCemsh6NTikUhW5bMId0sN79YjS ZdRvuErtuFUKGR5znliXjXBW3j2zkUQ= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id 67a5128d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 6 Apr 2024 14:26:13 +0000 (UTC) Message-ID: <70079918-e9e5-42de-a3b1-2c34496e57fa@geoffhill.org> Date: Sat, 6 Apr 2024 07:26:13 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Geoff Hill To: ffmpeg-devel@ffmpeg.org References: <51f7be0a-4267-47bf-ab0b-bd6585806da7@geoffhill.org> Content-Language: en-US In-Reply-To: <51f7be0a-4267-47bf-ab0b-bd6585806da7@geoffhill.org> Subject: [FFmpeg-devel] [PATCH v4 5/5] avcodec/ac3: Implement sum_square_butterfly_float for aarch64 NEON 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: Bb4qIp2M5H2k Signed-off-by: Geoff Hill --- libavcodec/aarch64/ac3dsp_init_aarch64.c | 5 ++++ libavcodec/aarch64/ac3dsp_neon.S | 30 ++++++++++++++++++++++++ tests/checkasm/ac3dsp.c | 26 ++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/libavcodec/aarch64/ac3dsp_init_aarch64.c b/libavcodec/aarch64/ac3dsp_init_aarch64.c index e95436c651..e367353e11 100644 --- a/libavcodec/aarch64/ac3dsp_init_aarch64.c +++ b/libavcodec/aarch64/ac3dsp_init_aarch64.c @@ -32,6 +32,10 @@ void ff_ac3_sum_square_butterfly_int32_neon(int64_t sum[4], const int32_t *coef0, const int32_t *coef1, int len); +void ff_ac3_sum_square_butterfly_float_neon(float sum[4], + const float *coef0, + const float *coef1, + int len); av_cold void ff_ac3dsp_init_aarch64(AC3DSPContext *c) { @@ -42,4 +46,5 @@ av_cold void ff_ac3dsp_init_aarch64(AC3DSPContext *c) c->extract_exponents = ff_ac3_extract_exponents_neon; c->float_to_fixed24 = ff_float_to_fixed24_neon; c->sum_square_butterfly_int32 = ff_ac3_sum_square_butterfly_int32_neon; + c->sum_square_butterfly_float = ff_ac3_sum_square_butterfly_float_neon; } diff --git a/libavcodec/aarch64/ac3dsp_neon.S b/libavcodec/aarch64/ac3dsp_neon.S index 77f9d20275..20beb6cc50 100644 --- a/libavcodec/aarch64/ac3dsp_neon.S +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -87,3 +87,33 @@ function ff_ac3_sum_square_butterfly_int32_neon, export=1 st1 {v0.1d-v3.1d}, [x0] ret endfunc + +function ff_ac3_sum_square_butterfly_float_neon, export=1 + movi v0.4s, #0 + movi v1.4s, #0 + movi v2.4s, #0 + movi v3.4s, #0 +1: ld1 {v30.4s}, [x1], #16 + ld1 {v31.4s}, [x2], #16 + fadd v16.4s, v30.4s, v31.4s + fsub v17.4s, v30.4s, v31.4s + fmla v0.4s, v30.4s, v30.4s + fmla v1.4s, v31.4s, v31.4s + fmla v2.4s, v16.4s, v16.4s + fmla v3.4s, v17.4s, v17.4s + subs w3, w3, #4 + b.gt 1b + faddp v0.4s, v0.4s, v0.4s + faddp v0.2s, v0.2s, v0.2s + st1 {v0.s}[0], [x0], #4 + faddp v1.4s, v1.4s, v1.4s + faddp v1.2s, v1.2s, v1.2s + st1 {v1.s}[0], [x0], #4 + faddp v2.4s, v2.4s, v2.4s + faddp v2.2s, v2.2s, v2.2s + st1 {v2.s}[0], [x0], #4 + faddp v3.4s, v3.4s, v3.4s + faddp v3.2s, v3.2s, v3.2s + st1 {v3.s}[0], [x0] + ret +endfunc diff --git a/tests/checkasm/ac3dsp.c b/tests/checkasm/ac3dsp.c index 573a76c764..442e965f3b 100644 --- a/tests/checkasm/ac3dsp.c +++ b/tests/checkasm/ac3dsp.c @@ -165,6 +165,31 @@ static void check_ac3_sum_square_butterfly_int32(AC3DSPContext *c) { report("ac3_sum_square_butterfly_int32"); } +static void check_ac3_sum_square_butterfly_float(AC3DSPContext *c) { + LOCAL_ALIGNED_32(float, lt, [ELEMS]); + LOCAL_ALIGNED_32(float, rt, [ELEMS]); + LOCAL_ALIGNED_16(float, v1, [4]); + LOCAL_ALIGNED_16(float, v2, [4]); + + declare_func(void, float[4], const float *, const float *, int); + + randomize_float(lt, ELEMS); + randomize_float(rt, ELEMS); + + if (check_func(c->sum_square_butterfly_float, + "ac3_sum_square_bufferfly_float")) { + call_ref(v1, lt, rt, ELEMS); + call_new(v2, lt, rt, ELEMS); + + if (!float_near_ulp_array(v1, v2, 10, 4)) + fail(); + + bench_new(v2, lt, rt, ELEMS); + } + + report("ac3_sum_square_butterfly_float"); +} + void checkasm_check_ac3dsp(void) { AC3DSPContext c; @@ -174,4 +199,5 @@ void checkasm_check_ac3dsp(void) check_ac3_extract_exponents(&c); check_float_to_fixed24(&c); check_ac3_sum_square_butterfly_int32(&c); + check_ac3_sum_square_butterfly_float(&c); }