Changeset 836 for trunk/platforms/tsar_generic_xbar/scripts

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

Location:

trunk/platforms/tsar_generic_xbar/scripts

Files:

• counter_defs.py (modified) (1 diff)
• create_graphs.py (modified) (4 diffs)
• run_simus.py (modified) (8 diffs)

trunk/platforms/tsar_generic_xbar/scripts/counter_defs.py

@@ -9 +9 @@
 m_prot_name['dhccp'] = "DHCCP"
 m_prot_name['rwt'] = "RWT"
-m_prot_name['mesi'] = "HMESI"
+m_prot_name['hmesi'] = "HMESI"
 
 m_app_name = {}

trunk/platforms/tsar_generic_xbar/scripts/create_graphs.py

@@ -7 +7 @@
 
 
-#apps = [ 'histogram', 'mandel', 'filter', 'radix', 'fft_ga' ]
-#apps = [ 'histogram', 'mandel', 'filter', 'radix', 'radix_ga', 'fft', 'fft_ga', 'filt_ga', 'kmeans', 'pca', 'lu' ]
-apps = [ 'fft', 'fft_ga' ]
-nb_procs = [ 1, 4, 8, 16, 32, 64, 128, 256 ]
-single_protocols = ['dhccp', 'rwt']
-joint_protocols = ['dhccp', 'rwt']
+apps = [ 'filter', 'lu', 'fft_ga' ]
+#apps = [ 'histogram', 'mandel', 'filter', 'fft', 'fft_ga', 'filt_ga', 'pca', 'lu' ]  # radix radix_ga kmeans
+#apps = [ 'filt_ga' ]
+nb_procs = [ 1, 4, 8, 16, 32, 64 ]
+single_protocols = ['dhccp', 'rwt' ]
+joint_protocols = ['dhccp', 'rwt' ]
 #joint_protocols = []
 
@@ -403 +403 @@
    gp_stacked_name   = os.path.join(scripts_path, gen_dir, prot + '_stacked.gp')
    
-   norm_factor_value = 256
+   norm_factor_value = nb_procs[-1]
    
    # Creating the gp file
@@ -616 +616 @@
 gp_cost_filename   = os.path.join(scripts_path, gen_dir, 'joint_relative_cost.gp')
    
-direct_cost_metrics = [ 'read_cost', 'write_cost' ]
-coherence_cost_metrics = ['update_cost', 'm_inv_cost', 'broadcast_cost' ]
-   
+direct_cost_metrics = [ 'read_cost', 'write_cost', 'getm_cost' ]
+coherence_cost_metrics = ['update_cost', 'm_inv_cost', 'broadcast_cost', 'inval_ro_cost', 'cleanup_cost', 'cleanup_d_cost' ]
+ 
 # Creating the gp file
 template_file = open(stacked_tmpl, 'r')
@@ -702 +702 @@
 
 
-
-
+#################################################################################
+### Graph 9 :         ###
+#################################################################################
+
+
+data_metric_filename = os.path.join(scripts_path, gen_dir, 'single_metric.dat')
+gp_metric_filename   = os.path.join(scripts_path, gen_dir, 'single_metric.gp')
+   
+metric = 'total_write'
+ 
+# Creating the gp file
+template_file = open(stacked_tmpl, 'r')
+template = template_file.read()
+   
+xtics_str = "("
+first = True
+xpos = 0 # successive x position of the center of the first bar in a application
+app_labels = ""
+prot_labels = ""
+for num_appli in range(0, len(apps)):
+   first_proc = True
+   for i in nb_procs:
+      x = 0 # local var for computing position of protocol names
+      #for prot in joint_protocols:
+         #prot_labels += "set label \"%s\" at first %f, character 2 center font \"Times,10\"\n" % (m_prot_name[prot], float((xpos - 0.5)) + x) # -0.5 instead of +0.5, don't know why... (bug gnuplot?)
+         #x += 1
+
+      if not first:
+         xtics_str += ", "
+      first = False
+      if first_proc:
+         first_proc = False
+         xpos_first = xpos
+      xtics_str += "\"%d\" %f -1" % (i, float(xpos - 0.5 + len(joint_protocols)))
+      xpos_last = xpos
+      xpos += 1 + len(joint_protocols)
+   app_name_xpos = float((xpos_first + xpos_last)) / 2
+   app_labels += "set label \"%s\" at first %f,character 1 center font \"Times,12\"\n" % (m_app_name[apps[num_appli]], app_name_xpos)
+   xpos += 1
+xtics_str += ")"
+
+n = 1
+plot_str = "newhistogram \"\""
+for prot in joint_protocols:
+   plot_str += ", \\\n    " + "'" + data_metric_filename + "'" + " using " + str(n) + " lc rgb " + colors[n] + " title \"" + m_metric_name[metric] + " for " + m_prot_name[prot] + "\""
+   n += 1
+
+ylabel_str = "%(m)s" % dict(m = m_metric_name[metric])
+content = template % dict(svg_name = os.path.join(graph_dir, 'single_metric'), xtics_str = xtics_str, plot_str = plot_str, ylabel_str = ylabel_str, app_labels = app_labels, prot_labels = prot_labels)
+
+create_file(gp_metric_filename, content)
+
+# Creating the data file
+content = "#" + metric
+content += "\n"
+for app in apps:
+   if app != apps[0]:
+      for prot in joint_protocols:
+         for p in joint_protocols:
+            content += "%-15f " % 0.0
+         content += "\n"
+   for i in nb_procs:
+      for prot in joint_protocols:
+         for p in joint_protocols:
+            if p != prot:
+               content += "%-15f " % 0
+            else:
+               content += "%-15f " % (float(metrics_val[prot][app][i][metric]))
+         content += "\n"
+      if i != nb_procs[-1]:
+         for p in joint_protocols:
+            content += "%-15f " % 0.0
+         content += "\n"
+
+create_file(data_metric_filename, content)
+# Calling gnuplot
+print "gnuplot", gp_metric_filename
+subprocess.call([ 'gnuplot', gp_metric_filename ])
+
+
+
+

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()
+