From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0828341206 for ; Thu, 17 Mar 2022 19:00:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B38968B0BE; Thu, 17 Mar 2022 20:59:23 +0200 (EET) Received: from outmail149080.authsmtp.com (outmail149080.authsmtp.com [62.13.149.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1EE468B08F for ; Thu, 17 Mar 2022 20:59:14 +0200 (EET) Received: from mail-c233.authsmtp.com (mail-c233.authsmtp.com [62.13.128.233]) by punt16.authsmtp.com. (8.15.2/8.15.2) with ESMTP id 22HIxEbo055449; Thu, 17 Mar 2022 18:59:14 GMT (envelope-from bavison@riscosopen.org) Received: from rpi2021 (237.63.9.51.dyn.plus.net [51.9.63.237]) (authenticated bits=0) by mail.authsmtp.com (8.15.2/8.15.2) with ESMTPSA id 22HIxB1U055532 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 17 Mar 2022 18:59:11 GMT (envelope-from bavison@riscosopen.org) Received: by rpi2021 (sSMTP sendmail emulation); Thu, 17 Mar 2022 18:59:11 +0000 From: Ben Avison To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Mar 2022 18:58:18 +0000 Message-Id: <20220317185819.466470-6-bavison@riscosopen.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220317185819.466470-1-bavison@riscosopen.org> References: <20220317185819.466470-1-bavison@riscosopen.org> MIME-Version: 1.0 X-Server-Quench: 55d54c4b-a624-11ec-a0f2-84349711df28 X-AuthReport-Spam: If SPAM / abuse - report it at: http://www.authsmtp.com/abuse X-AuthRoute: OCd1YggXA1ZfRRob ESQCJDVBUg4iPRpU DBlFKhFVNl8UURhQ KkJXbgASJgRDAnRQ QXkJW1ZWQFx5U2Z8 YQtSIwBcfENQWQZ0 UktOXVBXFgB3AFID BGZnGmtzEgVDfXtz ZwhjXHBSXgp/cBJ4 Rh1QR3BXY2VkdWEe BRNFJgMCch5CehxB Y1d+VSdbY21JDRoR IyQTd212YwAXITpe RQ0AJhUYRUEAHTIn X0JKNC8qVRNZAi8y M1QAB3k6VEwVNU4x eVAlVFsCexEbEREW B0hRADQx X-Authentic-SMTP: 61633632303230.1021:7600 X-AuthFastPath: 0 (Was 255) X-AuthSMTP-Origin: 51.9.63.237/2525 X-AuthVirus-Status: No virus detected - but ensure you scan with your own anti-virus system. Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/blockdsp: Arm 64-bit NEON block clear fast paths X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Ben Avison Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Ben Avison --- libavcodec/aarch64/Makefile | 2 + libavcodec/aarch64/blockdsp_init_aarch64.c | 42 +++++++++++++++++++++ libavcodec/aarch64/blockdsp_neon.S | 43 ++++++++++++++++++++++ libavcodec/blockdsp.c | 2 + libavcodec/blockdsp.h | 1 + 5 files changed, 90 insertions(+) create mode 100644 libavcodec/aarch64/blockdsp_init_aarch64.c create mode 100644 libavcodec/aarch64/blockdsp_neon.S diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile index c8935f205e..7078dc6089 100644 --- a/libavcodec/aarch64/Makefile +++ b/libavcodec/aarch64/Makefile @@ -35,6 +35,8 @@ ARMV8-OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp.o # subsystems NEON-OBJS-$(CONFIG_AAC_DECODER) += aarch64/sbrdsp_neon.o +NEON-OBJS-$(CONFIG_BLOCKDSP) += aarch64/blockdsp_init_aarch64.o \ + aarch64/blockdsp_neon.o NEON-OBJS-$(CONFIG_FFT) += aarch64/fft_neon.o NEON-OBJS-$(CONFIG_FMTCONVERT) += aarch64/fmtconvert_neon.o NEON-OBJS-$(CONFIG_H264CHROMA) += aarch64/h264cmc_neon.o diff --git a/libavcodec/aarch64/blockdsp_init_aarch64.c b/libavcodec/aarch64/blockdsp_init_aarch64.c new file mode 100644 index 0000000000..9f3280f007 --- /dev/null +++ b/libavcodec/aarch64/blockdsp_init_aarch64.c @@ -0,0 +1,42 @@ +/* + * AArch64 NEON optimised block operations + * + * Copyright (c) 2022 Ben Avison + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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/attributes.h" +#include "libavutil/cpu.h" +#include "libavutil/arm/cpu.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/blockdsp.h" + +void ff_clear_block_neon(int16_t *block); +void ff_clear_blocks_neon(int16_t *blocks); + +av_cold void ff_blockdsp_init_aarch64(BlockDSPContext *c) +{ + int cpu_flags = av_get_cpu_flags(); + + if (have_neon(cpu_flags)) { + c->clear_block = ff_clear_block_neon; + c->clear_blocks = ff_clear_blocks_neon; + } +} diff --git a/libavcodec/aarch64/blockdsp_neon.S b/libavcodec/aarch64/blockdsp_neon.S new file mode 100644 index 0000000000..a310647a5d --- /dev/null +++ b/libavcodec/aarch64/blockdsp_neon.S @@ -0,0 +1,43 @@ +/* + * AArch64 NEON optimised block operations + * + * Copyright (c) 2022 Ben Avison + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser 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_clear_block_neon, export=1 + movi v0.16b, #0 + movi v1.16b, #0 + st1 {v0.16b, v1.16b}, [x0], #32 + st1 {v0.16b, v1.16b}, [x0], #32 + st1 {v0.16b, v1.16b}, [x0], #32 + st1 {v0.16b, v1.16b}, [x0] + ret +endfunc + +function ff_clear_blocks_neon, export=1 + movi v0.16b, #0 + movi v1.16b, #0 + .rept 23 + st1 {v0.16b, v1.16b}, [x0], #32 + .endr + st1 {v0.16b, v1.16b}, [x0] + ret +endfunc diff --git a/libavcodec/blockdsp.c b/libavcodec/blockdsp.c index 5fb242ea65..97cc074765 100644 --- a/libavcodec/blockdsp.c +++ b/libavcodec/blockdsp.c @@ -64,6 +64,8 @@ av_cold void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx) c->fill_block_tab[0] = fill_block16_c; c->fill_block_tab[1] = fill_block8_c; + if (ARCH_AARCH64) + ff_blockdsp_init_aarch64(c); if (ARCH_ALPHA) ff_blockdsp_init_alpha(c); if (ARCH_ARM) diff --git a/libavcodec/blockdsp.h b/libavcodec/blockdsp.h index 58eecffb07..9838922d22 100644 --- a/libavcodec/blockdsp.h +++ b/libavcodec/blockdsp.h @@ -40,6 +40,7 @@ typedef struct BlockDSPContext { void ff_blockdsp_init(BlockDSPContext *c, AVCodecContext *avctx); +void ff_blockdsp_init_aarch64(BlockDSPContext *c); void ff_blockdsp_init_alpha(BlockDSPContext *c); void ff_blockdsp_init_arm(BlockDSPContext *c); void ff_blockdsp_init_ppc(BlockDSPContext *c); -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".