[vlc-commits] [Git][videolan/vlc][master] arm: move ARMv7 NEON stuff into isa/arm/neon
Rémi Denis-Courmont (@Courmisch)
gitlab at videolan.org
Wed Feb 2 09:11:11 UTC 2022
Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC
Commits:
2bb3ae82 by Rémi Denis-Courmont at 2022-02-02T08:29:05+00:00
arm: move ARMv7 NEON stuff into isa/arm/neon
Down the line, we probably should not have one directory per ISA
extension. This replicates the model from the hw/*/ directory.
isa/ seems better than arch/ because:
- "Instruction Set Architecture" is more specific than "Architecture",
- it saves one character,
- no modules/ subdirectory starts with I yet (so this will not break
auto-completion habits).
This also moves non-NEON-specific files to isa/arm/.
- - - - -
22 changed files:
- modules/Makefile.am
- modules/audio_filter/Makefile.am
- modules/arm_neon/Makefile.am → modules/isa/arm/Makefile.am
- modules/arm_neon/asm.S → modules/isa/arm/asm.S
- modules/arm_neon/amplify.S → modules/isa/arm/neon/amplify.S
- modules/arm_neon/chroma_neon.h → modules/isa/arm/neon/chroma_neon.h
- modules/arm_neon/chroma_yuv.c → modules/isa/arm/neon/chroma_yuv.c
- modules/arm_neon/deinterleave_chroma.S → modules/isa/arm/neon/deinterleave_chroma.S
- modules/arm_neon/i420_rgb.S → modules/isa/arm/neon/i420_rgb.S
- modules/arm_neon/i420_rv16.S → modules/isa/arm/neon/i420_rv16.S
- modules/arm_neon/i420_yuyv.S → modules/isa/arm/neon/i420_yuyv.S
- modules/arm_neon/i422_yuyv.S → modules/isa/arm/neon/i422_yuyv.S
- modules/arm_neon/nv12_rgb.S → modules/isa/arm/neon/nv12_rgb.S
- modules/arm_neon/nv21_rgb.S → modules/isa/arm/neon/nv21_rgb.S
- modules/arm_neon/simple_channel_mixer.S → modules/isa/arm/neon/simple_channel_mixer.S
- modules/arm_neon/volume.c → modules/isa/arm/neon/volume.c
- modules/arm_neon/yuv_rgb.c → modules/isa/arm/neon/yuv_rgb.c
- modules/arm_neon/yuyv_i422.S → modules/isa/arm/neon/yuyv_i422.S
- modules/video_filter/deinterlace/merge_arm.S
- modules/video_filter/deinterlace/merge_arm64.S
- modules/video_filter/deinterlace/merge_sve.S
- po/POTFILES.in
Changes:
=====================================
modules/Makefile.am
=====================================
@@ -18,7 +18,6 @@ include access/Makefile.am
include access/http/Makefile.am
include access/rtp/Makefile.am
include access/rtp/test/Makefile.am
-include arm_neon/Makefile.am
include audio_filter/Makefile.am
include audio_mixer/Makefile.am
include audio_output/Makefile.am
@@ -32,6 +31,7 @@ include hw/d3d11/Makefile.am
include hw/vaapi/Makefile.am
include hw/vdpau/Makefile.am
include hw/mmal/Makefile.am
+include isa/arm/Makefile.am
include keystore/Makefile.am
include logger/Makefile.am
include lua/Makefile.am
=====================================
modules/audio_filter/Makefile.am
=====================================
@@ -72,7 +72,7 @@ libsimple_channel_mixer_plugin_la_LIBADD =
if HAVE_NEON
EXTRA_LTLIBRARIES += libsimple_channel_mixer_plugin_arm_neon.la
-libsimple_channel_mixer_plugin_arm_neon_la_SOURCES = arm_neon/simple_channel_mixer.S
+libsimple_channel_mixer_plugin_arm_neon_la_SOURCES = isa/arm/neon/simple_channel_mixer.S
# Intentionally leaving out AM_LDFLAGS from this one; it's not meant to be
# built like a plugin.
libsimple_channel_mixer_plugin_arm_neon_la_LDFLAGS = -static
=====================================
modules/arm_neon/Makefile.am → modules/isa/arm/Makefile.am
=====================================
@@ -1,24 +1,24 @@
neondir = $(pluginsdir)/arm_neon
libchroma_yuv_neon_plugin_la_SOURCES = \
- arm_neon/deinterleave_chroma.S \
- arm_neon/i420_yuyv.S \
- arm_neon/i422_yuyv.S \
- arm_neon/yuyv_i422.S \
- arm_neon/chroma_yuv.c arm_neon/chroma_neon.h
+ isa/arm/neon/deinterleave_chroma.S \
+ isa/arm/neon/i420_yuyv.S \
+ isa/arm/neon/i422_yuyv.S \
+ isa/arm/neon/yuyv_i422.S \
+ isa/arm/neon/chroma_yuv.c isa/arm/neon/chroma_neon.h
libchroma_yuv_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
libchroma_yuv_neon_plugin_LIBTOOLFLAGS = --tag=CC
-libvolume_neon_plugin_la_SOURCES = arm_neon/volume.c arm_neon/amplify.S
+libvolume_neon_plugin_la_SOURCES = isa/arm/neon/volume.c isa/arm/neon/amplify.S
libvolume_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
libvolume_neon_plugin_LIBTOOLFLAGS = --tag=CC
libyuv_rgb_neon_plugin_la_SOURCES = \
- arm_neon/i420_rgb.S \
- arm_neon/i420_rv16.S \
- arm_neon/nv21_rgb.S \
- arm_neon/nv12_rgb.S \
- arm_neon/yuv_rgb.c
+ isa/arm/neon/i420_rgb.S \
+ isa/arm/neon/i420_rv16.S \
+ isa/arm/neon/nv21_rgb.S \
+ isa/arm/neon/nv12_rgb.S \
+ isa/arm/neon/yuv_rgb.c
libyuv_rgb_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
libyuv_rgb_neon_plugin_LIBTOOLFLAGS = --tag=CC
@@ -29,4 +29,4 @@ neon_LTLIBRARIES = \
libyuv_rgb_neon_plugin.la
endif
-EXTRA_DIST += arm_neon/asm.S
+noinst_HEADERS += isa/arm/asm.S
=====================================
modules/arm_neon/asm.S → modules/isa/arm/asm.S
=====================================
=====================================
modules/arm_neon/amplify.S → modules/isa/arm/neon/amplify.S
=====================================
@@ -18,7 +18,7 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
-#include "asm.S"
+#include "../asm.S"
.syntax unified
#if HAVE_AS_FPU_DIRECTIVE
=====================================
modules/arm_neon/chroma_neon.h → modules/isa/arm/neon/chroma_neon.h
=====================================
=====================================
modules/arm_neon/chroma_yuv.c → modules/isa/arm/neon/chroma_yuv.c
=====================================
@@ -27,7 +27,7 @@
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_cpu.h>
-#include "arm_neon/chroma_neon.h"
+#include "chroma_neon.h"
static int Open (filter_t *);
=====================================
modules/arm_neon/deinterleave_chroma.S → modules/isa/arm/neon/deinterleave_chroma.S
=====================================
@@ -19,7 +19,7 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
-#include "asm.S"
+#include "../asm.S"
.syntax unified
#if HAVE_AS_FPU_DIRECTIVE
=====================================
modules/arm_neon/i420_rgb.S → modules/isa/arm/neon/i420_rgb.S
=====================================
@@ -19,7 +19,7 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
-#include "asm.S"
+#include "../asm.S"
.syntax unified
#if HAVE_AS_FPU_DIRECTIVE
=====================================
modules/arm_neon/i420_rv16.S → modules/isa/arm/neon/i420_rv16.S
=====================================
@@ -19,7 +19,7 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
-#include "asm.S"
+#include "../asm.S"
.syntax unified
#if HAVE_AS_FPU_DIRECTIVE
=====================================
modules/arm_neon/i420_yuyv.S → modules/isa/arm/neon/i420_yuyv.S
=====================================
@@ -18,7 +18,7 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
-#include "asm.S"
+#include "../asm.S"
.syntax unified
#if HAVE_AS_FPU_DIRECTIVE
=====================================
modules/arm_neon/i422_yuyv.S → modules/isa/arm/neon/i422_yuyv.S
=====================================
@@ -18,7 +18,7 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
-#include "asm.S"
+#include "../asm.S"
.syntax unified
#if HAVE_AS_FPU_DIRECTIVE
=====================================
modules/arm_neon/nv12_rgb.S → modules/isa/arm/neon/nv12_rgb.S
=====================================
@@ -19,7 +19,7 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
-#include "asm.S"
+#include "../asm.S"
.syntax unified
#if HAVE_AS_FPU_DIRECTIVE
=====================================
modules/arm_neon/nv21_rgb.S → modules/isa/arm/neon/nv21_rgb.S
=====================================
@@ -19,7 +19,7 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
-#include "asm.S"
+#include "../asm.S"
.syntax unified
#if HAVE_AS_FPU_DIRECTIVE
=====================================
modules/arm_neon/simple_channel_mixer.S → modules/isa/arm/neon/simple_channel_mixer.S
=====================================
@@ -19,7 +19,7 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
-#include "asm.S"
+#include "../asm.S"
#if HAVE_AS_FPU_DIRECTIVE
.fpu neon
=====================================
modules/arm_neon/volume.c → modules/isa/arm/neon/volume.c
=====================================
=====================================
modules/arm_neon/yuv_rgb.c → modules/isa/arm/neon/yuv_rgb.c
=====================================
@@ -28,7 +28,7 @@
#include <vlc_filter.h>
#include <vlc_picture.h>
#include <vlc_cpu.h>
-#include "arm_neon/chroma_neon.h"
+#include "chroma_neon.h"
static int Open (filter_t *);
=====================================
modules/arm_neon/yuyv_i422.S → modules/isa/arm/neon/yuyv_i422.S
=====================================
@@ -18,7 +18,7 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
-#include "asm.S"
+#include "../asm.S"
.syntax unified
#if HAVE_AS_FPU_DIRECTIVE
=====================================
modules/video_filter/deinterlace/merge_arm.S
=====================================
@@ -18,7 +18,7 @@
@ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
@****************************************************************************/
-#include "../../arm_neon/asm.S"
+#include "../../isa/arm/asm.S"
.syntax unified
#if HAVE_AS_ARCH_DIRECTIVE
=====================================
modules/video_filter/deinterlace/merge_arm64.S
=====================================
@@ -19,7 +19,7 @@
// Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
//****************************************************************************/
-#include "../../arm_neon/asm.S"
+#include "../../isa/arm/asm.S"
.arch armv8-a+simd
.text
=====================================
modules/video_filter/deinterlace/merge_sve.S
=====================================
@@ -18,7 +18,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include "../../arm_neon/asm.S"
+#include "../../isa/arm/asm.S"
.arch armv8-a+sve
=====================================
po/POTFILES.in
=====================================
@@ -222,9 +222,6 @@ modules/access_output/livehttp.c
modules/access_output/rist.c
modules/access_output/shout.c
modules/access_output/srt.c
-modules/arm_neon/chroma_yuv.c
-modules/arm_neon/volume.c
-modules/arm_neon/yuv_rgb.c
modules/audio_filter/audiobargraph_a.c
modules/audio_filter/channel_mixer/dolby.c
modules/audio_filter/channel_mixer/headphone.c
@@ -1134,6 +1131,9 @@ modules/hw/vdpau/chroma.c
modules/hw/vdpau/deinterlace.c
modules/hw/vdpau/display.c
modules/hw/vdpau/sharpen.c
+modules/isa/arm/neon/chroma_yuv.c
+modules/isa/arm/neon/volume.c
+modules/isa/arm/neon/yuv_rgb.c
modules/keystore/file.c
modules/keystore/keychain.m
modules/keystore/kwallet.c
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2bb3ae82dade33739cc1e71c403bd3bb2dd41243
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/2bb3ae82dade33739cc1e71c403bd3bb2dd41243
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list