Index: /branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py =================================================================== --- /branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py (revision 925) +++ /branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py (revision 926) @@ -101,6 +101,6 @@ mmc_size = 0x1000 # 4 Kbytes - rom_base = 0x00BFC00000 - rom_size = 0x8000 # 32 Kbytes + drom_base = 0x00BFC00000 + drom_size = 0x8000 # 32 Kbytes offset_io = pmsb(X_IO, Y_IO) << (PADDR_WIDTH - X_WIDTH - Y_WIDTH) @@ -129,4 +129,7 @@ iob_base = 0x00BE000000 + offset_io iob_size = 0x1000 # 4 kbytes + + rom_base = 0x00BA000000 + rom_size = 0x8000 # 32 Kbytes # create mapping @@ -170,4 +173,7 @@ ptype='SIM') + mapping.addPeriph('ROM', base=rom_base, size=rom_size, + ptype='ROM') + pic = mapping.addPeriph('PIC', base=pic_base, size=pic_size, ptype='PIC', channels=32) @@ -196,6 +202,6 @@ ptype='MMC') - mapping.addPeriph('ROM', base=rom_base + offset, size=rom_size, - ptype='ROM') + mapping.addPeriph('DROM', base=drom_base + offset, size=drom_size, + ptype='DROM') dma = mapping.addPeriph('DMA', base=dma_base + offset, @@ -336,5 +342,5 @@ # for the Giet-VM is not necessary to map the replicated ROMs - mapping.addGlobal('seg_rom', rom_base, rom_size, 'CX__', vtype='PERI', + mapping.addGlobal('seg_rom', drom_base, drom_size, 'CX__', vtype='PERI', x=X_IO, y=Y_IO, pseg='ROM', local=False, big=True) Index: /branches/reconfiguration/platforms/tsar_generic_iob/scripts/onerun.py =================================================================== --- /branches/reconfiguration/platforms/tsar_generic_iob/scripts/onerun.py (revision 925) +++ /branches/reconfiguration/platforms/tsar_generic_iob/scripts/onerun.py (revision 926) @@ -69,9 +69,5 @@ 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) + os.symlink(os.path.join(basedir, "soft/test/config/boot_config.h"), dst) print "[ run.py ] compiling distributed boot procedure" @@ -82,4 +78,8 @@ subprocess.call(command, stdout=logfile, stderr=logfile) + # stop after compiling when the compile-only option is activated + if args.compileonly == True: + exit(0) + # 5. execute simulator os.environ["DISTRIBUTED_BOOT"] = "1" @@ -88,14 +88,11 @@ os.environ["SOCLIB_TTY"] = "FILES" - ompthreads = (args.x * args.y) / 4 - cpucount = multiprocessing.cpu_count() - if ompthreads > cpucount: ompthreads = cpucount - 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)]) + command.extend(["-DSOFT", os.path.join(basedir, "soft/build/soft.elf")]) + command.extend(["-SOFT", os.path.join(basedir, + "soft/loader/build/loader.elf")]) + command.extend(["-DISK", "file.dmg"]) if args.faultyrouter != None: @@ -104,4 +101,5 @@ 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,8 +107,16 @@ command.extend(["-PROCID", str(args.debug[2])]); command.extend(["-MEMCID", str(args.debug[3])]); + 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 = 400000 + (args.x + args.y) * 20000; + maxcycles = 1500000 + (args.x + args.y) * 20000 command.extend(["-NCYCLES", str(maxcycles)]) + + command.extend(["-THREADS", str(ompthreads)]) logfile.write("Execute: {0}\n".format(" ".join(command))) Index: /branches/reconfiguration/platforms/tsar_generic_iob/top.cpp =================================================================== --- /branches/reconfiguration/platforms/tsar_generic_iob/top.cpp (revision 925) +++ /branches/reconfiguration/platforms/tsar_generic_iob/top.cpp (revision 926) @@ -133,5 +133,4 @@ #include "vci_framebuffer.h" #include "vci_iox_network.h" -#include "vci_iox_network.h" #include "vci_iopic.h" #include "vci_simhelper.h" @@ -213,10 +212,4 @@ #define cluster(x, y) ((y) + ((x) << Y_WIDTH)) - -//////////////////////////////////////////////////////////// -// Software to be loaded in ROM & RAM -//////////////////////i///////////////////////////////////// - -#define BOOT_SOFT_NAME "../../softs/tsar_boot/preloader.elf" //////////////////////////////////////////////////////////// @@ -272,5 +265,5 @@ #define INT_XICU_TGT_ID 1 #define INT_MDMA_TGT_ID 2 -#define INT_BROM_TGT_ID 3 +#define INT_DROM_TGT_ID 3 #define INT_IOBX_TGT_ID 4 @@ -299,6 +292,7 @@ #define IOX_IOPI_TGT_ID 5 #define IOX_SIMH_TGT_ID 6 -#define IOX_IOB0_TGT_ID 7 -#define IOX_IOB1_TGT_ID 8 +#define IOX_ROM_TGT_ID 7 +#define IOX_IOB0_TGT_ID 8 +#define IOX_IOB1_TGT_ID 9 #define IOX_BDEV_INI_ID 0 @@ -317,5 +311,6 @@ - char soft_name[256] = BOOT_SOFT_NAME; // pathname: binary code + char dsoft_name[256] = ""; // pathname: binary code + char soft_name[256] = ""; // pathname: binary code size_t ncycles = UINT_MAX; // simulated cycles char disk_name[256] = BDEV_IMAGE_NAME; // pathname: disk image @@ -348,4 +343,8 @@ { strcpy(soft_name, argv[n+1]); + } + else if ((strcmp(argv[n], "-DSOFT") == 0) && (n+1 signal_vci_tgt_iopi("signal_vci_ini_iopi"); VciSignals signal_vci_tgt_simh("signal_vci_ini_simh"); + VciSignals signal_vci_tgt_rom("signal_vci_ini_rom"); // Horizontal inter-clusters INT network DSPIN @@ -929,5 +939,5 @@ almos_kernel_pathname); #else - soclib::common::Loader loader(soft_name); + soclib::common::Loader loader(soft_name, dsoft_name); #endif @@ -946,5 +956,5 @@ const size_t nb_iox_initiators = (cluster_iob0 != cluster_iob1) ? 5 : 4; - const size_t nb_iox_targets = (cluster_iob0 != cluster_iob1) ? 9 : 8; + const size_t nb_iox_targets = (cluster_iob0 != cluster_iob1) ? 10 : 9; // IOX network @@ -1022,4 +1032,12 @@ maptab_iox ); + // External ROM + VciSimpleRom* rom; + rom = new VciSimpleRom("rom", + IntTab(0, IOX_ROM_TGT_ID), + maptab_iox, + loader, + X_WIDTH + Y_WIDTH ); + // Clusters TsarIobClusterp_to_tgt[IOX_IOPI_TGT_ID] (signal_vci_tgt_iopi); iox_network->p_to_tgt[IOX_SIMH_TGT_ID] (signal_vci_tgt_simh); + iox_network->p_to_tgt[IOX_ROM_TGT_ID] (signal_vci_tgt_rom); if (cluster_iob0 != cluster_iob1) @@ -1285,4 +1304,9 @@ simh->p_vci(signal_vci_tgt_simh); + // External ROM connexion + rom->p_clk(signal_clk); + rom->p_resetn(signal_resetn); + rom->p_vci(signal_vci_tgt_rom); + // IOB0 cluster connexion to IOX network (*clusters[0][0]->p_vci_iob_iox_ini) (signal_vci_ini_iob0); Index: /branches/reconfiguration/platforms/tsar_generic_iob/top.desc =================================================================== --- /branches/reconfiguration/platforms/tsar_generic_iob/top.desc (revision 925) +++ /branches/reconfiguration/platforms/tsar_generic_iob/top.desc (revision 926) @@ -40,8 +40,4 @@ cell_size = vci_cell_size_ext), - # ROM - Uses('caba:vci_simple_rom', - cell_size = vci_cell_size_ext), - # Frame Buffer Uses('caba:vci_framebuffer', @@ -72,4 +68,8 @@ cell_size = vci_cell_size_ext), + # ROM + Uses('caba:vci_simple_rom', + cell_size = vci_cell_size_ext), + Uses('common:elf_file_loader'), Uses('common:plain_file_loader'), Index: /branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h =================================================================== --- /branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h (revision 925) +++ /branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h (revision 926) @@ -96,5 +96,5 @@ VciSignals signal_int_vci_tgt_xicu; VciSignals signal_int_vci_tgt_mdma; - VciSignals signal_int_vci_tgt_brom; + VciSignals signal_int_vci_tgt_drom; VciSignals signal_int_vci_tgt_iobx; @@ -149,5 +149,5 @@ VciMultiDma* mdma; - VciSimpleRom* brom; + VciSimpleRom* drom; VciLocalCrossbar* int_xbar_d; @@ -212,5 +212,5 @@ size_t int_xicu_tgt_id, size_t int_mdma_tgt_id, - size_t int_brom_tgt_id, + size_t int_drom_tgt_id, size_t int_iobx_tgt_id, size_t int_proc_ini_id, Index: /branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp =================================================================== --- /branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp (revision 925) +++ /branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp (revision 926) @@ -51,5 +51,5 @@ size_t int_xicu_tgt_id, // local index size_t int_mdma_tgt_id, // local index - size_t int_brom_tgt_id, // local index + size_t int_drom_tgt_id, // local index size_t int_iobx_tgt_id, // local index @@ -210,10 +210,10 @@ nb_dmas); // number of IRQs - /////////// DISTRIBUTED BOOT ROM - std::ostringstream s_brom; - s_brom << "brom_" << x_id << "_" << y_id; - brom = new VciSimpleRom( - s_brom.str().c_str(), - IntTab(cluster_id, int_brom_tgt_id), + /////////// DISTRIBUTED ROM + std::ostringstream s_drom; + s_drom << "drom_" << x_id << "_" << y_id; + drom = new VciSimpleRom( + s_drom.str().c_str(), + IntTab(cluster_id, int_drom_tgt_id), mt_int, loader, @@ -473,5 +473,5 @@ int_xbar_d->p_to_target[int_xicu_tgt_id] (signal_int_vci_tgt_xicu); int_xbar_d->p_to_target[int_mdma_tgt_id] (signal_int_vci_tgt_mdma); - int_xbar_d->p_to_target[int_brom_tgt_id] (signal_int_vci_tgt_brom); + int_xbar_d->p_to_target[int_drom_tgt_id] (signal_int_vci_tgt_drom); int_xbar_d->p_to_initiator[int_mdma_ini_id] (signal_int_vci_ini_mdma); for (size_t p = 0; p < nb_procs; p++) @@ -597,8 +597,8 @@ mdma->p_irq[i] (signal_irq_mdma[i]); - /////////////////////////////////// BROM - brom->p_clk (this->p_clk); - brom->p_resetn (this->p_resetn); - brom->p_vci (signal_int_vci_tgt_brom); + /////////////////////////////////// DROM + drom->p_clk (this->p_clk); + drom->p_resetn (this->p_resetn); + drom->p_vci (signal_int_vci_tgt_drom); //////////////////////////// RAM network CMD & RSP routers