Changeset 167 for trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el

Timestamp:

May 11, 2011, 6:53:01 PM (14 years ago)

Author:

kane

Message:

delete all timeout reference (multi write buffer)

Location:

trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el

Files:

• configuration/default.cfg (modified) (1 diff)
• configuration/gen_config.sh (modified) (5 diffs)
• top.cpp (modified) (6 diffs)

trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/default.cfg

@@ -3 +3 @@
 4 64 16
 4 64 16
-4 8 16
+4 8
 16 256 16 4096

trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/configuration/gen_config.sh

@@ -19 +19 @@
 #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 +28 @@
 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 +36 @@
         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 +51 @@
         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 +79 @@
                         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;

trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp

@@ -49 +49 @@
                                             
 // * Simulation                             
-#  define CONFIG_DEFAULT                      "configuration/default.cfg"
+#  define CONFIG_DEFAULT                    "configuration/default.cfg"
 #  define NCYCLES_DEFAULT                   0
 #  define SOFT_DEFAULT                      "soft/bin.soft"
@@ -64 +64 @@
   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 +112 @@
         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 +149 @@
         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 +177 @@
         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 +293 @@
                                                                                     ,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
                                                                                     );