Changeset 271 for soft/giet_vm/mappings/4c_1p_sort.xml

Timestamp:

Jan 17, 2014, 11:49:27 PM (11 years ago)

Author:

cfuguet

Message:

• Bugfix: The ISR_SWITCH index should be NB_PROCS_MAX + local_pid. This is because the first NB_PROCS_MAX indexes on the XICU in each cluster are used for the WAKEUP software interrupts.

• Relocating the memcpy and memset functions into the giet_libs/stdlib.* files.

• Modification of the sort application to used 8 threads instead of
  4. Modifying the mapping files to distribute the 8 threads on the available processors. (Ex. When using 4 processors, each one executes 2 threads)

File:

• soft/giet_vm/mappings/4c_1p_sort.xml (modified) (2 diffs)

soft/giet_vm/mappings/4c_1p_sort.xml

@@ -59 +59 @@
 
         <cluster x = "0" y = "1" >
+            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x0100000000" length = "0x0001000000" />
+            <pseg name = "PSEG_XCU"  type = "PERI" base = "0x01B0000000" length = "0x0000002000" />
+            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x01B1000000" length = "0x0000008000" />
+            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x01B8000000" length = "0x0000001000" />
+
+            <proc index = "0" >
+                <irq type = "SOFT" icuid = "0" isr = "ISR_WAKUP" />
+                <irq type = "TIME" icuid = "1" isr = "ISR_SWITCH" />
+            </proc>
+
+            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1" />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
+            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
+        </cluster>
+
+        <cluster x = "1" y = "0" >
             <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x1000000000" length = "0x0001000000" />
             <pseg name = "PSEG_XCU"  type = "PERI" base = "0x10B0000000" length = "0x0000002000" />
             <pseg name = "PSEG_DMA"  type = "PERI" base = "0x10B1000000" length = "0x0000008000" />
             <pseg name = "PSEG_MMC"  type = "PERI" base = "0x10B8000000" length = "0x0000001000" />
-
-            <proc index = "0" >
-                <irq type = "SOFT" icuid = "0" isr = "ISR_WAKUP" />
-                <irq type = "TIME" icuid = "1" isr = "ISR_SWITCH" />
-            </proc>
-
-            <periph type = "DMA"  psegname = "PSEG_DMA"  channels = "1" />
-            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
-            <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
-        </cluster>
-
-        <cluster x = "1" y = "0" >
-            <pseg name = "PSEG_RAM"  type = "RAM"  base = "0x0100000000" length = "0x0001000000" />
-            <pseg name = "PSEG_XCU"  type = "PERI" base = "0x01B0000000" length = "0x0000002000" />
-            <pseg name = "PSEG_DMA"  type = "PERI" base = "0x01B1000000" length = "0x0000008000" />
-            <pseg name = "PSEG_MMC"  type = "PERI" base = "0x01B8000000" length = "0x0000001000" />
 
             <proc index = "0" >
@@ -255 +255 @@
             <vseg name = "seg_sort_stack0" vbase = "0x00800000" mode = "C_WU" x = "0" y = "0" psegname = "PSEG_RAM" >
                 <vobj name = "sort_stack0" type  = "BUFFER" length = "0x00010000" /> 
+                <vobj name = "sort_stack1" type  = "BUFFER" length = "0x00010000" /> 
                 <vobj name = "sort_heap0"  type  = "BUFFER" length = "0x00010000" /> 
             </vseg>
             <vseg name = "seg_sort_stack1" vbase = "0x00A00000" mode = "C_WU" x = "0" y = "1" psegname = "PSEG_RAM" >
-                <vobj name = "sort_stack1" type  = "BUFFER" length = "0x00010000" /> 
+                <vobj name = "sort_stack2" type  = "BUFFER" length = "0x00010000" /> 
+                <vobj name = "sort_stack3" type  = "BUFFER" length = "0x00010000" /> 
                 <vobj name = "sort_heap1"  type  = "BUFFER" length = "0x00010000" /> 
             </vseg>
             <vseg name = "seg_sort_stack2" vbase = "0x00C00000" mode = "C_WU" x = "1" y = "0" psegname = "PSEG_RAM" >
-                <vobj name = "sort_stack2" type  = "BUFFER" length = "0x00010000" /> 
+                <vobj name = "sort_stack4" type  = "BUFFER" length = "0x00010000" /> 
+                <vobj name = "sort_stack5" type  = "BUFFER" length = "0x00010000" /> 
                 <vobj name = "sort_heap2"  type  = "BUFFER" length = "0x00010000" /> 
             </vseg>
             <vseg name = "seg_sort_stack3" vbase = "0x00E00000" mode = "C_WU" x = "1" y = "1" psegname = "PSEG_RAM" >
-                <vobj name = "sort_stack3" type  = "BUFFER" length = "0x00010000" /> 
+                <vobj name = "sort_stack6" type  = "BUFFER" length = "0x00010000" /> 
+                <vobj name = "sort_stack7" type  = "BUFFER" length = "0x00010000" /> 
                 <vobj name = "sort_heap3"  type  = "BUFFER" length = "0x00010000" /> 
             </vseg>
 
-            <task name = "sort_0" trdid = "0" x = "0" y = "0" proclocid = "0" stackname = "sort_stack0" heapname = "sort_heap3" startid = "0" usetty = "1" />
-            <task name = "sort_1" trdid = "1" x = "0" y = "1" proclocid = "0" stackname = "sort_stack1" heapname = "sort_heap3" startid = "0" usetty = "1" />
-            <task name = "sort_2" trdid = "2" x = "1" y = "0" proclocid = "0" stackname = "sort_stack2" heapname = "sort_heap3" startid = "0" usetty = "1" />
-            <task name = "sort_3" trdid = "3" x = "1" y = "1" proclocid = "0" stackname = "sort_stack3" heapname = "sort_heap3" startid = "0" usetty = "1" />
+            <task name = "sort_0" trdid = "0" x = "0" y = "0" proclocid = "0" stackname = "sort_stack0" heapname = "sort_heap0" startid = "0" usetty = "1" />
+            <task name = "sort_1" trdid = "1" x = "0" y = "0" proclocid = "0" stackname = "sort_stack1" heapname = "sort_heap0" startid = "0" usetty = "1" />
+            <task name = "sort_2" trdid = "2" x = "0" y = "1" proclocid = "0" stackname = "sort_stack2" heapname = "sort_heap1" startid = "0" usetty = "1" />
+            <task name = "sort_3" trdid = "3" x = "0" y = "1" proclocid = "0" stackname = "sort_stack3" heapname = "sort_heap1" startid = "0" usetty = "1" />
+            <task name = "sort_4" trdid = "4" x = "1" y = "0" proclocid = "0" stackname = "sort_stack4" heapname = "sort_heap2" startid = "0" usetty = "1" />
+            <task name = "sort_5" trdid = "5" x = "1" y = "0" proclocid = "0" stackname = "sort_stack5" heapname = "sort_heap2" startid = "0" usetty = "1" />
+            <task name = "sort_6" trdid = "6" x = "1" y = "1" proclocid = "0" stackname = "sort_stack6" heapname = "sort_heap3" startid = "0" usetty = "1" />
+            <task name = "sort_7" trdid = "7" x = "1" y = "1" proclocid = "0" stackname = "sort_stack7" heapname = "sort_heap3" startid = "0" usetty = "1" />
         </vspace>
     </vspaceset>