[vlc-commits] [Git][videolan/vlc][master] 5 commits: cpu: reorder alphabetically

Jean-Baptiste Kempf (@jbk) gitlab at videolan.org
Fri Dec 26 09:33:22 UTC 2025



Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
07ceabfc by Rémi Denis-Courmont at 2025-12-26T10:17:10+01:00
cpu: reorder alphabetically

No functional changes.

- - - - -
38282c38 by Rémi Denis-Courmont at 2025-12-26T10:17:10+01:00
riscv: add missing HAVE_FPU

- - - - -
211e16d0 by Rémi Denis-Courmont at 2025-12-26T10:17:10+01:00
mips: explicitly set HAVE_FPU always

- - - - -
cc8a11d4 by Rémi Denis-Courmont at 2025-12-26T10:17:10+01:00
loongarch: set HAVE_FPU

- - - - -
f58357e7 by Rémi Denis-Courmont at 2025-12-26T10:17:10+01:00
cpu: HAVE_FPU by default

At this point, this seems more reasonable.

- - - - -


1 changed file:

- include/vlc_cpu.h


Changes:

=====================================
include/vlc_cpu.h
=====================================
@@ -41,57 +41,60 @@ VLC_API unsigned vlc_CPU(void);
  */
 unsigned vlc_CPU_raw(void);
 
-# if defined (__i386__) || defined (__x86_64__)
+# if defined (__aarch64__)
 #  define HAVE_FPU 1
-#  define VLC_CPU_SSE2   0x00000080
-#  define VLC_CPU_SSE3   0x00000100
-#  define VLC_CPU_SSSE3  0x00000200
-#  define VLC_CPU_SSE4_1 0x00000400
-#  define VLC_CPU_AVX    0x00002000
-#  define VLC_CPU_AVX2   0x00004000
+#  define VLC_CPU_ARM_NEON 0x1
+#  define VLC_CPU_ARM_SVE  0x2
 
-#  if defined (__SSE__)
-#   define VLC_SSE
+#  ifdef __ARM_NEON
+#   define vlc_CPU_ARM_NEON() (1)
 #  else
-#   define VLC_SSE __attribute__ ((__target__ ("sse")))
+#   define vlc_CPU_ARM_NEON() ((vlc_CPU() & VLC_CPU_ARM_NEON) != 0)
 #  endif
 
-#  ifdef __SSE2__
-#   define vlc_CPU_SSE2() (1)
+#  ifdef __ARM_FEATURE_SVE
+#   define vlc_CPU_ARM_SVE()   (1)
 #  else
-#   define vlc_CPU_SSE2() ((vlc_CPU() & VLC_CPU_SSE2) != 0)
+#   define vlc_CPU_ARM_SVE()   ((vlc_CPU() & VLC_CPU_ARM_SVE) != 0)
 #  endif
 
-#  ifdef __SSE3__
-#   define vlc_CPU_SSE3() (1)
+# elif defined (__arm__)
+#  if defined (__VFP_FP__) && !defined (__SOFTFP__)
+#   define HAVE_FPU 1
 #  else
-#   define vlc_CPU_SSE3() ((vlc_CPU() & VLC_CPU_SSE3) != 0)
+#   define HAVE_FPU 0
 #  endif
+#  define VLC_CPU_ARMv6    4
+#  define VLC_CPU_ARM_NEON 2
 
-#  ifdef __SSSE3__
-#   define vlc_CPU_SSSE3() (1)
+#  if defined (__ARM_ARCH_7A__)
+#   define VLC_CPU_ARM_ARCH 7
+#  elif defined (__ARM_ARCH_6__) || defined (__ARM_ARCH_6T2__)
+#   define VLC_CPU_ARM_ARCH 6
 #  else
-#   define vlc_CPU_SSSE3() ((vlc_CPU() & VLC_CPU_SSSE3) != 0)
+#   define VLC_CPU_ARM_ARCH 4
 #  endif
 
-#  ifdef __SSE4_1__
-#   define vlc_CPU_SSE4_1() (1)
+#  if (VLC_CPU_ARM_ARCH >= 6)
+#   define vlc_CPU_ARMv6() (1)
 #  else
-#   define vlc_CPU_SSE4_1() ((vlc_CPU() & VLC_CPU_SSE4_1) != 0)
+#   define vlc_CPU_ARMv6() ((vlc_CPU() & VLC_CPU_ARMv6) != 0)
 #  endif
 
-#  ifdef __AVX__
-#   define vlc_CPU_AVX() (1)
-#   define VLC_AVX
+#  ifdef __ARM_NEON__
+#   define vlc_CPU_ARM_NEON() (1)
 #  else
-#   define vlc_CPU_AVX() ((vlc_CPU() & VLC_CPU_AVX) != 0)
-#   define VLC_AVX __attribute__ ((__target__ ("avx")))
+#   define vlc_CPU_ARM_NEON() ((vlc_CPU() & VLC_CPU_ARM_NEON) != 0)
 #  endif
 
-#  ifdef __AVX2__
-#   define vlc_CPU_AVX2() (1)
+# elif defined (__loongarch__)
+#  define HAVE_FPU 1
+
+# elif defined (__mips)
+#  if defined (__mips_hard_float)
+#   define HAVE_FPU 1
 #  else
-#   define vlc_CPU_AVX2() ((vlc_CPU() & VLC_CPU_AVX2) != 0)
+#   define HAVE_FPU 0
 #  endif
 
 # elif defined (__ppc__) || defined (__ppc64__) || defined (__powerpc__)
@@ -106,76 +109,82 @@ unsigned vlc_CPU_raw(void);
 #   define VLC_ALTIVEC __attribute__ ((__target__ ("altivec")))
 #  endif
 
-# elif defined (__arm__)
-#  if defined (__VFP_FP__) && !defined (__SOFTFP__)
+# elif defined (__riscv)
+#  ifdef __riscv_f
 #   define HAVE_FPU 1
 #  else
 #   define HAVE_FPU 0
 #  endif
-#  define VLC_CPU_ARMv6    4
-#  define VLC_CPU_ARM_NEON 2
+#  define VLC_CPU_RV_V 0x1
+#  define VLC_CPU_RV_B 0x2
 
-#  if defined (__ARM_ARCH_7A__)
-#   define VLC_CPU_ARM_ARCH 7
-#  elif defined (__ARM_ARCH_6__) || defined (__ARM_ARCH_6T2__)
-#   define VLC_CPU_ARM_ARCH 6
+#  ifdef __riscv_v
+#   define vlc_CPU_RV_V() (1)
 #  else
-#   define VLC_CPU_ARM_ARCH 4
+#   define vlc_CPU_RV_V() ((vlc_CPU() & VLC_CPU_RV_V) != 0)
 #  endif
 
-#  if (VLC_CPU_ARM_ARCH >= 6)
-#   define vlc_CPU_ARMv6() (1)
+#  if (defined (__riscv_b) || (defined (__riscv_zba) && defined (__riscv_zbb) \
+                            && defined (__riscv_zbs)))
+#   define vlc_CPU_RV_B() (1)
 #  else
-#   define vlc_CPU_ARMv6() ((vlc_CPU() & VLC_CPU_ARMv6) != 0)
+#   define vlc_CPU_RV_B() ((vlc_CPU() & VLC_CPU_RV_B) != 0)
 #  endif
 
-#  ifdef __ARM_NEON__
-#   define vlc_CPU_ARM_NEON() (1)
-#  else
-#   define vlc_CPU_ARM_NEON() ((vlc_CPU() & VLC_CPU_ARM_NEON) != 0)
-#  endif
+# elif defined (__sparc__)
+#  define HAVE_FPU 1
 
-# elif defined (__aarch64__)
+# elif  defined (__x86_64__) || defined (__i386__)
 #  define HAVE_FPU 1
-#  define VLC_CPU_ARM_NEON 0x1
-#  define VLC_CPU_ARM_SVE  0x2
+#  define VLC_CPU_SSE2   0x00000080
+#  define VLC_CPU_SSE3   0x00000100
+#  define VLC_CPU_SSSE3  0x00000200
+#  define VLC_CPU_SSE4_1 0x00000400
+#  define VLC_CPU_AVX    0x00002000
+#  define VLC_CPU_AVX2   0x00004000
 
-#  ifdef __ARM_NEON
-#   define vlc_CPU_ARM_NEON() (1)
+#  if defined (__SSE__)
+#   define VLC_SSE
 #  else
-#   define vlc_CPU_ARM_NEON() ((vlc_CPU() & VLC_CPU_ARM_NEON) != 0)
+#   define VLC_SSE __attribute__ ((__target__ ("sse")))
 #  endif
 
-#  ifdef __ARM_FEATURE_SVE
-#   define vlc_CPU_ARM_SVE()   (1)
+#  ifdef __SSE2__
+#   define vlc_CPU_SSE2() (1)
 #  else
-#   define vlc_CPU_ARM_SVE()   ((vlc_CPU() & VLC_CPU_ARM_SVE) != 0)
+#   define vlc_CPU_SSE2() ((vlc_CPU() & VLC_CPU_SSE2) != 0)
 #  endif
 
-# elif defined (__sparc__)
-#  define HAVE_FPU 1
+#  ifdef __SSE3__
+#   define vlc_CPU_SSE3() (1)
+#  else
+#   define vlc_CPU_SSE3() ((vlc_CPU() & VLC_CPU_SSE3) != 0)
+#  endif
 
-# elif defined (__mips_hard_float)
-#  define HAVE_FPU 1
+#  ifdef __SSSE3__
+#   define vlc_CPU_SSSE3() (1)
+#  else
+#   define vlc_CPU_SSSE3() ((vlc_CPU() & VLC_CPU_SSSE3) != 0)
+#  endif
 
-# elif defined (__riscv)
-#  ifdef __riscv_flen
-#   define HAVE_FPU 1
+#  ifdef __SSE4_1__
+#   define vlc_CPU_SSE4_1() (1)
+#  else
+#   define vlc_CPU_SSE4_1() ((vlc_CPU() & VLC_CPU_SSE4_1) != 0)
 #  endif
-#  define VLC_CPU_RV_V 0x1
-#  define VLC_CPU_RV_B 0x2
 
-#  ifdef __riscv_v
-#   define vlc_CPU_RV_V() (1)
+#  ifdef __AVX__
+#   define vlc_CPU_AVX() (1)
+#   define VLC_AVX
 #  else
-#   define vlc_CPU_RV_V() ((vlc_CPU() & VLC_CPU_RV_V) != 0)
+#   define vlc_CPU_AVX() ((vlc_CPU() & VLC_CPU_AVX) != 0)
+#   define VLC_AVX __attribute__ ((__target__ ("avx")))
 #  endif
 
-#  if (defined (__riscv_b) || (defined (__riscv_zba) && defined (__riscv_zbb) \
-                            && defined (__riscv_zbs)))
-#   define vlc_CPU_RV_B() (1)
+#  ifdef __AVX2__
+#   define vlc_CPU_AVX2() (1)
 #  else
-#   define vlc_CPU_RV_B() ((vlc_CPU() & VLC_CPU_RV_B) != 0)
+#   define vlc_CPU_AVX2() ((vlc_CPU() & VLC_CPU_AVX2) != 0)
 #  endif
 
 # else
@@ -184,7 +193,7 @@ unsigned vlc_CPU_raw(void);
  * If this preprocessor constant is zero, floating point should be avoided
  * (especially relevant for audio codecs).
  */
-#  define HAVE_FPU 0
+#  define HAVE_FPU 1
 
 # endif
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b71bd03233a6a9392c906a22345041a9447bc49a...f58357e7eaebb8ab8a4f530b93f1155281f71a5a

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b71bd03233a6a9392c906a22345041a9447bc49a...f58357e7eaebb8ab8a4f530b93f1155281f71a5a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance


More information about the vlc-commits mailing list