From patchwork Sat Apr 6 14:25:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47882 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1559658pzd; Sat, 6 Apr 2024 07:26:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX6qjPKAhmO1kL7LBvs2MF/IChqPn+sq2tajU4KBgcTeWQMpg78Y9T/crLxnqb2olC9Atwb9+WbrL/sBg2/IT+hew0uzaaSbwEe4A== X-Google-Smtp-Source: AGHT+IEQFzUvAxIb4U57di4WiQABs8ewPPHe/CR5g0wt2AW+LEPnVuzBhzDxFW3baD0mzErheVE+ X-Received: by 2002:aa7:c34e:0:b0:56e:36d9:265d with SMTP id j14-20020aa7c34e000000b0056e36d9265dmr2228816edr.4.1712413565796; Sat, 06 Apr 2024 07:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712413565; cv=none; d=google.com; s=arc-20160816; b=MDdjTYS/MhD1mREtJb6ykLhy+jLx/sOA1o7WEwjy7yoJZEdsr7TbLKs0WmfqNhFwtk J46l79RVVvRVL/d1huAw1ygyY6HC6rzrCHHuxCJW1wR1B7qB8i+afGgQENhAvZraBjU/ I7yPCD1tJ9jEi09BCWSVQF4jwxbLSlg1TpcsuzEnqykgJ7YJF8P0UBo0ZXvDR3FjmGT9 nkXfkG3DpyUv2ji+cZvZdmcJHJRWy56byCO4SpkPUgKkGPdIKvHe/BtODZLPfxRdqUyG mHTacnYNMt5MDD/8XY23GPITvDVymkVu1ytg6oW4fXRTsVXAWr28hF/WTlvuwsshCtnj O0Bg== 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=o2/wsABVQl4bRliC7XRx5+grzfI7NPlVthn5jZ4XcMw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=tKy74q8oBTRqTL5Ba+WFHEiBXkIvChyljp+soSTrCtu4TCiWFZYOBIBlGnzL+xBieH Rz9nhwnr57tEUEiF1Eswx4cSf/6hfKprtsROqSen0EmjzqxgNsRgXjWMIkdXEn6qeSve jLUsYMoWzDByTwKV/SY0TOLyuA3mPYe5cho+yZBRExeR0MOeMa9AxMtaeD2mEgbFHQIf MnTNRpDaoFpbnqewHZYqPYqie5iI3Sl6zC59HJWoY6gzfv7nLeNYmkF8C69/rTeZICHH yRdexnZmns7yCBuYhySUT23YkUDo940EclyLErX8l1ah5Axqni/YJx1rWPXsFcpZaRa/ 29TA==; 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=ZE2MROO8; 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 s6-20020a508d06000000b0056e1de6b1e3si1832574eds.556.2024.04.06.07.26.05; Sat, 06 Apr 2024 07:26:05 -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=ZE2MROO8; 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 7615D68D068; Sat, 6 Apr 2024 17:26:02 +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 CD23568C6E0 for ; Sat, 6 Apr 2024 17:25:54 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1712413552; 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=tBedIWBXHYvs5MzgLel/AConQYuCLBW64EDqwz5eafQ=; b=ZE2MROO8DkeGlSB5uVwlL5A28QWbe/GzO6ZEVXln70dMEK7Crz5FUzcPUwtihQYXu6oecW nsk/X7RWSxn+N9lQcROAWoqPfoPTmTInOK6ttE82seXimSqAda7CEbmZnYJ9Xa05fNA9Kj lDdOLUn4dFnjg4WJQE9uAcxEZiELyjA= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id 56744642 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 6 Apr 2024 14:25:52 +0000 (UTC) Message-ID: Date: Sat, 6 Apr 2024 07:25:51 -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 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: OKaOStp8xj9t Signed-off-by: Geoff Hill --- libavcodec/aarch64/Makefile | 2 ++ libavcodec/aarch64/ac3dsp_init_aarch64.c | 36 ++++++++++++++++++++++++ libavcodec/aarch64/ac3dsp_neon.S | 36 ++++++++++++++++++++++++ libavcodec/ac3dsp.c | 4 ++- libavcodec/ac3dsp.h | 3 +- tests/checkasm/ac3dsp.c | 1 + 6 files changed, 80 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..c4d204b51a --- /dev/null +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2011 Mans Rullgard + * 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 +1: 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 1b + 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); diff --git a/tests/checkasm/ac3dsp.c b/tests/checkasm/ac3dsp.c index 344e1fe5c2..b1064fccb4 100644 --- a/tests/checkasm/ac3dsp.c +++ b/tests/checkasm/ac3dsp.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS). + * Copyright (c) 2024 Geoff Hill * * This file is part of FFmpeg. * From patchwork Sat Apr 6 14:25:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47883 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1559738pzd; Sat, 6 Apr 2024 07:26:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUpQpF8RYGDIvtF0778aMn501PYaF6ylEPYKeyPZVN7Wr7k/QNx3TdwL8n5EyGeVXYN91Vfg6DUxXGO/ND7vUdB2sFHaSuzXGu6qA== X-Google-Smtp-Source: AGHT+IGupOdSZstAjzz4WZ5OHCIaFynszmygCtpA4E+1OC/xpjxk8SL9z802/kq9r3e5Q5UwLl0a X-Received: by 2002:aa7:d747:0:b0:56e:50f4:9ee5 with SMTP id a7-20020aa7d747000000b0056e50f49ee5mr206106eds.3.1712413574526; Sat, 06 Apr 2024 07:26:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712413574; cv=none; d=google.com; s=arc-20160816; b=NlQto8QzkRAVmHAf6czlw/Cr4NsQggMYXjyljoqmso3IjD+3CmZ/pQM4OfDrG8RX5a RPkT3fZ1Uw3BZitebg0ubte6VUwAjzNtYBk1ykTA1BFbDXEU81NqnQdGvfybkqXw0RpI +tEG1lbVMpplwJXLFRbBdjUS/1rWT+gxkSgPHB7KrAGsHAMy9S0MOLk9IOcVK+sYJG/z +szW6DfPTwaviEM/nkhyU4eEdeokv7h3dnz9t3ZixI3W5NGgfTLOkO4yqlLxy5IqMg1N leAaCRfz0zkXiShg39tdINZn3UrYOZONO8+smc7LpSdWMtFqAZ5EAv6qNRUAhj+jot4l LsqA== 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=8pSRptTYAw8oNb3w1nV3C9EYrx0hARZRsRO00Z9JjIQ=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=dM6sxdlKdc8AvcZ2L+5oD75z8JaaiuF6KRA+o8PfRqKHJryW8cXw9IKWSbrWO+F3tp RP/lGZ2tWRw/is9lV8lHH1DxyTRld6FzEzwGRVSUDzoL+HJ3x7+hbCIcab7niBElJ1NV mJovv31a3ttUHri5m4/QCHMV1rCXiLpsO29fhHG695ZwwxEQKVgeng6VZDOQQ9LAOnwo Y0BnENT8qhMXBmGv6FQayFVNsqa3uyAW5cgMQcO67DzYoVlcwoX0LHa03EllZwQmR3sh 8ZhMcwtTlGN4J0H3a862AnjBfSAe2XPRjoqIQMNVxlDk0Ji0I2h60LiByyGlYOEbZG2a Hp0A==; 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=cUM6NFU8; 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 a29-20020a50c31d000000b0056e02f9a753si1827938edb.203.2024.04.06.07.26.14; Sat, 06 Apr 2024 07:26:14 -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=cUM6NFU8; 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 719A068D0BD; Sat, 6 Apr 2024 17:26:07 +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 C6A8068CFF4 for ; Sat, 6 Apr 2024 17:26:00 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1712413556; 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=mhJpYDWi0axt24WZ+LYomuO0VlHYE6m5vQlBto53dUM=; b=cUM6NFU8fZmCBPZzVGhYI4lHKcOOzAgOXvniPD3rMWA1xKrgRlzxPAG0GdRBywKIzmUv52 /r3QdUKAf/rc4e8t8rh6E5671aHM9iEclEXuk4epf6JqP1qYk594oXDECSkPosf9DVNp2P OU4V4DPy0pHkSKdGFb2PwqbG5pz1U0M= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id 2eec3a5d (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 6 Apr 2024 14:25:56 +0000 (UTC) Message-ID: <7594175d-da69-4483-9073-74d5235266b4@geoffhill.org> Date: Sat, 6 Apr 2024 07:25:56 -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 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: Omza9lkHrTjE 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 c4d204b51a..f916c32538 100644 --- a/libavcodec/aarch64/ac3dsp_neon.S +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -21,6 +21,22 @@ #include "libavutil/aarch64/asm.S" +function ff_ac3_exponent_min_neon, export=1 + cbz w1, 3f +1: ld1 {v0.16b}, [x0] + mov w3, w1 + add x4, x0, #256 +2: ld1 {v1.16b}, [x4] + umin v0.16b, v0.16b, v1.16b + add x4, x4, #256 + subs w3, w3, #1 + b.gt 2b + st1 {v0.16b}, [x0], #16 + subs w2, w2, #16 + b.gt 1b +3: ret +endfunc + function ff_float_to_fixed24_neon, export=1 1: 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 b1064fccb4..06f31339f9 100644 --- a/tests/checkasm/ac3dsp.c +++ b/tests/checkasm/ac3dsp.c @@ -28,6 +28,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; \ @@ -37,6 +45,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]); @@ -67,5 +107,6 @@ void checkasm_check_ac3dsp(void) AC3DSPContext c; ff_ac3dsp_init(&c); + check_ac3_exponent_min(&c); check_float_to_fixed24(&c); } From patchwork Sat Apr 6 14:26:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47884 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1559824pzd; Sat, 6 Apr 2024 07:26:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUMI8zfVPwjKmnM4EUqTi9v8jxbInwb9I9vT71jfOjdCtLHpA8xMAuctoTGzotS22anlCHMDcW8fTVtxr4MJ4psxrDnZxprUfdHtQ== X-Google-Smtp-Source: AGHT+IEEhOgov4bhRdqi64c2E3QTMskz4c1nzJaeqVSa7razkwc2X0DyauQiBjhLLvI5j3VBN5zG X-Received: by 2002:a50:c348:0:b0:56e:2a7d:827c with SMTP id q8-20020a50c348000000b0056e2a7d827cmr3058301edb.18.1712413583014; Sat, 06 Apr 2024 07:26:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712413582; cv=none; d=google.com; s=arc-20160816; b=mKBCCYWo/vjv3FO00j4MgIb2HHC/35FvM8Pt9BZGyHbLjOcqb6V/g2/OIYUZcE9PzS lCy2u5UTrQ65UQTGSZ3EnSOGCqCm8MLJOh7anesA0DrBDYLgPJvLgtOU+CcOkbqQTMPV D0BSaK/ULU8g2xh1Dnx4+bOLrdd0DiM/2Y5AbFfBv46MWu0Qkjlgx6DnViviLFrDZFrw cYKly9NrwFtU+A6PpMXQIMn4NKjsNlRCuT1S1aLuuX1gDZtbtD0a4SjVws+zjfXmio37 GV/IYHkgv7JtFuwsYhhHVJLKlt0sGeAEy3KrsNc2v9Z8fMVYZIt5CIErr7EmQl+vTVex tZ+g== 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=Hb2OXbR+ficrPN/EIpEtM/guNUi3odirBI0K1+574wE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HP78D+WbI7zUyRPt/RRZu1nWJnNlyoWNjwVP3OjnhypsCbJP+TxL53KCcEPI4ghtDl MBkPu2oXkmgouGyM5COtXcpCoWK4aqSx4Oun7ihby/ceGY8bpUWWOyvQ2j14vT4GlqSJ XOhcz4VM9yKfaUvscGEBKTliiehzGZFU+6Qxef6qogoTe5RJm1CG1FBmp3TJD+j6COd+ MpRExmYgvMgSwVFzQdmzdtFX2taNuoN2ptJuhFZ0sfR7yRwo4OK7nFTsY7gaw01ONXGq KLPtitdpNGqZP3OXAZ/keilPzKzcvqpCxKBhjWcKsHOnO53pwSra1wj5fGEK1OHNLY6o dqjw==; 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=J+TEweDL; 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 z2-20020a5096c2000000b00568c14e5e31si1789848eda.428.2024.04.06.07.26.22; Sat, 06 Apr 2024 07:26:22 -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=J+TEweDL; 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 6DD3568D0F4; Sat, 6 Apr 2024 17:26:13 +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 BF46468D0AD for ; Sat, 6 Apr 2024 17:26:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1712413561; 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=h1r2pWj3jaMHKzcL5fBwsIF1u4LuZhgREnE5JlaA7A8=; b=J+TEweDLRzdwbHE796YnenTK//zJQC/cBu/ebjZH7ar65wEk6Bbc+6dDhUl0Vwo//niqpc 3qC6TV7yD43Z9YQHtneRqMYg8m20W5CjZR6iWHb3BUnmLGtFF3jEBJgA7Lyn8fnS2SM9rg C8D+U1sCRrOHIrcgTFlM+yVNmwxfBKU= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id 9d9be2e7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 6 Apr 2024 14:26:01 +0000 (UTC) Message-ID: Date: Sat, 6 Apr 2024 07:26:01 -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 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: OkkytYOv2Ag3 Signed-off-by: Geoff Hill --- libavcodec/aarch64/ac3dsp_init_aarch64.c | 2 ++ libavcodec/aarch64/ac3dsp_neon.S | 14 +++++++++ tests/checkasm/ac3dsp.c | 38 ++++++++++++++++++++++++ 3 files changed, 54 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 f916c32538..c350c1f173 100644 --- a/libavcodec/aarch64/ac3dsp_neon.S +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -37,6 +37,20 @@ function ff_ac3_exponent_min_neon, export=1 3: ret endfunc +function ff_ac3_extract_exponents_neon, export=1 + movi v1.4s, #8 +1: 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 1b + ret +endfunc + function ff_float_to_fixed24_neon, export=1 1: 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 06f31339f9..dc1b169e68 100644 --- a/tests/checkasm/ac3dsp.c +++ b/tests/checkasm/ac3dsp.c @@ -19,6 +19,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include #include "libavutil/mem.h" @@ -36,6 +37,16 @@ } \ } while (0) +#define randomize_i24(buf, len) \ + do { \ + int i; \ + for (i = 0; i < len; i++) { \ + int32_t v = (int32_t)rnd(); \ + int32_t u = (v & 0xFFFFFF); \ + buf[i] = (v < 0) ? -u : u; \ + } \ + } while (0) + #define randomize_float(buf, len) \ do { \ int i; \ @@ -77,6 +88,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]); @@ -108,5 +145,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 Sat Apr 6 14:26:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47885 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp1559890pzd; Sat, 6 Apr 2024 07:26:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXVw7qEPXz69Aoy0Sc9KPJeLS8DYCfDNLZvYwmJu5lXkWSc1xrATpgpAHIfu7I15TFZfuDF05CiBOfnNxVdG8TiH9xSOs6eBLZreQ== X-Google-Smtp-Source: AGHT+IFLtHXgMp+tNjTXk9TDaQLnxhw+SCFt9WDcw0MsXF9g9JeUqhSrGvOxNw4ud5A/0dJ18PTo X-Received: by 2002:a05:6000:144f:b0:343:f2e0:449c with SMTP id v15-20020a056000144f00b00343f2e0449cmr3178662wrx.0.1712413591052; Sat, 06 Apr 2024 07:26:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712413591; cv=none; d=google.com; s=arc-20160816; b=Qc0D2F0vxIHQ2p02I8gH9edlGfDPS12H89X83UL2wnNIsX+D6jJLF4bP/ZoLo4qhDX S3zxUy0kczI2AJeJg8in1JJTRENiEvPS/GcLgM524P4p0oVm2NW7HQIghKxVx65f7D+t 2eNCQ6Aoaw7/dTz1U9JbfD2il1e7CjER1InfmgwHeyOYqPoADQy2XG1Oz/a054S3YHUT GJjWAnCeJ2tkmuGrBr1lg4RzGaNFnsWK48scRYeXFEuWj2+7xH2Ofdo5xXp/iJbchOAZ u+MJ3ZQAn2RBNztBrQj7t2YLRm6mgBKOuSyE7IZWPnYdxJ5AgjyYqOWc8qBPNpBIKojk m/sg== 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=7Lsz3kNoeC4qRhnpMeCGYzoBskSC6ue8oo6HcXIY1Yw=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ia1SP7MVS5kjjX/+z605eJlsaaIJeY9QqJWBU5XjwQVOFl7vUCqW6omIuMpOl1I54h QlaFfk12jd1Otgsv/3Qgn0HGPRS6O8gcSEUCzHuys+wyk7qF96XUdgMd6RXYbyifkaqH TCHNOoJ0iOrfCnETS5tvrgnj+9vYEMcbb08to5bTUQg5/pcIxBxXm4Rpmbtr/r+VM+Pv 3yaQ+GKd94wBWK6ynRkV+4PjGxHIluwSdJ9ljFHj4tiBErfv+v+FMHolaWDgxB9xlL+p GeAGVTbhP7hYZoaM/GehKYMxudSwQ7W6geQDqK+ARdQBoRWbmxsac7idLq5jX0e1zy2d uepA==; 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=ff1E5sy1; 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 n4-20020a509344000000b0056e2c12b574si1809310eda.531.2024.04.06.07.26.30; Sat, 06 Apr 2024 07:26:31 -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=ff1E5sy1; 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 83A0368D10C; Sat, 6 Apr 2024 17:26:19 +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 C514568CD00 for ; Sat, 6 Apr 2024 17:26:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1712413566; 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=/x+N5pb1zFg8+/IKLSTO3lgDCMvasM9pYpvC0dbx+fc=; b=ff1E5sy1totBuyJ6Of28OKWsOH7iz0tqjUf8ZWSP90RBZMMedL6sdOTlRbkbSjkbvZf4nG CA3PoiwB0DSAuHt+pwv+ZJ6eL2TXUN3Jk+kw3g8xld22ZQ/IF1rTC9R2So2HBUCqdiU0G7 3uHEex4kslYxhZtG0QuUMEn8RR/eGoY= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id 8d0c57d7 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Sat, 6 Apr 2024 14:26:06 +0000 (UTC) Message-ID: <9ec9519a-5914-4f04-8873-bdabfb590d36@geoffhill.org> Date: Sat, 6 Apr 2024 07:26:06 -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 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: BaljQt1WMKs/ Signed-off-by: Geoff Hill --- libavcodec/aarch64/ac3dsp_init_aarch64.c | 5 +++++ libavcodec/aarch64/ac3dsp_neon.S | 23 ++++++++++++++++++++ tests/checkasm/ac3dsp.c | 27 ++++++++++++++++++++++++ 3 files changed, 55 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 c350c1f173..77f9d20275 100644 --- a/libavcodec/aarch64/ac3dsp_neon.S +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -64,3 +64,26 @@ function ff_float_to_fixed24_neon, export=1 b.ne 1b ret endfunc + +function ff_ac3_sum_square_butterfly_int32_neon, export=1 + movi v0.2d, #0 + movi v1.2d, #0 + movi v2.2d, #0 + movi v3.2d, #0 +1: 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 1b + addp d0, v0.2d + addp d1, v1.2d + addp d2, v2.2d + addp d3, v3.2d + st1 {v0.1d-v3.1d}, [x0] + ret +endfunc diff --git a/tests/checkasm/ac3dsp.c b/tests/checkasm/ac3dsp.c index dc1b169e68..573a76c764 100644 --- a/tests/checkasm/ac3dsp.c +++ b/tests/checkasm/ac3dsp.c @@ -139,6 +139,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; @@ -147,4 +173,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 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); }