From patchwork Fri Jun 7 18:19:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= X-Patchwork-Id: 49685 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1210351vqo; Fri, 7 Jun 2024 11:20:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVlb02lj5VTTNSaFPiWo09XOhA5EHb4VguXanXz3Z7r4ehFTQZRMSYYOQbEqc3iychaJFLVpkm2vESTPgWA/azbM1yNpN/2cvmOsQ== X-Google-Smtp-Source: AGHT+IHvuORjtFMXKHf2fo/ECcUVld3V2qLtdSR4VxoHRf4ZtC3kby6eoHrWpCX4dN+T1WJOpPJn X-Received: by 2002:a05:651c:211f:b0:2ea:7e4a:d85b with SMTP id 38308e7fff4ca-2eadcebe4f6mr25002491fa.5.1717784401016; Fri, 07 Jun 2024 11:20:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717784401; cv=none; d=google.com; s=arc-20160816; b=Xo1PtxAfqaek3IQa6x/zIajuApcQsZJLl3mQFQS2p5MgfAQLeqXj+I9/LaJ54Opl7x w3mZJ2Ja9UlEsQhgIPBV0byzLOcxPuEPFBRLpLI8w5R++8RkJXuwuzKMveFgTPv5zE02 rswhzt03GrZReS4YSPj5rXptoyjgIZF2n+hBXBa8/LGZz958EhRI2I0LddUiSNj0rikj gdH2evQ8LBfkj2RQjZdM9l6uu26/gWJwGWnL5T6ZR2wSMi9BbS8P6nIT1JGMTE4K/oTA rN3fKHKHd0QgErpcxKV8xL9ugH9aH/EVAO4AvwwA2ogeyzm88X+otHotYdge3uT+M+VS FUJQ== 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:mime-version:message-id:date:to:from :delivered-to; bh=IoyCJS0CFM50fq2UvpCvyfeJ2l2W+A4Fme1yg86FnF0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=UvqVX1Yms4GAzWQ45AzbGVuNBbjJKByHSXHkKeCNP9Bkicvrk2zyp8OTbIT9r+Ntyn a3sbo9kvSIF+Xa/dJC4DKnslAsg5Im4RV8QK9QhU5eaPw5B2RCkzBVDyOZtx3tiNnavn NoMu41hBGc7iY14qyvkMkneZmaUX0L4Qyl5R/hPatGCHOq6K4dh2pxA4nBSorW6i62LY c7dm5mUHNO9tXVxbYuaaVGx3VYTRmb7o9Jg0ddFDAkkJ4jaIgY5PZJE/LKlkqjUEO0+V Gua08e+ilAkdvOESS9/NQRhG5JY82zifkqQe1O/oPCPs9zACDhPItedrWm9kbM1KSnrr yh1w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2ead419cf23si11305151fa.604.2024.06.07.11.20.00; Fri, 07 Jun 2024 11:20:00 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 297A068D811; Fri, 7 Jun 2024 21:19:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ursule.remlab.net (vps-a2bccee9.vps.ovh.net [51.75.19.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 89CD068D7C9 for ; Fri, 7 Jun 2024 21:19:48 +0300 (EEST) Received: from basile.remlab.net (localhost [IPv6:::1]) by ursule.remlab.net (Postfix) with ESMTP id B85D1C006E for ; Fri, 7 Jun 2024 21:19:47 +0300 (EEST) From: =?utf-8?q?R=C3=A9mi_Denis-Courmont?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2024 21:19:46 +0300 Message-ID: <20240607181947.330026-1-remi@remlab.net> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavu/bswap: remove some inline assembler 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: /KpBEAUnvQ1h C code or compiler built-ins are preferable over inline assembler for byte-swaps as it allows for better optimisations (e.g. instruction scheduling) which would otherwise be impossible. As with f64c2e710fa1a7b59753224e717f57c48462076f for x86 and Arm, this removes the inline assembler on GCC (and Clang) since we now require recent enough compiler versions (this indeed seems to work on AArch64). --- libavutil/aarch64/bswap.h | 56 --------------------------------------- libavutil/avr32/bswap.h | 44 ------------------------------ libavutil/bswap.h | 8 +----- libavutil/sh4/bswap.h | 48 --------------------------------- 4 files changed, 1 insertion(+), 155 deletions(-) delete mode 100644 libavutil/aarch64/bswap.h delete mode 100644 libavutil/avr32/bswap.h delete mode 100644 libavutil/sh4/bswap.h diff --git a/libavutil/aarch64/bswap.h b/libavutil/aarch64/bswap.h deleted file mode 100644 index 7abca657ba..0000000000 --- a/libavutil/aarch64/bswap.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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 - */ - -#ifndef AVUTIL_AARCH64_BSWAP_H -#define AVUTIL_AARCH64_BSWAP_H - -#include -#include "config.h" -#include "libavutil/attributes.h" - -#if HAVE_INLINE_ASM - -#define av_bswap16 av_bswap16 -static av_always_inline av_const unsigned av_bswap16(unsigned x) -{ - unsigned y; - - __asm__("rev16 %w0, %w1" : "=r"(y) : "r"(x)); - return y; -} - -#define av_bswap32 av_bswap32 -static av_always_inline av_const uint32_t av_bswap32(uint32_t x) -{ - uint32_t y; - - __asm__("rev %w0, %w1" : "=r"(y) : "r"(x)); - return y; -} - -#define av_bswap64 av_bswap64 -static av_always_inline av_const uint64_t av_bswap64(uint64_t x) -{ - uint64_t y; - - __asm__("rev %0, %1" : "=r"(y) : "r"(x)); - return y; -} - -#endif /* HAVE_INLINE_ASM */ -#endif /* AVUTIL_AARCH64_BSWAP_H */ diff --git a/libavutil/avr32/bswap.h b/libavutil/avr32/bswap.h deleted file mode 100644 index e79d53f369..0000000000 --- a/libavutil/avr32/bswap.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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 - */ - -#ifndef AVUTIL_AVR32_BSWAP_H -#define AVUTIL_AVR32_BSWAP_H - -#include -#include "config.h" -#include "libavutil/attributes.h" - -#if HAVE_INLINE_ASM - -#define av_bswap16 av_bswap16 -static av_always_inline av_const uint16_t av_bswap16(uint16_t x) -{ - __asm__ ("swap.bh %0" : "+r"(x)); - return x; -} - -#define av_bswap32 av_bswap32 -static av_always_inline av_const uint32_t av_bswap32(uint32_t x) -{ - __asm__ ("swap.b %0" : "+r"(x)); - return x; -} - -#endif /* HAVE_INLINE_ASM */ - -#endif /* AVUTIL_AVR32_BSWAP_H */ diff --git a/libavutil/bswap.h b/libavutil/bswap.h index 1528906f93..b339c90b9b 100644 --- a/libavutil/bswap.h +++ b/libavutil/bswap.h @@ -34,16 +34,10 @@ #include "config.h" -#if ARCH_AARCH64 -# include "aarch64/bswap.h" -#elif ARCH_ARM +#if ARCH_ARM # include "arm/bswap.h" -#elif ARCH_AVR32 -# include "avr32/bswap.h" #elif ARCH_RISCV # include "riscv/bswap.h" -#elif ARCH_SH4 -# include "sh4/bswap.h" #elif ARCH_X86 # include "x86/bswap.h" #endif diff --git a/libavutil/sh4/bswap.h b/libavutil/sh4/bswap.h deleted file mode 100644 index 48dd27f806..0000000000 --- a/libavutil/sh4/bswap.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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 - */ - -/** - * @file - * byte swapping routines - */ - -#ifndef AVUTIL_SH4_BSWAP_H -#define AVUTIL_SH4_BSWAP_H - -#include -#include "config.h" -#include "libavutil/attributes.h" - -#define av_bswap16 av_bswap16 -static av_always_inline av_const uint16_t av_bswap16(uint16_t x) -{ - __asm__("swap.b %0,%0" : "+r"(x)); - return x; -} - -#define av_bswap32 av_bswap32 -static av_always_inline av_const uint32_t av_bswap32(uint32_t x) -{ - __asm__("swap.b %0,%0\n" - "swap.w %0,%0\n" - "swap.b %0,%0\n" - : "+r"(x)); - return x; -} - -#endif /* AVUTIL_SH4_BSWAP_H */