Changeset 457 for soft

Timestamp:

Dec 5, 2014, 3:41:22 PM (10 years ago)

Author:

alain

Message:

Introducing the "classif" application.
Updating the "transpose", "convol", and "router" applications.

Location:

soft/giet_vm/applications

Files:

• classif (added)
• classif/Makefile (added)
• classif/classif.ld (added)
• classif/classif.py (added)
• classif/main.c (added)
• convol/convol.py (modified) (1 diff)
• router/main.c (modified) (3 diffs)
• router/router.py (modified) (3 diffs)
• transpose/transpose.py (modified) (1 diff)

soft/giet_vm/applications/convol/convol.py

@@ -65 +65 @@
             for p in xrange( nprocs ):
                 proc_id = (((x * y_size) + y) * nprocs) + p
-                size    = stack_size / nprocs
+                size    = (stack_size / nprocs) & 0xFFFFF000
                 base    = stack_base + (proc_id * size)
                 mapping.addVseg( vspace, 'conv_stack_%d_%d_%d' % (x,y,p), base, size,

soft/giet_vm/applications/router/main.c

@@ -38 +38 @@
 #define DEPTH  20           // MWMR channels depth
 
-//////////////// MWMR channels /////////////////////////////////////////////
+//////////////// MWMR channels and associated buffers  /////////////////////
 
 __attribute__((section (".data_in")))  mwmr_channel_t fifo_in;
+__attribute__((section (".data_in")))  unsigned int   buf_in[DEPTH];
+
 __attribute__((section (".data_out"))) mwmr_channel_t fifo_out;
+__attribute__((section (".data_out"))) unsigned int   buf_out[DEPTH];
  
 //////////////// Instrumentation Counters //////////////////////////////////
@@ -67 +70 @@
 
     // initializes fifo_in
-    mwmr_init( &fifo_in, 1 , DEPTH );
+    mwmr_init( &fifo_in, buf_in, 1 , DEPTH );
 
     // main loop : display token value = source index
@@ -96 +99 @@
 
     // initializes fifo_out 
-    mwmr_init( &fifo_out, 1 , DEPTH );
+    mwmr_init( &fifo_out, buf_out, 1 , DEPTH );
 
     // main loop : register token arrival index and value

soft/giet_vm/applications/router/router.py

@@ -4 +4 @@
 
 ######################################################################################
-#   file   : router.py  (for the router application)
+#   file   : router.py
 #   date   : november 2014
 #   author : Alain Greiner
@@ -68 +68 @@
             mapping.addVseg( vspace, 'router_code_%d_%d' %(x,y), code_base , code_size,
                              'CXWU', vtype = 'ELF', x = x, y = y, pseg = 'RAM', 
-                             binpath = 'build/transpose/transpose.elf',
+                             binpath = 'build/router/router.elf',
                              local = True )
 
@@ -108 +108 @@
 if __name__ == '__main__':
 
-    vspace = transpose( Mapping( 'test', 2, 2, 4 ) )
+    vspace = router( Mapping( 'test', 2, 2, 4 ) )
     print vspace.xml()
 

soft/giet_vm/applications/transpose/transpose.py

@@ -64 +64 @@
             for p in xrange( nprocs ):
                 proc_id = (((x * y_size) + y) * nprocs) + p
-                size    = stack_size / nprocs
+                size    = (stack_size / nprocs) & 0xFFFFF000
                 base    = stack_base + (proc_id * size)
                 mapping.addVseg( vspace, 'trsp_stack_%d_%d_%d' % (x,y,p), base, size,