From patchwork Wed Apr 3 06:43:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47743 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp213687pzb; Tue, 2 Apr 2024 23:43:43 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUjaoQKaJkqBvK2+lQf958cFB8u2xuEpt+r7VM7jThQvNJMeVmuoPzQwY6lkIk4WWOSJaxfvgROqhnf3XxonKIm475tg95o0idZ/A== X-Google-Smtp-Source: AGHT+IHUgQErQk2y6Yyp8SfcQOmNmj2u0NhgvXXjBQwWVcJwTxA+e03Is08AZV6gEUKcqfdR9O8g X-Received: by 2002:ac2:46f0:0:b0:513:dd23:7a02 with SMTP id q16-20020ac246f0000000b00513dd237a02mr9456154lfo.26.1712126623240; Tue, 02 Apr 2024 23:43:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712126623; cv=none; d=google.com; s=arc-20160816; b=VyBa89GN34xFRxungfhzUod5P+gWpLkYVxYrA1gsqylY9rMwx5/CP1NDZmhhUb/GwW Cyhf1tT0EO0RrdLtzUdcZKZCpXjzoypIJpOBoxWbeOPUokKMEJSCqQWwD9/+cJRHquiB izlNeIKw4x9GxHpvRUTRqg9XPXKw/MoUWRSB/ZXd1NKG/ziCECqaBl/bWZ2SHjcA+INg 05/xPVClhR+FmGR376QFY9Yx3cXE/J0aiMMOd8H7ypv71scwIAGR9a6KaS5+xHl4YNlz xxGSf3UVdsJlQ/XWsRifI4fbeDyY0WJ5juqOTzdLLIdwDJvN5ei6KdD0qg7FNA7jc2s8 g1Mg== 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:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=iVv7RVO7+/pJ6urZcdSrJdeXHam84wgEuTOuolXpIsI=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=JOOwF+OWLeewapTaKReoh9j8BUf8vNR7d20I06jWkvO41DfAe5RGsDletIzsD6j+sh IUcpAEnd+byzLRuGKWFCoEpCT+x9BmcEvKTe2kXMhJqw1dK2tfRQ7HEQZirTk4K6+VZy 4JET6m5QAeMoswaJwaxbKfRi4oj8MhZUkBwIEbHoQAsv7+MDahcZPeoLF8RCNV3/LEVs ZD+4/TfRanbxDV3kRaK5+urxWZQFihyznFUehxsn6aEvgiOppsaDUpNt3dsDvoo8P7At zrKxd3x0ygZeAfkflcn5wA1apyXzhZVAgtkpAmYdYhgTqRgVKu/4R68zdtfRZ05GKYTI p/kQ==; 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=qBmK0v2F; 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 h20-20020a50cdd4000000b0056dfab8eaa9si830387edj.519.2024.04.02.23.43.42; Tue, 02 Apr 2024 23:43:43 -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=qBmK0v2F; 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 8C13C68D09E; Wed, 3 Apr 2024 09:43:35 +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 379C868D08E for ; Wed, 3 Apr 2024 09:43:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1712126603; 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; bh=Au3h9ebm7gTFVlRKohmLTTYRBPiArc6S6auDGkGqfxs=; b=qBmK0v2FRJZ3V8XnQh5S60eunbpVXbyYzsl/5nXw2FinsmlB03pvBuJgmU7ZaeCh47mAat Bnm5OLyW8sjmt8CEYc3sXSZYy81gw2SRWvFKMEsYdc7IBgqTYmgGMrdzwUClogx8nKpu1h D8r+uMHj3aSEvyUDbbh+sa3jMOpOMnw= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id 68521af7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Wed, 3 Apr 2024 06:43:23 +0000 (UTC) Message-ID: Date: Tue, 2 Apr 2024 23:43:22 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Geoff Hill To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH v3 1/5] avcodec/ac3: Implement float_to_fixed24 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: RfWD2j0RNMDV Signed-off-by: Geoff Hill --- libavcodec/aarch64/Makefile | 2 ++ libavcodec/aarch64/ac3dsp_init_aarch64.c | 36 ++++++++++++++++++++++++ libavcodec/aarch64/ac3dsp_neon.S | 35 +++++++++++++++++++++++ libavcodec/ac3dsp.c | 4 ++- libavcodec/ac3dsp.h | 3 +- 5 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 libavcodec/aarch64/ac3dsp_init_aarch64.c create mode 100644 libavcodec/aarch64/ac3dsp_neon.S diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile index beb6a02f5f..95ad4dd202 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -1,4 +1,5 @@ # subsystems +OBJS-$(CONFIG_AC3DSP) += aarch64/ac3dsp_init_aarch64.o OBJS-$(CONFIG_FMTCONVERT) += aarch64/fmtconvert_init.o OBJS-$(CONFIG_H264CHROMA) += aarch64/h264chroma_init_aarch64.o OBJS-$(CONFIG_H264DSP) += aarch64/h264dsp_init_aarch64.o @@ -35,6 +36,7 @@ ARMV8-OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp.o # subsystems NEON-OBJS-$(CONFIG_AAC_DECODER) += aarch64/sbrdsp_neon.o +NEON-OBJS-$(CONFIG_AC3DSP) += aarch64/ac3dsp_neon.o NEON-OBJS-$(CONFIG_FMTCONVERT) += aarch64/fmtconvert_neon.o NEON-OBJS-$(CONFIG_H264CHROMA) += aarch64/h264cmc_neon.o NEON-OBJS-$(CONFIG_H264DSP) += aarch64/h264dsp_neon.o \ diff --git a/libavcodec/aarch64/ac3dsp_init_aarch64.c b/libavcodec/aarch64/ac3dsp_init_aarch64.c new file mode 100644 index 0000000000..e3320de0f5 --- /dev/null +++ b/libavcodec/aarch64/ac3dsp_init_aarch64.c @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2024 Geoff Hill + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include + +#include "libavutil/arm/cpu.h" +#include "libavutil/attributes.h" +#include "libavcodec/ac3dsp.h" +#include "config.h" + +void ff_float_to_fixed24_neon(int32_t *dst, const float *src, size_t len); + +av_cold void ff_ac3dsp_init_aarch64(AC3DSPContext *c) +{ + int cpu_flags = av_get_cpu_flags(); + if (!have_neon(cpu_flags)) return; + + c->float_to_fixed24 = ff_float_to_fixed24_neon; +} diff --git a/libavcodec/aarch64/ac3dsp_neon.S b/libavcodec/aarch64/ac3dsp_neon.S new file mode 100644 index 0000000000..6924645b7e --- /dev/null +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2024 Geoff Hill + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "libavutil/aarch64/asm.S" + +function ff_float_to_fixed24_neon, export=1 +0: ld1 {v0.4s, v1.4s}, [x1], #32 + fcvtzs v0.4s, v0.4s, #24 + ld1 {v2.4s, v3.4s}, [x1], #32 + fcvtzs v1.4s, v1.4s, #24 + fcvtzs v2.4s, v2.4s, #24 + st1 {v0.4s, v1.4s}, [x0], #32 + fcvtzs v3.4s, v3.4s, #24 + st1 {v2.4s, v3.4s}, [x0], #32 + subs w2, w2, #16 + b.ne 0b + ret +endfunc diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c index 8397e03d32..730fa70fff 100644 --- a/libavcodec/ac3dsp.c +++ b/libavcodec/ac3dsp.c @@ -389,7 +389,9 @@ av_cold void ff_ac3dsp_init(AC3DSPContext *c) c->downmix = NULL; c->downmix_fixed = NULL; -#if ARCH_ARM +#if ARCH_AARCH64 + ff_ac3dsp_init_aarch64(c); +#elif ARCH_ARM ff_ac3dsp_init_arm(c); #elif ARCH_X86 ff_ac3dsp_init_x86(c); diff --git a/libavcodec/ac3dsp.h b/libavcodec/ac3dsp.h index ae33b361a9..b1b2bced8f 100644 --- a/libavcodec/ac3dsp.h +++ b/libavcodec/ac3dsp.h @@ -106,7 +106,8 @@ typedef struct AC3DSPContext { void (*downmix_fixed)(int32_t **samples, int16_t **matrix, int len); } AC3DSPContext; -void ff_ac3dsp_init (AC3DSPContext *c); +void ff_ac3dsp_init(AC3DSPContext *c); +void ff_ac3dsp_init_aarch64(AC3DSPContext *c); void ff_ac3dsp_init_arm(AC3DSPContext *c); void ff_ac3dsp_init_x86(AC3DSPContext *c); void ff_ac3dsp_init_mips(AC3DSPContext *c); From patchwork Wed Apr 3 06:43:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47744 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp213738pzb; Tue, 2 Apr 2024 23:43:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV+jrvg4N3uq6GwIFIVNQg0cuzk4FNRQLXycH4d6Yy12s2fasj787lbBcQz5oIzTq6k1CA4MeyfuplswqpzZyp0zacMaCwYndKvGg== X-Google-Smtp-Source: AGHT+IHy7ZXcTUx+fo0zB07hDU1uMb/EqfS0Tbt3PiM2q0DwnKS8uOVNuv4v7yG0wvug/q6mNKhy X-Received: by 2002:a50:c34c:0:b0:568:b0f4:fe69 with SMTP id q12-20020a50c34c000000b00568b0f4fe69mr1447169edb.12.1712126632091; Tue, 02 Apr 2024 23:43:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712126632; cv=none; d=google.com; s=arc-20160816; b=OTKQhSYJ1PpVpF9tIGumViP4b/UEaDplyK/434ZHE7vhvneYupM/iWk2X0dCMS17vB /uzgsM4ypzCrnUEQDH3ZF7xOpJn8EU20AUzAVTwDw/5ZF8OpYlYQZa+vBUyNz/RhX9fW tkR2cU7UwiwuTfpbJXQbnQxeZZnZwKLRin7TRSlgyzifjffZCS95rsxLY8DEXHHZ/pHr tbKUR9baF24r4VCz9oCTifhEpE+k0ojfew83wX5EYCajxJ4tpXaLFze9vwDUfABPxuK0 EAkEkQ5Dr98fqmpLT5SA6p5/KV6xlAt/M0t+rEdWpMAXj0iDbcZnw5DQzDCoeMqQMlis yH1g== 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:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=4HUopN05UwVSIZKBVJAXjxOLTQ8Fxa0AQnoy4v77MPc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ZiI+kDGlY/EJ/ZK0XKK1zuB8qzvZzyIRPjYoJdgIBqy5JUTIwpKTgjBwA0ZO6013W1 vhfPgHONviuOASSvVHZmb9xfdWz89/COQPK4+AChx+KIeTBMhN63clasTKOVGXAIq9sS E5WvIpUpa7FQy8NaKB9sFHKMRfz9ynmIX4P/h8ntMa++113LCDPkLu8VW77WiGKiTz18 /gjHNRY8tt4HqfrHkEW8k6FQv80DxN4qa/f+sBxKAqrGoteuU0KPndXHVDwM+WdWn3X2 l8Dh9JANAEjD65UI3CNHUf8pThaKl2OVcIwgKSj5jilYa2ktNfj8jkVgvlHV7wMzYOTI YQhw==; 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=iGOfKlLH; 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 k7-20020a508ac7000000b0056bf30ff6b4si6345728edk.122.2024.04.02.23.43.51; Tue, 02 Apr 2024 23:43:52 -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=iGOfKlLH; 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 A534968D0B7; Wed, 3 Apr 2024 09:43:39 +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 0673068D095 for ; Wed, 3 Apr 2024 09:43:32 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1712126606; 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; bh=y6CA4nDbpmw8mTCNkHyvCIleOCyrruqldrbp9kHOWMk=; b=iGOfKlLHl5/xYXXno9ERZwbYGjaIxbqe+k0XTWwSzC6RC4XiEO9KERxfB3zJTwg9N9LfVT kMKeqgbfdkZhmMN4pMJMluRXZvbQox4oYZKNqBig2b7WkNE+QIVfVogmeDYE0Jt8LoSqlv RuJubgE5pkhxM77RUrfEt2F/GgAvD14= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id 08392bfe (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Wed, 3 Apr 2024 06:43:26 +0000 (UTC) Message-ID: <35877d65-6a5c-4897-bf83-d6216b171aaf@geoffhill.org> Date: Tue, 2 Apr 2024 23:43:26 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Geoff Hill To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH v3 2/5] avcodec/ac3: Implement ac3_exponent_min 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: UHsEim38jQFc Signed-off-by: Geoff Hill --- libavcodec/aarch64/ac3dsp_init_aarch64.c | 2 ++ libavcodec/aarch64/ac3dsp_neon.S | 16 +++++++++ tests/checkasm/ac3dsp.c | 41 ++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/libavcodec/aarch64/ac3dsp_init_aarch64.c b/libavcodec/aarch64/ac3dsp_init_aarch64.c index e3320de0f5..8874b41393 100644 --- a/libavcodec/aarch64/ac3dsp_init_aarch64.c +++ b/libavcodec/aarch64/ac3dsp_init_aarch64.c @@ -25,6 +25,7 @@ #include "libavcodec/ac3dsp.h" #include "config.h" +void ff_ac3_exponent_min_neon(uint8_t *exp, int num_reuse_blocks, int nb_coefs); void ff_float_to_fixed24_neon(int32_t *dst, const float *src, size_t len); av_cold void ff_ac3dsp_init_aarch64(AC3DSPContext *c) @@ -32,5 +33,6 @@ av_cold void ff_ac3dsp_init_aarch64(AC3DSPContext *c) int cpu_flags = av_get_cpu_flags(); if (!have_neon(cpu_flags)) return; + c->ac3_exponent_min = ff_ac3_exponent_min_neon; c->float_to_fixed24 = ff_float_to_fixed24_neon; } diff --git a/libavcodec/aarch64/ac3dsp_neon.S b/libavcodec/aarch64/ac3dsp_neon.S index 6924645b7e..c8bdbb1bd3 100644 --- a/libavcodec/aarch64/ac3dsp_neon.S +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -20,6 +20,22 @@ #include "libavutil/aarch64/asm.S" +function ff_ac3_exponent_min_neon, export=1 + cbz w1, 2f +0: ld1 {v0.16b}, [x0] + mov w3, w1 + add x4, x0, #256 +1: ld1 {v1.16b}, [x4] + umin v0.16b, v0.16b, v1.16b + add x4, x4, #256 + subs w3, w3, #1 + b.gt 1b + st1 {v0.16b}, [x0], #16 + subs w2, w2, #16 + b.gt 0b +2: ret +endfunc + function ff_float_to_fixed24_neon, export=1 0: ld1 {v0.4s, v1.4s}, [x1], #32 fcvtzs v0.4s, v0.4s, #24 diff --git a/tests/checkasm/ac3dsp.c b/tests/checkasm/ac3dsp.c index 344e1fe5c2..acb00b6fe1 100644 --- a/tests/checkasm/ac3dsp.c +++ b/tests/checkasm/ac3dsp.c @@ -27,6 +27,14 @@ #include "checkasm.h" +#define randomize_exp(buf, len) \ + do { \ + int i; \ + for (i = 0; i < len; i++) { \ + buf[i] = (uint8_t)rnd(); \ + } \ + } while (0) \ + #define randomize_float(buf, len) \ do { \ int i; \ @@ -36,6 +44,38 @@ } \ } while (0) +static void check_ac3_exponent_min(AC3DSPContext *c) { +#define MAX_COEFS 256 +#define MAX_CTXT 6 +#define EXP_SIZE (MAX_CTXT * MAX_COEFS) + + LOCAL_ALIGNED_16(uint8_t, src, [EXP_SIZE]); + LOCAL_ALIGNED_16(uint8_t, v1, [EXP_SIZE]); + LOCAL_ALIGNED_16(uint8_t, v2, [EXP_SIZE]); + int n; + + declare_func(void, uint8_t *, int, int); + + for (n = 0; n < MAX_CTXT; ++n) { + if (check_func(c->ac3_exponent_min, "ac3_exponent_min_reuse%d", n)) { + randomize_exp(src, EXP_SIZE); + + memcpy(v1, src, EXP_SIZE); + memcpy(v2, src, EXP_SIZE); + + call_ref(v1, n, MAX_COEFS); + call_new(v2, n, MAX_COEFS); + + if (memcmp(v1, v2, EXP_SIZE) != 0) + fail(); + + bench_new(v2, n, MAX_COEFS); + } + } + + report("ac3_exponent_min"); +} + static void check_float_to_fixed24(AC3DSPContext *c) { #define BUF_SIZE 1024 LOCAL_ALIGNED_32(float, src, [BUF_SIZE]); @@ -66,5 +106,6 @@ void checkasm_check_ac3dsp(void) AC3DSPContext c; ff_ac3dsp_init(&c); + check_ac3_exponent_min(&c); check_float_to_fixed24(&c); } From patchwork Wed Apr 3 06:43:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47745 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp213782pzb; Tue, 2 Apr 2024 23:44:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUAYE6v1i441V3phY8y44bUDAF5Om0D6UZyrmv/dfiH65VL3VBfXWePOpCEOwdBL9g9g4mU9Jk2avbFgNT14UFcbzDnRDneuFAQpg== X-Google-Smtp-Source: AGHT+IHYhm+uGA5xSGp/Y//19tjOCQxcACD5hk6wb3s+54xJXblWtG/mGTFQ2TTv8E5im0J0eIQE X-Received: by 2002:a05:6402:5111:b0:56e:418:5559 with SMTP id m17-20020a056402511100b0056e04185559mr989190edd.3.1712126641311; Tue, 02 Apr 2024 23:44:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712126641; cv=none; d=google.com; s=arc-20160816; b=dlVm52oIvTFYoWjR79pMf/OOe6ZhOffI+GiwE4/gP9sB/jnTl2I88I4uR9/r06Cz0C ISM2zSarCHPXURS9Rb9Dn6/xNDmPpQ2dfW3u+OS4U7m0YGJfw1rSv3Jytumzq385tvnK esKnMhRr7OZ6/TmqqKv7wMcXm4/ILKmEopKLslf4Enmn59uU7ZnXRf1Ny32AF0vhfQbd /Ecc9jRA7k1swTx3W77uiKr+zMqltPt4aEx+/TgTjb4H3IJ+8IXFPjqsEZRPm/JCzKjh gvv9KJzLWXnVETNvQzklhBCrMWZRIpV5C8OB5JbCJs808wY63S6rFLFKN4Ub89ZBtGJp 4/Kw== 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:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=hyGQ1QEm/VtjKDxPgjHd7Ns8NRwTm++vM/zImye4OQQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=WAt6vJY/tNKgOJZAy7Tb0dJdhF8frLkRfnmXb/Kqy34LEAM4fF4hcc63WvRtyuiFu2 tjN/o3C+RpGdW0pmlFsELHutOsG9a3ngN354XSJomj/JKeIcMzAUQTjipUl0W0asZOwy lm9Y39JAVPsy/uJ2k537NdN5Hnd367x01vMVJmKnppFeJPNe9+7nOp9LQI96TFSuhWKF l0xLB9RTK3BM+IqrwWoumF9oS+M6TRh9SjdEIHCv7/3SWm9hNkbzZuK9x5sjjiTm0p8z L5gup48PaXdnHR2e9SXeET8Sl5Iyl8fD8zNoXRapBeG813MFht/J9hnhtt/zmr+975KA Toxg==; 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=oDFVKN6P; 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 s29-20020a50ab1d000000b0056df27d4a53si1195928edc.670.2024.04.02.23.44.00; Tue, 02 Apr 2024 23:44:01 -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=oDFVKN6P; 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 C28DE68D0DD; Wed, 3 Apr 2024 09:43:40 +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 4DC4668D097 for ; Wed, 3 Apr 2024 09:43:34 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1712126610; 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; bh=E2GKZNAO8la7iiY4Da7sAuF0niLf5S/vHmPHM5fqPhM=; b=oDFVKN6PGYz9mA1G5P4UwMqOUklsTaDCywa2nj8DL/KFYWdGfndF3X09m7bJXHkzgsFcvX ryOxk1MbFFBt7QOG0Dw8YyIAzrxu5oM0sgJWBbVSSmXdJJTnyjQu3/jC4PrEWoRhrhbUxm yPILUvB5VzhHVcDivCyPPWIPLyLMzw0= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id 933aff2b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Wed, 3 Apr 2024 06:43:30 +0000 (UTC) Message-ID: <9c17becb-dbec-40cd-9def-84d956bf397f@geoffhill.org> Date: Tue, 2 Apr 2024 23:43:30 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Geoff Hill To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH v3 3/5] avcodec/ac3: Implement ac3_extract_exponents 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: LYCtzpKhGY1j Signed-off-by: Geoff Hill --- libavcodec/aarch64/ac3dsp_init_aarch64.c | 2 ++ libavcodec/aarch64/ac3dsp_neon.S | 15 ++++++++++ tests/checkasm/ac3dsp.c | 36 ++++++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/libavcodec/aarch64/ac3dsp_init_aarch64.c b/libavcodec/aarch64/ac3dsp_init_aarch64.c index 8874b41393..1bdc215b51 100644 --- a/libavcodec/aarch64/ac3dsp_init_aarch64.c +++ b/libavcodec/aarch64/ac3dsp_init_aarch64.c @@ -26,6 +26,7 @@ #include "config.h" void ff_ac3_exponent_min_neon(uint8_t *exp, int num_reuse_blocks, int nb_coefs); +void ff_ac3_extract_exponents_neon(uint8_t *exp, int32_t *coef, int nb_coefs); void ff_float_to_fixed24_neon(int32_t *dst, const float *src, size_t len); av_cold void ff_ac3dsp_init_aarch64(AC3DSPContext *c) @@ -34,5 +35,6 @@ av_cold void ff_ac3dsp_init_aarch64(AC3DSPContext *c) if (!have_neon(cpu_flags)) return; c->ac3_exponent_min = ff_ac3_exponent_min_neon; + c->extract_exponents = ff_ac3_extract_exponents_neon; c->float_to_fixed24 = ff_float_to_fixed24_neon; } diff --git a/libavcodec/aarch64/ac3dsp_neon.S b/libavcodec/aarch64/ac3dsp_neon.S index c8bdbb1bd3..b26f71a3f6 100644 --- a/libavcodec/aarch64/ac3dsp_neon.S +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -36,6 +36,21 @@ function ff_ac3_exponent_min_neon, export=1 2: ret endfunc +function ff_ac3_extract_exponents_neon, export=1 + cbz w2, 1f + movi v1.4s, #8 +0: ld1 {v0.4s}, [x1], #16 + abs v0.4s, v0.4s + clz v0.4s, v0.4s + sub v0.4s, v0.4s, v1.4s + xtn v0.4h, v0.4s + xtn v0.8b, v0.8h + st1 {v0.s}[0], [x0], #4 + subs w2, w2, #4 + b.gt 0b +1: ret +endfunc + function ff_float_to_fixed24_neon, export=1 0: ld1 {v0.4s, v1.4s}, [x1], #32 fcvtzs v0.4s, v0.4s, #24 diff --git a/tests/checkasm/ac3dsp.c b/tests/checkasm/ac3dsp.c index acb00b6fe1..a8a20349f9 100644 --- a/tests/checkasm/ac3dsp.c +++ b/tests/checkasm/ac3dsp.c @@ -18,6 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include #include "libavutil/mem.h" @@ -35,6 +36,14 @@ } \ } while (0) \ +#define randomize_i24(buf, len) \ + do { \ + int i; \ + for (i = 0; i < len; i++) { \ + buf[i] = (int32_t)rnd() & 0xFFFFFF; \ + } \ + } while (0) \ + #define randomize_float(buf, len) \ do { \ int i; \ @@ -76,6 +85,32 @@ static void check_ac3_exponent_min(AC3DSPContext *c) { report("ac3_exponent_min"); } +static void check_ac3_extract_exponents(AC3DSPContext *c) { +#define MAX_EXPS 3072 + LOCAL_ALIGNED_16(int32_t, src, [MAX_EXPS]); + LOCAL_ALIGNED_16(uint8_t, v1, [MAX_EXPS]); + LOCAL_ALIGNED_16(uint8_t, v2, [MAX_EXPS]); + int n; + + declare_func(void, uint8_t *, int32_t *, int); + + for (n = 512; n <= MAX_EXPS; n += 256) { + if (check_func(c->extract_exponents, "ac3_extract_exponents_n%d", n)) { + randomize_i24(src, n); + + call_ref(v1, src, n); + call_new(v2, src, n); + + if (memcmp(v1, v2, n) != 0) + fail(); + + bench_new(v1, src, n); + } + } + + report("ac3_extract_exponents"); +} + static void check_float_to_fixed24(AC3DSPContext *c) { #define BUF_SIZE 1024 LOCAL_ALIGNED_32(float, src, [BUF_SIZE]); @@ -107,5 +142,6 @@ void checkasm_check_ac3dsp(void) ff_ac3dsp_init(&c); check_ac3_exponent_min(&c); + check_ac3_extract_exponents(&c); check_float_to_fixed24(&c); } From patchwork Wed Apr 3 06:43:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47746 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp213868pzb; Tue, 2 Apr 2024 23:44:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUk4Uu1xiT5fJGi+VEWMB82VU1tRDvUvQJ1w5kRNri7mze8Iz+ln+5ZrzFP00kYG9Ps2SD0JlDCMhfRQniFiLG0CxDjExkQJtFCiw== X-Google-Smtp-Source: AGHT+IE+CPk5lGiYbh4TGc1KIhzKlF6XdTK4cHSKqQwgPnkBY7DZeYI1gdJWGdHWFjRhDd4gs/zC X-Received: by 2002:a17:906:fe42:b0:a4e:375b:ef23 with SMTP id wz2-20020a170906fe4200b00a4e375bef23mr9689298ejb.0.1712126656774; Tue, 02 Apr 2024 23:44:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712126656; cv=none; d=google.com; s=arc-20160816; b=S7Djy8uvQjB7eSFOr/dW5FnvxTPFU6BDLsO4qbstCJnleMP5f7URdfDSTlnucgVqKY 9KSpud6eXal3Tce7XSKxjV/IhSrhEwqPpPX68wxBH1qSh8f3PFgPzYmN1fbAWcSepQPq cPA1l2H0UBZQvACLJ9/z8qRf+1kDtCB/8XkLnmBS53bjTd4FlF2hhPyj6rbfO5SUl4+M mIs1SuJDol2r/Bnz2SONTyayoCNzfQG6cDykomC8ntaKxDmQ8YanoRkHuefCrQcoLcg5 ozD0G9bIgNRP3jVR/KzWDuJGBJrmydN8Pq+RG6MSg18KgWkIygfBsJtHL0MZ1Pxgr3HA W2Xg== 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:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=jj4lhhe57OI/CCnWfAxmTDlWpISpCn2W+xvo7mXTIZE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=hWDvHZcMjpBRIuZ+eOC28FTsBFAmNUiFuOdKWcLFgUYM0GYLYVBRDrzrMD1OsfZJq1 +Nagg4TJXt8K8tx8PiOEPjYRERK7omg+igePUy71Wxw+VtPG8JtPf2bcgpTmeIkkmIRt qGW5bgxLYiGZFvZbkqFLzBnKl7NVKP2V3pCCtSzZfOJ4vXwhirQ/ohkU3n+tTBIpu22x 0C2MZ320AdgtRDpA12vbYzhGIaJs6LOOnOb12I3vhpk5byT8D/rzc44fF9U0upwZxpCt aa2WEQ/6s3L+aX3rr3vcq9AZviLP257ntcs2tRcP0u9RsnjVFqIPwssPyJujZDsvmw/J S6pw==; 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=VaH8zVOv; 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 pw21-20020a17090720b500b00a4e24dcad27si6338629ejb.898.2024.04.02.23.44.08; Tue, 02 Apr 2024 23:44:16 -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=VaH8zVOv; 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 B8E4668D0D2; Wed, 3 Apr 2024 09:43:45 +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 0F6A768D0E4 for ; Wed, 3 Apr 2024 09:43:38 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1712126614; 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; bh=aXWOg1mvJjARK3xrBaFvX1wdYFTJ0NwyKvx2FbyNz5o=; b=VaH8zVOvl8FdSAOAiWe93ZYGRgBFL1NtKDCpsRQC3UVMOKYZQhhIAaRGD6dFxYrRVj2pHX E1tDFGMR4MJOGZ2MtE4hPT7i5zhFNcEARlZC7ntYkArRLorUaDs25KSQsdNRYETupncWeO /QQGB40sQYvgZDqkpfRltgF/CswaiEM= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id 9db6c949 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Wed, 3 Apr 2024 06:43:34 +0000 (UTC) Message-ID: <17305bcf-364b-4f60-8e60-633466da4918@geoffhill.org> Date: Tue, 2 Apr 2024 23:43:34 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Geoff Hill To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH v3 4/5] avcodec/ac3: Implement sum_square_butterfly_int32 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: SBhFZ3X4rKKv Signed-off-by: Geoff Hill --- libavcodec/aarch64/ac3dsp_init_aarch64.c | 5 +++++ libavcodec/aarch64/ac3dsp_neon.S | 24 +++++++++++++++++++++ tests/checkasm/ac3dsp.c | 27 ++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/libavcodec/aarch64/ac3dsp_init_aarch64.c b/libavcodec/aarch64/ac3dsp_init_aarch64.c index 1bdc215b51..e95436c651 100644 --- a/libavcodec/aarch64/ac3dsp_init_aarch64.c +++ b/libavcodec/aarch64/ac3dsp_init_aarch64.c @@ -28,6 +28,10 @@ void ff_ac3_exponent_min_neon(uint8_t *exp, int num_reuse_blocks, int nb_coefs); void ff_ac3_extract_exponents_neon(uint8_t *exp, int32_t *coef, int nb_coefs); void ff_float_to_fixed24_neon(int32_t *dst, const float *src, size_t len); +void ff_ac3_sum_square_butterfly_int32_neon(int64_t sum[4], + const int32_t *coef0, + const int32_t *coef1, + int len); av_cold void ff_ac3dsp_init_aarch64(AC3DSPContext *c) { @@ -37,4 +41,5 @@ av_cold void ff_ac3dsp_init_aarch64(AC3DSPContext *c) c->ac3_exponent_min = ff_ac3_exponent_min_neon; 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; } diff --git a/libavcodec/aarch64/ac3dsp_neon.S b/libavcodec/aarch64/ac3dsp_neon.S index b26f71a3f6..fa8fcf2e47 100644 --- a/libavcodec/aarch64/ac3dsp_neon.S +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -64,3 +64,27 @@ function ff_float_to_fixed24_neon, export=1 b.ne 0b ret endfunc + +function ff_ac3_sum_square_butterfly_int32_neon, export=1 + cbz w3, 1f + movi v0.2d, #0 + movi v1.2d, #0 + movi v2.2d, #0 + movi v3.2d, #0 +0: ld1 {v4.2s}, [x1], #8 + ld1 {v5.2s}, [x2], #8 + add v6.2s, v4.2s, v5.2s + sub v7.2s, v4.2s, v5.2s + smlal v0.2d, v4.2s, v4.2s + smlal v1.2d, v5.2s, v5.2s + smlal v2.2d, v6.2s, v6.2s + smlal v3.2d, v7.2s, v7.2s + subs w3, w3, #2 + b.gt 0b + addp d0, v0.2d + addp d1, v1.2d + addp d2, v2.2d + addp d3, v3.2d + st1 {v0.1d-v3.1d}, [x0] +1: ret +endfunc diff --git a/tests/checkasm/ac3dsp.c b/tests/checkasm/ac3dsp.c index a8a20349f9..c920dc9eb0 100644 --- a/tests/checkasm/ac3dsp.c +++ b/tests/checkasm/ac3dsp.c @@ -136,6 +136,32 @@ static void check_float_to_fixed24(AC3DSPContext *c) { report("float_to_fixed24"); } +static void check_ac3_sum_square_butterfly_int32(AC3DSPContext *c) { +#define ELEMS 240 + LOCAL_ALIGNED_16(int32_t, lt, [ELEMS]); + LOCAL_ALIGNED_16(int32_t, rt, [ELEMS]); + LOCAL_ALIGNED_16(uint64_t, v1, [4]); + LOCAL_ALIGNED_16(uint64_t, v2, [4]); + + declare_func(void, int64_t[4], const int32_t *, const int32_t *, int); + + randomize_i24(lt, ELEMS); + randomize_i24(rt, ELEMS); + + if (check_func(c->sum_square_butterfly_int32, + "ac3_sum_square_bufferfly_int32")) { + call_ref(v1, lt, rt, ELEMS); + call_new(v2, lt, rt, ELEMS); + + if (memcmp(v1, v2, sizeof(int64_t[4])) != 0) + fail(); + + bench_new(v2, lt, rt, ELEMS); + } + + report("ac3_sum_square_butterfly_int32"); +} + void checkasm_check_ac3dsp(void) { AC3DSPContext c; @@ -144,4 +170,5 @@ void checkasm_check_ac3dsp(void) check_ac3_exponent_min(&c); check_ac3_extract_exponents(&c); check_float_to_fixed24(&c); + check_ac3_sum_square_butterfly_int32(&c); } From patchwork Wed Apr 3 06:43:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47747 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp213876pzb; Tue, 2 Apr 2024 23:44:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVqzYR5E5MT9Z8FNuQV2eZysVxUkvR2KwUwjjJwrMaqY6Hbas+zfR3mCkxOPLrXOdSrMXxRnw9Um+GUP8f9cZzV+7riRcKYyabLPA== X-Google-Smtp-Source: AGHT+IEafuKhzIZe5Y2d0WZSLTEB1pp5ZQz1Ah/bBK88RI5jpRvg9xpdYQ+7d96rgyjIUJCVKdV/ X-Received: by 2002:a17:907:86a2:b0:a4e:6bf6:eab2 with SMTP id qa34-20020a17090786a200b00a4e6bf6eab2mr5928919ejc.4.1712126657722; Tue, 02 Apr 2024 23:44:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712126657; cv=none; d=google.com; s=arc-20160816; b=hqEN6wG4R0yxSwrZhKv6kznXvdz5o800/vDegqYRDz1SN9BQqVOi4HvnE9qPcVh0lW VejoBPJEe29sgpbWkQXFuseBRD3f1yFOU+0UrTBAdqi6gfKdckQeL9iC4uN7cqTyvw9Q 2oaWVsZ8wcTw4Dw/ZvKjYYfK4/fkKQQhUuWQEIVZrlfSSqyxO+ENCHxFlueJAAyhG7KT 9du/WLdyZAmHCrmK/183Rbr9JVMKYpBhB2XxCSY4KvjqlgnU/Zr1y/s6Cl8/1pMLKkXc 3fPx6K2a3G9J4EUXNRKlfT8UrjWWHfmqLIFeYGvRYAJFFy9Mn9z/XTZb59EGP2gph5ZY 3oSQ== 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:content-language:to:from:user-agent:mime-version :date:message-id:dkim-signature:delivered-to; bh=Tz8ESM2/OdnrAtNfKEe5ETplTovvtbG41KMGxEF2bLA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ijXevjo9RTN/DrgDM+4BDXnybLQcxYIvCv/xNESgS0mzzrgyFv0J1RD04/nWbNszM9 W3mBBydjys+oa7P2OdyEbtPgAQ2cddsavY75aXJyuca1aKl1ytMncV2qSeJOboyRDc/l Fw6y0O+LX5asY7mt1Rf5rCCZJJRiWwLq9Ixka39yL3/wCOtnbxUMd/m8EcOelJFRat0d oqacBP0aSCKSHXoW9c5dOgdPeE0H0psDqVwRASQP25o8w24ugU3BHCB+bDrApKRD8wvY PPN8V/PysdAUf9ogCfdU6KPy6Z5ToS2J4WwYIN/0FK1LGLWgyIr001j0RyTdjzkFTmVq M9qg==; 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=wIyNgMCU; 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 sa5-20020a1709076d0500b00a4df3e5e6b1si6649501ejc.802.2024.04.02.23.44.17; Tue, 02 Apr 2024 23:44:17 -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=wIyNgMCU; 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 CFE3A68CDB6; Wed, 3 Apr 2024 09:43:46 +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 5EB1468D092 for ; Wed, 3 Apr 2024 09:43:40 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1712126618; 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; bh=y45i7Go/icCMPmWwzPzH4JLpNuWWVa171PgGc6I58K4=; b=wIyNgMCUnYmol0IS0ua9K7XhTK8wmjLiwwmOYMrF2utzyV6PF+JSAA+cZvvfaZrCIrdCYR sJjJqB1/QkVsBKPBT6AbPA8GufXpxGPUinhefRDzwUMfuZ8/XntPvt/BebrSQeIb7h8nji EQrb/lB9kkS1IgeIZjCQHJUl+6lwPZs= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id 5e9a9490 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Wed, 3 Apr 2024 06:43:38 +0000 (UTC) Message-ID: <18a55da1-45a2-43ee-b918-9eb67c5bf741@geoffhill.org> Date: Tue, 2 Apr 2024 23:43:38 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Geoff Hill To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH v3 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: ZAJq9fmlcodT Signed-off-by: Geoff Hill --- libavcodec/aarch64/ac3dsp_init_aarch64.c | 5 ++++ libavcodec/aarch64/ac3dsp_neon.S | 35 ++++++++++++++++++++++++ tests/checkasm/ac3dsp.c | 26 ++++++++++++++++++ 3 files changed, 66 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 fa8fcf2e47..4a78ec0b2a 100644 --- a/libavcodec/aarch64/ac3dsp_neon.S +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -88,3 +88,38 @@ function ff_ac3_sum_square_butterfly_int32_neon, export=1 st1 {v0.1d-v3.1d}, [x0] 1: ret endfunc + +function ff_ac3_sum_square_butterfly_float_neon, export=1 + cbz w3, 1f + movi v0.4s, #0 + movi v1.4s, #0 + movi v2.4s, #0 + movi v3.4s, #0 +0: ld1 {v30.4s}, [x1], #16 + ld1 {v31.4s}, [x2], #16 + fadd v16.4s, v30.4s, v31.4s + fsub v17.4s, v30.4s, v31.4s + fmul v30.4s, v30.4s, v30.4s + fadd v0.4s, v0.4s, v30.4s + fmul v31.4s, v31.4s, v31.4s + fadd v1.4s, v1.4s, v31.4s + fmul v16.4s, v16.4s, v16.4s + fadd v2.4s, v2.4s, v16.4s + fmul v17.4s, v17.4s, v17.4s + fadd v3.4s, v3.4s, v17.4s + subs w3, w3, #4 + b.gt 0b + 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] +1: ret +endfunc diff --git a/tests/checkasm/ac3dsp.c b/tests/checkasm/ac3dsp.c index c920dc9eb0..ef5186cfc1 100644 --- a/tests/checkasm/ac3dsp.c +++ b/tests/checkasm/ac3dsp.c @@ -162,6 +162,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; @@ -171,4 +196,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); }