From 6b781d5a9bb11ffee87436ecd3e3d007b1071932 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 29 May 2020 05:12:09 +0200 Subject: [PATCH] Move global performance counter state into retroarch.c --- Makefile.common | 1 - griffin/griffin.c | 1 - performance_counters.c | 176 ----------------------------------------- performance_counters.h | 4 - retroarch.c | 144 +++++++++++++++++++++++++++++++++ 5 files changed, 144 insertions(+), 182 deletions(-) delete mode 100644 performance_counters.c diff --git a/Makefile.common b/Makefile.common index c34f43bc3e..7437194e19 100644 --- a/Makefile.common +++ b/Makefile.common @@ -270,7 +270,6 @@ OBJ += \ $(LIBRETRO_COMM_DIR)/utils/md5.o \ playlist.o \ $(LIBRETRO_COMM_DIR)/features/features_cpu.o \ - performance_counters.o \ verbosity.o \ $(LIBRETRO_COMM_DIR)/playlists/label_sanitization.o \ manual_content_scan.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index e75d50710b..7694e69b2d 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -142,7 +142,6 @@ ENCODINGS PERFORMANCE ============================================================ */ #include "../libretro-common/features/features_cpu.c" -#include "../performance_counters.c" /*============================================================ CONFIG FILE diff --git a/performance_counters.c b/performance_counters.c deleted file mode 100644 index 976691d2a1..0000000000 --- a/performance_counters.c +++ /dev/null @@ -1,176 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis - * Copyright (C) 2016-2019 - Brad Parker - * - * 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 . - */ - -#include -#include - -#ifdef _WIN32 -#include -#else -#include -#endif - -#include - -#include "performance_counters.h" - -#include "retroarch.h" -#include "verbosity.h" - -#ifdef _WIN32 -#define PERF_LOG_FMT "[PERF]: Avg (%s): %I64u ticks, %I64u runs.\n" -#else -#define PERF_LOG_FMT "[PERF]: Avg (%s): %llu ticks, %llu runs.\n" -#endif - -static struct retro_perf_counter *perf_counters_rarch[MAX_COUNTERS]; -static struct retro_perf_counter *perf_counters_libretro[MAX_COUNTERS]; -static unsigned perf_ptr_rarch; -static unsigned perf_ptr_libretro; - -struct retro_perf_counter **retro_get_perf_counter_rarch(void) -{ - return perf_counters_rarch; -} - -struct retro_perf_counter **retro_get_perf_counter_libretro(void) -{ - return perf_counters_libretro; -} - -unsigned retro_get_perf_count_rarch(void) -{ - return perf_ptr_rarch; -} - -unsigned retro_get_perf_count_libretro(void) -{ - return perf_ptr_libretro; -} - -void rarch_perf_register(struct retro_perf_counter *perf) -{ - if ( - !rarch_ctl(RARCH_CTL_IS_PERFCNT_ENABLE, NULL) - || perf->registered - || perf_ptr_rarch >= MAX_COUNTERS - ) - return; - - perf_counters_rarch[perf_ptr_rarch++] = perf; - perf->registered = true; -} - -void performance_counter_register(struct retro_perf_counter *perf) -{ - if (perf->registered || perf_ptr_libretro >= MAX_COUNTERS) - return; - - perf_counters_libretro[perf_ptr_libretro++] = perf; - perf->registered = true; -} - -void performance_counters_clear(void) -{ - perf_ptr_libretro = 0; - memset(perf_counters_libretro, 0, sizeof(perf_counters_libretro)); -} - -static void log_counters(struct retro_perf_counter **counters, unsigned num) -{ - unsigned i; - for (i = 0; i < num; i++) - { - if (counters[i]->call_cnt) - { - RARCH_LOG(PERF_LOG_FMT, - counters[i]->ident, - (uint64_t)counters[i]->total / - (uint64_t)counters[i]->call_cnt, - (uint64_t)counters[i]->call_cnt); - } - } -} - -void rarch_perf_log(void) -{ - RARCH_LOG("[PERF]: Performance counters (RetroArch):\n"); - log_counters(perf_counters_rarch, perf_ptr_rarch); -} - -void retro_perf_log(void) -{ - RARCH_LOG("[PERF]: Performance counters (libretro):\n"); - log_counters(perf_counters_libretro, perf_ptr_libretro); -} - -void rarch_timer_tick(rarch_timer_t *timer, retro_time_t current_time) -{ - if (!timer) - return; - timer->current = current_time; - timer->timeout_us = (timer->timeout_end - timer->current); -} - -int rarch_timer_get_timeout(rarch_timer_t *timer) -{ - if (!timer) - return 0; - return (int)(timer->timeout_us / 1000000); -} - -bool rarch_timer_is_running(rarch_timer_t *timer) -{ - if (!timer) - return false; - return timer->timer_begin; -} - -bool rarch_timer_has_expired(rarch_timer_t *timer) -{ - if (!timer || timer->timeout_us <= 0) - return true; - return false; -} - -void rarch_timer_end(rarch_timer_t *timer) -{ - if (!timer) - return; - timer->timer_end = true; - timer->timer_begin = false; - timer->timeout_end = 0; -} - -void rarch_timer_begin_new_time_us(rarch_timer_t *timer, uint64_t usec) -{ - if (!timer) - return; - timer->timeout_us = usec; - timer->current = cpu_features_get_time_usec(); - timer->timeout_end = timer->current + timer->timeout_us; -} - -void rarch_timer_begin_us(rarch_timer_t *timer, uint64_t usec) -{ - if (!timer) - return; - rarch_timer_begin_new_time_us(timer, usec); - timer->timer_begin = true; - timer->timer_end = false; -} - diff --git a/performance_counters.h b/performance_counters.h index 08674aac6b..f69f1566b5 100644 --- a/performance_counters.h +++ b/performance_counters.h @@ -51,10 +51,6 @@ void performance_counter_register(struct retro_perf_counter *perf); void performance_counters_clear(void); -void retro_perf_log(void); - -void rarch_perf_log(void); - void rarch_perf_register(struct retro_perf_counter *perf); #define performance_counter_init(perf, name) \ diff --git a/retroarch.c b/retroarch.c index 57ea3898d0..a8238fbb91 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1377,6 +1377,12 @@ static const camera_driver_t *camera_drivers[] = { #endif #endif +#ifdef _WIN32 +#define PERF_LOG_FMT "[PERF]: Avg (%s): %I64u ticks, %I64u runs.\n" +#else +#define PERF_LOG_FMT "[PERF]: Avg (%s): %llu ticks, %llu runs.\n" +#endif + /* Descriptive names for options without short variant. * * Please keep the name in sync with the option name. @@ -2280,6 +2286,11 @@ static socklen_t lastcmd_net_source_len; #endif #endif +static struct retro_perf_counter *perf_counters_rarch[MAX_COUNTERS]; +static struct retro_perf_counter *perf_counters_libretro[MAX_COUNTERS]; +static unsigned perf_ptr_rarch; +static unsigned perf_ptr_libretro; + /* TODO/FIXME - turn these into static global variable */ char input_device_names [MAX_INPUT_DEVICES][64]; struct retro_keybind input_config_binds[MAX_USERS][RARCH_BIND_LIST_END]; @@ -2514,6 +2525,139 @@ static bool driver_location_start(void); static void driver_camera_stop(void); static bool driver_camera_start(void); +static void log_counters(struct retro_perf_counter **counters, unsigned num) +{ + unsigned i; + for (i = 0; i < num; i++) + { + if (counters[i]->call_cnt) + { + RARCH_LOG(PERF_LOG_FMT, + counters[i]->ident, + (uint64_t)counters[i]->total / + (uint64_t)counters[i]->call_cnt, + (uint64_t)counters[i]->call_cnt); + } + } +} + +static void rarch_perf_log(void) +{ + RARCH_LOG("[PERF]: Performance counters (RetroArch):\n"); + log_counters(perf_counters_rarch, perf_ptr_rarch); +} + +static void retro_perf_log(void) +{ + RARCH_LOG("[PERF]: Performance counters (libretro):\n"); + log_counters(perf_counters_libretro, perf_ptr_libretro); +} + + +struct retro_perf_counter **retro_get_perf_counter_rarch(void) +{ + return perf_counters_rarch; +} + +struct retro_perf_counter **retro_get_perf_counter_libretro(void) +{ + return perf_counters_libretro; +} + +unsigned retro_get_perf_count_rarch(void) +{ + return perf_ptr_rarch; +} + +unsigned retro_get_perf_count_libretro(void) +{ + return perf_ptr_libretro; +} + +void rarch_perf_register(struct retro_perf_counter *perf) +{ + if ( + !rarch_ctl(RARCH_CTL_IS_PERFCNT_ENABLE, NULL) + || perf->registered + || perf_ptr_rarch >= MAX_COUNTERS + ) + return; + + perf_counters_rarch[perf_ptr_rarch++] = perf; + perf->registered = true; +} + +void performance_counter_register(struct retro_perf_counter *perf) +{ + if (perf->registered || perf_ptr_libretro >= MAX_COUNTERS) + return; + + perf_counters_libretro[perf_ptr_libretro++] = perf; + perf->registered = true; +} + +void performance_counters_clear(void) +{ + perf_ptr_libretro = 0; + memset(perf_counters_libretro, 0, sizeof(perf_counters_libretro)); +} + +void rarch_timer_tick(rarch_timer_t *timer, retro_time_t current_time) +{ + if (!timer) + return; + timer->current = current_time; + timer->timeout_us = (timer->timeout_end - timer->current); +} + +int rarch_timer_get_timeout(rarch_timer_t *timer) +{ + if (!timer) + return 0; + return (int)(timer->timeout_us / 1000000); +} + +bool rarch_timer_is_running(rarch_timer_t *timer) +{ + if (!timer) + return false; + return timer->timer_begin; +} + +bool rarch_timer_has_expired(rarch_timer_t *timer) +{ + if (!timer || timer->timeout_us <= 0) + return true; + return false; +} + +void rarch_timer_end(rarch_timer_t *timer) +{ + if (!timer) + return; + timer->timer_end = true; + timer->timer_begin = false; + timer->timeout_end = 0; +} + +void rarch_timer_begin_new_time_us(rarch_timer_t *timer, uint64_t usec) +{ + if (!timer) + return; + timer->timeout_us = usec; + timer->current = cpu_features_get_time_usec(); + timer->timeout_end = timer->current + timer->timeout_us; +} + +void rarch_timer_begin_us(rarch_timer_t *timer, uint64_t usec) +{ + if (!timer) + return; + rarch_timer_begin_new_time_us(timer, usec); + timer->timer_begin = true; + timer->timer_end = false; +} + struct string_list *dir_list_new_special(const char *input_dir, enum dir_list_type type, const char *filter, bool show_hidden_files)