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

Timestamp:

Oct 21, 2015, 11:48:40 AM (9 years ago)

Author:

meunier

Message:

• Update the scripts to use a common file hard_params.py in both gen_arch_info and gen_hdd
• Adding the P_WIDTH parameter in the topcell

File:

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

trunk/platforms/tsar_generic_xbar/scripts/run_simus.py

@@ -15 +15 @@
 
 # User parameters
-bscpu = 0
-#nb_procs = [ 4 ]
-nb_procs = [ 1, 4, 8, 16, 32, 64, 128, 256 ]
-rerun_stats = True
-use_omp = True
+bscpu = 0 # bootstrap CPU
+nb_procs = [ 4 ]
+#nb_procs = [ 1, 4, 8, 16, 32, 64, 128, 256 ]
+rerun_stats = False
+use_omp = False
 protocol = 'rwt'
 cpu_per_cluster = 4
 # mode must be one of 'test' and 'simu'
-mode = 'simu'
+mode = 'test'
 
 #apps = [ 'cholesky', 'fft', 'fft_ga', 'filter', 'filt_ga', 'histogram', 'kmeans', 'lu', 'mandel', 'mat_mult', 'pca', 'radix_ga' ]
 #apps = [ 'histogram', 'mandel', 'filter', 'radix_ga', 'fft_ga', 'kmeans' ]
-apps = [ 'blackscholes', 'linear_regression', 'string_match', 'swaptions', 'fluidanimate' ]
+#apps = [ 'blackscholes', 'linear_regression', 'string_match', 'swaptions', 'fluidanimate' ]
+apps = [ 'hello', 'taquin', '2048' ]
 
 
@@ -40 +41 @@
 # Global Variables
 
-all_apps = [ 'blackscholes', 'boot_only', 'cholesky', 'fft', 'fft_ga', 'filter', 'filt_ga', 'fluidanimate', 'histogram', 'histo-opt', 'kmeans', 'kmeans-opt', 'linear_regression', 'lu', 'mandel', 'mat_mult', 'mat_mult-opt', 'pca', 'pca-opt', 'radix', 'radix_ga', 'showimg', 'string_match', 'swaptions', ]
+all_apps = [ '2048', 'blackscholes', 'boot_only', 'cholesky', 'fft', 'fft_ga', 'filter', 'filt_ga', 'fluidanimate', 'hello', 'histogram', 'histo-opt', 'kmeans', 'kmeans-opt', 'linear_regression', 'lu', 'mandel', 'mat_mult', 'mat_mult-opt', 'pca', 'pca-opt', 'radix', 'radix_ga', 'showimg', 'string_match', 'swaptions', 'taquin']
 # to come: 'barnes', 'fmm', 'ocean', 'raytrace', 'radiosity', 'waters', 'watern'
 
 all_protocols = [ 'dhccp', 'rwt', 'hmesi', 'wtidl', 'snoop' ]
 
-top_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "..")
+top_path = os.path.abspath(os.path.join(os.path.dirname(os.path.realpath(__file__)), ".."))
 config_name = os.path.join(os.path.dirname(os.path.realpath(__file__)), "config.py")
 
-scripts_path         = os.path.join(top_path, 'scripts')
-almos_path           = os.path.join(top_path, 'almos')
-soclib_conf_name     = os.path.join(top_path, "soclib.conf")
-topcell_name         = os.path.join(top_path, "top.cpp")
-partition_root_path  = os.path.join(top_path, "hdd_root")
-arch_info_name       = os.path.join(almos_path, "arch-info-gen.info")
-arch_info_bib_name   = os.path.join(almos_path, 'arch-info.bib')
-hdd_img_file_name    = os.path.join(almos_path, "hdd-img.bin")
-shrc_file_name       = os.path.join(almos_path, "shrc")
-hard_config_name     = os.path.join(almos_path, "hard_config.h")
-bootloader_link_name = os.path.join(almos_path, "bootloader-tsar-mipsel.bin")
+scripts_path          = os.path.join(top_path, 'scripts')
+almos_path            = os.path.join(top_path, 'almos')
+soclib_conf_name      = os.path.join(top_path, "soclib.conf")
+topcell_name          = os.path.join(top_path, "top.cpp")
+partition_root_path   = os.path.join(top_path, "hdd_root")
+arch_info_name        = os.path.join(almos_path, "arch-info.info")
+arch_info_bib_name    = os.path.join(almos_path, 'arch-info.bib')
+hdd_img_file_name     = os.path.join(almos_path, "hdd-img.bin")
+shrc_file_name        = os.path.join(almos_path, "shrc")
+hard_config_name      = os.path.join(almos_path, "hard_config.h")
+bootloader_file_name  = os.path.join(almos_path, "bootloader-tsar-mipsel.bin")
+preloader_file_name   = os.path.join(almos_path, "preloader.elf")
+preloader_build_path  = os.path.join(almos_path, "build_preloader")
+bootloader_build_path = os.path.join(almos_path, "build_bootloader")
 
 
@@ -87 +91 @@
  - almos_src_dir:     path to almos source directory (for kernel and bootloader binaries)
  - preloader_src_dir: path to the preloader main directory (where to run make)
- - 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):
@@ -102 +105 @@
 
 # Check that variables and paths exist
-for var in [ 'apps_dir', 'almos_src_dir', 'hdd_img_name', 'tsar_dir' ]:
+for var in [ 'apps_dir', 'almos_src_dir', 'tsar_dir' ]:
     if eval(var) == "":
         print "*** Error: variable %s not defined in config file" % (var)
@@ -183 +186 @@
 def gen_soclib_conf():
     if os.path.isfile(soclib_conf_name):
-        print "Updating file %s" % (soclib_conf_name)
+        print "# Updating file %s" % (soclib_conf_name)
         # First, remove lines containing "addDescPath"
         f = open(soclib_conf_name, "r")
@@ -196 +199 @@
         f.close()
     else:
-        print "Creating file %s" % (soclib_conf_name)
+        print "# Creating file %s" % (soclib_conf_name)
         f = open(soclib_conf_name, "w")
         f.close()
@@ -245 +248 @@
 
 
-def gen_arch_info_bib(x, y, arch_info, arch_info_bib):
+def gen_arch_info_bib(x, y, x_width, y_width):
+    print "### Generating arch-info files"
     old_path = os.getcwd()
 
     print "cd", scripts_path
     os.chdir(scripts_path)
-    gen_arch_info(x, y, x_width, y_width, bscpu, arch_info)
+    gen_arch_info(x, y, x_width, y_width, cpu_per_cluster, bscpu, arch_info_name)
     os.chdir(almos_path)
    
-    cmd = ['./info2bib', '-i', arch_info, '-o', arch_info_bib]
+    cmd = ['./info2bib', '-i', arch_info_name, '-o', arch_info_bib_name]
     print_and_call(cmd)
 
     print "cd", old_path
     os.chdir(old_path)
+
+    print "### End of arch-info files generation"
    
 
-def gen_sym_links():
-    target = os.path.join(almos_src_dir, 'tools/soclib-bootloader/bootloader-tsar-mipsel.bin')
-    if not os.path.isfile(bootloader_link_name):
-        print "ln -s", target, bootloader_link_name
-        os.symlink(target, bootloader_link_name)
-
-    #target = os.path.join(almos_src_dir, 'kernel/obj.tsar/almix-tsar-mipsel.bin')
-    #link_name = 'kernel-soclib.bin'
-    #if not os.path.isfile(link_name):
-    #    print "ln -s", target, link_name
-    #    os.symlink(target, link_name)
+#def gen_sym_links():
+#    print "### Generating symbolic links"
+#    target = os.path.join(almos_src_dir, 'tools/soclib-bootloader/bootloader-tsar-mipsel.bin')
+#    if not os.path.isfile(bootloader_link_name):
+#        print "ln -s", target, bootloader_link_name
+#        os.symlink(target, bootloader_link_name)
+#
+#    print "### End of symbolic links generation"
+#    #target = os.path.join(almos_src_dir, 'kernel/obj.tsar/almix-tsar-mipsel.bin')
+#    #link_name = 'kernel-soclib.bin'
+#    #if not os.path.isfile(link_name):
+#    #    print "ln -s", target, link_name
+#    #    os.symlink(target, link_name)
 
 
 def compile_almos():
+    print "### Compiling Almos"
     old_path = os.getcwd()
 
@@ -279 +288 @@
     os.chdir(almos_src_dir)
     cmd = ['make']
-    print_and_call(cmd)
+    retval = print_and_call(cmd)
+    if retval != 0:
+        sys.exit()
+
+    print "cd", old_path
+    os.chdir(old_path)
+
+    print "### End of Almos compilation"
+ 
+
+def compile_bootloader():
+    # This function depends upon the file arch-info.bib and should be called
+    # every time it is modified
+    print "### Compiling Almos bootloader"
+    old_path = os.getcwd()
+
     bootloader_dir = os.path.join(almos_src_dir, 'tools/soclib-bootloader')
     print "cd", bootloader_dir
     os.chdir(bootloader_dir)
-    print_and_call(cmd)
+    cmd = ['make', 'ARCH_BIB=%s' % (arch_info_bib_name), 'BUILD_DIR=%s' % (bootloader_build_path), 'TARGET_DIR=%s' % (almos_path)]
+    retval = print_and_call(cmd)
+    if retval != 0:
+        sys.exit()
 
     print "cd", old_path
     os.chdir(old_path)
- 
+
+    print "### End of Almos bootloader compilation"
+ 
+
 
 def compile_preloader():
+    # This function depends upon the file hard_config.h, and should be called
+    # every time it is modified
+    print "### Compiling preloader"
     old_path = os.getcwd()
+
     hard_conf_path_set = "HARD_CONFIG_PATH=" + almos_path
     bscpu_set = "BS_PROC=%d" % bscpu
@@ -296 +330 @@
     print "cd", preloader_src_dir
     os.chdir(preloader_src_dir)
-    cmd = ['make', hard_conf_path_set, bscpu_set, 'USE_DT=0']
-    print_and_call(cmd)
+    cmd = ['make', hard_conf_path_set, bscpu_set, 'USE_DT=0', 'BUILD_DIR=%s' % (preloader_build_path)]
+    retval = print_and_call(cmd)
+    if retval != 0:
+        sys.exit()
 
     print "cd", old_path
     os.chdir(old_path)
 
+    print "### End of preloader compilation"
+
 
 
 
 def compile_app(app_name):
+    print "### Compiling application %s" % (app_name)
 
     #if app_name in splash2:
@@ -352 +391 @@
     print "cd", old_path
     os.chdir(old_path)
+
+    print "### End of compilation for application %s" % (app_name)
 # end of compile_app
 
@@ -358 +399 @@
 
 def gen_shrc(app_name, nprocs):
-    # Creation/Modification du shrc de almos
+    # Creation/Modification of almos shrc file
+    print "### Generating shrc for application %s and %d threads" % (app_name, nprocs)
     if mode == 'test':
         if (app_name == "blackscholes"):
@@ -374 +416 @@
         elif (app_name == "fluidanimate"):
             shrc = "exec -p 0 /bin/fluidani -n%(nproc)d -i /etc/flui_15K.flu\n" % dict(nproc = nprocs)
+        elif (app_name == "hello"):
+            shrc = "exec -p 0 /bin/hello -n%(nproc)d\n" % dict(nproc = nprocs)
         elif (app_name == "histogram"):
             shrc = "exec -p 0 /bin/histogra -n%(nproc)d /etc/histo_s.bmp\n" % dict(nproc = nprocs)
@@ -480 +524 @@
     cmd = ['cp', shrc_file_name, os.path.join(partition_root_path, "etc", "shrc")]
     print_and_call(cmd)
+
+    print "### End of shrc generation for application %s and %d threads" % (app_name, nprocs)
 # end of gen_shrc
 
@@ -487 +533 @@
 print_and_call(cmd)
 
-gen_sym_links()
+#gen_sym_links()
 gen_soclib_conf()
-compile_preloader()
 compile_almos()
 # Compile application once at the beginning not to intererfere with
@@ -507 +552 @@
     x_width = get_nb_bits(x)
     y_width = get_nb_bits(y)
-    nthreads = min(4, x * y)
+    nthreads = min(4, x * y) # thread number for parallel systemcass
     hard_config(x, y, x_width, y_width, cpu_per_cluster, hard_config_name, protocol)
-    gen_arch_info_bib(x, y, arch_info_name, arch_info_bib_name)
+    gen_arch_info_bib(x, y, x_width, y_width)
+    # We must recompile the preloader because we modified the hard_config file
+    # and the bootloader because we modified the arch-info.bib file
+    compile_preloader()
+    compile_bootloader()
 
     cmd = ['touch', topcell_name]
@@ -523 +572 @@
         gen_shrc(app, i)
 
-        # Remove current disk image
-        print "rm", hdd_img_file_name
-        os.remove(hdd_img_file_name)
-
         # Regenerate disk image
-        hdd_img(partition_root_path, hdd_img_file_name, "fat32", bootloader_link_name)
+        hdd_img(partition_root_path, hdd_img_file_name, "fat32", bootloader_file_name)
 
         # Launch simulation
@@ -560 +605 @@
             assert(start2_found and end_found)
           
-            # Regenerate shrc and hdd to ensure having the same hdd image
-            gen_shrc(app, i)
+            # Regenerate hdd to ensure having the same hdd image
+            hdd_img(partition_root_path, hdd_img_file_name, "fat32", bootloader_file_name)
  
             # Relauching simulation with reset and dump of counters
@@ -581 +626 @@
             file.write(output)
             file.close()
- 
 
 ## End of simulations