X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmisc%2Fcpu.c;h=eca79b5911178ec05fd82c46f7c368b4c7d83ff7;hb=3d9656b6cf4c629c8031125f869ce3b5a1f48e2d;hp=69b471b2ca9444ca4dbae65c2679107b128d03db;hpb=f942343d3a8b13578c882c4d4c6a1e74adb19384;p=vlc diff --git a/src/misc/cpu.c b/src/misc/cpu.c index 69b471b2ca..eca79b5911 100644 --- a/src/misc/cpu.c +++ b/src/misc/cpu.c @@ -1,26 +1,26 @@ /***************************************************************************** * cpu.c: CPU detection code ***************************************************************************** - * Copyright (C) 1998-2004 the VideoLAN team + * Copyright (C) 1998-2004 VLC authors and VideoLAN * $Id$ * * Authors: Samuel Hocevar * Christophe Massiot * Eugenio Jarosiewicz * - * This program 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 + * This program 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. * * This program 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. + * 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 General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -32,64 +32,90 @@ #include #include +#include "libvlc.h" + +#include +#ifndef __linux__ #include -#ifndef WIN32 +#ifndef _WIN32 #include #include #include #else #include #endif -#include #ifdef __APPLE__ #include #endif +#ifdef __ANDROID__ +#include +#endif -#include "libvlc.h" +#if defined(__OpenBSD__) && defined(__powerpc__) +#include +#include +#include +#endif static uint32_t cpu_flags; -#if defined( __i386__ ) || defined( __x86_64__ ) || defined( __powerpc__ ) \ - || defined( __ppc__ ) || defined( __ppc64__ ) || defined( __powerpc64__ ) -# if !defined( WIN32 ) && !defined( __OS2__ ) -static bool check_OS_capability( const char *psz_capability, pid_t pid ) +#if defined (__i386__) || defined (__x86_64__) || defined (__powerpc__) \ + || defined (__ppc__) || defined (__ppc64__) || defined (__powerpc64__) +# if !defined (_WIN32) && !defined (__OS2__) +static bool vlc_CPU_check (const char *name, void (*func) (void)) { - int status; + pid_t pid = fork(); - if( pid == -1 ) - return false; /* fail safe :-/ */ + switch (pid) + { + case 0: + signal (SIGILL, SIG_DFL); + func (); + //__asm__ __volatile__ ( code : : input ); + _exit (0); + case -1: + return false; + } + //i_capabilities |= (flag); + int status; while( waitpid( pid, &status, 0 ) == -1 ); if( WIFEXITED( status ) && WEXITSTATUS( status ) == 0 ) return true; - fprintf( stderr, "warning: your CPU has %s instructions, but not your " - "operating system.\n", psz_capability ); + fprintf (stderr, "Warning: your CPU has %s instructions, but not your " + "operating system.\n", name); fprintf( stderr, " some optimizations will be disabled unless " "you upgrade your OS\n" ); return false; } -# define check_capability(name, flag, code, input) \ - do { \ - pid_t pid = fork(); \ - if( pid == 0 ) \ - { \ - signal(SIGILL, SIG_DFL); \ - __asm__ __volatile__ ( code : : input ); \ - _exit(0); \ - } \ - if( check_OS_capability((name), pid )) \ - i_capabilities |= (flag); \ - } while(0) - -# else /* WIN32 || __OS2__ */ -# define check_capability(name, flag, code, input) \ - i_capabilities |= (flag); -# endif +#if defined (CAN_COMPILE_SSE) && !defined (__SSE__) +VLC_SSE static void SSE_test (void) +{ + asm volatile ("xorps %%xmm0,%%xmm0\n" : : : "xmm0", "xmm1"); +} +#endif +#if defined (CAN_COMPILE_3DNOW) +VLC_MMX static void ThreeD_Now_test (void) +{ + asm volatile ("pfadd %%mm0,%%mm0\n" "femms\n" : : : "mm0"); +} +#endif + +#if defined (CAN_COMPILE_ALTIVEC) +static void Altivec_test (void) +{ + asm volatile ("mtspr 256, %0\n" "vand %%v0, %%v0, %%v0\n" : : "r" (-1)); +} +#endif + +#else /* _WIN32 || __OS2__ */ +# define vlc_CPU_check(name, func) (1) +#endif #endif /** @@ -165,61 +191,27 @@ void vlc_CPU_init (void) if( ! (i_edx & 0x00800000) ) goto out; # endif - i_capabilities |= CPU_CAPABILITY_MMX; + i_capabilities |= VLC_CPU_MMX; -# if defined (__SSE__) - i_capabilities |= CPU_CAPABILITY_MMXEXT | CPU_CAPABILITY_SSE; -# else if( i_edx & 0x02000000 ) + i_capabilities |= VLC_CPU_MMXEXT; +# if defined (CAN_COMPILE_SSE) && !defined (__SSE__) + if (( i_edx & 0x02000000 ) && vlc_CPU_check ("SSE", SSE_test)) +# endif { - i_capabilities |= CPU_CAPABILITY_MMXEXT; - -# ifdef CAN_COMPILE_SSE - check_capability( "SSE", CPU_CAPABILITY_SSE, - "xorps %%xmm0,%%xmm0\n", ); -# endif + /*if( i_edx & 0x02000000 )*/ + i_capabilities |= VLC_CPU_SSE; + if (i_edx & 0x04000000) + i_capabilities |= VLC_CPU_SSE2; + if (i_ecx & 0x00000001) + i_capabilities |= VLC_CPU_SSE3; + if (i_ecx & 0x00000200) + i_capabilities |= VLC_CPU_SSSE3; + if (i_ecx & 0x00080000) + i_capabilities |= VLC_CPU_SSE4_1; + if (i_ecx & 0x00100000) + i_capabilities |= VLC_CPU_SSE4_2; } -# endif - -# if defined (__SSE2__) - i_capabilities |= CPU_CAPABILITY_SSE2; -# elif defined (CAN_COMPILE_SSE2) - if( i_edx & 0x04000000 ) - check_capability( "SSE2", CPU_CAPABILITY_SSE2, - "movupd %%xmm0, %%xmm0\n", ); -# endif - -# if defined (__SSE3__) - i_capabilities |= CPU_CAPABILITY_SSE3; -# elif defined (CAN_COMPILE_SSE3) - if( i_ecx & 0x00000001 ) - check_capability( "SSE3", CPU_CAPABILITY_SSE3, - "movsldup %%xmm1, %%xmm0\n", ); -# endif - -# if defined (__SSSE3__) - i_capabilities |= CPU_CAPABILITY_SSSE3; -# elif defined (CAN_COMPILE_SSSE3) - if( i_ecx & 0x00000200 ) - check_capability( "SSSE3", CPU_CAPABILITY_SSSE3, - "pabsw %%xmm1, %%xmm0\n", ); -# endif - -# if defined (__SSE4_1__) - i_capabilities |= CPU_CAPABILITY_SSE4_1; -# elif defined (CAN_COMPILE_SSE4_1) - if( i_ecx & 0x00080000 ) - check_capability( "SSE4.1", CPU_CAPABILITY_SSE4_1, - "pmaxsb %%xmm1, %%xmm0\n", ); -# endif - -# if defined (__SSE4_2__) - i_capabilities |= CPU_CAPABILITY_SSE4_2; -# elif defined (CAN_COMPILE_SSE4_2) - if( i_ecx & 0x00100000 ) - check_capability( "SSE4.2", CPU_CAPABILITY_SSE4_2, - "pcmpgtq %%xmm1, %%xmm0\n", ); -# endif /* test for additional capabilities */ cpuid( 0x80000000 ); @@ -230,59 +222,15 @@ void vlc_CPU_init (void) /* list these additional capabilities */ cpuid( 0x80000001 ); -# if defined (__3dNOW__) - i_capabilities |= CPU_CAPABILITY_3DNOW; -# elif defined (CAN_COMPILE_3DNOW) - if( i_edx & 0x80000000 ) - check_capability( "3D Now!", CPU_CAPABILITY_3DNOW, - "pfadd %%mm0,%%mm0\n" "femms\n", ); +# if defined (CAN_COMPILE_3DNOW) && !defined (__3dNOW__) + if ((i_edx & 0x80000000) && vlc_CPU_check ("3D Now!", ThreeD_Now_test)) # endif + i_capabilities |= VLC_CPU_3dNOW; if( b_amd && ( i_edx & 0x00400000 ) ) - { - i_capabilities |= CPU_CAPABILITY_MMXEXT; - } + i_capabilities |= VLC_CPU_MMXEXT; out: -#elif defined (__arm__) - -# if defined (__ARM_NEON__) - i_capabilities |= CPU_CAPABILITY_NEON; -# elif defined (CAN_COMPILE_NEON) -# define NEED_RUNTIME_CPU_CHECK 1 -# endif - -# ifdef NEED_RUNTIME_CPU_CHECK -# if defined (__linux__) - FILE *info = fopen ("/proc/cpuinfo", "rt"); - if (info != NULL) - { - char *line = NULL; - size_t linelen = 0; - - while (getline (&line, &linelen, info) != -1) - { - const char *cap; - - if (strncmp (line, "Features\t:", 10)) - continue; - - /* TODO: detect other CPU features when we use them */ -# if defined (CAN_COMPILE_NEON) && !defined (__ARM_NEON__) - cap = strstr (line + 10, " neon"); - if (cap != NULL && (cap[5] == '\0' || cap[5] == ' ')) - i_capabilities |= CPU_CAPABILITY_NEON; -# endif - break; - } - fclose (info); - free (line); - } -# else -# warning Run-time CPU detection missing: optimizations disabled! -# endif -# endif - #elif defined( __powerpc__ ) || defined( __ppc__ ) || defined( __powerpc64__ ) \ || defined( __ppc64__ ) @@ -297,16 +245,20 @@ out: int i_error = sysctl( selectors, 2, &i_has_altivec, &i_length, NULL, 0); if( i_error == 0 && i_has_altivec != 0 ) - i_capabilities |= CPU_CAPABILITY_ALTIVEC; + i_capabilities |= VLC_CPU_ALTIVEC; # elif defined( CAN_COMPILE_ALTIVEC ) - check_capability( "Altivec", CPU_CAPABILITY_ALTIVEC, - "mtspr 256, %0\n\t" - "vand %%v0, %%v0, %%v0", - "r" (-1)); + if (vlc_CPU_check ("Altivec", Altivec_test)) + i_capabilities |= VLC_CPU_ALTIVEC; # endif +#elif defined ( __arm__) +# ifdef __ANDROID__ + if (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) + i_capabilities |= VLC_CPU_ARM_NEON; +# endif + #endif cpu_flags = i_capabilities; @@ -319,39 +271,39 @@ unsigned vlc_CPU (void) { /* On Windows and OS/2, * initialized from DllMain() and _DLL_InitTerm() respectively, instead */ -#if !defined(WIN32) && !defined(__OS2__) +#if !defined(_WIN32) && !defined(__OS2__) static pthread_once_t once = PTHREAD_ONCE_INIT; pthread_once (&once, vlc_CPU_init); #endif return cpu_flags; } +#endif void vlc_CPU_dump (vlc_object_t *obj) { - const unsigned flags = vlc_CPU(); char buf[200], *p = buf; -#define PRINT_CAPABILITY( capability, string ) \ - if (flags & (capability)) \ - p += sprintf (p, "%s ", (string) ) - #if defined (__i386__) || defined (__x86_64__) - PRINT_CAPABILITY(CPU_CAPABILITY_MMX, "MMX"); - PRINT_CAPABILITY(CPU_CAPABILITY_3DNOW, "3DNow!"); - PRINT_CAPABILITY(CPU_CAPABILITY_MMXEXT, "MMXEXT"); - PRINT_CAPABILITY(CPU_CAPABILITY_SSE, "SSE"); - PRINT_CAPABILITY(CPU_CAPABILITY_SSE2, "SSE2"); - PRINT_CAPABILITY(CPU_CAPABILITY_SSE3, "SSE3"); - PRINT_CAPABILITY(CPU_CAPABILITY_SSSE3, "SSSE3"); - PRINT_CAPABILITY(CPU_CAPABILITY_SSE4_1, "SSE4.1"); - PRINT_CAPABILITY(CPU_CAPABILITY_SSE4_2, "SSE4.2"); - PRINT_CAPABILITY(CPU_CAPABILITY_SSE4A, "SSE4A"); + if (vlc_CPU_MMX()) p += sprintf (p, "MMX "); + if (vlc_CPU_MMXEXT()) p += sprintf (p, "MMXEXT "); + if (vlc_CPU_SSE()) p += sprintf (p, "SSE "); + if (vlc_CPU_SSE2()) p += sprintf (p, "SSE2 "); + if (vlc_CPU_SSE3()) p += sprintf (p, "SSE3 "); + if (vlc_CPU_SSSE3()) p += sprintf (p, "SSSE3 "); + if (vlc_CPU_SSE4_1()) p += sprintf (p, "SSE4.1 "); + if (vlc_CPU_SSE4_2()) p += sprintf (p, "SSE4.2 "); + if (vlc_CPU_SSE4A()) p += sprintf (p, "SSE4A "); + if (vlc_CPU_AVX()) p += sprintf (p, "AVX "); + if (vlc_CPU_AVX2()) p += sprintf (p, "AVX "); + if (vlc_CPU_3dNOW()) p += sprintf (p, "3DNow! "); + if (vlc_CPU_XOP()) p += sprintf (p, "XOP "); + if (vlc_CPU_FMA4()) p += sprintf (p, "FMA4 "); #elif defined (__powerpc__) || defined (__ppc__) || defined (__ppc64__) - PRINT_CAPABILITY(CPU_CAPABILITY_ALTIVEC, "AltiVec"); + if (vlc_CPU_ALTIVEC()) p += sprintf (p, "AltiVec"); #elif defined (__arm__) - PRINT_CAPABILITY(CPU_CAPABILITY_NEON, "NEONv1"); + if (vlc_CPU_ARM_NEON()) p += sprintf (p, "ARM_NEON "); #endif @@ -362,20 +314,3 @@ void vlc_CPU_dump (vlc_object_t *obj) if (p > buf) msg_Dbg (obj, "CPU has capabilities %s", buf); } - - -static vlc_memcpy_t pf_vlc_memcpy = memcpy; - -void vlc_fastmem_register (vlc_memcpy_t cpy) -{ - assert (cpy != NULL); - pf_vlc_memcpy = cpy; -} - -/** - * vlc_memcpy: fast CPU-dependent memcpy - */ -void *vlc_memcpy (void *tgt, const void *src, size_t n) -{ - return pf_vlc_memcpy (tgt, src, n); -}