CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-21 20:22:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(PS3) Fix benchmarking on PS3 by expanding ifdef of GNUC - also

Browse Source 
add PERF_TEST options to most platforms
This commit is contained in:
twinaphex 2012-10-02 00:47:20 +02:00
parent 018b97be72
commit c54035e3f3
6 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.ngc
View File

@ -6,6 +6,7 @@
DEBUG = 0
HAVE_LOGGER = 1
HAVE_FILE_LOGGER = 0
PERF_TEST = 0
PC_DEVELOPMENT_IP_ADDRESS = "192.168.1.7"
PC_DEVELOPMENT_UDP_PORT = 3490
@ -39,6 +40,10 @@ LIBS := -lfat -lretro_ngc -logc
OBJ = console/griffin/griffin.o console/font.binobj console/rzlib/rzlib.o
ifeq ($(PERF_TEST), 1)
CFLAGS += -DPERF_TEST
endif
ifeq ($(HAVE_LOGGER), 1)
CFLAGS += -DHAVE_LOGGER
CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)

7
Makefile.ps3
View File

@ -12,6 +12,7 @@ STRIPPING_ENABLE = 0
HAVE_RGL = 1
HAVE_LOGGER = 0
HAVE_FREETYPE = 0
PERF_TEST = 0
CONTENT_ID_FULL = UP0001-SSNE10000_00-0000000000000001
CONTENT_ID = SSNE10000
@ -59,8 +60,12 @@ endif
PPU_SRCS = ps3/frontend/main.c
ifeq ($(PERF_TEST), 1)
DEFINES += -DPERF_TEST
endif
ifeq ($(HAVE_RGL), 1)
DEFINES = -DHAVE_RGL
DEFINES += -DHAVE_RGL
GL_LIBS := -L. -lrgl_ps3
else
GL_LIBS := -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt -lPSGL -lPSGLcgc

7
Makefile.ps3.retroarch
View File

@ -10,6 +10,7 @@ DEBUG = 0
HAVE_RGL = 1
HAVE_LOGGER = 0
HAVE_FREETYPE = 0
PERF_TEST = 0
PC_DEVELOPMENT_IP_ADDRESS = "192.168.1.7"
PC_DEVELOPMENT_UDP_PORT = 3490
@ -28,6 +29,10 @@ else ifneq ($(findstring MINGW,$(shell uname -a)),)
system_platform = win
endif
ifeq ($(PERF_TEST), 1)
DEFINES += -DPERF_TEST
endif
PPU_LIB_TARGET = libretroarch_ps3.a
LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
@ -36,7 +41,7 @@ INCDIRS = -I. -Ips3 -Icommon
PPU_SRCS = console/griffin/griffin.c console/rzlib/rzlib.c
ifeq ($(HAVE_RGL), 1)
DEFINES = -DHAVE_RGL
DEFINES += -DHAVE_RGL
endif
ifeq ($(HAVE_FREETYPE), 1)

5
Makefile.wii
View File

@ -6,6 +6,7 @@
DEBUG = 0
HAVE_LOGGER = 0
HAVE_FILE_LOGGER = 0
PERF_TEST = 0
PC_DEVELOPMENT_IP_ADDRESS = "192.168.1.7"
PC_DEVELOPMENT_UDP_PORT = 3490
@ -41,6 +42,10 @@ APP_BOOTER_DIR = wii/app_booter
OBJ = console/griffin/griffin.o console/font.binobj console/rzlib/rzlib.o $(APP_BOOTER_DIR)/app_booter.binobj
ifeq ($(PERF_TEST), 1)
CFLAGS += -DPERF_TEST
endif
ifeq ($(HAVE_LOGGER), 1)
CFLAGS += -DHAVE_LOGGER
CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)

2
benchmark.c
View File

@ -36,7 +36,7 @@ rarch_perf_tick_t rarch_get_perf_counter(void)
__asm mov time_tmp.HighPart, edx;
time = time_tmp.QuadPart;
#elif defined(__GNUC__)
#elif defined(__GNUC__) && !defined(RARCH_CONSOLE)
#if defined(__i386__) || defined(__i486__)
asm volatile ("rdtsc" : "=A" (time));

2
console/griffin/griffin.c
View File

@ -42,7 +42,7 @@ CONSOLE EXTENSIONS
#include "../rarch_console_exec.c"
#endif
#if defined(__CELLOS_LV2__) || defined(GEKKO) || defined(_XBOX)
#ifdef PERF_TEST
#include "../../benchmark.c"
#endif