Changeset 974 for branches/reconfiguration/platforms/tsar_generic_iob/scripts/onerun.py

Timestamp:

Apr 15, 2015, 4:02:08 PM (9 years ago)

Author:

cfuguet

Message:

reconf: improve reconf:tsar_generic_iob simulation scripts

File:

• branches/reconfiguration/platforms/tsar_generic_iob/scripts/onerun.py (modified) (7 diffs)

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

@@ -30 +30 @@
     firmdebug    -- activate the DEBUG compilation mode on software
     diskimage    -- relative or absolute path to the disk image
+    force        -- create configuration files (or overwrite them)
     """
 
@@ -48 +49 @@
     hardpath = os.path.join(outdir, "config/hard_config.h")
     xmlpath = os.path.join(outdir, "config/giet.map.xml")
-    dtspath = os.path.join(outdir, "config/linux.dts")
-    arch.main(args.x, args.y, args.nprocs, hardpath, xmlpath, dtspath)
-    faultyprocs.generate(args.faultycore, faultpath)
+    if args.linux:
+        dtspath = os.path.join(outdir, "config/platform.dts")
+    else:
+        dtspath = None
+
+    exist = True
+    exist = exist and os.path.exists(faultpath)
+    exist = exist and os.path.exists(hardpath)
+    exist = exist and os.path.exists(xmlpath)
+    if args.linux: exist = exist and os.path.exists(dtspath)
+
+    if not args.force and exist:
+        print "[ run.py ] Warning: Reusing existing configuration files. "
+        print "[ run.py ] Script arguments will be ignored (no --force option)"
+        cmd = raw_input('[ run.py ] Would you like to continue (y/n): ')
+        if cmd == 'n': exit(0)
+        if cmd == 'y': pass
+        else: exit(1)
+    else:
+        arch.main(args.x, args.y, args.nprocs, hardpath, xmlpath, dtspath)
+        faultyprocs.generate(args.faultycore, faultpath)
 
     # create a log file
@@ -66 +85 @@
     command.extend(['make'])
     command.extend(['-C', basedir])
-    subprocess.call(command, stdout=logfile, stderr=logfile)
+    subprocess.check_call(command, stdout=logfile, stderr=logfile)
 
     # 4. compile distributed boot executable
@@ -81 +100 @@
     command.extend(["CONFIG=" + outdir])
     command.extend(["DEBUG=" + str(args.firmdebug)])
-    subprocess.call(command, stdout=logfile, stderr=logfile)
+    if args.linux:
+        command.extend(["PATCHER_OS=1"])
+    else:
+        command.extend(["PATCHER_OS=0"])
+
+    subprocess.check_call(command, stdout=logfile, stderr=logfile)
 
     # stop after compiling when the compile-only option is activated
-    if args.compileonly == True:
-        exit(0)
+    if args.compileonly == True: exit(0)
 
     # 5. execute simulator
@@ -107 +130 @@
     if args.debug != None:
         command.extend(["-DEBUG", str(args.debug[0])]);
-        command.extend(["-NCYCLES", str(args.debug[1])]);
-        command.extend(["-PROCID", str(args.debug[2])]);
-        command.extend(["-MEMCID", str(args.debug[3])]);
+        command.extend(["-PROCID", str(args.debug[1])]);
+        command.extend(["-MEMCID", str(args.debug[2])]);
+
+    if args.ncycles > 0:
+        command.extend(["-NCYCLES", str(args.ncycles)])
 
     elif os.environ.get('SOCLIB_GDB') == None:
         # the procedure grows linearly with the diameter of the mesh.
-        maxcycles = 1500000 + (args.x + args.y) * 20000
-        command.extend(["-NCYCLES", str(maxcycles)])
+        # maxcycles = 1500000 + (args.x + args.y) * 20000
+        # command.extend(["-NCYCLES", str(maxcycles)])
+        command.extend(["-NCYCLES", str(200000000)])
 
     # OpenMP number of threads definition
@@ -131 +157 @@
     logfile.flush()
 
-    subprocess.call(command, stdout=logfile, stderr=logfile)
+    subprocess.check_call(command, stdout=logfile, stderr=logfile)
 
     logfile.close()
@@ -198 +224 @@
         help='relative or absolute path to the external firmware')
 
+    parser.add_argument(
+        '--force', '-f', dest='force', action='store_true',
+        help='create configuration files (or overwrite them)')
+
+    parser.add_argument(
+        '--linux', dest='linux', action='store_true',
+        help='generate linux device tree and compile bootloader ' +
+             'with linux specifics')
+
+    parser.add_argument(
+        '--ncycles', type=int, dest='ncycles', default=-1,
+        help='max simulation cycles')
+
     run(parser.parse_args())