Index: trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/default.cfg =================================================================== --- trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/default.cfg (revision 166) +++ trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/default.cfg (revision 167) @@ -3,4 +3,4 @@ 4 64 16 4 64 16 -4 8 16 +4 8 16 256 16 4096 Index: trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/gen_config.sh =================================================================== --- trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/gen_config.sh (revision 166) +++ trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/gen_config.sh (revision 167) @@ -19,9 +19,7 @@ #wnwords=( "1" "16" "*2" "4"); #wnlines=( "1" "8" "*2" "8"); -#wtimeout=( "1" "1024" "*4" "16"); wnwords=( "4" "4" "*2" "4"); wnlines=( "8" "8" "*2" "8"); -wtimeout=( "16" "16" "*4" "16"); archi_default="1"; @@ -30,5 +28,5 @@ function gen_file () { - filename=$(printf "archi_%s-x%.2d_%.2d_%.2d-wbuf_%.2d_%.2d_%.4d.cfg" ${archi_name[${4}]} ${1} ${2} ${3} ${5} ${6} ${7}); + filename=$(printf "archi_%s-x%.2d_%.2d_%.2d-wbuf_%.2d_%.2d_%.4d.cfg" ${archi_name[${4}]} ${1} ${2} ${3} ${5} ${6}); echo ${filename}; @@ -38,5 +36,5 @@ echo "${iways[${4}]} ${isets[${4}]} ${iwords[${4}]}" >> ${filename}; echo "${dways[${4}]} ${dsets[${4}]} ${dwords[${4}]}" >> ${filename}; - echo "${5} ${6} ${7}" >> ${filename}; + echo "${5} ${6}" >> ${filename}; echo "${memc_nways[${4}]} ${memc_nsets[${4}]} ${memc_words[${4}]} ${memc_heap_size[${4}]}" >> ${filename}; } @@ -53,5 +51,5 @@ echo "${iways[${archi}]} ${isets[${archi}]} ${iwords[${archi}]}" >> ${filename}; echo "${dways[${archi}]} ${dsets[${archi}]} ${dwords[${archi}]}" >> ${filename}; - echo "${wnwords[3]} ${wnlines[3]} ${wtimeout[3]}" >> ${filename}; + echo "${wnwords[3]} ${wnlines[3]}" >> ${filename}; echo "${memc_nways[${archi}]} ${memc_nsets[${archi}]} ${memc_words[${archi}]} ${memc_heap_size[${archi}]}" >> ${filename}; } @@ -81,11 +79,7 @@ num_lines=${wnlines[0]}; while test ${num_lines} -le ${wnlines[1]}; do - num_timeout=${wtimeout[0]}; - while test ${num_timeout} -le ${wtimeout[1]}; do - - gen_file ${num_proc} ${num_cpu_by_cache} ${num_cache} ${num_archi} ${num_words} ${num_lines} ${num_timeout}; - - num_timeout=$((${num_timeout} ${wtimeout[2]})); - done; + + gen_file ${num_proc} ${num_cpu_by_cache} ${num_cache} ${num_archi} ${num_words} ${num_lines}; + num_lines=$((${num_lines} ${wnlines[2]})); done; Index: trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp =================================================================== --- trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp (revision 166) +++ trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp (revision 167) @@ -49,5 +49,5 @@ // * Simulation -# define CONFIG_DEFAULT "configuration/default.cfg" +# define CONFIG_DEFAULT "configuration/default.cfg" # define NCYCLES_DEFAULT 0 # define SOFT_DEFAULT "soft/bin.soft" @@ -64,5 +64,5 @@ std::cout << " - iways, isets, iwords," << std::endl; std::cout << " - dways, dsets, dwords," << std::endl; - std::cout << " - wnwords, wnlines, wtimeout," << std::endl; + std::cout << " - wnwords, wnlines, " << std::endl; std::cout << " - memc_nways, memc_nsets, memc_words, memc_heap_size." << std::endl; std::cout << " default : \"" << CONFIG_DEFAULT << "\"" << std::endl; @@ -112,5 +112,5 @@ uint32_t iways, isets, iwords; uint32_t dways, dsets, dwords; - uint32_t wnwords, wnlines, wtimeout; + uint32_t wnwords, wnlines; uint32_t memc_nways, memc_nsets, memc_words, memc_heap_size; @@ -149,6 +149,4 @@ if (not (inFile >> str)){std::cout << "Invalid parameters number in configuration file." << std::endl; usage(argv[0]);} wnlines =std::atoi(str.c_str()); - if (not (inFile >> str)){std::cout << "Invalid parameters number in configuration file." << std::endl; usage(argv[0]);} - wtimeout =std::atoi(str.c_str()); if (not (inFile >> str)){std::cout << "Invalid parameters number in configuration file." << std::endl; usage(argv[0]);} memc_nways =std::atoi(str.c_str()); @@ -179,5 +177,4 @@ std::cout << " * wnwords : " << wnwords << std::endl; std::cout << " * wnlines : " << wnlines << std::endl; - std::cout << " * wtimeout : " << wtimeout << std::endl; std::cout << " * memc_nways : " << memc_nways << std::endl; std::cout << " * memc_nsets : " << memc_nsets << std::endl; @@ -296,5 +293,5 @@ ,iways*nb_cpu_by_cache, isets, iwords ,dways*nb_cpu_by_cache, dsets, dwords - ,wnwords, wnlines*nb_cpu_by_cache, wtimeout + ,wnwords, wnlines*nb_cpu_by_cache #endif ); Index: trunk/platforms/tsarv4_dspin_generic_32/tsarv4_dspin_generic_32_top.cpp =================================================================== --- trunk/platforms/tsarv4_dspin_generic_32/tsarv4_dspin_generic_32_top.cpp (revision 166) +++ trunk/platforms/tsarv4_dspin_generic_32/tsarv4_dspin_generic_32_top.cpp (revision 167) @@ -550,5 +550,5 @@ 1,1, 4,64,16,4,64,16, // Icache and Dcache sizes - 4,8,16); + 4,8); } } Index: trunk/platforms/tsarv4_generic_ring/tsarv4_cluster_ring/caba/source/src/tsarv4_cluster_ring.cpp =================================================================== --- trunk/platforms/tsarv4_generic_ring/tsarv4_cluster_ring/caba/source/src/tsarv4_cluster_ring.cpp (revision 166) +++ trunk/platforms/tsarv4_generic_ring/tsarv4_cluster_ring/caba/source/src/tsarv4_cluster_ring.cpp (revision 167) @@ -101,6 +101,6 @@ l1_d_ways,l1_d_sets,16, // DCACHE size 16, // WBUF width - 1, // WBUF depth - 0); // WBUF timeout + 1 // WBUF depth + ); } Index: trunk/platforms/tsarv4_generic_xbar/tsarv4_cluster_xbar/caba/source/src/tsarv4_cluster_xbar.cpp =================================================================== --- trunk/platforms/tsarv4_generic_xbar/tsarv4_cluster_xbar/caba/source/src/tsarv4_cluster_xbar.cpp (revision 166) +++ trunk/platforms/tsarv4_generic_xbar/tsarv4_cluster_xbar/caba/source/src/tsarv4_cluster_xbar.cpp (revision 167) @@ -101,6 +101,6 @@ l1_d_ways,l1_d_sets,16, // DCACHE size 16, // WBUF width - 1, // WBUF depth - 0); // WBUF timeout + 1 // WBUF depth + ); } Index: trunk/platforms/tsarv4_vgmn_generic_32/tsarv4_vgmn_generic_32_top.cpp =================================================================== --- trunk/platforms/tsarv4_vgmn_generic_32/tsarv4_vgmn_generic_32_top.cpp (revision 166) +++ trunk/platforms/tsarv4_vgmn_generic_32/tsarv4_vgmn_generic_32_top.cpp (revision 167) @@ -541,5 +541,5 @@ 1,1, 4,64,16,4,64,16 // Icache and Dcache sizes - ,4,8,16 + ,4,8 ); }