Changeset 453 for soft/giet_vm


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • soft/giet_vm/giet_python/genmap

    r441 r453  
    2020#  - x_size    : number of clusters in a row
    2121#  - y_size    : number of clusters in a column
    22 #  - nprocs    : number of processors per cluster
     22#  - nb_procs  : number of processors per cluster
     23#  - nb_ttys   : number of TTY channels
     24#  - fbf_size  : frame buffer width & heigth
    2325#######################################################################################
    2426# The supported platforms are:
     
    5456                   help = 'define number of clusters in a column' )
    5557
    56 parser.add_option( '--p', type = 'int', dest = 'nprocs',
     58parser.add_option( '--p', type = 'int', dest = 'nb_procs',
    5759                   default = 2,
    5860                   help = 'define number of processors per cluster' )
     61
     62parser.add_option( '--tty', type = 'int', dest = 'nb_ttys',
     63                   default = 1,
     64                   help = 'define number of tty channels' )
    5965
    6066parser.add_option( '--fbf', type = 'int', dest = 'fbf_size',
     
    114120x_size        = options.x_size      # number of clusters in a row
    115121y_size        = options.y_size      # number of clusters in a column
    116 nprocs        = options.nprocs      # number of processors in a cluster
     122nb_procs      = options.nb_procs    # number of processors in a cluster
     123nb_ttys       = options.nb_ttys     # number of TTY channels           
    117124fbf_size      = options.fbf_size    # frame buffer width & heigth
    118125
     
    150157
    151158# build mapping calling the function (function name)
    152 mapping = select.arch( x_size, y_size, nprocs, fbf_size )
     159mapping = select.arch( x_size, y_size, nb_procs, nb_ttys, fbf_size )
    153160print '[genmap] platform %s build' % mapping.name
    154161
  • soft/giet_vm/giet_python/mapping.py

    r441 r453  
    21102110
    21112111        # compute vobj local index for heap
    2112         vobj_heap_id = 0xFFFFFFFF
    2113         for vseg in vspace.vsegs:
    2114             if ( vseg.vobjs[0].name == self.heapname ):
    2115                 vobj_heap_id = vseg.vobjs[0].index
    2116         if ( vobj_heap_id == 0xFFFFFFFF ):
    2117             print '[genmap error] in Task.cbin() : heapname %s not found for task %s in vspace %s' \
    2118                   % ( self.heapname, self.name, vspace.name )
    2119             sys.exit(1)
     2112        if ( self.heapname == '' ):
     2113            vobj_heap_id = 0
     2114        else:
     2115            vobj_heap_id = 0xFFFFFFFF
     2116            for vseg in vspace.vsegs:
     2117                if ( vseg.vobjs[0].name == self.heapname ):
     2118                    vobj_heap_id = vseg.vobjs[0].index
     2119            if ( vobj_heap_id == 0xFFFFFFFF ):
     2120                print '[genmap error] in Task.cbin() : heapname %s not found for task %s in vspace %s' \
     2121                      % ( self.heapname, self.name, vspace.name )
     2122                sys.exit(1)
    21202123
    21212124        byte_stream = bytearray()
Note: See TracChangeset for help on using the changeset viewer.