Changeset 571 for trunk/softs/test_llsc/scripts

Timestamp:

Oct 31, 2013, 5:47:51 PM (11 years ago)

Author:

meunier

Message:

Correction of the "double barrier" problem from the user point of view for the generated llsc tests (use of 2 distinct barriers)

Location:

trunk/softs/test_llsc/scripts

Files:

• LLSCTestGenerator/Program.hpp (modified) (4 diffs)
• functions.c (modified) (1 diff)
• run_simus.py (modified) (2 diffs)
• test_llsc.py (modified) (7 diffs)

trunk/softs/test_llsc/scripts/LLSCTestGenerator/Program.hpp

@@ -89 +89 @@
       res << "   tab = (int *) SRL_MEMSPACE_ADDR(memspace);" << endl;
       res << "   srl_barrier_t barrier = SRL_GET_BARRIER(barrier);" << endl;
+      res << "   srl_barrier_t barrier2 = SRL_GET_BARRIER(barrier2);" << endl;
       res << endl;
       res << "   // Initialisation du tableau" << endl;
@@ -99 +100 @@
       res << "   run0();" << endl;
       res << endl;
-      res << "   barrier_wait(barrier);" << endl;
+      res << "   barrier_wait(barrier2);" << endl;
       res << endl;
       res << "   for (i = 0; i < " << tab_size << "; i++) {" << endl;
@@ -158 +159 @@
       res << "   tab = (int *) SRL_MEMSPACE_ADDR(memspace);" << endl;
       res << "   srl_barrier_t barrier = SRL_GET_BARRIER(barrier);" << endl;
+      res << "   srl_barrier_t barrier2 = SRL_GET_BARRIER(barrier2);" << endl;
       res << "   int thread_id = SRL_GET_CONST(id);" << endl;
       res << endl;
@@ -174 +176 @@
       res << "   }" << endl;
       res << endl;
-      res << "   barrier_wait(barrier);" << endl;
+      res << "   barrier_wait(barrier2);" << endl;
       res << endl;
       res << "   srl_exit();" << endl;

trunk/softs/test_llsc/scripts/functions.c

@@ -7 +7 @@
       "move $16, %0                   \n"
       "giet_lock_try :                \n"
+      "lw   $2,    0($16)             \n"
       "ll   $2,    0($16)             \n"
       "bnez $2,    giet_lock_try      \n"

trunk/softs/test_llsc/scripts/run_simus.py

@@ -23 +23 @@
 nb_locks = 20
 nb_max_incr = 2000
-nb_procs = 4
+nb_procs = 64
 
 
@@ -105 +105 @@
    # Quit if results obtained by simulation are incorrect
    print "diff", term_filename, os.path.join(data_dir, res_natif)
-   output = subprocess.Popen([ 'diff', term_filename, os.path.join(data_dir, res_natif) ]).communicate()[0]
-   if output != None:
+   output = subprocess.Popen([ 'diff', term_filename, os.path.join(data_dir, res_natif) ], stdout = subprocess.PIPE).communicate()[0]
+   if output != "":
       break;
 

trunk/softs/test_llsc/scripts/test_llsc.py

@@ -15 +15 @@
 cluster_x = int(sys.argv[1])
 cluster_y = int(sys.argv[2])
-memspace_size = int(sys.argv[3])
+memspace_size = int(sys.argv[3]) * 4
 
 nb_procs = 4
@@ -27 +27 @@
             'table':   MemspacePort(),
             'barrier': BarrierPort(),
+            'barrier2': BarrierPort(),
         },
         impls = [
@@ -44 +45 @@
             'table':   MemspacePort(),
             'barrier': BarrierPort(),
+            'barrier2': BarrierPort(),
             'id' : ConstPort(),
         },
@@ -57 +59 @@
 
 barrier = Barrier('barrier')
+barrier2 = Barrier('barrier2')
 memspace = Memspace('memspace', memspace_size)
 
@@ -66 +69 @@
                'table'   : memspace,
                'barrier' : barrier,
+               'barrier2' : barrier2,
             },
             defines = {} ),
@@ -75 +79 @@
                'table'   : memspace,
                'barrier' : barrier,
+               'barrier2' : barrier2,
                'id' : i,
             },
             defines = {} ),
 
-
-
-
 tcg = dsx.Tcg('test_llsc', *tasks)
 
-mpr = Mapper(hd ,tcg) 
+mpr = Mapper(hd, tcg) 
 
 mpr.map('task_llsc_main', cluster = 0, proc = 0, stack = "PSEG_RAM_0")
@@ -95 +97 @@
    mpr.map(const, pseg = 'PSEG_RAM_0')
 
+
 mpr.map('memspace', pseg = "PSEG_RAM_0")
 mpr.map('barrier', pseg = "PSEG_RAM_0")
+mpr.map('barrier2', pseg = "PSEG_RAM_0")
 
 mpr.map(tcg, code = 'PSEG_RAM_0', data = 'PSEG_RAM_0', ptab = "PSEG_RAM_0")
 mpr.map('system', boot = 'PSEG_RAM_0', kernel = 'PSEG_RAM_0', scheduler = True)
 
-mpr.generate(dsx.Giet(outdir = '.', vaddr_replicated_peri_inc = 0x2000, debug = True))
+mpr.generate(dsx.Giet(outdir = '.', vaddr_replicated_peri_inc = 0x2000, debug = False))