From ebc9b5c1c286c0a6b68a1559ec2ffcc07b293772 Mon Sep 17 00:00:00 2001
From: Lephenixnoir <sebastien.michelland@protonmail.com>
Date: Fri, 18 Jun 2021 14:45:23 +0200
Subject: [PATCH] timer_callbacks: add an ICS test

---
 assets-fx/img/opt_gint_timer_callbacks.png | Bin 2279 -> 2735 bytes
 src/gint/timer_callbacks.c                 |  57 +++++++++++++--------
 src/perf/memory.c                          |   3 ++
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/assets-fx/img/opt_gint_timer_callbacks.png b/assets-fx/img/opt_gint_timer_callbacks.png
index 14729875d899786e5747fef4c278819c50204f5f..618d5f0f432f361a140fad373a9e509d7105e6a2 100644
GIT binary patch
delta 2701
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
Hu0mjft2kWK

delta 2259
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

diff --git a/src/gint/timer_callbacks.c b/src/gint/timer_callbacks.c
index e720c03..5fdeb2b 100644
--- a/src/gint/timer_callbacks.c
+++ b/src/gint/timer_callbacks.c
@@ -11,15 +11,14 @@ static int tests = 0;
 /* Auxiliary timer for tests than need an interrupt during the callback */
 static int auxiliary_timer = -1;
 
-static int callback_simple(volatile void *arg)
+static int callback_simple(volatile int *base)
 {
 	/* Perform a multiplication to check basic register saves */
-	int base = *(volatile int *)arg;
 	tests++;
-	return base * 387 + TIMER_STOP;
+	return (*base) * 387 + TIMER_STOP;
 }
 
-static int callback_sleep(GUNUSED volatile void *arg)
+static int callback_sleep(void)
 {
 	/* Start the aux. timer to have a guaranteed non-masked interrupt */
 	timer_start(auxiliary_timer);
@@ -28,7 +27,7 @@ static int callback_sleep(GUNUSED volatile void *arg)
 	return TIMER_STOP;
 }
 
-static int callback_timer(GUNUSED volatile void *arg)
+static int callback_timer(void)
 {
 	/* Wait specifically on the auxiliary timer */
 	timer_start(auxiliary_timer);
@@ -37,6 +36,13 @@ static int callback_timer(GUNUSED volatile void *arg)
 	return TIMER_STOP;
 }
 
+static int callback_ics(cpu_csleep_t *ics)
+{
+	cpu_csleep_cancel(ics);
+	tests++;
+	return TIMER_STOP;
+}
+
 /* gintctl_gint_timer_callbacks(): Stunts in the environment of callbacks */
 void gintctl_gint_timer_callbacks(void)
 {
@@ -59,7 +65,7 @@ void gintctl_gint_timer_callbacks(void)
 
 		extern bopti_image_t img_opt_gint_timer_callbacks;
 		dimage(0, 56, &img_opt_gint_timer_callbacks);
-		dprint(69, 56, C_BLACK, "Done:%d", tests);
+		dprint(86, 56, C_BLACK, "Done:%d", tests);
 		#endif
 
 		#ifdef FXCG50
@@ -77,33 +83,41 @@ void gintctl_gint_timer_callbacks(void)
 			"TIMER runs a callback that starts a timer (with its");
 		row_print(8, 1,
 			"own callback) and waits for the interrupt.");
+		row_print(10, 1,
+			"ICS uses an interrupt-cancellable sleep.");
 
-		row_print(10, 1, "Tests run: %d", tests);
+		row_print(12, 1, "Tests run: %d", tests);
 
-		if(status == 1) row_print(12, 1, "Success!");
-		if(status == 2) row_print(12, 1, "Not enough timers!");
+		if(status == 1) row_print(13, 1, "Success!");
+		if(status == 2) row_print(13, 1, "Not enough timers!");
 
-		fkey_action(1, "SIMPLE");
-		fkey_action(2, "SLEEP");
-		fkey_action(3, "TIMER");
+		fkey_button(1, "SIMPLE");
+		fkey_button(2, "SLEEP");
+		fkey_button(3, "TIMER");
+		fkey_button(4, "ICS");
 		#endif
 
 		dupdate();
 		key = getkey().key;
 
 		status = 0;
-		int (*callback)(volatile void *arg) = NULL;
-		volatile void *arg = NULL;
+		gint_call_t cb;
 		auxiliary_timer = -1;
 
-		if(key == KEY_F1) callback = callback_simple, arg = &base;
-		if(key == KEY_F2) callback = callback_sleep;
-		if(key == KEY_F3) callback = callback_timer;
+		cpu_csleep_t ics;
 
-		if(!callback) continue;
+		if(key == KEY_F4)
+		{
+			cpu_csleep_init(&ics);
+			cb = GINT_CALL(callback_ics, (void *)&ics);
+		}
+		else if(key == KEY_F1) cb = GINT_CALL(callback_simple, &base);
+		else if(key == KEY_F2) cb = GINT_CALL(callback_sleep);
+		else if(key == KEY_F3) cb = GINT_CALL(callback_timer);
+		else continue;
 
 		/* Allocate a first timer to run the callback */
-		int t = timer_configure(TIMER_ANY, 40000, GINT_CALL(callback, arg));
+		int t = timer_configure(TIMER_ANY, 40000, cb);
 		if(t < 0)
 		{
 			status = 2;
@@ -128,7 +142,10 @@ void gintctl_gint_timer_callbacks(void)
 
 		status = 1;
 		timer_start(t);
-		timer_wait(t);
+
+		/* Test the ICS on F4 */
+		if(key == KEY_F4) cpu_csleep(&ics);
+		else timer_wait(t);
 	}
 }
 
diff --git a/src/perf/memory.c b/src/perf/memory.c
index a6a2b7a..a67dfc5 100644
--- a/src/perf/memory.c
+++ b/src/perf/memory.c
@@ -22,6 +22,7 @@ extern void memory_dsp_xyram_memcpy(volatile uint8_t *dst,
 GILRAM GALIGNED(32) static char ilram_buffer[0x800];
 GXRAM  GALIGNED(32) static char xram_buffer[0x800];
 GYRAM  GALIGNED(32) static char yram_buffer[0x800];
+#define pram0 ((void *)0xfe200000)
 
 struct results
 {
@@ -288,6 +289,7 @@ void gintctl_perf_memory(void)
 		fkey_button(2, "ILRAM");
 		fkey_button(3, "XRAM");
 		fkey_button(4, "YRAM");
+		fkey_button(5, "PRAM0");
 		#endif
 
 		dfont(old_font);
@@ -299,6 +301,7 @@ void gintctl_perf_memory(void)
 			if(key == KEY_F2) test(&r, &ilram_buffer, 0x800, 64);
 			if(key == KEY_F3) test(&r, &xram_buffer, 0x800, 64);
 			if(key == KEY_F4) test(&r, &yram_buffer, 0x800, 64);
+			if(key == KEY_F5) test(&r, pram0, 0x8000, 1);
 		}
 	}
 }