Changeset 167 for trunk/platforms
- Timestamp:
- May 11, 2011, 6:53:01 PM (14 years ago)
- Location:
- trunk/platforms
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/default.cfg
r166 r167 3 3 4 64 16 4 4 4 64 16 5 4 8 165 4 8 6 6 16 256 16 4096 -
trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/gen_config.sh
r140 r167 19 19 #wnwords=( "1" "16" "*2" "4"); 20 20 #wnlines=( "1" "8" "*2" "8"); 21 #wtimeout=( "1" "1024" "*4" "16");22 21 23 22 wnwords=( "4" "4" "*2" "4"); 24 23 wnlines=( "8" "8" "*2" "8"); 25 wtimeout=( "16" "16" "*4" "16");26 24 27 25 archi_default="1"; … … 30 28 function gen_file () 31 29 { 32 filename=$(printf "archi_%s-x%.2d_%.2d_%.2d-wbuf_%.2d_%.2d_%.4d.cfg" ${archi_name[${4}]} ${1} ${2} ${3} ${5} ${6} ${7});30 filename=$(printf "archi_%s-x%.2d_%.2d_%.2d-wbuf_%.2d_%.2d_%.4d.cfg" ${archi_name[${4}]} ${1} ${2} ${3} ${5} ${6}); 33 31 34 32 echo ${filename}; … … 38 36 echo "${iways[${4}]} ${isets[${4}]} ${iwords[${4}]}" >> ${filename}; 39 37 echo "${dways[${4}]} ${dsets[${4}]} ${dwords[${4}]}" >> ${filename}; 40 echo "${5} ${6} ${7}" >> ${filename};38 echo "${5} ${6}" >> ${filename}; 41 39 echo "${memc_nways[${4}]} ${memc_nsets[${4}]} ${memc_words[${4}]} ${memc_heap_size[${4}]}" >> ${filename}; 42 40 } … … 53 51 echo "${iways[${archi}]} ${isets[${archi}]} ${iwords[${archi}]}" >> ${filename}; 54 52 echo "${dways[${archi}]} ${dsets[${archi}]} ${dwords[${archi}]}" >> ${filename}; 55 echo "${wnwords[3]} ${wnlines[3]} ${wtimeout[3]}" >> ${filename};53 echo "${wnwords[3]} ${wnlines[3]}" >> ${filename}; 56 54 echo "${memc_nways[${archi}]} ${memc_nsets[${archi}]} ${memc_words[${archi}]} ${memc_heap_size[${archi}]}" >> ${filename}; 57 55 } … … 81 79 num_lines=${wnlines[0]}; 82 80 while test ${num_lines} -le ${wnlines[1]}; do 83 num_timeout=${wtimeout[0]}; 84 while test ${num_timeout} -le ${wtimeout[1]}; do 85 86 gen_file ${num_proc} ${num_cpu_by_cache} ${num_cache} ${num_archi} ${num_words} ${num_lines} ${num_timeout}; 87 88 num_timeout=$((${num_timeout} ${wtimeout[2]})); 89 done; 81 82 gen_file ${num_proc} ${num_cpu_by_cache} ${num_cache} ${num_archi} ${num_words} ${num_lines}; 83 90 84 num_lines=$((${num_lines} ${wnlines[2]})); 91 85 done; -
trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp
r165 r167 49 49 50 50 // * Simulation 51 # define CONFIG_DEFAULT 51 # define CONFIG_DEFAULT "configuration/default.cfg" 52 52 # define NCYCLES_DEFAULT 0 53 53 # define SOFT_DEFAULT "soft/bin.soft" … … 64 64 std::cout << " - iways, isets, iwords," << std::endl; 65 65 std::cout << " - dways, dsets, dwords," << std::endl; 66 std::cout << " - wnwords, wnlines, wtimeout," << std::endl;66 std::cout << " - wnwords, wnlines, " << std::endl; 67 67 std::cout << " - memc_nways, memc_nsets, memc_words, memc_heap_size." << std::endl; 68 68 std::cout << " default : \"" << CONFIG_DEFAULT << "\"" << std::endl; … … 112 112 uint32_t iways, isets, iwords; 113 113 uint32_t dways, dsets, dwords; 114 uint32_t wnwords, wnlines , wtimeout;114 uint32_t wnwords, wnlines; 115 115 uint32_t memc_nways, memc_nsets, memc_words, memc_heap_size; 116 116 … … 149 149 if (not (inFile >> str)){std::cout << "Invalid parameters number in configuration file." << std::endl; usage(argv[0]);} 150 150 wnlines =std::atoi(str.c_str()); 151 if (not (inFile >> str)){std::cout << "Invalid parameters number in configuration file." << std::endl; usage(argv[0]);}152 wtimeout =std::atoi(str.c_str());153 151 if (not (inFile >> str)){std::cout << "Invalid parameters number in configuration file." << std::endl; usage(argv[0]);} 154 152 memc_nways =std::atoi(str.c_str()); … … 179 177 std::cout << " * wnwords : " << wnwords << std::endl; 180 178 std::cout << " * wnlines : " << wnlines << std::endl; 181 std::cout << " * wtimeout : " << wtimeout << std::endl;182 179 std::cout << " * memc_nways : " << memc_nways << std::endl; 183 180 std::cout << " * memc_nsets : " << memc_nsets << std::endl; … … 296 293 ,iways*nb_cpu_by_cache, isets, iwords 297 294 ,dways*nb_cpu_by_cache, dsets, dwords 298 ,wnwords, wnlines*nb_cpu_by_cache , wtimeout295 ,wnwords, wnlines*nb_cpu_by_cache 299 296 #endif 300 297 ); -
trunk/platforms/tsarv4_dspin_generic_32/tsarv4_dspin_generic_32_top.cpp
r140 r167 550 550 1,1, 551 551 4,64,16,4,64,16, // Icache and Dcache sizes 552 4,8 ,16);552 4,8); 553 553 } 554 554 } -
trunk/platforms/tsarv4_generic_ring/tsarv4_cluster_ring/caba/source/src/tsarv4_cluster_ring.cpp
r155 r167 101 101 l1_d_ways,l1_d_sets,16, // DCACHE size 102 102 16, // WBUF width 103 1 ,// WBUF depth104 0); // WBUF timeout103 1 // WBUF depth 104 ); 105 105 } 106 106 -
trunk/platforms/tsarv4_generic_xbar/tsarv4_cluster_xbar/caba/source/src/tsarv4_cluster_xbar.cpp
r154 r167 101 101 l1_d_ways,l1_d_sets,16, // DCACHE size 102 102 16, // WBUF width 103 1 ,// WBUF depth104 0); // WBUF timeout103 1 // WBUF depth 104 ); 105 105 } 106 106 -
trunk/platforms/tsarv4_vgmn_generic_32/tsarv4_vgmn_generic_32_top.cpp
r140 r167 541 541 1,1, 542 542 4,64,16,4,64,16 // Icache and Dcache sizes 543 ,4,8 ,16543 ,4,8 544 544 ); 545 545 }
Note: See TracChangeset
for help on using the changeset viewer.