Prepare for initial eval timing benchmark

3 files changed, 34 insertions, 53 deletions

diff --git a/src/config.c b/src/config.c
index d100233..42ad56b 100644
--- a/src/config.c
+++ b/src/config.c
@@ -8,4 +8,4 @@
 #define CONTROL_METHODS CONTROL_CONTROLLER,CONTROL_MOUSE,CONTROL_KEYBOARD
 #endif
 
-#define PROF_ENABLE 0
+#define PROF_ENABLE 2
diff --git a/src/main.c b/src/main.c
index 70d1445..11799e4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -274,7 +274,10 @@ main(void) {
     // uxn_eval(&u, PAGE_PROGRAM);
     u8 frame_counter = 0;
 
-    uxn_eval_asm(PAGE_PROGRAM);
+    FRAME_START();
+    PROF(uxn_eval_asm(PAGE_PROGRAM), eval_cycles);
+    FRAME_END();
+    PROF_SHOW();
 
     // txt_printf("\nROM");
     // for (size_t i = 0; i < 32; i++) {
@@ -285,31 +288,31 @@ main(void) {
     // }
     // txt_printf("\n");
 
-    txt_printf("\nWST (");
-    txt_printf("SIZE: %d)", wst_ptr - (uintptr_t)wst);
-    for (size_t i = 0; i < 32; i++) {
-        if (i % 8 == 0) {
-            txt_printf("\n");
-        }
-        if (i >= (wst_ptr - (uintptr_t)wst)) {
-            txt_printf("%02x ", 0);
-        } else {
-            txt_printf("%02x ", wst[i]);
-        }
-    }
-    txt_printf("\n\n");
-    txt_printf("RST (");
-    txt_printf("SIZE: %d)", rst_ptr - (uintptr_t)rst);
-    for (size_t i = 0; i < 32; i++) {
-        if (i % 8 == 0) {
-            txt_printf("\n");
-        }
-        if (i >= (rst_ptr - (uintptr_t)rst)) {
-            txt_printf("%02x ", 0);
-        } else {
-            txt_printf("%02x ", rst[i]);
-        }
-    }
+    // txt_printf("\nWST (");
+    // txt_printf("SIZE: %d)", wst_ptr - (uintptr_t)wst);
+    // for (size_t i = 0; i < 32; i++) {
+    //     if (i % 8 == 0) {
+    //         txt_printf("\n");
+    //     }
+    //     if (i >= (wst_ptr - (uintptr_t)wst)) {
+    //         txt_printf("%02x ", 0);
+    //     } else {
+    //         txt_printf("%02x ", wst[i]);
+    //     }
+    // }
+    // txt_printf("\n\n");
+    // txt_printf("RST (");
+    // txt_printf("SIZE: %d)", rst_ptr - (uintptr_t)rst);
+    // for (size_t i = 0; i < 32; i++) {
+    //     if (i % 8 == 0) {
+    //         txt_printf("\n");
+    //     }
+    //     if (i >= (rst_ptr - (uintptr_t)rst)) {
+    //         txt_printf("%02x ", 0);
+    //     } else {
+    //         txt_printf("%02x ", rst[i]);
+    //     }
+    // }
     // txt_printf("\n\n");
     // txt_printf("RAM (ZP)\n");
     // for (size_t i = 0; i < 64; i++) {
@@ -338,13 +341,13 @@ main(void) {
         // // }
         // FRAME_END();
         bios_vblank_wait();
-        FRAME_START();
+        // FRAME_START();
         flipbuf();
         // screen_fill(0);
         // txt_printf("WST: 0x%08x\n", wst);
         // txt_printf("PTR: 0x%08x\n", wst_ptr);
-        FRAME_END();
-        PROF_SHOW();
+        // FRAME_END();
+        // PROF_SHOW();
         // txt_render();
         // txt_clear();
     }
diff --git a/src/profiling.c b/src/profiling.c
index 2d230df..9817eb1 100644
--- a/src/profiling.c
+++ b/src/profiling.c
@@ -39,29 +39,7 @@
 #define PROF_SHOW() \
     do { \
         txt_position((PROF_SHOW_X), (PROF_SHOW_Y));\
-        txt_printf("INPUT  %.8lu\n", avg_input_cycles);\
-        txt_printf("EVAL   %.8lu\n", avg_eval_cycles);\
-        txt_printf("VIDEO\n");\
-        txt_printf(">PIX   %.8lu\n", avg_ppu_pixel_cycles);\
-        txt_printf(">FILL  %.8lu\n", avg_ppu_fill_cycles);\
-        txt_printf(">1BPP  %.8lu\n", avg_ppu_icn_cycles);\
-        txt_printf(">2BPP  %.8lu\n", avg_ppu_chr_cycles);\
-        txt_printf(">FLIP  %.8lu\n", avg_flip_cycles);\
-        txt_printf("AUDIO  %.8lu\n", avg_mix_cycles);\
-        txt_printf("TOTAL  %.8lu\n", avg_frame_cycles);\
-        u32 frame_time =\
-            FP_DIV(\
-                FP_NUM(avg_frame_cycles + 1, 2),\
-                FP_NUM(2809, 2),\
-                2) * 166;\
-        u32 fps =\
-            FP_DIV(\
-                FP_NUM(280896 * 60, 2),\
-                FP_NUM(avg_frame_cycles + 1, 2),\
-                2);\
-        txt_printf("TIME   %.8lu\n", frame_time >> 2);\
-        txt_printf("FPS    %.8lu\n", (fps >> 2) + 1);\
-        screen_fill(BG_BACK, 0, 0, 8 * 16, 8 * 12, 2);\
+        txt_printf("N CYCLES:  %.8lu\n", eval_cycles);\
     } while (0)
 
 static u32 prof_frame_counter = 0;