Changeset 836 for trunk/platforms/tsar_generic_xbar/scripts/run_simus.py

Timestamp:

Oct 15, 2014, 11:41:49 AM (10 years ago)

Author:

meunier

Message:

Trunk:

• Cosmetic in mem_cache_directory.h and xram_transaction.h
• Renamed mem_cache param dspin_in_width and dspin_out_width to memc_dspin_in_width and memc_dspin_out_width (because of a bug in soclib-cc ?). Should have updated these names in the .sd or .py files of all platforms
• Updated the scripts for tsar_generic_xbar to take into account the ideal write-through + added a graph in create_graphs.py

File:

• trunk/platforms/tsar_generic_xbar/scripts/run_simus.py (modified) (8 diffs)

trunk/platforms/tsar_generic_xbar/scripts/run_simus.py

@@ -12 +12 @@
 # User parameters
 nb_procs = [ 4 ]
-#nb_procs = [ 16, 32, 64, 128, 256 ]
+#nb_procs = [ 1, 4, 8, 16, 32, 64, 128, 256 ]
 rerun_stats = False
 use_omp = False
-protocol = 'dhccp'
+protocol = 'wtidl'
 
 #apps = [ 'histogram', 'mandel', 'filter', 'radix_ga', 'fft_ga', 'kmeans' ]
@@ -32 +32 @@
 # to come: 'barnes', 'fmm', 'ocean', 'raytrace', 'radiosity', 'waters', 'watern'
 
-all_protocols = [ 'dhccp', 'rwt', 'hmesi' ]
+all_protocols = [ 'dhccp', 'rwt', 'hmesi', 'wtidl' ]
 
 top_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
@@ -66 +66 @@
  - apps_dir:      path to almos-tsar-mipsel/apps directory
  - almos_src_dir: path to almos source directory (for kernel and bootloader binaries)
- - hdd_img_name:  path to the hdd image to use
+ - hdd_img_name:  path to the hdd image to use (will be copied but not modified)
+ - tsar_dir:      path to tsar repository
+Optional definitions (necessary if you want to use alternative protocols):
+ - rwt_dir:       path to the RWT repository
+ - hmesi_dir:     path to HMESI directory
+ - wtidl_dir:     path to the ideal write-through protocol directory
 *** Stopping execution
 '''
@@ -98 +103 @@
     if not os.path.exists(hmesi_dir):
         print "*** Error: variable hmesi_dir does not define a valid path"
+        sys.exit()
+
+if protocol == "wtidl":
+    if wtidl_dir == "":
+        print "*** Error: variable wtidl_dir not defined in config file"
+        sys.exit()
+    if not os.path.exists(wtidl_dir):
+        print "*** Error: variable wtidl_dir does not define a valid path"
         sys.exit()
 
@@ -156 +169 @@
             'modules/vci_io_bridge',
             'modules/vci_iox_network',
-            'modules/vci_spi'
+            'modules/vci_spi',
             'platforms/tsar_generic_xbar/tsar_xbar_cluster'
     ]
@@ -164 +177 @@
             'lib/generic_cache_tsar',
             'modules/vci_cc_vcache_wrapper',
-            'modules/vci_mem_cache'
+            'modules/vci_mem_cache',
     ]
 
@@ -179 +192 @@
     elif protocol == "hmesi":
         arch_dir = hmesi_dir
+    elif protocol == "wtidl":
+        arch_dir = wtidl_dir
     else:
         assert(False)
@@ -213 +228 @@
 #define IOMMU_ACTIVE        0
 
-#define   IRQ_PER_PROCESSOR   1
-
-#endif //_HD_CONFIG_H
+#define IRQ_PER_PROCESSOR   1
 ''' % dict(x = x, y = y, nb_clus = x * y)
+
+   if protocol == 'wtidl':
+       header += '#define WT_IDL\n'
+
+   header += '#endif //_HD_CONFIG_H\n'
+
    file = open(hard_config, 'w')
    file.write(header)
    file.close()
+