From patchwork Fri Mar 29 04:24:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geoff Hill X-Patchwork-Id: 47640 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1771637pzb; Thu, 28 Mar 2024 21:24:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW5BfAuwAMLKcR2fNTsHY1G0Bal+GzCprQjP6v7qDOWLySnxCx2exDE8JcXnQ7GW2fF89gIwUkc2MofwJV+YDAmftrVpGra3tjT0g== X-Google-Smtp-Source: AGHT+IGOHQhAMmR4VX1WFZT6epsKW1rNs5cJzx6ymcWAxhCDoOppE4WhplZRzvzkPDUHS/a/+1SI X-Received: by 2002:a17:907:1115:b0:a46:ed72:6bb4 with SMTP id qu21-20020a170907111500b00a46ed726bb4mr636251ejb.72.1711686274181; Thu, 28 Mar 2024 21:24:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711686274; cv=none; d=google.com; s=arc-20160816; b=MM994dz4Htru00GQriCO/BqghNl/UjIX/yCgorU2MoKqf50Kwr5N0c4oLx6efTOE0n Z+dr7wgUHRMcqQgU2GZoE1/UwXBeByovTFMt4T8oV9rGcft2yNZbkp7fHeH3s6nymMbR DWdDrIKP6jUDL9JJPnKLI8oboVkQmknoykPlE2uv7bjVnLByUnlP52EATYsiPqhLRqDP HgB1f25Gv/VFte2w00m9T8seVQ/2fLMzEINFxYDQKTazEN3EyfrJHvmISCdEieJ6gt0b IKbG4QEM4+YeAl++2dp+FgQgDjOMIg2nrLQWfmXMd+2GRtSGnE+FyLsQtMgWzq16LrEG 1vuA== 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=AV9TUJ1b61/BAoAd1bGr0Ny5E7P2HN/lCNI19kw1piU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=iVzHGpg3gnIJuUklaHDWu5JwXJzcW0qyEe5KeyeOByD6YLAR+678lrYvLRdHBFOmUh 6nhXcPt5o+/CWgybYFgsrIBT1oOrhjzkKjsu6PIaKMdaUkb2mCZwsRgt6vpVuOOvx0Tq GYGrq/xs8ebeNyZ088Y/vP+bp9JxH7JNZSHTK014LBDKlAb4hr0rOvH3uNGbOK+sRoQt jgh+OvCcCPLLPEurXtqF4PWbCEGbd5RWyKjCoGkZ2DmTlWe3Q3c5E3v8PtMldXNbemdr +Xx0wShXfU55eKnOv2OIBGS4e4rAyGbshavY0nV5B/GeQUd9EVCwzh8Gj3lGgBBBjiEq RL6g==; 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/ptdQMV"; 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 lf21-20020a170906ae5500b00a4746e4ac10si1344405ejb.902.2024.03.28.21.24.33; Thu, 28 Mar 2024 21:24:34 -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/ptdQMV"; 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 5A0BB68D46C; Fri, 29 Mar 2024 06:24:30 +0200 (EET) 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 A7AF168D441 for ; Fri, 29 Mar 2024 06:24:22 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=geoffhill.org; s=20220510; t=1711686259; 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=xA86aga2idI9EnkubvbEx34pvqkmZsqPGoc3P8ptPbM=; b=J/ptdQMVikXFXe/z6U+dz9LB5vD6IorIS9a3Q/X93zMLGFIzN5uHnXIVHocTM+adSsE1nm MBS8OoEh48lLsEIzcR98wREn6zvuHDuUuUxD3xRKhvsERKyF9bISgewDUFD/3dM0LvNXZA LeTlj+1nXtAuNro7/2pYxR05SjnfpR8= Received: by riki.gfrh.net (OpenSMTPD) with ESMTPSA id acd07c31 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 29 Mar 2024 04:24:18 +0000 (UTC) Message-ID: Date: Thu, 28 Mar 2024 21:24:18 -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 v2] 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: g9FcN7SPSEku Start porting AC-3 ARMv7 NEON algorithms over to aarch64. This one is low-hanging fruit since checkasm tests exist. Fixed the Makefile compared to v1. Tested on AWS Graviton2 (t4g.medium), GCC 12.3: $ tests/checkasm/checkasm --verbose --bench --test=ac3dsp ... NEON: - ac3dsp.float_to_fixed24 [OK] checkasm: all 1 tests passed float_to_fixed24_c: 2450.7 float_to_fixed24_neon: 574.0 Signed-off-by: Geoff Hill --- libavcodec/aarch64/Makefile | 2 ++ libavcodec/aarch64/ac3dsp_init_aarch64.c | 36 +++++++++++++++++++++++ libavcodec/aarch64/ac3dsp_neon.S | 37 ++++++++++++++++++++++++ libavcodec/ac3dsp.c | 4 ++- libavcodec/ac3dsp.h | 3 +- 5 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..77106ea586 --- /dev/null +++ b/libavcodec/aarch64/ac3dsp_neon.S @@ -0,0 +1,37 @@ +/* + * 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" + +// void ff_float_to_fixed24_neon(int32_t *dst, const float *src, unsigned int len) + +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);