Changeset 764 for trunk/platforms

Timestamp:

Aug 11, 2014, 9:58:17 PM (10 years ago)

Author:

alain

Message:

Modify arch.py to support idle_task in scheduler.
(scheduler vseg must have 8 Kbytes)

Location:

trunk/platforms/tsar_generic_iob

Files:

• arch.py (modified) (5 diffs)
• giet_vm (deleted)
• top.cpp (modified) (8 diffs)

trunk/platforms/tsar_generic_iob/arch.py

@@ -43 +43 @@
     nb_ttys           = 1
     nb_nics           = 2 
-    fbf_width         = 1024
+    fbf_width         = 128
     x_io              = 0
     y_io              = 0
@@ -59 +59 @@
 
     assert( (x_size == 1) or (x_size == 2) or (x_size == 4) 
-             or (y_size == 8) or (x_size == 16) )
+             or (x_size == 8) or (x_size == 16) )
 
     assert( (y_size == 1) or (y_size == 2) or (y_size == 4) 
@@ -114 +114 @@
 
     boot_mapping_vbase   = 0x00000000      # ident
-    boot_mapping_size    = 0x00080000      # 256 Kbytes
+    boot_mapping_size    = 0x00080000      # 512 Kbytes
 
     boot_code_vbase      = 0x00080000      # ident
@@ -120 +120 @@
   
     boot_data_vbase      = 0x000C0000      # ident
-    boot_data_size       = 0x00080000      # 512 Kbytes (including 128K bytes for the GIET_ELF_BUFFER)
+    boot_data_size       = 0x00080000      # 512 Kbytes
 
     boot_stack_vbase     = 0x00140000      # ident
@@ -140 +140 @@
 
     kernel_sched_vbase   = 0xF0000000            # distributed in all clusters
-    kernel_sched_size    = 0x1000 * nb_procs     # 4 kbytes per processor
+    kernel_sched_size    = 0x2000 * nb_procs     # 8 kbytes per processor
 
     ### create mapping

trunk/platforms/tsar_generic_iob/top.cpp

@@ -206 +206 @@
 #define L1_DSETS              64
 
-#define BDEV_IMAGE_NAME       "../../../giet_vm/hdd/virt_hdd.dmg"
-
-#define NIC_RX_NAME           "giet_vm/nic/rx_packets.txt"
-#define NIC_TX_NAME           "giet_vm/nic/tx_packets.txt"
+#define BDEV_IMAGE_NAME       "virt_hdd.dmg"
+
+#define NIC_RX_NAME           "/dev/null"
+#define NIC_TX_NAME           "/dev/null"
 #define NIC_TIMEOUT           10000
 
@@ -229 +229 @@
 //////////////////////i/////////////////////////////////////
 
-#define MAX_FROZEN_CYCLES     20000000
+#define MAX_FROZEN_CYCLES     100000
 
 /////////////////////////////////////////////////////////
@@ -245 +245 @@
 // All initiators are in the same indexing space (14 bits).
 // The SRCID is structured in two fields:
-// - The 10 MSB bits define the cluster index (left aligned)
-// - The 4  LSB bits define the local index.
+// - The 8 MSB bits define the cluster index (left aligned)
+// - The 6  LSB bits define the local index.
 // Two different initiators cannot have the same SRCID, but a given
 // initiator can have two alias SRCIDs:
@@ -328 +328 @@
    ssize_t  threads_nr       = 1;                          // simulator's threads number
    bool     debug_ok         = false;                      // trace activated
-   size_t   debug_period     = 1;                          // trace period
    size_t   debug_memc_id    = 0xFFFFFFFF;                 // index of traced memc
    size_t   debug_proc_id    = 0xFFFFFFFF;                 // index of traced proc
@@ -418 +417 @@
             frozen_cycles = atoi(argv[n+1]);
          }
-         else if ((strcmp(argv[n], "-PERIOD") == 0) && (n+1 < argc))
-         {
-            debug_period = atoi(argv[n+1]);
-         }
          else
          {
@@ -433 +428 @@
             std::cout << "     -THREADS simulator's threads number" << std::endl;
             std::cout << "     -FROZEN max_number_of_lines" << std::endl;
-            std::cout << "     -PERIOD number_of_cycles between trace" << std::endl;
             std::cout << "     -MEMCID index_memc_to_be_traced" << std::endl;
             std::cout << "     -XRAMID index_xram_to_be_traced" << std::endl;
@@ -1431 +1425 @@
 
         // Monitor a specific address for one L2 cache
-        // clusters[0][0]->memc->cache_monitor( 0xE1904ULL, true );   // single word
+        // clusters[0][0]->memc->cache_monitor( 0x1c4924LL, true );   // single word
 
         // Monitor a specific address for one XRAM
         // clusters[0][0]->xram->start_monitor( 0xE1900ULL , 64);
 
-        if (debug_ok and (n > debug_from) and (n % debug_period == 0))
+        if ( debug_ok and (n > debug_from) )
         {
             std::cout << "****************** cycle " << std::dec << n ;
@@ -1448 +1442 @@
                 size_t x          = cluster_xy >> 4;
                 size_t y          = cluster_xy & 0xF;
-  
-                clusters[x][y]->proc[l]->print_trace(0x40);
+
+                clusters[x][y]->proc[l]->print_trace(0x1);
                 std::ostringstream proc_signame;
                 proc_signame << "[SIG]PROC_" << x << "_" << y << "_" << l ;