Almost finish tp7

NicolasVanPhan · Apr 12, 2018 · c889090 · c889090
1 parent d10ebab
commit c889090
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 17 deletions.
diff --git a/tme7/Makefile b/tme7/Makefile
diff --git a/tme7/soft/config.h b/tme7/soft/config.h
@@ -1,7 +1,8 @@
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
-#define NB_PROCS    2
+#define NB_PROCS    1
 #define NB_MAXTASKS 1
+#define NO_HARD_CC  1
 
 #endif
diff --git a/tme7/soft/main_dma.c b/tme7/soft/main_dma.c
@@ -1,23 +1,51 @@
 
 #include "stdio.h"
 
-#define NPIXEL 128
-#define NLINE  128
+#define NPIXEL 256
+#define NLINE  256
 
 ///////////////////////////////////////////////////////////////////////////////
 //	main function
 ///////////////////////////////////////////////////////////////////////////////
 __attribute__ ((constructor)) void main() 
 {
-    unsigned char 	BUF[NPIXEL*NLINE];
+    unsigned char 	BUF1[NPIXEL*NLINE];
+    unsigned char 	BUF2[NPIXEL*NLINE];
+    unsigned char	*BUF;
     unsigned int 	line;
     unsigned int 	pixel;
     unsigned int 	step;
 
-    for(step = 1 ; step < 6 ; step++)
+    /* --------------------------- PROLOGUE --------------------------------- */
+    step = 1;
+    BUF = BUF1;
+
+    for(pixel = 0 ; pixel < NPIXEL ; pixel++)
+    { 
+        for(line = 0 ; line < NLINE ; line++) 
+        {
+            if( ( (pixel>>step & 0x1) && !(line>>step & 0x1)) || 
+                (!(pixel>>step & 0x1) &&  (line>>step & 0x1)) )  	BUF[NPIXEL*line + pixel] = 0xFF;
+            else 							BUF[NPIXEL*line + pixel] = 0x0;
+        }
+    }
+    tty_printf(" - build   %d OK at cycle %d\n", step, proctime());
+
+    // Pipeline synchronization 
+
+    /* --------------------------- LOOP ------------------------------------- */
+    for(step = 2 ; step < 6 ; step++)
     {
-        tty_printf("\n*** damier %d ***\n\n",step);
+	/* ---- DISPLAY PICTURE (STEP - 1) ---- */
+	BUF = ((step & 1) == 0) ? BUF1 : BUF2;
+        if(fb_write(0, BUF, NLINE*NPIXEL) != 0)
+	{
+            tty_printf("\n!!! error in fb_syn_write syscall !!!\n"); 
+	    exit();
+	}
 
+	/* ---- BUILD PICTURE (STEP) ---- */
+	BUF = (BUF == BUF1) ? BUF2 : BUF1;
         for(pixel = 0 ; pixel < NPIXEL ; pixel++)
         { 
             for(line = 0 ; line < NLINE ; line++) 
@@ -27,18 +55,23 @@ __attribute__ ((constructor)) void main()
                 else 							BUF[NPIXEL*line + pixel] = 0x0;
             }
         }
+        tty_printf(" - build   %d OK at cycle %d\n", step, proctime());
 
-        tty_printf(" - build   OK at cycle %d\n", proctime());
-
-        if(fb_sync_write(0, BUF, NLINE*NPIXEL) != 0)
-	{
-            tty_printf("\n!!! error in fb_syn_write syscall !!!\n"); 
-	    exit();
-	}
-
-        tty_printf(" - display OK at cycle %d\n", proctime());
+	/* ---- Pipeline synchronisation ---- */
+	fb_completed();
+        tty_printf(" - display %d OK at cycle %d\n", step, proctime());
 
     }
+    /* --------------------------- EPILOGUE --------------------------------- */
+    BUF = ((step & 1) == 0) ? BUF1 : BUF2;
+    if(fb_write(0, BUF, NLINE*NPIXEL) != 0)
+    {
+	tty_printf("\n!!! error in fb_syn_write syscall !!!\n"); 
+	exit();
+    }
+    fb_completed();
+    tty_printf(" - display %d OK at cycle %d\n", step, proctime());
+
     tty_printf("\nFin du programme au cycle = %d\n\n", proctime());
     exit(); 
 } // end main

diff --git a/tme7/soft/main_dma.c.bak2 b/tme7/soft/main_dma.c.bak2
@@ -0,0 +1,43 @@
+
+#include "stdio.h"
+
+#define NPIXEL 256
+#define NLINE  256
+
+///////////////////////////////////////////////////////////////////////////////
+//	main function
+///////////////////////////////////////////////////////////////////////////////
+__attribute__ ((constructor)) void main() 
+{
+    unsigned char 	BUF[NPIXEL*NLINE];
+    unsigned int 	line;
+    unsigned int 	pixel;
+    unsigned int 	step;
+
+    /* --------------------------- LOOP ------------------------------------- */
+    for(step = 1 ; step < 6 ; step++)
+    {
+	/* ---- BUILD PICTURE (STEP) ---- */
+        for(pixel = 0 ; pixel < NPIXEL ; pixel++)
+        { 
+            for(line = 0 ; line < NLINE ; line++) 
+            {
+                if( ( (pixel>>step & 0x1) && !(line>>step & 0x1)) || 
+                    (!(pixel>>step & 0x1) &&  (line>>step & 0x1)) )  	BUF[NPIXEL*line + pixel] = 0xFF;
+                else 							BUF[NPIXEL*line + pixel] = 0x0;
+            }
+        }
+        tty_printf(" - build   %d OK at cycle %d\n", step, proctime());
+
+	/* ---- DISPLAY PICTURE (STEP - 1) ---- */
+        if(fb_sync_write(0, BUF, NLINE*NPIXEL) != 0)
+	{
+            tty_printf("\n!!! error in fb_syn_write syscall !!!\n"); 
+	    exit();
+	}
+        tty_printf(" - display %d OK at cycle %d\n", step, proctime());
+    }
+    tty_printf("\nFin du programme au cycle = %d\n\n", proctime());
+    exit(); 
+} // end main
+
diff --git a/tme7/tp7_top.cpp b/tme7/tp7_top.cpp
@@ -34,10 +34,10 @@
 #define RAM_LATENCY	0	// ram latency
 #define ICACHE_WAYS	4       // instruction cache number of ways
 #define ICACHE_SETS	32      // instruction cache number of sets
-#define ICACHE_WORDS	8       // instruction cache number of words per line
+#define ICACHE_WORDS	4       // instruction cache number of words per line
 #define DCACHE_WAYS	4       // data cache number of ways
 #define DCACHE_SETS	32      // data cache number of sets
-#define DCACHE_WORDS	8       // data cache number of words per line
+#define DCACHE_WORDS	4       // data cache number of words per line
 #define WBUF_DEPTH	8       // cache write buffer depth
 #define SNOOP		false	// cache snoop activation
 #define	DMA_BURST	16	// number of words in a DMA burst