Changeset 453

Timestamp:

Nov 11, 2014, 4:27:10 PM (10 years ago)

Author:

alain

Message:

Remove the use_tty, use_timer, use_nic etc. from the mapping.
Introduce the router application in genmap.

Location:

soft/giet_vm/giet_python

Files:

• genmap (modified) (4 diffs)
• mapping.py (modified) (1 diff)

soft/giet_vm/giet_python/genmap

@@ -20 +20 @@
 #  - x_size    : number of clusters in a row
 #  - y_size    : number of clusters in a column
-#  - nprocs    : number of processors per cluster
+#  - nb_procs  : number of processors per cluster
+#  - nb_ttys   : number of TTY channels 
+#  - fbf_size  : frame buffer width & heigth
 #######################################################################################
 # The supported platforms are:
@@ -54 +56 @@
                    help = 'define number of clusters in a column' )
 
-parser.add_option( '--p', type = 'int', dest = 'nprocs', 
+parser.add_option( '--p', type = 'int', dest = 'nb_procs', 
                    default = 2,
                    help = 'define number of processors per cluster' )
+
+parser.add_option( '--tty', type = 'int', dest = 'nb_ttys', 
+                   default = 1,
+                   help = 'define number of tty channels' )
 
 parser.add_option( '--fbf', type = 'int', dest = 'fbf_size', 
@@ -114 +120 @@
 x_size        = options.x_size      # number of clusters in a row
 y_size        = options.y_size      # number of clusters in a column
-nprocs        = options.nprocs      # number of processors in a cluster
+nb_procs      = options.nb_procs    # number of processors in a cluster
+nb_ttys       = options.nb_ttys     # number of TTY channels           
 fbf_size      = options.fbf_size    # frame buffer width & heigth
 
@@ -150 +157 @@
 
 # build mapping calling the function (function name)
-mapping = select.arch( x_size, y_size, nprocs, fbf_size )
+mapping = select.arch( x_size, y_size, nb_procs, nb_ttys, fbf_size )
 print '[genmap] platform %s build' % mapping.name 
 

soft/giet_vm/giet_python/mapping.py

@@ -2110 +2110 @@
 
         # compute vobj local index for heap
-        vobj_heap_id = 0xFFFFFFFF
-        for vseg in vspace.vsegs:
-            if ( vseg.vobjs[0].name == self.heapname ):
-                vobj_heap_id = vseg.vobjs[0].index
-        if ( vobj_heap_id == 0xFFFFFFFF ):
-            print '[genmap error] in Task.cbin() : heapname %s not found for task %s in vspace %s' \
-                  % ( self.heapname, self.name, vspace.name )
-            sys.exit(1)
+        if ( self.heapname == '' ):
+            vobj_heap_id = 0
+        else:
+            vobj_heap_id = 0xFFFFFFFF
+            for vseg in vspace.vsegs:
+                if ( vseg.vobjs[0].name == self.heapname ):
+                    vobj_heap_id = vseg.vobjs[0].index
+            if ( vobj_heap_id == 0xFFFFFFFF ):
+                print '[genmap error] in Task.cbin() : heapname %s not found for task %s in vspace %s' \
+                      % ( self.heapname, self.name, vspace.name )
+                sys.exit(1)
 
         byte_stream = bytearray()