Changeset 137 for trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp

Timestamp:

Feb 16, 2011, 1:42:13 PM (14 years ago)

Author:

simerabe

Message:

replacing old ring versions with new one

File:

• trunk/platforms/caba-ring-ccxcachev4_memcachev4-mips32el/top.cpp (modified) (5 diffs)

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

@@ -14 +14 @@
 #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 +31 @@
 #  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 +54 @@
 {
   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 +249 @@
 
             proc[i] = new soclib::caba::VciCcXCacheWrapperV4<vci_param, proc_iss > (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 +295 @@
         // interconnect_x : memc       | xram
 
-#if USE_VGMN
-        soclib::caba::VciVgmn<vci_param> 
-        interconnect_p("interconnect_p",maptabp, nb_proc  , 5        , PARAM_VGMN_P);
-
-        soclib::caba::VciVgmn<vci_param> 
-        interconnect_c("interconnect_c",maptabc, nb_proc+1, nb_proc+1, PARAM_VGMN_C);
-
-        soclib::caba::VciVgmn<vci_param> 
-        interconnect_x("interconnect_x",maptabx, 1        , 1        , PARAM_VGMN_X);
-#else
-        soclib::caba::VciSimpleRingNetwork2<vci_param,37,33> 
+        soclib::caba::VciSimpleRingFast<vci_param,40,33> 
         interconnect_p("interconnect_p",maptabp, IntTab(), PARAM_RING_P,nb_proc  , 5        );
 
-        soclib::caba::VciSimpleRingNetwork2<vci_param,37,33>
+        soclib::caba::VciSimpleRingFast<vci_param,40,33>
         interconnect_c("interconnect_c",maptabc, IntTab(), PARAM_RING_C,nb_proc+1, nb_proc+1);
 
-        soclib::caba::VciSimpleRingNetwork2<vci_param,37,33>
+        soclib::caba::VciSimpleRingFast<vci_param,40,33>
         interconnect_x("interconnect_x",maptabx, IntTab(), PARAM_RING_X,1        , 1        );
-#endif
 
         // Net-List