Index: /branches/reconfiguration/platforms/tsar_generic_iob/Makefile =================================================================== --- /branches/reconfiguration/platforms/tsar_generic_iob/Makefile (revision 889) +++ /branches/reconfiguration/platforms/tsar_generic_iob/Makefile (revision 890) @@ -15,4 +15,5 @@ distclean: clean + rm -f $(TAGS) hard_config.h find . -name "*.pyc" -exec rm -f {} \; Index: /branches/reconfiguration/platforms/tsar_generic_iob/scripts/faultyprocs.py =================================================================== --- /branches/reconfiguration/platforms/tsar_generic_iob/scripts/faultyprocs.py (revision 889) +++ /branches/reconfiguration/platforms/tsar_generic_iob/scripts/faultyprocs.py (revision 890) @@ -13,6 +13,7 @@ " /* X | Y | L */\n") - for x, y, l in faulty: - content.append(" ({0} << 6) | ({1} << 2) | {2},\n".format(x, y, l)) + if faulty != None: + for x, y, l in faulty: + content.append(" ({0} << 6) | ({1} << 2) | {2},\n".format(x, y, l)) content.append( "};\n" Index: /branches/reconfiguration/platforms/tsar_generic_iob/scripts/onerun.py =================================================================== --- /branches/reconfiguration/platforms/tsar_generic_iob/scripts/onerun.py (revision 889) +++ /branches/reconfiguration/platforms/tsar_generic_iob/scripts/onerun.py (revision 890) @@ -9,144 +9,165 @@ import argparse +def run(args): + """ Execute the distributed bootloader providing permanent fault-recovery on + the TSAR platform. + + Keyword arguments: + path -- platform's base directory path + outpath -- output's base directory path + x -- number of clusters on the X coordinate + y -- number of clusters on the Y coordinate + nprocs -- number of processors per cluster + compileonly -- stops after platform's compilation + batchmode -- TTY and FB are only redirected to FILES + faultyrouter -- a list containing faulty routers' coordinates (x, y) + faultymask -- a mask of disabled routers' interfaces + faultycore -- a list containing faulty cores' coordinates (x, y, l) + debug -- a list with debug's start cycle, stop cycle, PID and MID + """ + + # translate the relative path (if needed) into an absolute path + basedir = os.path.abspath(args.path) + outdir = os.path.abspath(args.outpath) + print "[ run.py ] platform base directory: {0}".format(basedir) + print "[ run.py ] output directory: {0}".format(outdir) + + # 1. generate configuration and ouput directories + try: + os.makedirs(os.path.join(outdir, "config"), 0755) + except OSError: + pass # directory already exists => do nothing + + # 2. generate hard_config.h and fault_config.h files + faultpath = os.path.join(outdir, "config/fault_config.h") + hardpath = os.path.join(outdir, "config/hard_config.h") + xmlpath = os.path.join(outdir, "config/map.xml") + arch.main(args.x, args.y, args.nprocs, hardpath, xmlpath) + faultyprocs.generate(args.faultycore, faultpath) + + # create a log file + logfile = open(os.path.join(outdir, "log"), "w") + + # 3. compile simulator executable + dst = os.path.join(basedir, "hard_config.h") + if os.path.lexists(dst): + os.unlink(dst) + + os.symlink(hardpath, dst) + + print "[ run.py ] compiling simulator" + command = [] + command.extend(['make']) + command.extend(['-C', basedir]) + subprocess.call(command, stdout=logfile, stderr=logfile) + + # 4. compile distributed boot executable + dst = os.path.join(outdir, "config/boot_config.h") + if os.path.lexists(dst): + os.unlink(dst) + + os.symlink(os.path.join(basedir, "soft/config/boot_config.h"), dst) + + # stop after compiling the platform when the compile-only option is activated + if args.compileonly == True: + exit(0) + + print "[ run.py ] compiling distributed boot procedure" + command = [] + command.extend(['make']) + command.extend(['-C', os.path.join(basedir, "soft")]) + command.extend(["CONFDIR=" + outdir]) + subprocess.call(command, stdout=logfile, stderr=logfile) + + # 5. execute simulator + os.environ["DISTRIBUTED_BOOT"] = "1" + if args.batchmode: + os.environ["SOCLIB_FB"] = "HEADLESS" + os.environ["SOCLIB_TTY"] = "FILES" + + if (args.x * args.y) <= 4: + ompthreads = args.x * args.y + elif (args.x * args.y) <= 16: + ompthreads = 4 + else: + ompthreads = 8 + + print "[ run.py ] starting simulation" + command = [] + command.extend([os.path.join(basedir, "simul.x")]) + command.extend(["-SOFT", os.path.join(basedir, "soft/build/soft.elf")]) + command.extend(["-DISK", "/dev/null"]) + command.extend(["-THREADS", str(ompthreads)]) + + if args.faultyrouter != None: + command.extend(["-FAULTY_MASK", str(args.faultymask)]) + for f in args.faultyrouter: + command.extend(["-FAULTY_ROUTER", str(f[0]), str(f[1])]) + + 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])]); + else: + command.extend(["-NCYCLES", "1000000"]) + + print command + subprocess.call(command, stdout=logfile, stderr=logfile) + + logfile.close() + + # 6. move simulation terminal output into the target config dir + os.rename("term0", os.path.join(outdir, "term")) + # get command-line arguments -parser = argparse.ArgumentParser(description='Run simulation') +if __name__ == "__main__": + parser = argparse.ArgumentParser(description='Run simulation') -parser.add_argument( - '--path', '-p', type=str, dest='path', default=os.getcwd(), - help='relative or absolute path to the platform') + parser.add_argument( + '--path', '-p', type=str, dest='path', default=os.getcwd(), + help='relative or absolute path to the platform') -parser.add_argument( - '--output', '-o', type=str, dest='outpath', default='./output', - help='relative or absolute path to the output directory') + parser.add_argument( + '--output', '-o', type=str, dest='outpath', default='./output', + help='relative or absolute path to the output directory') -parser.add_argument( - '--xsize', '-x', type=int, dest='x', default=2, - help='# of clusters in a row') + parser.add_argument( + '--xsize', '-x', type=int, dest='x', default=2, + help='# of clusters in a row') -parser.add_argument( - '--ysize', '-y', type=int, dest='y', default=2, - help='# of clusters in a column') + parser.add_argument( + '--ysize', '-y', type=int, dest='y', default=2, + help='# of clusters in a column') -parser.add_argument( - '--nprocs', '-n', type=int, dest='nprocs', default=4, - help='# of processors per cluster') + parser.add_argument( + '--nprocs', '-n', type=int, dest='nprocs', default=4, + help='# of processors per cluster') -parser.add_argument( - '--compile-only', '-c', dest='compileonly', action='store_true', - help='generate config files and compile the platform. Do not simulate') + parser.add_argument( + '--compile-only', '-c', dest='compileonly', action='store_true', + help='generate config files and compile the platform. Do not simulate') -parser.add_argument( - '--batch-mode', '-b', dest='batchmode', action='store_true', - help='run simulation in batch mode: no interactive TTY or FrameBuffer') + parser.add_argument( + '--batch-mode', '-b', dest='batchmode', action='store_true', + help='run simulation in batch mode: no interactive TTY or FrameBuffer') -parser.add_argument( - '--faulty-router', '-f', dest='faultyrouter', action='append', - help='ID (X,Y) of faulty router') + parser.add_argument( + '--faulty-router', '-fr', dest='faultyrouter', action='append', nargs=2, + help='ID (X,Y) of faulty router') -parser.add_argument( - '--faulty-mask', '-m', dest='faultymask', default=0x1F, - help='Disable mask for faulty router interfaces') + parser.add_argument( + '--faulty-mask', '-m', dest='faultymask', default=0x1F, + help='Disable mask for faulty router interfaces') -parser.add_argument( - '--debug', '-g', dest='debug', nargs=4, - help='needs four arguments: from, to, procid, memcid') + parser.add_argument( + '--faulty-core', '-fc', dest='faultycore', action='append', nargs=3, + help='ID (X,Y,L) of faulty processor') -args = parser.parse_args() + parser.add_argument( + '--debug', '-g', dest='debug', nargs=4, + help='needs four arguments: from, to, procid, memcid') -# faulty processor list -faultylist = [(0, 0, 1), (0, 0, 2), (0, 1, 2)] - -# translate the relative path (if needed) into an absolute path -basedir = os.path.abspath(args.path) -outdir = os.path.abspath(args.outpath) -print "[ run.py ] platform base directory: {0}".format(basedir) -print "[ run.py ] output directory: {0}".format(outdir) - -# 1. generate configuration and ouput directories -try: - os.makedirs(os.path.join(outdir, "config"), 0755) -except OSError: - pass # directory already exists => do nothing - -# 2. generate hard_config.h and fault_config.h files -faultpath = os.path.join(outdir, "config/fault_config.h") -hardpath = os.path.join(outdir, "config/hard_config.h") -xmlpath = os.path.join(outdir, "config/map.xml") -arch.main(args.x, args.y, args.nprocs, hardpath, xmlpath) -faultyprocs.generate(faultylist, faultpath) - -# create a log file -logfile = open(os.path.join(outdir, "log"), "w") - -# 3. compile simulator executable -dst = os.path.join(basedir, "hard_config.h") -if os.path.lexists(dst): - os.unlink(dst) - -os.symlink(hardpath, dst) - -print "[ run.py ] compiling simulator" -command = [] -command.extend(['make']) -command.extend(['-C', basedir]) -subprocess.call(command, stdout=logfile, stderr=logfile) - -# 4. compile distributed boot executable -dst = os.path.join(outdir, "config/boot_config.h") -if os.path.lexists(dst): - os.unlink(dst) - -os.symlink(os.path.join(basedir, "soft/config/boot_config.h"), dst) - -# stop after compiling the platform when the compile-only option is activated -if args.compileonly == True: - exit(0) - -print "[ run.py ] compiling distributed boot procedure" -command = [] -command.extend(['make']) -command.extend(['-C', os.path.join(basedir, "soft")]) -command.extend(["CONFDIR=" + outdir]) -subprocess.call(command, stdout=logfile, stderr=logfile) - -# 5. execute simulator -os.environ["DISTRIBUTED_BOOT"] = "1" -if args.batchmode: - os.environ["SOCLIB_FB"] = "HEADLESS" - os.environ["SOCLIB_TTY"] = "FILES" - -if (args.x * args.y) <= 4: - ompthreads = args.x * args.y -elif (args.x * args.y) <= 16: - ompthreads = 4 -else: - ompthreads = 8 - -print "[ run.py ] starting simulation" -command = [] -command.extend([os.path.join(basedir, "simul.x")]) -command.extend(["-SOFT", os.path.join(basedir, "soft/build/soft.elf")]) -command.extend(["-DISK", "/dev/null"]) -command.extend(["-THREADS", str(ompthreads)]) - -if args.faultyrouter != None: - command.extend(["-FAULTY_MASK", str(args.faultymask)]) - for f in args.faultyrouter: - command.extend(["-FAULTY_ROUTER", str(f)]) - -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])]); -else: - command.extend(["-NCYCLES", "1000000"]) - -subprocess.call(command, stdout=logfile, stderr=logfile) - -logfile.close() - -# 6. move simulation terminal output into the target config dir -os.rename("term0", os.path.join(outdir, "term")) + run(parser.parse_args()) # vim: tabstop=4 : softtabstop=4 : shiftwidth=4 : expandtab Index: /branches/reconfiguration/platforms/tsar_generic_iob/top.cpp =================================================================== --- /branches/reconfiguration/platforms/tsar_generic_iob/top.cpp (revision 889) +++ /branches/reconfiguration/platforms/tsar_generic_iob/top.cpp (revision 890) @@ -415,9 +415,9 @@ debug_period = strtol(argv[n+1], NULL, 0); } - else if ((strcmp(argv[n], "-FAULTY_ROUTER") == 0) && (n+1 < argc) ) - { - size_t faulty_router_id = strtol(argv[n+1], NULL, 0); - size_t x = faulty_router_id >> Y_WIDTH; - size_t y = faulty_router_id & ((1 << Y_WIDTH) - 1); + else if ((strcmp(argv[n], "-FAULTY_ROUTER") == 0) && (n+2 < argc) ) + { + size_t x = strtol(argv[n+1], NULL, 0); + size_t y = strtol(argv[n+2], NULL, 0); + n++; if( (x>=X_SIZE) || (y>=Y_SIZE) ) { @@ -425,5 +425,5 @@ exit(0); } - faulty_routers.push_back(faulty_router_id); + faulty_routers.push_back((x << Y_WIDTH) | y); } else if ((strcmp(argv[n], "-FAULTY_MASK") == 0) && (n+1 < argc) )