X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fpcnt.h;h=545f0c43ae79c36d2bf9078df18ac88780bea88a;hp=0aca901edfe01042324ca361a2e906139aca5452;hb=a2d91a5d28651b7cfa6d411208da5f86bc168dfe;hpb=722285599b1ce45ca435f484b0f34a5e568487a1

diff --git a/frontend/pcnt.h b/frontend/pcnt.h
index 0aca901e..545f0c43 100644
--- a/frontend/pcnt.h
+++ b/frontend/pcnt.h
@@ -4,13 +4,21 @@ enum pcounters {
 	PCNT_GPU,
 	PCNT_SPU,
 	PCNT_BLIT,
+	PCNT_GTE,
 	PCNT_TEST,
 	PCNT_CNT
 };
 
 #ifdef PCNT
 
-static const char *pcnt_names[PCNT_CNT] = { "", "gpu", "spu", "blit", "test" };
+#ifndef __ARM_ARCH_7A__
+#include <sys/time.h>
+#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
 
@@ -32,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++)
@@ -49,13 +57,25 @@ static inline void pcnt_print(float fps)
 	}
 
 	printf("%4.1f ", fps);
+#if 0
+	static float pcounters_all[PCNT_CNT+1];
+	static int pcounter_samples;
+	pcounter_samples++;
+
+	for (i = 1; i < PCNT_CNT; i++) {
+		pcounters_all[i] += pcounters[i];
+		printf("%5.0f ", pcounters_all[i] / pcounter_samples);
+	}
+	pcounters_all[i] += rem;
+	printf("%5.0f\n", pcounters_all[i] / pcounter_samples);
+#else
 	for (i = 1; i < PCNT_CNT; i++)
 		printf("%5u ", pcounters[i]);
 	printf("%5u (", rem);
 	for (i = 1; i < PCNT_CNT; i++)
 		printf("%2u ", pcounters[i] * 100 / total);
 	printf("%2u) %u\n", rem * 100 / total, total);
-
+#endif
 	memset(pcounters, 0, sizeof(pcounters));
 }
 
@@ -66,11 +86,33 @@ 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;
 }
 
+static inline void pcnt_init(void)
+{
+#ifdef __ARM_ARCH_7A__
+	int v;
+	asm volatile("mrc p15, 0, %0, c9, c12, 0" : "=r"(v));
+	v |= 5; // master enable, ccnt reset
+	v &= ~8; // ccnt divider 0
+	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));
+#endif
+}
+
+void pcnt_gte_start(int op);
+void pcnt_gte_end(int op);
+
 #else
 
 #define pcnt_start(id)