From a2d91a5d28651b7cfa6d411208da5f86bc168dfe Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 18 Nov 2012 01:39:24 +0200 Subject: frontend: pcnt: use gettimeofday better than nothing --- frontend/pcnt.h | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'frontend/pcnt.h') diff --git a/frontend/pcnt.h b/frontend/pcnt.h index 0213ca1..545f0c4 100644 --- a/frontend/pcnt.h +++ b/frontend/pcnt.h @@ -11,6 +11,13 @@ enum pcounters { #ifdef PCNT +#ifndef __ARM_ARCH_7A__ +#include +#define PCNT_DIV 1 +#else +#define PCNT_DIV 1000 +#endif + static const char *pcnt_names[PCNT_CNT] = { "", "gpu", "spu", "blit", "gte", "test" }; #define PCNT_FRAMES 10 @@ -33,7 +40,7 @@ static inline void pcnt_print(float fps) int i; for (i = 0; i < PCNT_CNT; i++) - pcounters[i] /= 1000 * PCNT_FRAMES; + pcounters[i] /= PCNT_DIV * PCNT_FRAMES; rem = total = pcounters[PCNT_ALL]; for (i = 1; i < PCNT_CNT; i++) @@ -79,7 +86,13 @@ static inline unsigned int pcnt_get(void) __asm__ volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(val)); #else - val = 0; + // all slow on ARM :( + //struct timespec tv; + //clock_gettime(CLOCK_MONOTONIC_RAW, &tv); + //val = tv.tv_sec * 1000000000 + tv.tv_nsec; + struct timeval tv; + gettimeofday(&tv, NULL); + val = tv.tv_sec * 1000000 + tv.tv_usec; #endif return val; } -- cgit v1.2.3 From 603efa29ac7176c5dc27cab52007d4c9f61c3069 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 19 Nov 2012 03:08:06 +0200 Subject: frontend: pcnt: support arm11 --- frontend/pcnt.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'frontend/pcnt.h') diff --git a/frontend/pcnt.h b/frontend/pcnt.h index 545f0c4..9ddd500 100644 --- a/frontend/pcnt.h +++ b/frontend/pcnt.h @@ -11,11 +11,11 @@ enum pcounters { #ifdef PCNT -#ifndef __ARM_ARCH_7A__ +#if defined(__ARM_ARCH_7A__) || defined(ARM1176) +#define PCNT_DIV 1000 +#else #include #define PCNT_DIV 1 -#else -#define PCNT_DIV 1000 #endif static const char *pcnt_names[PCNT_CNT] = { "", "gpu", "spu", "blit", "gte", "test" }; @@ -85,6 +85,9 @@ static inline unsigned int pcnt_get(void) #ifdef __ARM_ARCH_7A__ __asm__ volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(val)); +#elif defined(ARM1176) + __asm__ volatile("mrc p15, 0, %0, c15, c12, 1" + : "=r"(val)); #else // all slow on ARM :( //struct timespec tv; @@ -107,6 +110,12 @@ static inline void pcnt_init(void) asm volatile("mcr p15, 0, %0, c9, c12, 0" :: "r"(v)); // enable cycle counter asm volatile("mcr p15, 0, %0, c9, c12, 1" :: "r"(1<<31)); +#elif defined(ARM1176) + int v; + asm volatile("mrc p15, 0, %0, c15, c12, 0" : "=r"(v)); + v |= 5; // master enable, ccnt reset + v &= ~8; // ccnt divider 0 + asm volatile("mcr p15, 0, %0, c15, c12, 0" :: "r"(v)); #endif } -- cgit v1.2.3