Index: /trunk/platforms/caba-new_vdspin-test/Makefile =================================================================== --- /trunk/platforms/caba-new_vdspin-test/Makefile (revision 136) +++ /trunk/platforms/caba-new_vdspin-test/Makefile (revision 137) @@ -1,5 +1,5 @@ ARCH=mips32el SIMULATION_ARGS=100000 -#SOCLIB_CC_ADD_ARGS=-t systemcass +SOCLIB_CC_ADD_ARGS=-t systemcass SOCLIB?=$(shell soclib-cc --getpath) export SOCLIB Index: /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/Makefile =================================================================== --- /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/Makefile (revision 136) +++ /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/Makefile (revision 137) @@ -1,4 +1,5 @@ ARCH=mips32el SIMULATION_ARGS=100000 +SOCLIB_CC_ADD_ARGS=-I. -t systemcass SOCLIB?=$(shell soclib-cc --getpath) export SOCLIB Index: /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/platform_desc =================================================================== --- /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/platform_desc (revision 136) +++ /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/platform_desc (revision 137) @@ -9,5 +9,7 @@ Uses('caba:vci_logger'), Uses('caba:vci_multi_tty'), - Uses('caba:vci_vgmn'), + Uses('caba:vci_simple_ring_fast', + ring_cmd_data_size = 40, + ring_rsp_data_size = 33), Uses('caba:vci_mem_cache_v1'), Uses('common:elf_file_loader'), @@ -20,6 +22,6 @@ rflag_size = 1, srcid_size = 8, - pktid_size = 6, - trdid_size = 6, + pktid_size = 4, + trdid_size = 4, wrplen_size = 1 ) Index: /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/segmentation.h =================================================================== --- /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/segmentation.h (revision 136) +++ /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/segmentation.h (revision 137) @@ -19,14 +19,14 @@ // base address required by MIPS processor ///////////////////////////////////////////////////////////////// -#define MMU +//#define MMU #define RESET_BASE 0xBFC00000 -#define RESET_SIZE 0x00000040 +#define RESET_SIZE 0x00001000 #define EXCEP_BASE 0x80000000 -#define EXCEP_SIZE 0x000002e0 +#define EXCEP_SIZE 0x00001000 #define TEXT_BASE 0x00400000 -#define TEXT_SIZE 0x000011c8 +#define TEXT_SIZE 0x00100000 ///////////////////////////////////////////////////////////////// // global data segment (initialised) @@ -34,16 +34,6 @@ #define MC_M_BASE 0x10000000 -#define MC_M_SIZE 0x0000eb20 +#define MC_M_SIZE 0x00100000 -///////////////////////////////////////////////////////////////// -// page table (initialised) -///////////////////////////////////////////////////////////////// -#define PTD_ADDR 0x40400000 -#define PTE_ADDR 0x40402000 -#define IPTE_ADDR 0x40403000 -#define TAB_SIZE 0x00010000 - -#define V_TTY_BASE 0x00800000 -#define V_TIMER_BASE 0x00C00000 // timer virtual address ////////////////////////////////////////////////////////// // System devices Index: /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/top.cpp =================================================================== --- /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/top.cpp (revision 136) +++ /trunk/platforms/caba-ring-ccxcachev1_memcachev1-mipsel/top.cpp (revision 137) @@ -11,5 +11,5 @@ #include "vci_simple_ram.h" #include "vci_multi_tty.h" -#include "vci_vgmn.h" +#include "vci_simple_ring_fast.h" #include "vci_mem_cache_v1.h" #include "vci_cc_xcache_wrapper_v1.h" @@ -30,5 +30,5 @@ // Define VCI parameters - typedef soclib::caba::VciParams<4,8,32,1,1,1,8,6,6,1> vci_param; + typedef soclib::caba::VciParams<4,8,32,1,1,1,8,4,4,1> vci_param; typedef soclib::common::Iss2Simhelper proc_iss; // Mapping table @@ -36,9 +36,9 @@ soclib::common::MappingTable maptabp(32, IntTab(8), IntTab(8), 0x00300000); - maptabp.add(Segment("reset", RESET_BASE, RESET_SIZE, IntTab(2), true)); - maptabp.add(Segment("excep", EXCEP_BASE, EXCEP_SIZE, IntTab(2), true)); - maptabp.add(Segment("text" , TEXT_BASE , TEXT_SIZE , IntTab(2), true)); + maptabp.add(Segment("reset", RESET_BASE, RESET_SIZE, IntTab(0), true)); + maptabp.add(Segment("excep", EXCEP_BASE, EXCEP_SIZE, IntTab(0), true)); + maptabp.add(Segment("text" , TEXT_BASE , TEXT_SIZE , IntTab(0), true)); maptabp.add(Segment("tty" , TTY_BASE , TTY_SIZE , IntTab(1), false)); - maptabp.add(Segment("mc_m" , MC_M_BASE , MC_M_SIZE , IntTab(2), true )); + maptabp.add(Segment("mc_m" , MC_M_BASE , MC_M_SIZE , IntTab(0), true )); std::cout << maptabp << std::endl; @@ -114,6 +114,4 @@ soclib::caba::VciSignals signal_vci_tgt_tty("vci_tgt_tty"); - soclib::caba::VciSignals signal_vci_tgt_rom("vci_tgt_rom"); - soclib::caba::VciSignals signal_vci_tgt_xram("vci_tgt_xram"); @@ -134,17 +132,14 @@ // Components soclib::caba::VciCcXCacheWrapperV1 - proc0("proc0", 0, maptabp, maptabc, IntTab(0),IntTab(0),IntTab(0),4,64,16,4,64,16); + proc0("proc0", 0, maptabp, maptabc, IntTab(0),IntTab(0),IntTab(0),4,4,16,4,4,16); soclib::caba::VciCcXCacheWrapperV1 - proc1("proc1", 1, maptabp, maptabc, IntTab(1),IntTab(1),IntTab(1),4,64,16,4,64,16); + proc1("proc1", 1, maptabp, maptabc, IntTab(1),IntTab(1),IntTab(1),4,4,16,4,4,16); soclib::caba::VciCcXCacheWrapperV1 - proc2("proc2", 2, maptabp, maptabc, IntTab(2),IntTab(2),IntTab(2),4,64,16,4,64,16); + proc2("proc2", 2, maptabp, maptabc, IntTab(2),IntTab(2),IntTab(2),4,4,16,4,4,16); soclib::caba::VciCcXCacheWrapperV1 - proc3("proc3", 3, maptabp, maptabc, IntTab(3),IntTab(3),IntTab(3),4,64,16,4,64,16); - - soclib::caba::VciSimpleRam - rom("rom", IntTab(0), maptabp, loader); + proc3("proc3", 3, maptabp, maptabc, IntTab(3),IntTab(3),IntTab(3),4,4,16,4,4,16); soclib::caba::VciSimpleRam @@ -152,5 +147,5 @@ soclib::caba::VciMemCacheV1 - memc("memc",maptabp,maptabc,maptabx,IntTab(0),IntTab(4),IntTab(2), IntTab(4),4,16,16); + memc("memc",maptabp,maptabc,maptabx,IntTab(0),IntTab(4),IntTab(0), IntTab(4),16,16,16); soclib::caba::VciMultiTty @@ -163,18 +158,18 @@ // soclib::caba::VciLogger vci_logger_memc("vci_logger_memc",maptabp); -// soclib::caba::VciSimpleRingNetwork -// ringd("ringd",maptabp, IntTab(), 2, 4, 3); - soclib::caba::VciVgmn - ringd("ringd",maptabp, 4, 3, 2, 2); - -// soclib::caba::VciSimpleRingNetwork -// ringc("ringc",maptabc, IntTab(), 2, 5, 5); - soclib::caba::VciVgmn - ringc("ringc",maptabc, 5, 5, 2, 2); - -// soclib::caba::VciSimpleRingNetwork -// ringx("ringx",maptabx, IntTab(), 2, 1, 1); - soclib::caba::VciVgmn - ringx("ringx",maptabx, 1, 1, 2, 2); + soclib::caba::VciSimpleRingFast + ringd("ringd",maptabp, IntTab(), 2, 4, 2); +// soclib::caba::VciVgmn +// ringd("ringd",maptabp, 4, 3, 2, 2); + + soclib::caba::VciSimpleRingFast + ringc("ringc",maptabc, IntTab(), 2, 5, 5); +// soclib::caba::VciVgmn +// ringc("ringc",maptabc, 5, 5, 2, 2); + + soclib::caba::VciSimpleRingFast + ringx("ringx",maptabx, IntTab(), 2, 1, 1); +// soclib::caba::VciVgmn +// ringx("ringx",maptabx, 1, 1, 2, 2); // Net-List @@ -228,8 +223,4 @@ proc3.p_vci_tgt(signal_vci_tgt_proc3); - rom.p_clk(signal_clk); - rom.p_resetn(signal_resetn); - rom.p_vci(signal_vci_tgt_rom); - // vci_logger_proc0.p_clk(signal_clk); // vci_logger_proc0.p_resetn(signal_resetn); @@ -277,7 +268,6 @@ ringd.p_to_initiator[2](signal_vci_ini_rw_proc2); ringd.p_to_initiator[3](signal_vci_ini_rw_proc3); - ringd.p_to_target[0](signal_vci_tgt_rom); + ringd.p_to_target[0](signal_vci_tgt_memc); ringd.p_to_target[1](signal_vci_tgt_tty); - ringd.p_to_target[2](signal_vci_tgt_memc); ringc.p_clk(signal_clk); Index: /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/Makefile =================================================================== --- /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/Makefile (revision 136) +++ /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/Makefile (revision 137) @@ -1,4 +1,5 @@ ARCH=mips32el SIMULATION_ARGS=100000 +SOCLIB_CC_ADD_ARGS=-t systemcass SOCLIB?=$(shell soclib-cc --getpath) export SOCLIB Index: /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/segmentation.h =================================================================== --- /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/segmentation.h (revision 136) +++ /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/segmentation.h (revision 137) @@ -19,5 +19,4 @@ // base address required by MIPS processor ///////////////////////////////////////////////////////////////// -#define MMU #define RESET_BASE 0xBFC00000 @@ -36,14 +35,4 @@ #define MC_M_SIZE 0x00200000 -///////////////////////////////////////////////////////////////// -// page table (initialised) -///////////////////////////////////////////////////////////////// -#define PTD_ADDR 0x40400000 -#define PTE_ADDR 0x40402000 -#define IPTE_ADDR 0x40403000 -#define TAB_SIZE 0x00010000 - -#define V_TTY_BASE 0x00800000 -#define V_TIMER_BASE 0x00C00000 // timer virtual address ////////////////////////////////////////////////////////// // System devices @@ -77,6 +66,2 @@ #define XRAM_SIZE 0x00000008 -#define MC_R_BASE 0x20200000 -#define MC_R_SIZE 0x00000008 - -#define CLEANUP_OFFSET 0x20200000 Index: /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/soft/main.c =================================================================== --- /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/soft/main.c (revision 136) +++ /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/soft/main.c (revision 137) @@ -8,5 +8,5 @@ #define NPROCS 4 #define SIZE 500 -#define SORT_TYPE 2 +#define SORT_TYPE 0 volatile int nprocs=NPROCS; Index: /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/top.cpp =================================================================== --- /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/top.cpp (revision 136) +++ /trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/top.cpp (revision 137) @@ -41,7 +41,5 @@ maptabp.add(Segment("text" , TEXT_BASE , TEXT_SIZE , IntTab(2), true)); maptabp.add(Segment("tty" , TTY_BASE , TTY_SIZE , IntTab(1), false)); - maptabp.add(Segment("mc_r" , MC_R_BASE , MC_R_SIZE , IntTab(2), false, true, IntTab(0))); maptabp.add(Segment("mc_m" , MC_M_BASE , MC_M_SIZE , IntTab(2), true )); - maptabp.add(Segment("ptba" , PTD_ADDR , TAB_SIZE , IntTab(2), true)); std::cout << maptabp << std::endl; @@ -52,10 +50,8 @@ maptabc.add(Segment("c_proc2" , C_PROC2_BASE , C_PROC2_SIZE , IntTab(2), false, true, IntTab(2))); maptabc.add(Segment("c_proc3" , C_PROC3_BASE , C_PROC3_SIZE , IntTab(3), false, true, IntTab(3))); - maptabc.add(Segment("mc_r" , MC_R_BASE , MC_R_SIZE , IntTab(4), false, false)); maptabc.add(Segment("mc_m" , MC_M_BASE , MC_M_SIZE , IntTab(4), false, false)); maptabc.add(Segment("reset", RESET_BASE, RESET_SIZE, IntTab(4), false, false)); maptabc.add(Segment("excep", EXCEP_BASE, EXCEP_SIZE, IntTab(4), false, false)); maptabc.add(Segment("text" , TEXT_BASE , TEXT_SIZE , IntTab(4), false, false)); - maptabc.add(Segment("ptba" , PTD_ADDR , TAB_SIZE , IntTab(4), false, false)); std::cout << maptabc << std::endl; @@ -66,5 +62,4 @@ maptabx.add(Segment("excep", EXCEP_BASE, EXCEP_SIZE, IntTab(0), false)); maptabx.add(Segment("text" , TEXT_BASE , TEXT_SIZE , IntTab(0), false)); - maptabx.add(Segment("ptba" , PTD_ADDR , TAB_SIZE , IntTab(0), false)); std::cout << maptabx << std::endl; Index: /trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/Makefile =================================================================== --- /trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/Makefile (revision 136) +++ /trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/Makefile (revision 137) @@ -3,4 +3,5 @@ #SIMULATION_ARGS = 100000 #SOCLIB_CC_ADD_ARGS = "-DCC_XCACHE_WRAPPER_DEBUG=1" +SOCLIB_CC_ADD_ARGS=-t systemcass SOCLIB ?= $(shell soclib-cc --getpath) export SOCLIB Index: /trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/platform_desc =================================================================== --- /trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/platform_desc (revision 136) +++ /trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/platform_desc (revision 137) @@ -9,7 +9,6 @@ Uses('caba:vci_simhelper'), Uses('caba:vci_multi_tty'), - Uses('caba:vci_vgmn'), - Uses('caba:vci_simple_ring_network_2', - ring_cmd_data_size = 37, + Uses('caba:vci_simple_ring_fast', + ring_cmd_data_size = 40, ring_rsp_data_size = 33), Uses('caba:vci_mem_cache_v4'), Index: /trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp =================================================================== --- /trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp (revision 136) +++ /trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp (revision 137) @@ -14,6 +14,5 @@ #include "vci_multi_tty.h" #include "vci_xicu.h" -#include "vci_simple_ring_network_2.h" -#include "vci_vgmn.h" +#include "vci_simple_ring_fast.h" #include "vci_mem_cache_v4.h" #include "vci_cc_xcache_wrapper_v4.h" @@ -32,13 +31,7 @@ # define PARAM_VCI 4,8,32,1,1,1,8,4,4,1 -# define USE_OLD_XCACHE 1 -# define USE_VGMN 1 # define NB_PROC_MIN 1 # define NB_PROC_MAX 15 // min_latency, fifo_depth -# define PARAM_VGMN_P 1 , 8 -# define PARAM_VGMN_C 1 , 8 -# define PARAM_VGMN_X 2 , 8 -// wrapper_fifo_depth # define PARAM_RING_P 2 # define PARAM_RING_C 2 @@ -61,7 +54,7 @@ { std::cout << funcname << " [nb_cycle [file [soft]]] " << std::endl; - std::cout << " * nb_cycle : number of simulated cycle, if 0 then no stop condition. (default : " << NCYCLES_DEFAULT << " cycle(s))" << endl; - std::cout << " * file : Configuration file : nb_proc, iways, isets, iwords, dways, dsets, dwords, wnwords, wnlines, wtimeout, memc_nways, memc_nsets, memc_words, memc_heap_size. (default : " << FILE_DEFAULT << " cycle(s))" << endl; - std::cout << " * soft : software executed by this platforms. (default : \"" << SOFT_DEFAULT << "\")" << endl; + std::cout << " * nb_cycle : number of simulated cycle, if 0 then no stop condition. (default : " << NCYCLES_DEFAULT << " cycle(s))" << std::endl; + std::cout << " * file : Configuration file : nb_proc, iways, isets, iwords, dways, dsets, dwords, wnwords, wnlines, wtimeout, memc_nways, memc_nsets, memc_words, memc_heap_size. (default : " << FILE_DEFAULT << " cycle(s))" << std::endl; + std::cout << " * soft : software executed by this platforms. (default : \"" << SOFT_DEFAULT << "\")" << std::endl; exit(1); @@ -256,12 +249,7 @@ proc[i] = new soclib::caba::VciCcXCacheWrapperV4 (str.str().c_str(), i, maptabp, maptabc, IntTab(i),IntTab(i),IntTab(i) -#if USE_OLD_XCACHE - ,iways, isets, iwords - ,dways, dsets, dwords -#else ,iways, isets, iwords ,dways, dsets, dwords ,wnwords, wnlines, wtimeout -#endif ); @@ -307,23 +295,12 @@ // interconnect_x : memc | xram -#if USE_VGMN - soclib::caba::VciVgmn - interconnect_p("interconnect_p",maptabp, nb_proc , 5 , PARAM_VGMN_P); - - soclib::caba::VciVgmn - interconnect_c("interconnect_c",maptabc, nb_proc+1, nb_proc+1, PARAM_VGMN_C); - - soclib::caba::VciVgmn - interconnect_x("interconnect_x",maptabx, 1 , 1 , PARAM_VGMN_X); -#else - soclib::caba::VciSimpleRingNetwork2 + soclib::caba::VciSimpleRingFast interconnect_p("interconnect_p",maptabp, IntTab(), PARAM_RING_P,nb_proc , 5 ); - soclib::caba::VciSimpleRingNetwork2 + soclib::caba::VciSimpleRingFast interconnect_c("interconnect_c",maptabc, IntTab(), PARAM_RING_C,nb_proc+1, nb_proc+1); - soclib::caba::VciSimpleRingNetwork2 + soclib::caba::VciSimpleRingFast interconnect_x("interconnect_x",maptabx, IntTab(), PARAM_RING_X,1 , 1 ); -#endif // Net-List Index: /trunk/platforms/caba-ring-vcache2_memcache-mipsel/Makefile =================================================================== --- /trunk/platforms/caba-ring-vcache2_memcache-mipsel/Makefile (revision 136) +++ /trunk/platforms/caba-ring-vcache2_memcache-mipsel/Makefile (revision 137) @@ -1,4 +1,5 @@ ARCH=mips32el SIMULATION_ARGS=100000 +SOCLIB_CC_ADD_ARGS=-t systemcass SOCLIB?=$(shell soclib-cc --getpath) export SOCLIB Index: /trunk/platforms/caba-ring-vcache2_memcache-mipsel/platform_desc =================================================================== --- /trunk/platforms/caba-ring-vcache2_memcache-mipsel/platform_desc (revision 136) +++ /trunk/platforms/caba-ring-vcache2_memcache-mipsel/platform_desc (revision 137) @@ -8,5 +8,8 @@ Uses('caba:vci_simple_ram'), Uses('caba:vci_multi_tty'), - Uses('caba:vci_simple_ring_network'), + Uses('caba:vci_simple_ring_fast', + ring_cmd_data_size = 40, + ring_rsp_data_size = 33, +), Uses('caba:vci_mem_cache2'), Uses('common:elf_file_loader'), Index: /trunk/platforms/caba-ring-vcache2_memcache-mipsel/top.cpp =================================================================== --- /trunk/platforms/caba-ring-vcache2_memcache-mipsel/top.cpp (revision 136) +++ /trunk/platforms/caba-ring-vcache2_memcache-mipsel/top.cpp (revision 137) @@ -11,5 +11,5 @@ #include "vci_simple_ram.h" #include "vci_multi_tty.h" -#include "vci_simple_ring_network.h" +#include "vci_simple_ring_fast.h" #include "vci_mem_cache2.h" #include "vci_cc_vcache_wrapper2_ring.h" @@ -165,11 +165,11 @@ tty("tty",IntTab(1),maptabp,"tty0","tty1","tty2","tty3",NULL); - soclib::caba::VciSimpleRingNetwork - ringp("ringp",maptabp, IntTab(), 2, 4, 3); - - soclib::caba::VciSimpleRingNetwork - ringc("ringc",maptabc, IntTab(), 2, 5, 5); - - soclib::caba::VciSimpleRingNetwork + soclib::caba::VciSimpleRingFast + ringp("ringp",maptabp, IntTFast, 4, 3); + + soclib::caba::VciSimpleRingFast + ringc("ringc",maptabc, IntTFast, 5, 5); + + soclib::caba::VciSimpleRingFast ringx("ringx",maptabx, IntTab(), 2, 1, 1); Index: /trunk/platforms/fpga_3_tsar_v1/platform_desc =================================================================== --- /trunk/platforms/fpga_3_tsar_v1/platform_desc (revision 136) +++ /trunk/platforms/fpga_3_tsar_v1/platform_desc (revision 137) @@ -12,6 +12,6 @@ Uses('caba:vci_multi_tty'), Uses('caba:vci_vgmn'), - Uses('caba:vci_simple_ring_network_2', - ring_cmd_data_size = 37, + Uses('caba:vci_simple_ring_fast', + ring_cmd_data_size = 40, ring_rsp_data_size = 33), Uses('caba:vci_mem_cache_v2'), Index: /trunk/platforms/fpga_3_tsar_v1/top.cpp =================================================================== --- /trunk/platforms/fpga_3_tsar_v1/top.cpp (revision 136) +++ /trunk/platforms/fpga_3_tsar_v1/top.cpp (revision 137) @@ -10,5 +10,5 @@ #include "vci_simple_ram.h" #include "vci_multi_tty.h" -#include "vci_simple_ring_network_2.h" +#include "vci_simple_ring_fast.h" #include "vci_vgmn.h" #include "vci_mem_cache_v2.h" @@ -21,5 +21,5 @@ //#define VCI_LOGGER #include "segmentation.h" -#define USE_VGMN +//#define USE_VGMN int _main(int argc, char *argv[]) @@ -198,11 +198,11 @@ #else - soclib::caba::VciSimpleRingNetwork2 + soclib::caba::VciSimpleRingFast ringp("ringp",maptabp, IntTab(), 2, 4, 3); - soclib::caba::VciSimpleRingNetwork2 + soclib::caba::VciSimpleRingFast ringc("ringc",maptabc, IntTab(), 2, 5, 5); - soclib::caba::VciSimpleRingNetwork2 + soclib::caba::VciSimpleRingFast ringx("ringx",maptabx, IntTab(), 2, 1, 1); #endif Index: /trunk/platforms/tsarv2_mutekh/top.cpp =================================================================== --- /trunk/platforms/tsarv2_mutekh/top.cpp (revision 136) +++ /trunk/platforms/tsarv2_mutekh/top.cpp (revision 137) @@ -10,5 +10,5 @@ #include "vci_simple_ram.h" #include "vci_multi_tty.h" -#include "vci_simple_ring_network_2.h" +#include "vci_simple_ring_fast.h" #include "vci_vgmn.h" #include "vci_mem_cache_v2.h" @@ -218,8 +218,8 @@ #else - soclib::caba::VciSimpleRingNetwork2 + soclib::caba::VciSimpleRingFast ringp("ringp",maptabp, IntTab(), 2, 4, 4); - soclib::caba::VciSimpleRingNetwork2 + soclib::caba::VciSimpleRingFast ringc("ringc",maptabc, IntTab(), 2, 5, 5);