Changeset 927 for branches/reconfiguration

Timestamp:

Jan 23, 2015, 11:16:08 AM (9 years ago)

Author:

cfuguet

Message:

reconf: improve test scripts for tsar_generic_iob platform

• Now it is possible to pass the number of OpenMP threads as a parameter

Location:

branches/reconfiguration/platforms/tsar_generic_iob/scripts

Files:

• arch.py (modified) (1 diff)
• onerun.py (modified) (4 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py

@@ -89 +89 @@
     # define physical segments
     ram_base = 0x0000000000
-    if 1: ram_size = 0x4000000            # 64 Mbytes
-    else: ram_size = 0x0040000            # 256 Kbytes
+    ram_size = 0x10000000 / (x_size * y_size)
 
     xcu_base = 0x00B0000000

branches/reconfiguration/platforms/tsar_generic_iob/scripts/onerun.py

@@ -84 +84 @@
     # 5. execute simulator
     os.environ["DISTRIBUTED_BOOT"] = "1"
+    os.environ["SOCLIB_FB"] = "HEADLESS"
     if args.batchmode:
-        os.environ["SOCLIB_FB"] = "HEADLESS"
         os.environ["SOCLIB_TTY"] = "FILES"
 
@@ -101 +101 @@
             command.extend(["-FAULTY_ROUTER", str(f[0]), str(f[1]), str(f[2])])
 
-    ompthreads = 1
     if args.debug != None:
         command.extend(["-DEBUG", str(args.debug[0])]);
@@ -109 +108 @@
 
     elif os.environ.get('SOCLIB_GDB') == None:
-        ompthreads = (args.x * args.y) / 4
-        cpucount = multiprocessing.cpu_count()
-        if ompthreads > cpucount:
-            ompthreads = cpucount
-
         # the procedure grows linearly with the diameter of the mesh.
         maxcycles = 1500000 + (args.x + args.y) * 20000
         command.extend(["-NCYCLES", str(maxcycles)])
 
+    # OpenMP number of threads definition
+    ompthreads = args.threads
+    if ompthreads < 0:
+        if os.environ.get('SOCLIB_GDB') != None:
+            ompthreads = 1
+
+        elif args.debug != None:
+            ompthreads = 1
+
+        else:
+            ompthreads = (args.x * args.y) / 4
+            cpucount = multiprocessing.cpu_count()
+            if ompthreads > cpucount: ompthreads = cpucount
+
     command.extend(["-THREADS", str(ompthreads)])
+
 
     logfile.write("Execute: {0}\n".format(" ".join(command)))
@@ -178 +187 @@
         help='needs four arguments: from, to, procid, memcid')
 
+    parser.add_argument(
+        '--threads', '-t', dest='threads', default=-1,
+        help='number of OpenMP threads')
+
     run(parser.parse_args())