diff --git a/performance/performance_linux.c b/performance/performance_linux.c
deleted file mode 100644
index 975e60a9d5..0000000000
--- a/performance/performance_linux.c
+++ /dev/null
@@ -1,516 +0,0 @@
-/* RetroArch - A frontend for libretro.
- * Copyright (C) 2010-2012 - Hans-Kristian Arntzen
- * Copyright (C) 2011-2012 - Daniel De Matteis
- *
- * RetroArch 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 Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * RetroArch 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.
- *
- * You should have received a copy of the GNU General Public License along with RetroArch.
- * If not, see .
- */
-
-/*
- * Copyright (C) 2010 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifdef ANDROID
-#include
-#endif
-#ifdef __arm__
-#include
-#endif
-#include "performance_linux.h"
-#include
-#include
-#include
-#include
-#include
-#include
-#include "../general.h"
-#include "../retroarch_logger.h"
-
-static unsigned g_cpuFamily;
-static uint64_t g_cpuFeatures;
-static unsigned g_cpuCount;
-
-#ifdef __arm__
-# define DEFAULT_CPU_FAMILY CPU_FAMILY_ARM
-#elif defined __i386__
-# define DEFAULT_CPU_FAMILY CPU_FAMILY_X86
-#else
-# define DEFAULT_CPU_FAMILY CPU_FAMILY_UNKNOWN
-#endif
-
-#ifdef __i386__
-static inline void x86_cpuid(int func, int values[4])
-{
- int a, b, c, d;
- /* We need to preserve ebx since we're compiling PIC code */
- /* this means we can't use "=b" for the second output register */
- __asm__ __volatile__ ( \
- "push %%ebx\n"
- "cpuid\n" \
- "mov %1, %%ebx\n"
- "pop %%ebx\n"
- : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
- : "a" (func) \
- );
- values[0] = a;
- values[1] = b;
- values[2] = c;
- values[3] = d;
-}
-#endif
-
-static inline void cpulist_set(unsigned* list, int index)
-{
- if ((unsigned)index < 32)
- *list |= (uint32_t)(1U << index);
-}
-
-/* Parse an decimal integer starting from 'input', but not going further
- * than 'limit'. Return the value into '*result'.
- *
- * NOTE: Does not skip over leading spaces, or deal with sign characters.
- * NOTE: Ignores overflows.
- *
- * The function returns NULL in case of error (bad format), or the new
- * position after the decimal number in case of success (which will always
- * be <= 'limit').
- */
-static const char* parse_decimal(const char* input, const char* limit, int* result)
-{
- const char* p = input;
- int val = 0;
- while (p < limit)
- {
- int d = (*p - '0');
- if ((unsigned)d >= 10U)
- break;
- val = val*10 + d;
- p++;
- }
- if (p == input)
- return NULL;
-
- *result = val;
- return p;
-}
-
-/* Parse a textual list of cpus and store the result inside a variable.
- * Input format is the following:
- * - comma-separated list of items (no spaces)
- * - each item is either a single decimal number (cpu index), or a range made
- * of two numbers separated by a single dash (-). Ranges are inclusive.
- *
- * Examples: 0
- * 2,4-127,128-143
- * 0-1
- */
-
-static void rarch_perf_cpulist_parse(unsigned* list, const char* line, int line_len)
-{
- const char* p = line;
- const char* end = p + line_len;
- const char* q;
-
- /* NOTE: the input line coming from sysfs typically contains a
- * trailing newline, so take care of it in the code below
- */
- while (p < end && *p != '\n')
- {
- int val, start_value, end_value;
-
- /* Find the end of current item, and put it into 'q' */
- q = memchr(p, ',', end-p);
- if (q == NULL)
- q = end;
-
- /* Get first value */
- p = parse_decimal(p, q, &start_value);
- if (p == NULL)
- goto BAD_FORMAT;
-
- end_value = start_value;
-
- /* If we're not at the end of the item, expect a dash and
- * and integer; extract end value.
- */
- if (p < q && *p == '-')
- {
- p = parse_decimal(p+1, q, &end_value);
- if (p == NULL)
- goto BAD_FORMAT;
- }
-
- /* Set bits CPU list bits */
- for (val = start_value; val <= end_value; val++)
- cpulist_set(list, val);
-
- /* Jump to next item */
- p = q;
- if (p < end)
- p++;
- }
-
-BAD_FORMAT:
- ;
-}
-
-/* Read the content of /proc/cpuinfo into a user-provided buffer.
- * Return the length of the data, or -1 on error. Does *not*
- * zero-terminate the content. Will not read more
- * than 'buffsize' bytes.
- */
-static int read_file(const char* pathname, char* buffer, size_t buffsize)
-{
- int fd, len;
-
- fd = open(pathname, O_RDONLY);
- if (fd < 0)
- return -1;
-
- do {
- len = read(fd, buffer, buffsize);
- } while (len < 0 && errno == EINTR);
-
- close(fd);
-
- return len;
-}
-
-static void cpulist_read_from(unsigned* list, const char* filename)
-{
- char file[64];
- int filelen;
-
- *list = 0;
-
- filelen = read_file(filename, file, sizeof file);
- if (filelen < 0)
- {
- RARCH_ERR("Could not read %s: %s\n", filename, strerror(errno));
- return;
- }
-
- rarch_perf_cpulist_parse(list, file, filelen);
-}
-
-static int get_cpu_count(void)
-{
- unsigned cpus_present[1];
- unsigned cpus_possible[1];
-
- cpulist_read_from(cpus_present, "/sys/devices/system/cpu/present");
- cpulist_read_from(cpus_possible, "/sys/devices/system/cpu/possible");
-
- /* Compute the intersection of both sets to get the actual number of
- * CPU cores that can be used on this device by the kernel.
- */
- *cpus_present &= *cpus_possible;
-
- 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.
- *
- * Return NULL if not found
- */
-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;
- const char *p, *q;
-
- /* Look for first field occurence, and ensures it starts the line.
- */
- p = buffer;
- bufend = buffer + buflen;
- for (;;)
- {
- p = memmem(p, bufend-p, field, fieldlen);
- if (p == NULL)
- goto EXIT;
-
- if (p == buffer || p[-1] == '\n')
- break;
-
- p += fieldlen;
- }
-
- /* Skip to the first column followed by a space */
- p += fieldlen;
- p = memchr(p, ':', bufend-p);
- if (p == NULL || p[1] != ' ')
- goto EXIT;
-
- /* Find the end of the line */
- p += 2;
- q = memchr(p, '\n', bufend-p);
- if (q == NULL)
- q = bufend;
-
- /* Copy the line into a heap-allocated buffer */
- len = q-p;
- result = malloc(len+1);
- if (result == NULL)
- goto EXIT;
-
- memcpy(result, p, len);
- result[len] = '\0';
-
-EXIT:
- return result;
-}
-
-/* Checks that a space-separated list of items contains one given 'item'.
- * Returns 1 if found, 0 otherwise.
- */
-static int has_list_item(const char* list, const char* item)
-{
- const char* p = list;
- int itemlen = strlen(item);
-
- if (list == NULL)
- return 0;
-
- while (*p)
- {
- const char* q;
-
- /* skip spaces */
- while (*p == ' ' || *p == '\t')
- p++;
-
- /* find end of current list item */
- q = p;
- while (*q && *q != ' ' && *q != '\t')
- q++;
-
- if (itemlen == q-p && !memcmp(p, item, itemlen))
- return 1;
-
- /* skip to next item */
- p = q;
- }
-
- return 0;
-}
-#endif
-
-static void rarch_perf_init_cpu(void)
-{
- char cpuinfo[4096];
- int cpuinfo_len;
-
- g_cpuFamily = DEFAULT_CPU_FAMILY;
- g_cpuFeatures = 0;
- g_cpuCount = 1;
-
- cpuinfo_len = read_file("/proc/cpuinfo", cpuinfo, sizeof cpuinfo);
- RARCH_LOG("cpuinfo_len is (%d):\n%.*s\n", cpuinfo_len,
- cpuinfo_len >= 0 ? cpuinfo_len : 0, cpuinfo);
-
- if (cpuinfo_len < 0) /* should not happen */
- return;
-
- /* Count the CPU cores, the value may be 0 for single-core CPUs */
- g_cpuCount = get_cpu_count();
- if (g_cpuCount == 0)
- g_cpuCount = 1;
-
- RARCH_LOG("found cpuCount = %d\n", g_cpuCount);
-
-#ifdef __ARM_ARCH__
- char* features = NULL;
- char* architecture = NULL;
-
- /* Extract architecture from the "CPU Architecture" field.
- * The list is well-known, unlike the the output of
- * the 'Processor' field which can vary greatly.
- *
- * See the definition of the 'proc_arch' array in
- * $KERNEL/arch/arm/kernel/setup.c and the 'c_show' function in
- * same file.
- */
- char* cpuArch = extract_cpuinfo_field(cpuinfo, cpuinfo_len, "CPU architecture");
-
- if (cpuArch != NULL)
- {
- char* end;
- long archNumber;
- int hasARMv7 = 0;
-
- RARCH_LOG("found cpuArch = '%s'\n", cpuArch);
-
- /* read the initial decimal number, ignore the rest */
- archNumber = strtol(cpuArch, &end, 10);
-
- /* Here we assume that ARMv8 will be upwards compatible with v7
- * in the future. Unfortunately, there is no 'Features' field to
- * indicate that Thumb-2 is supported.
- */
- if (end > cpuArch && archNumber >= 7)
- hasARMv7 = 1;
-
- /* Unfortunately, it seems that certain ARMv6-based CPUs
- * report an incorrect architecture number of 7!
- *
- * See http://code.google.com/p/android/issues/detail?id=10812
- *
- * We try to correct this by looking at the 'elf_format'
- * field reported by the 'Processor' field, which is of the
- * form of "(v7l)" for an ARMv7-based CPU, and "(v6l)" for
- * an ARMv6-one.
- */
- if (hasARMv7)
- {
- char* cpuProc = extract_cpuinfo_field(cpuinfo, cpuinfo_len,
- "Processor");
- if (cpuProc != NULL)
- {
- RARCH_LOG("found cpuProc = '%s'\n", cpuProc);
- if (has_list_item(cpuProc, "(v6l)"))
- {
- RARCH_ERR("CPU processor and architecture mismatch!!\n");
- hasARMv7 = 0;
- }
- free(cpuProc);
- }
- }
-
- if (hasARMv7)
- g_cpuFeatures |= CPU_ARM_FEATURE_ARMv7;
-
- /* The LDREX / STREX instructions are available from ARMv6 */
- if (archNumber >= 6)
- g_cpuFeatures |= CPU_ARM_FEATURE_LDREX_STREX;
-
- free(cpuArch);
- }
-
- /* Extract the list of CPU features from 'Features' field */
- char* cpuFeatures = extract_cpuinfo_field(cpuinfo, cpuinfo_len, "Features");
-
- if (cpuFeatures != NULL)
- {
- RARCH_LOG("found cpuFeatures = '%s'\n", cpuFeatures);
-
- if (has_list_item(cpuFeatures, "vfpv3"))
- g_cpuFeatures |= CPU_ARM_FEATURE_VFPv3;
-
- else if (has_list_item(cpuFeatures, "vfpv3d16"))
- g_cpuFeatures |= CPU_ARM_FEATURE_VFPv3;
-
- if (has_list_item(cpuFeatures, "neon"))
- {
- /* Note: Certain kernels only report neon but not vfpv3
- * in their features list. However, ARM mandates
- * that if Neon is implemented, so must be VFPv3
- * so always set the flag.
- */
- g_cpuFeatures |= CPU_ARM_FEATURE_NEON | CPU_ARM_FEATURE_VFPv3;
- }
- free(cpuFeatures);
- }
-#endif /* __ARM_ARCH__ */
-
-#ifdef __i386__
- g_cpuFamily = CPU_FAMILY_X86;
-
- int regs[4];
-
- /* According to http://en.wikipedia.org/wiki/CPUID */
-#define VENDOR_INTEL_b 0x756e6547
-#define VENDOR_INTEL_c 0x6c65746e
-#define VENDOR_INTEL_d 0x49656e69
-
- x86_cpuid(0, regs);
- int vendorIsIntel = (regs[1] == VENDOR_INTEL_b &&
- regs[2] == VENDOR_INTEL_c &&
- regs[3] == VENDOR_INTEL_d);
-
- x86_cpuid(1, regs);
- if ((regs[2] & (1 << 9)) != 0)
- {
- RARCH_LOG("CPU Feature supported: sse3.\n");
- g_cpuFeatures |= CPU_X86_FEATURE_SSE3;
- }
-
-
- if ((regs[2] & (1 << 23)) != 0)
- {
- RARCH_LOG("CPU Feature supported: popcnt.\n");
- g_cpuFeatures |= CPU_X86_FEATURE_POPCNT;
- }
-
- if (vendorIsIntel && (regs[2] & (1 << 22)) != 0)
- {
- RARCH_LOG("CPU Feature supported: movbe.\n");
- g_cpuFeatures |= CPU_X86_FEATURE_MOVBE;
- }
-#endif
-
-#ifdef _MIPS_ARCH
- g_cpuFamily = CPU_FAMILY_MIPS;
-#endif /* _MIPS_ARCH */
-}
-
-unsigned rarch_perf_get_cpu_family(void)
-{
- rarch_perf_init_cpu();
- return g_cpuFamily;
-}
-
-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;
-}
-
-
-unsigned rarch_perf_get_cpu_count(void)
-{
- rarch_perf_init_cpu();
- return g_cpuCount;
-}
diff --git a/performance/performance_linux.h b/performance/performance_linux.h
deleted file mode 100644
index c998c165fc..0000000000
--- a/performance/performance_linux.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* RetroArch - A frontend for libretro.
- * Copyright (C) 2010-2012 - Hans-Kristian Arntzen
- * Copyright (C) 2011-2012 - Daniel De Matteis
- *
- * RetroArch 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 Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * RetroArch 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.
- *
- * You should have received a copy of the GNU General Public License along with RetroArch.
- * If not, see .
- */
-
-/*
- * Copyright (C) 2010 The Android Open Source Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef RARCH_PERF_CPU_FEATURES_LINUX_H
-#define RARCH_PERF_CPU_FEATURES_LINUX_H
-
-#include
-#include
-
-#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 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 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_LINUX_H */