Emulation/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-04-02 10:51:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Get rid of PERF_TEST entirely - if Performance Counters setting is

Browse source 
enabled, will also report performance counters log at exit
This commit is contained in:
twinaphex 2014-06-01 22:16:22 +02:00
parent 9911aac09c
commit 001d6e8897
9 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -201,10 +201,6 @@ ifeq ($(SCALER_NO_SIMD), 1)
DEFINES += -DSCALER_NO_SIMD DEFINES += -DSCALER_NO_SIMD
endif endif
ifeq ($(PERF_TEST), 1)
DEFINES += -DPERF_TEST
endif
ifeq ($(HAVE_SDL), 1) ifeq ($(HAVE_SDL), 1)
OBJ += gfx/sdl_gfx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o OBJ += gfx/sdl_gfx.o input/sdl_input.o input/sdl_joypad.o audio/sdl_audio.o
JOYCONFIG_OBJ += input/sdl_joypad.o JOYCONFIG_OBJ += input/sdl_joypad.o

4
Makefile.emscripten
View file

@ -68,10 +68,6 @@ LIBS =
DEFINES = -DHAVE_SCREENSHOTS -DHAVE_CAMERA -DHAVE_NULLAUDIO -DHAVE_BSV_MOVIE -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER DEFINES = -DHAVE_SCREENSHOTS -DHAVE_CAMERA -DHAVE_NULLAUDIO -DHAVE_BSV_MOVIE -DRARCH_INTERNAL -DHAVE_CC_RESAMPLER
LDFLAGS = -L. -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 --js-library emscripten/library_rwebaudio.js --js-library emscripten/library_rwebinput.js --js-library emscripten/library_rwebcam.js --no-heap-copy LDFLAGS = -L. -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 --js-library emscripten/library_rwebaudio.js --js-library emscripten/library_rwebinput.js --js-library emscripten/library_rwebcam.js --no-heap-copy
ifeq ($(PERF_TEST), 1)
DEFINES += -DPERF_TEST
endif
ifeq ($(HAVE_RGUI), 1) ifeq ($(HAVE_RGUI), 1)
DEFINES += -DHAVE_MENU -DHAVE_RGUI DEFINES += -DHAVE_MENU -DHAVE_RGUI
OBJ += frontend/menu/disp/rgui.o OBJ += frontend/menu/disp/rgui.o

5
Makefile.griffin
View file

@ -1,7 +1,6 @@
DEBUG = 0 DEBUG = 0
HAVE_LOGGER = 0 HAVE_LOGGER = 0
HAVE_FILE_LOGGER = 0 HAVE_FILE_LOGGER = 0
PERF_TEST = 0
WHOLE_ARCHIVE_LINK = 0 WHOLE_ARCHIVE_LINK = 0
BIG_STACK = 0 BIG_STACK = 0
PC_DEVELOPMENT_IP_ADDRESS = 255.255.255.255 PC_DEVELOPMENT_IP_ADDRESS = 255.255.255.255
@ -130,10 +129,6 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
OBJ = griffin/griffin.o $(PLATOBJS) OBJ = griffin/griffin.o $(PLATOBJS)
ifeq ($(PERF_TEST), 1)
CFLAGS += -DPERF_TEST
endif
ifeq ($(HAVE_LOGGER), 1) ifeq ($(HAVE_LOGGER), 1)
CFLAGS += -DHAVE_LOGGER CFLAGS += -DHAVE_LOGGER
CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT) CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS=\"$(PC_DEVELOPMENT_IP_ADDRESS)\" -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)

5
Makefile.ps3
View file

@ -16,7 +16,6 @@ HAVE_GCMGL = 1
HAVE_LOGGER = 0 HAVE_LOGGER = 0
HAVE_FREETYPE = 0 HAVE_FREETYPE = 0
HAVE_RLAUNCH = 0 HAVE_RLAUNCH = 0
PERF_TEST = 0
WHOLE_ARCHIVE_LINK = 0 WHOLE_ARCHIVE_LINK = 0
CONTENT_ID_FULL = UP0001-SSNE10000_00-0000000000000001 CONTENT_ID_FULL = UP0001-SSNE10000_00-0000000000000001
@ -65,10 +64,6 @@ endif
PPU_SRCS = griffin/griffin.c PPU_SRCS = griffin/griffin.c
ifeq ($(PERF_TEST), 1)
DEFINES += -DPERF_TEST
endif
ifeq ($(HAVE_RLAUNCH), 1) ifeq ($(HAVE_RLAUNCH), 1)
DEFINES += -DHAVE_RLAUNCH DEFINES += -DHAVE_RLAUNCH
endif endif

5
Makefile.ps3.cobra
View file

@ -16,7 +16,6 @@ HAVE_GCMGL = 1
HAVE_LOGGER = 0 HAVE_LOGGER = 0
HAVE_FREETYPE = 0 HAVE_FREETYPE = 0
HAVE_RLAUNCH = 0 HAVE_RLAUNCH = 0
PERF_TEST = 0
WHOLE_ARCHIVE_LINK = 0 WHOLE_ARCHIVE_LINK = 0
CONTENT_ID_FULL = UP0001-SSNE10000_00-0000000000000001 CONTENT_ID_FULL = UP0001-SSNE10000_00-0000000000000001
@ -65,10 +64,6 @@ endif
PPU_SRCS = griffin/griffin.c PPU_SRCS = griffin/griffin.c
ifeq ($(PERF_TEST), 1)
DEFINES += -DPERF_TEST
endif
ifeq ($(HAVE_RLAUNCH), 1) ifeq ($(HAVE_RLAUNCH), 1)
DEFINES += -DHAVE_RLAUNCH DEFINES += -DHAVE_RLAUNCH
endif endif

4
Makefile.win
View file

@ -110,10 +110,6 @@ ifeq ($(SCALER_NO_SIMD), 1)
DEFINES += -DSCALER_NO_SIMD DEFINES += -DSCALER_NO_SIMD
endif endif
ifeq ($(PERF_TEST), 1)
DEFINES += -DPERF_TEST
endif
JLIBS = JLIBS =
ifeq ($(HAVE_RGUI), 1) ifeq ($(HAVE_RGUI), 1)

5
android/native/jni/Android.mk
View file

@ -1,5 +1,4 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
PERF_TEST := 0
HAVE_NEON := 1 HAVE_NEON := 1
HAVE_LOGGER := 1 HAVE_LOGGER := 1
@ -42,10 +41,6 @@ ifeq ($(HAVE_LOGGER), 1)
LOGGER_LDLIBS := -llog LOGGER_LDLIBS := -llog
endif endif
ifeq ($(PERF_TEST), 1)
LOCAL_CFLAGS += -DPERF_TEST
endif
ifeq ($(GLES),3) ifeq ($(GLES),3)
GLES_LIB := -lGLESv3 GLES_LIB := -lGLESv3
LOCAL_CFLAGS += -DHAVE_OPENGLES3 LOCAL_CFLAGS += -DHAVE_OPENGLES3

2
frontend/frontend.c
View file

@ -259,9 +259,7 @@ void main_exit(args_type() args)
} }
rarch_deinit_msg_queue(); rarch_deinit_msg_queue();
#ifdef PERF_TEST
rarch_perf_log(); rarch_perf_log();
#endif
#if defined(HAVE_LOGGER) && !defined(ANDROID) #if defined(HAVE_LOGGER) && !defined(ANDROID)
logger_shutdown(); logger_shutdown();

5
performance.c
View file

@ -123,10 +123,11 @@ static void log_counters(const struct retro_perf_counter **counters, unsigned nu
void rarch_perf_log(void) void rarch_perf_log(void)
{ {
#if defined(PERF_TEST) || !defined(RARCH_INTERNAL) if (!g_extern.perfcnt_enable)
return;
RARCH_LOG("[PERF]: Performance counters (RetroArch):\n"); RARCH_LOG("[PERF]: Performance counters (RetroArch):\n");
log_counters(perf_counters_rarch, perf_ptr_rarch); log_counters(perf_counters_rarch, perf_ptr_rarch);
#endif
} }
void retro_perf_log(void) void retro_perf_log(void)