Index: /trunk/platforms/caba-vdspin-vci_synthetic_initiator/Makefile =================================================================== --- /trunk/platforms/caba-vdspin-vci_synthetic_initiator/Makefile (revision 132) +++ /trunk/platforms/caba-vdspin-vci_synthetic_initiator/Makefile (revision 133) @@ -1,5 +1,6 @@ ARCH=mips32el SIMULATION_ARGS=100000 -#SOCLIB_CC_ADD_ARGS=-t systemcass +SOCLIB_CC_ADD_ARGS=-t systemcass -I. +#SOCLIB_CC_ADD_ARGS=-I. SOCLIB?=$(shell soclib-cc --getpath) export SOCLIB Index: /trunk/platforms/caba-vdspin-vci_synthetic_initiator/top.cpp =================================================================== --- /trunk/platforms/caba-vdspin-vci_synthetic_initiator/top.cpp (revision 132) +++ /trunk/platforms/caba-vdspin-vci_synthetic_initiator/top.cpp (revision 133) @@ -16,6 +16,6 @@ // MESH SIZE -#define X_MAX 16 -#define Y_MAX 16 +#define X_MAX 8 +#define Y_MAX 8 #define N_CLUSTERS X_MAX*Y_MAX // FLIT_WIDTH @@ -43,5 +43,5 @@ #define TARGET_SIZE 0x400 // FIFO depth in the gateways -#define DEPTH 2 +#define DEPTH 4 // LENGTH of packets #define PACKET_LENGTH 2 @@ -162,11 +162,10 @@ str0 << "Initiator_c0_" << (i*Y_MAX+j) ; str1 << "Initiator_c1_" << (i*Y_MAX+j) ; - //if( (i == X_MAX-1) && (j == Y_MAX-1)){ - new(&initiator_c0[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator (str0.str().c_str() , maptab0, IntTab((i*Y_MAX+j) ,0), PACKET_LENGTH, 40, 8, X_MAX, Y_MAX); //, 250, 0, X_MAX, 0, Y_MAX); - new(&initiator_c1[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator (str1.str().c_str() , maptab1, IntTab((i*Y_MAX+j) ,0), PACKET_LENGTH, 40, 8, X_MAX, Y_MAX); //, 250, 0, X_MAX, 0, Y_MAX); - //} else { - // new(&initiator_c0[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator (str0.str().c_str() , maptab0, IntTab((i*Y_MAX+j),0), 16, 50, 2, X_MAX, Y_MAX); //, 0, 0, 0, 0, 0); - // new(&initiator_c1[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator (str1.str().c_str() , maptab1, IntTab((i*Y_MAX+j),0), 16, 50, 2, X_MAX, Y_MAX); //, 0, 0, 0, 0, 0); - //} + new(&initiator_c0[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator (str0.str().c_str() , maptab0, IntTab((i*Y_MAX+j) ,0), PACKET_LENGTH, 0, 16, X_MAX, Y_MAX); + if( (i == X_MAX-1) && (j == Y_MAX-1)){ + new(&initiator_c1[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator (str1.str().c_str() , maptab1, IntTab((i*Y_MAX+j) ,0), PACKET_LENGTH, 0, 16, X_MAX, Y_MAX, 2000, 0, X_MAX, 0, Y_MAX); + } else { + new(&initiator_c1[Y_MAX*i+j]) soclib::caba::VciSyntheticInitiator (str1.str().c_str() , maptab1, IntTab((i*Y_MAX+j),0), PACKET_LENGTH, 0, 16, X_MAX, Y_MAX); + } } @@ -380,7 +379,12 @@ std::cout << "synt_cmd = " << signal_vci_ini_synth_c0[0][i*Y_MAX+j].cmd.read() << std::endl; std::cout << "synt_srcid = " << signal_vci_ini_synth_c0[0][i*Y_MAX+j].srcid.read() << std::endl; + std::cout << "synt_trdid = " << signal_vci_ini_synth_c0[0][i*Y_MAX+j].trdid.read() << std::endl; std::cout << "synt_plen = " << signal_vci_ini_synth_c0[0][i*Y_MAX+j].plen.read() << std::endl; std::cout << "synt_eop = " << signal_vci_ini_synth_c0[0][i*Y_MAX+j].eop.read() << std::endl; std::cout << "synt_rspval = " << signal_vci_ini_synth_c0[0][i*Y_MAX+j].rspval.read() << std::endl; + std::cout << "synt_rspack = " << signal_vci_ini_synth_c0[0][i*Y_MAX+j].rspack.read() << std::endl; + std::cout << "synt_rsrcid = " << signal_vci_ini_synth_c0[0][i*Y_MAX+j].rsrcid.read() << std::endl; + std::cout << "synt_rtrdid = " << signal_vci_ini_synth_c0[0][i*Y_MAX+j].rtrdid.read() << std::endl; + std::cout << "synt_rpktid = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].rpktid.read() << std::endl; std::cout << "synt_rerror = " << signal_vci_ini_synth_c0[0][i*Y_MAX+j].rerror.read() << std::endl; std::cout << "synt_reop = " << signal_vci_ini_synth_c0[0][i*Y_MAX+j].reop.read() << std::endl; @@ -391,4 +395,5 @@ std::cout << "ram_cmd = " << signal_vci_ini_synth_c0[1][i*Y_MAX+j].cmd.read() << std::endl; std::cout << "ram_srcid = " << signal_vci_ini_synth_c0[1][i*Y_MAX+j].srcid.read() << std::endl; + std::cout << "ram_trdid = " << signal_vci_ini_synth_c0[1][i*Y_MAX+j].trdid.read() << std::endl; std::cout << "ram_plen = " << signal_vci_ini_synth_c0[1][i*Y_MAX+j].plen.read() << std::endl; std::cout << "ram_eop = " << signal_vci_ini_synth_c0[1][i*Y_MAX+j].eop.read() << std::endl; @@ -396,6 +401,42 @@ std::cout << "ram_rspack = " << signal_vci_ini_synth_c0[1][i*Y_MAX+j].rspack.read() << std::endl; std::cout << "ram_rsrcid = " << signal_vci_ini_synth_c0[1][i*Y_MAX+j].rsrcid.read() << std::endl; + std::cout << "ram_rtrdid = " << signal_vci_ini_synth_c0[1][i*Y_MAX+j].rtrdid.read() << std::endl; std::cout << "ram_rerror = " << signal_vci_ini_synth_c0[1][i*Y_MAX+j].rerror.read() << std::endl; std::cout << "ram_reop = " << signal_vci_ini_synth_c0[1][i*Y_MAX+j].reop.read() << std::endl; + initiator_c1[i*Y_MAX+j].print_trace(); + std::cout << std::hex; + std::cout << "synt_cmdval = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].cmdval.read() << std::endl; + std::cout << "synt_cmdack = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].cmdack.read() << std::endl; + std::cout << "synt_address = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].address.read() << std::endl; + std::cout << "synt_cmd = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].cmd.read() << std::endl; + std::cout << "synt_srcid = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].srcid.read() << std::endl; + std::cout << "synt_trdid = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].trdid.read() << std::endl; + std::cout << "synt_pktid = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].pktid.read() << std::endl; + std::cout << "synt_plen = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].plen.read() << std::endl; + std::cout << "synt_eop = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].eop.read() << std::endl; + std::cout << "synt_rspval = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].rspval.read() << std::endl; + std::cout << "synt_rspack = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].rspack.read() << std::endl; + std::cout << "synt_rsrcid = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].rsrcid.read() << std::endl; + std::cout << "synt_rtrdid = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].rtrdid.read() << std::endl; + std::cout << "synt_rpktid = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].rpktid.read() << std::endl; + std::cout << "synt_rerror = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].rerror.read() << std::endl; + std::cout << "synt_reop = " << signal_vci_ini_synth_c1[0][i*Y_MAX+j].reop.read() << std::endl; + ram_c1[i*Y_MAX+j].print_trace(); + std::cout << std::hex; + std::cout << "ram_cmdval = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].cmdval.read() << std::endl; + std::cout << "ram_address = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].address.read() << std::endl; + std::cout << "ram_cmd = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].cmd.read() << std::endl; + std::cout << "ram_srcid = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].srcid.read() << std::endl; + std::cout << "ram_trdid = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].trdid.read() << std::endl; + std::cout << "ram_pktid = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].pktid.read() << std::endl; + std::cout << "ram_plen = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].plen.read() << std::endl; + std::cout << "ram_eop = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].eop.read() << std::endl; + std::cout << "ram_rspval = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].rspval.read() << std::endl; + std::cout << "ram_rspack = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].rspack.read() << std::endl; + std::cout << "ram_rsrcid = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].rsrcid.read() << std::endl; + std::cout << "ram_rtrdid = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].rtrdid.read() << std::endl; + std::cout << "ram_rpktid = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].rpktid.read() << std::endl; + std::cout << "ram_rerror = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].rerror.read() << std::endl; + std::cout << "ram_reop = " << signal_vci_ini_synth_c1[1][i*Y_MAX+j].reop.read() << std::endl; #endif #if DEBUG==2 @@ -415,5 +456,5 @@ for(int i = 0 ; i < Y_MAX ; i++){ for(int j = 0 ; j < X_MAX ; j++){ - initiator_c0[i*Y_MAX+j].printStats(); + initiator_c1[i*Y_MAX+j].printStats(); } }