mirror of
https://github.com/libretro/RetroArch
synced 2025-02-14 06:40:48 +00:00
(PC/Linux) performance_android.c works for PC Linux too - refactor as
performance_linux and compile it in for Linux build (but don't yet use it)
This commit is contained in:
twinaphex
parent
85f6ddc4ae
commit
b0e4ca599c
2
Makefile
2
Makefile
@ -56,7 +56,7 @@ endif
|
||||
|
||||
ifneq ($(findstring Linux,$(OS)),)
|
||||
LIBS += -lrt
|
||||
OBJ += input/linuxraw_input.o input/linuxraw_joypad.o
|
||||
OBJ += input/linuxraw_input.o input/linuxraw_joypad.o performance/performance_linux.o
|
||||
JOYCONFIG_OBJ += input/linuxraw_joypad.o
|
||||
endif
|
||||
|
||||
|
||||
@ -55,7 +55,7 @@ LOCAL_SRC_FILES = $(RARCH_PATH)/retroarch.c \
|
||||
$(RARCH_PATH)/conf/config_file.c \
|
||||
$(RARCH_PATH)/autosave.c \
|
||||
$(RARCH_PATH)/thread.c \
|
||||
$(RARCH_PATH)/performance/performance_android.c \
|
||||
$(RARCH_PATH)/performance/performance_linux.c \
|
||||
main.c
|
||||
|
||||
ifeq ($(PERF_TEST), 1)
|
||||
|
||||
@ -261,7 +261,6 @@ void android_main(struct android_app* state)
|
||||
}
|
||||
}
|
||||
|
||||
RARCH_LOG("Checking CPU features...\n");
|
||||
rarch_perf_get_cpu_features();
|
||||
|
||||
RARCH_LOG("Starting RetroArch...\n");
|
||||
|
||||
@ -23,8 +23,8 @@
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef ANDROID
|
||||
#include "performance/performance_android.h"
|
||||
#ifdef __linux
|
||||
#include "performance/performance_linux.h"
|
||||
#endif
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
@ -42,15 +42,20 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifdef ANDROID
|
||||
#include <sys/system_properties.h>
|
||||
#endif
|
||||
#ifdef __arm__
|
||||
#include <machine/cpu-features.h>
|
||||
#endif
|
||||
#include "performance_android.h"
|
||||
#include "performance_linux.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include "../general.h"
|
||||
#include "../retroarch_logger.h"
|
||||
|
||||
static unsigned g_cpuFamily;
|
||||
@ -58,11 +63,11 @@ static uint64_t g_cpuFeatures;
|
||||
static unsigned g_cpuCount;
|
||||
|
||||
#ifdef __arm__
|
||||
# define DEFAULT_CPU_FAMILY ANDROID_CPU_FAMILY_ARM
|
||||
# define DEFAULT_CPU_FAMILY CPU_FAMILY_ARM
|
||||
#elif defined __i386__
|
||||
# define DEFAULT_CPU_FAMILY ANDROID_CPU_FAMILY_X86
|
||||
# define DEFAULT_CPU_FAMILY CPU_FAMILY_X86
|
||||
#else
|
||||
# define DEFAULT_CPU_FAMILY ANDROID_CPU_FAMILY_UNKNOWN
|
||||
# define DEFAULT_CPU_FAMILY CPU_FAMILY_UNKNOWN
|
||||
#endif
|
||||
|
||||
#ifdef __i386__
|
||||
@ -236,6 +241,7 @@ static int get_cpu_count(void)
|
||||
return __builtin_popcount(*cpus_present);
|
||||
}
|
||||
|
||||
#ifdef __ARM_ARCH__
|
||||
/* Extract the content of a the first occurence of a given field in
|
||||
* the content of /proc/cpuinfo and return it as a heap-allocated
|
||||
* string that must be freed by the caller.
|
||||
@ -247,7 +253,7 @@ static char* extract_cpuinfo_field(char* buffer, int buflen, const char* field)
|
||||
int fieldlen = strlen(field);
|
||||
char* bufend = buffer + buflen;
|
||||
char* result = NULL;
|
||||
int len, ignore;
|
||||
int len;
|
||||
const char *p, *q;
|
||||
|
||||
/* Look for first field occurence, and ensures it starts the line.
|
||||
@ -324,6 +330,7 @@ static int has_list_item(const char* list, const char* item)
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void rarch_perf_init_cpu(void)
|
||||
{
|
||||
@ -407,11 +414,11 @@ static void rarch_perf_init_cpu(void)
|
||||
}
|
||||
|
||||
if (hasARMv7)
|
||||
g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_ARMv7;
|
||||
g_cpuFeatures |= CPU_ARM_FEATURE_ARMv7;
|
||||
|
||||
/* The LDREX / STREX instructions are available from ARMv6 */
|
||||
if (archNumber >= 6)
|
||||
g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_LDREX_STREX;
|
||||
g_cpuFeatures |= CPU_ARM_FEATURE_LDREX_STREX;
|
||||
|
||||
free(cpuArch);
|
||||
}
|
||||
@ -424,10 +431,10 @@ static void rarch_perf_init_cpu(void)
|
||||
RARCH_LOG("found cpuFeatures = '%s'\n", cpuFeatures);
|
||||
|
||||
if (has_list_item(cpuFeatures, "vfpv3"))
|
||||
g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_VFPv3;
|
||||
g_cpuFeatures |= CPU_ARM_FEATURE_VFPv3;
|
||||
|
||||
else if (has_list_item(cpuFeatures, "vfpv3d16"))
|
||||
g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_VFPv3;
|
||||
g_cpuFeatures |= CPU_ARM_FEATURE_VFPv3;
|
||||
|
||||
if (has_list_item(cpuFeatures, "neon"))
|
||||
{
|
||||
@ -436,15 +443,14 @@ static void rarch_perf_init_cpu(void)
|
||||
* that if Neon is implemented, so must be VFPv3
|
||||
* so always set the flag.
|
||||
*/
|
||||
g_cpuFeatures |= ANDROID_CPU_ARM_FEATURE_NEON |
|
||||
ANDROID_CPU_ARM_FEATURE_VFPv3;
|
||||
g_cpuFeatures |= CPU_ARM_FEATURE_NEON | CPU_ARM_FEATURE_VFPv3;
|
||||
}
|
||||
free(cpuFeatures);
|
||||
}
|
||||
#endif /* __ARM_ARCH__ */
|
||||
|
||||
#ifdef __i386__
|
||||
g_cpuFamily = ANDROID_CPU_FAMILY_X86;
|
||||
g_cpuFamily = CPU_FAMILY_X86;
|
||||
|
||||
int regs[4];
|
||||
|
||||
@ -460,17 +466,17 @@ static void rarch_perf_init_cpu(void)
|
||||
|
||||
x86_cpuid(1, regs);
|
||||
if ((regs[2] & (1 << 9)) != 0)
|
||||
g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_SSE3;
|
||||
g_cpuFeatures |= CPU_X86_FEATURE_SSE3;
|
||||
|
||||
if ((regs[2] & (1 << 23)) != 0)
|
||||
g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_POPCNT;
|
||||
g_cpuFeatures |= CPU_X86_FEATURE_POPCNT;
|
||||
|
||||
if (vendorIsIntel && (regs[2] & (1 << 22)) != 0)
|
||||
g_cpuFeatures |= ANDROID_CPU_X86_FEATURE_MOVBE;
|
||||
g_cpuFeatures |= CPU_X86_FEATURE_MOVBE;
|
||||
#endif
|
||||
|
||||
#ifdef _MIPS_ARCH
|
||||
g_cpuFamily = ANDROID_CPU_FAMILY_MIPS;
|
||||
g_cpuFamily = CPU_FAMILY_MIPS;
|
||||
#endif /* _MIPS_ARCH */
|
||||
}
|
||||
|
||||
@ -482,7 +488,13 @@ unsigned rarch_perf_get_cpu_family(void)
|
||||
|
||||
uint64_t rarch_perf_get_cpu_features(void)
|
||||
{
|
||||
g_extern.verbose = true;
|
||||
|
||||
RARCH_LOG("Checking CPU features...\n");
|
||||
|
||||
rarch_perf_init_cpu();
|
||||
|
||||
g_extern.verbose = false;
|
||||
return g_cpuFeatures;
|
||||
}
|
||||
|
||||
@ -42,29 +42,29 @@
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef RARCH_PERF_CPU_FEATURES_H
|
||||
#define RARCH_PERF_CPU_FEATURES_H
|
||||
#ifndef RARCH_PERF_CPU_FEATURES_LINUX_H
|
||||
#define RARCH_PERF_CPU_FEATURES_LINUX_H
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#define ANDROID_CPU_FAMILY_UNKNOWN 0
|
||||
#define ANDROID_CPU_FAMILY_ARM 1
|
||||
#define ANDROID_CPU_FAMILY_X86 2
|
||||
#define ANDROID_CPU_FAMILY_MIPS 3
|
||||
#define ANDROID_CPU_FAMILY_MAX 4
|
||||
#define CPU_FAMILY_UNKNOWN 0
|
||||
#define CPU_FAMILY_ARM 1
|
||||
#define CPU_FAMILY_X86 2
|
||||
#define CPU_FAMILY_MIPS 3
|
||||
#define CPU_FAMILY_MAX 4
|
||||
|
||||
#define ANDROID_CPU_ARM_FEATURE_ARMv7 (1)
|
||||
#define ANDROID_CPU_ARM_FEATURE_VFPv3 (2)
|
||||
#define ANDROID_CPU_ARM_FEATURE_NEON (4)
|
||||
#define ANDROID_CPU_ARM_FEATURE_LDREX_STREX (8)
|
||||
#define CPU_ARM_FEATURE_ARMv7 (1)
|
||||
#define CPU_ARM_FEATURE_VFPv3 (2)
|
||||
#define CPU_ARM_FEATURE_NEON (4)
|
||||
#define CPU_ARM_FEATURE_LDREX_STREX (8)
|
||||
|
||||
#define ANDROID_CPU_X86_FEATURE_SSE3 (1)
|
||||
#define ANDROID_CPU_X86_FEATURE_POPCNT (2)
|
||||
#define ANDROID_CPU_X86_FEATURE_MOVBE (4)
|
||||
#define CPU_X86_FEATURE_SSE3 (1)
|
||||
#define CPU_X86_FEATURE_POPCNT (2)
|
||||
#define CPU_X86_FEATURE_MOVBE (4)
|
||||
|
||||
extern unsigned rarch_perf_get_cpu_family(void);
|
||||
extern uint64_t rarch_perf_get_cpu_features(void);
|
||||
extern unsigned rarch_perf_get_cpu_count(void);
|
||||
|
||||
#endif /* RARCH_PERF_CPU_FEATURES_H */
|
||||
#endif /* RARCH_PERF_CPU_FEATURES_LINUX_H */
|
||||
@ -2792,6 +2792,9 @@ int rarch_main(int argc, char *argv[])
|
||||
// Consoles use the higher level API.
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
#if 0
|
||||
rarch_perf_get_cpu_features();
|
||||
#endif
|
||||
return rarch_main(argc, argv);
|
||||
}
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user