Changeset 441

Timestamp:

Nov 3, 2014, 11:15:07 AM (10 years ago)

Author:

alain

Message:

Removing support for the (use_tty, use_tim, use_nic, use_cma) constructs in the mapping.
Introducing the "display" application using the CMA component to acces the frame buffer.

Location:

soft/giet_vm/giet_python

Files:

• genmap (modified) (3 diffs)
• mapping.py (modified) (16 diffs)

soft/giet_vm/giet_python/genmap

@@ -102 +102 @@
                    help = 'map the "router" application for the GietVM' )
 
+parser.add_option( '--display', action = 'store_true', dest = 'display',     
+                   default = False,
+                   help = 'map the "display" application for the GietVM' )
+
 ######################################################################################
 #   Get command line arguments
@@ -129 +133 @@
 map_convol    = options.convol      # map "convol" application if True
 map_router    = options.router      # map "convol" application if True
+map_display   = options.display     # map "convol" application if True
 
 ######################################################################################
@@ -155 +160 @@
     app = __import__( 'transpose' )
     app.transpose( mapping )
-    print '[genmap] application "transpose" loaded'
+    print '[genmap] application "transpose" will be loaded'
 
 if ( map_sort ):      
     app = __import__( 'sort' )
     app.sort( mapping )
-    print '[genmap] application "sort" loaded'
+    print '[genmap] application "sort" will be loaded'
 
 if ( map_convol ):      
     app = __import__( 'convol' )
     app.convol( mapping )
-    print '[genmap] application "convol" loaded'
+    print '[genmap] application "convol" will be loaded'
 
 if ( map_router ):      
     app = __import__( 'router' )
     app.router( mapping )
-    print '[genmap] application "router" loaded'
+    print '[genmap] application "router" will be loaded'
+
+if ( map_display ):      
+    app = __import__( 'display' )
+    app.display( mapping )
+    print '[genmap] application "display" will be loaded'
 
 ######################################################################################

soft/giet_vm/giet_python/mapping.py

@@ -19 +19 @@
 #                        a set of 'Task'      (user tasks mapping)
 # - A 'Vseg'   contains  a set of 'Vobj'
-# - A 'Periph' contains  a set of 'Irq'       (only for XCU, ICU and PIC types )
+# - A 'Periph' contains  a set of 'Irq'       (only for XCU and PIC types )
 # - A 'Coproc' contains  a set of 'Cpports'   (one port per MWMR channel)
 ##########################################################################################
@@ -54 +54 @@
                   'DMA',
                   'FBF',
-                  'ICU',
                   'IOB',
                   'IOC',
@@ -173 +172 @@
         self.x_size         = x_size
         self.y_size         = y_size
-        self.nprocs      = nprocs
+        self.nprocs         = nprocs
         self.x_width        = x_width
         self.y_width        = y_width
@@ -494 +493 @@
                  stackname,             # name of vobj containing stack
                  heapname,              # name of vobj containing heap
-                 startid,               # index in start_vector
-                 usetty = False,        # request a private TTY channel
-                 usenic = False,        # request a private NIC channel
-                 usecma = False,        # request a private CMA channel
-                 usehba = False,        # request a private HBA channel
-                 usetim = False ):      # request a private TIM channel
+                 startid ):             # index in start_vector
 
         assert (x < self.x_size) and (y < self.y_size)
@@ -505 +499 @@
 
         # add one task into mapping
-        task = Task( name, trdid, x, y, lpid, stackname, heapname, startid,
-                     usetty, usenic, usecma, usehba, usetim )
+        task = Task( name, trdid, x, y, lpid, stackname, heapname, startid )
         vspace.tasks.append( task )
         task.index = self.total_tasks
@@ -854 +847 @@
         seg_fbf_size = 0
 
-        nb_icu       = 0
-        icu_channels = 0
-        seg_icu_base = 0xFFFFFFFF
-        seg_icu_size = 0
-
         nb_iob       = 0
         iob_channels = 0
@@ -941 +929 @@
                     nb_fbf +=1
 
-                elif ( periph.ptype == 'ICU' ):
-                    seg_icu_base = periph.pseg.base & 0xFFFFFFFF
-                    seg_icu_size = periph.pseg.size
-                    icu_channels = periph.channels
-                    nb_icu +=1
-
                 elif ( periph.ptype == 'IOB' ):
                     seg_iob_base = periph.pseg.base & 0xFFFFFFFF
@@ -1019 +1001 @@
                     xcu_arg      = periph.arg
                     nb_xcu +=1
-
-        # don't mix ICU and XCU
-        assert ( nb_icu*nb_xcu == 0 )
 
         # no more than two access to external peripherals
@@ -1168 +1147 @@
         s += '#define SEG_FBF_BASE           0x%x\n'  % seg_fbf_base
         s += '#define SEG_FBF_SIZE           0x%x\n'  % seg_fbf_size
-        s += '\n'
-        s += '#define SEG_ICU_BASE           0x%x\n'  % seg_icu_base
-        s += '#define SEG_ICU_SIZE           0x%x\n'  % seg_icu_size
         s += '\n'
         s += '#define SEG_IOB_BASE           0x%x\n'  % seg_iob_base
@@ -1326 +1302 @@
                     s += '    reg = <0x%x  0x%x  0x%x>;\n' % (msb, lsb, size)
                     s += '  };\n\n'
-
-                # search ICU (non supported by Linux)
-                if ( periph.ptype == 'ICU' ):
-                    print '[genmap warning] in linux_dts() : ICU peripheral not supported by LINUX'
 
             # we need one interrupt controler in any cluster containing peripherals
@@ -1762 +1734 @@
                     sys.exit(1)
 
-                # research ICU component
-                elif ( periph.ptype == 'ICU' ):
-                    print '[genmap error] in netbsd_dts() : ICU peripheral not supported by NetBSD'
-                    sys.exit(1)
-
         # topology
         s += '\n'
@@ -2089 +2056 @@
                   stackname,
                   heapname,
-                  startid,
-                  usetty = False,
-                  usenic = False,
-                  usecma = False,
-                  usehba = False,
-                  usetim = False ):
+                  startid ):
 
         self.index     = 0             # global index value set by addTask()
@@ -2105 +2067 @@
         self.heapname  = heapname      # name of vobj containing the heap
         self.startid   = startid       # index in start_vector
-        self.usetty    = usetty        # request a private TTY channel
-        self.usenic    = usenic        # request a private NIC channel
-        self.usecma    = usecma        # request a private CMA channel
-        self.usehba    = usehba        # request a private HBA channel
-        self.usetim    = usetim        # request a private TIM channel
         return
 
@@ -2123 +2080 @@
         s += ' heapname="%s"'              % self.heapname
         s += ' startid="%d"'               % self.startid
-        if self.usetty != 0: s += ' usetty="1"'
-        if self.usenic != 0: s += ' usenic="1"'
-        if self.usecma != 0: s += ' usehba="1"'
-        if self.usehba != 0: s += ' usehba="1"'
-        if self.usetim != 0: s += ' usehba="1"'
         s += ' />\n'
 
@@ -2175 +2127 @@
         byte_stream += mapping.int2bytes( 4,  vobj_heap_id )    # heap vobj local index
         byte_stream += mapping.int2bytes( 4,  self.startid )    # index in start vector
-        byte_stream += mapping.int2bytes( 4,  self.usetty )     # TTY channel required
-        byte_stream += mapping.int2bytes( 4,  self.usenic )     # NIC channel required
-        byte_stream += mapping.int2bytes( 4,  self.usecma )     # CMA channel required
-        byte_stream += mapping.int2bytes( 4,  self.usehba )     # IOC channel required
-        byte_stream += mapping.int2bytes( 4,  self.usetim )     # TIM channel required
 
         if ( verbose ):
@@ -2501 +2448 @@
         s += ' channels="%d"'                % self.channels
         s += ' arg="%d" >\n'                 % self.arg
-        if ( (self.ptype == 'PIC') or (self.ptype == 'XCU') or (self.ptype == 'ICU') ):
+        if ( (self.ptype == 'PIC') or (self.ptype == 'XCU') ):
             for irq in self.irqs: s += irq.xml()
         s += '            </periph>\n'