Changeset 762 for trunk

Timestamp:

Aug 5, 2014, 4:57:46 PM (10 years ago)

Author:

alain

Message:

1/ reducing boot and kernel segments sizes (mainly data) in arch.py
2/introducing the simul_period variable in top.cpp to support OPENMP.

Location:

trunk/platforms/tsar_generic_iob

Files:

• arch.py (modified) (2 diffs)
• top.cpp (modified) (10 diffs)

trunk/platforms/tsar_generic_iob/arch.py

@@ -114 +114 @@
 
     boot_mapping_vbase   = 0x00000000      # ident
-    boot_mapping_size    = 0x00040000      # 256 Kbytes
-
-    boot_code_vbase      = 0x00040000      # ident
+    boot_mapping_size    = 0x00080000      # 256 Kbytes
+
+    boot_code_vbase      = 0x00080000      # ident
     boot_code_size       = 0x00040000      # 256 Kbytes 
   
-    boot_data_vbase      = 0x00080000      # ident
-    boot_data_size       = 0x00080000      # 512 Kbytes
-
-    boot_stack_vbase     = 0x00100000      # ident
+    boot_data_vbase      = 0x000C0000      # ident
+    boot_data_size       = 0x00080000      # 512 Kbytes (including 128K bytes for the GIET_ELF_BUFFER)
+
+    boot_stack_vbase     = 0x00140000      # ident
     boot_stack_size      = 0x00050000      # 320 Kbytes
 
@@ -131 +131 @@
 
     kernel_data_vbase    = 0x80020000
-    kernel_data_size     = 0x00060000      # 384 Kbytes
-
-    kernel_uncdata_vbase = 0x80080000
-    kernel_uncdata_size  = 0x00040000      # 256 Kbytes
-
-    kernel_init_vbase    = 0x800C0000
+    kernel_data_size     = 0x00020000      # 128 Kbytes
+
+    kernel_uncdata_vbase = 0x80040000
+    kernel_uncdata_size  = 0x00010000      # 64 Kbytes
+
+    kernel_init_vbase    = 0x80050000
     kernel_init_size     = 0x00010000      # 64 Kbytes
 

trunk/platforms/tsar_generic_iob/top.cpp

@@ -148 +148 @@
 //               Parallelisation
 ///////////////////////////////////////////////////
-#define USE_OPENMP               0
-
-#if USE_OPENMP
+
+#define USING_OPENMP           0
+
+#if USING_OPENMP
 #include <omp.h>
 #endif
@@ -185 +186 @@
 //////////////////////i/////////////////////////////////////
 
-#include "hard_config.h"
+#include "../../../giet_vm/hard_config.h"
 
 ////////////////////////////////////////////////////////////
@@ -321 +322 @@
 
    char     soft_name[256]   = BOOT_SOFT_NAME;             // pathname: binary code
-   size_t   ncycles          = 1000000000;                 // simulated cycles
+   size_t   ncycles          = 4000000000;                 // simulated cycles
    char     disk_name[256]   = BDEV_IMAGE_NAME;            // pathname: disk image
    char     nic_rx_name[256] = NIC_RX_NAME;                // pathname: rx packets file
@@ -338 +339 @@
    size_t   x_width          = 4;                          // at most 256 clusters
    size_t   y_width          = 4;                          // at most 256 clusters
+
+#if USING_OPENMP
+   size_t   simul_period     = 1000000;
+#else
+   size_t   simul_period     = 1;
+#endif
 
    assert( (X_WIDTH == 4) and (Y_WIDTH == 4) and
@@ -472 +479 @@
    std::cout << std::endl;
 
-#if USE_OPENMP
+#if USING_OPENMP
    omp_set_dynamic(false);
    omp_set_num_threads(threads_nr);
@@ -984 +991 @@
                   dspin_ram_rsp_width>* clusters[XMAX][YMAX];
 
-#if USE_OPENMP
+#if USING_OPENMP
 #pragma omp parallel
     {
@@ -994 +1001 @@
             size_t y = i % YMAX;
 
-#if USE_OPENMP
+#if USING_OPENMP
 #pragma omp critical
             {
@@ -1074 +1081 @@
             );
 
-#if USE_OPENMP
+#if USING_OPENMP
             } // end critical
 #endif
         } // end for
-#if USE_OPENMP
+#if USING_OPENMP
     }
 #endif
@@ -1400 +1407 @@
     gettimeofday(&t1, NULL);
 
-    for (size_t n = 1; n < ncycles; n++)
+
+    for ( size_t n = 0; n < ncycles ; n += simul_period )
     {
         // stats display
@@ -1559 +1567 @@
         }
 
-        sc_start(sc_core::sc_time(1, SC_NS));
+        sc_start(sc_core::sc_time(simul_period, SC_NS));
     }
     return EXIT_SUCCESS;