Remove routing - topology verification

leds-lab · Dec 1, 2016 · aa2a2fc · aa2a2fc
1 parent cfa8a8c
commit aa2a2fc
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 44 deletions.
diff --git a/SoCIN/SoCIN.cpp b/SoCIN/SoCIN.cpp
@@ -35,13 +35,6 @@ SoCINfp_VC::SoCINfp_VC(sc_module_name mn)
       w_Y_RETURN_TO_NORTH("w_Y_RETURN_TO_NORTH"),
       w_Y_VC_SELECTOR_TO_NORTH("w_Y_VC_SELECTOR_TO_NORTH")
 {
-    IRouting* tester = PLUGIN_MANAGER->routingInstance("Tester",0,5);
-    if(tester != NULL) {
-        if( tester->supportedTopology() != this->topologyType() ) {
-            throw std::runtime_error("[SoCINfp_VC] Routing incompatible with the topology");
-        }
-    }
-
     // Allocating the number of routers needed
     u_ROUTER.resize( (X_SIZE*Y_SIZE) , NULL);
     unsigned short numberOfXWires = (X_SIZE-1) * Y_SIZE;
@@ -386,12 +379,6 @@ SoCINfp::SoCINfp(sc_module_name mn)
       w_Y_VALID_TO_NORTH("w_Y_VALID_OUT"),
       w_Y_RETURN_TO_NORTH("w_Y_RETURN_OUT")
 {
-    IRouting* tester = PLUGIN_MANAGER->routingInstance("Tester",0,5);
-    if(tester != NULL) {
-        if( tester->supportedTopology() != this->topologyType() ) {
-            throw std::runtime_error("[SoCINfp] Routing incompatible with the topology");
-        }
-    }
     // Allocating the number of routers needed
     u_ROUTER.resize( (X_SIZE*Y_SIZE) , NULL);
 

diff --git a/SoCIN_3D/SoCIN_3D.cpp b/SoCIN_3D/SoCIN_3D.cpp
@@ -46,13 +46,6 @@ SoCIN_3D::SoCIN_3D(sc_module_name mn)
         throw std::runtime_error("[SoCIN-3D]Number of interfaces is 0, verify Z size.");
     }
 
-    IRouting* tester = PLUGIN_MANAGER->routingInstance("Tester",0,5);
-    if(tester != NULL) {
-        if( tester->supportedTopology() != this->topologyType() ) {
-            throw std::runtime_error("[SoCINfp-3D] Routing incompatible with the topology");
-        }
-    }
-
     unsigned short i; // Loop iterator
 
     // Allocating the number of routers needed

diff --git a/SoCIN_Ring/SoCIN_Ring.cpp b/SoCIN_Ring/SoCIN_Ring.cpp
@@ -15,12 +15,13 @@ SoCIN_Ring::SoCIN_Ring(sc_module_name mn)
     w_RETURN_TO_RIGHT("w_X_RETURN_TO_RIGHT"),
     w_VC_SELECTOR_TO_RIGHT("w_X_VC_SELECTOR_TO_RIGHT")
 {
-    IRouting* tester = PLUGIN_MANAGER->routingInstance("Tester",0,5);
-    if(tester != NULL) {
-        if( tester->supportedTopology() != this->topologyType() ) {
-            throw std::runtime_error("[SoCIN_Ring] Routing incompatible with the topology");
-        }
-    }
+//    IRouting* tester = PLUGIN_MANAGER->routingInstance("Tester",0,5);
+//    if(tester != NULL) {
+//        if( tester->supportedTopology() != this->topologyType() ) {
+//            throw std::runtime_error("[SoCIN_Ring] Routing incompatible with the topology");
+//        }
+//        PLUGIN_MANAGER->destroyRouting(tester);
+//    }
 
     unsigned short numberOfElements = numInterfaces;
 

diff --git a/SoCIN_Spider/SoCIN_Spider.cpp b/SoCIN_Spider/SoCIN_Spider.cpp
@@ -19,12 +19,6 @@ SoCIN_Spider::SoCIN_Spider(sc_module_name mn)
       w_RETURN_ACROSS("w_X_RETURN_TO_ACROSS"),
       w_VC_SELECTOR_ACROSS("w_X_VC_SELECTOR_TO_ACROSS")
 {
-    IRouting* tester = PLUGIN_MANAGER->routingInstance("Tester",0,5);
-    if(tester != NULL) {
-        if( tester->supportedTopology() != this->topologyType() ) {
-            throw std::runtime_error("[SoCIN_Spider] Routing incompatible with the topology");
-        }
-    }
     unsigned short numberOfElements = numInterfaces;
 
     // Allocate the number of routers needed

diff --git a/SoCIN_Torus/SoCIN_Torus.cpp b/SoCIN_Torus/SoCIN_Torus.cpp
@@ -23,12 +23,6 @@ SoCIN_Torus::SoCIN_Torus(sc_module_name mn)
       w_Y_RETURN_TO_NORTH("w_Y_RETURN_TO_NORTH"),
       w_Y_VC_SELECTOR_TO_NORTH("w_Y_VC_SELECTOR_TO_NORTH")
 {
-    IRouting* tester = PLUGIN_MANAGER->routingInstance("Tester",0,5);
-    if(tester != NULL) {
-        if( tester->supportedTopology() != this->topologyType() ) {
-            throw std::runtime_error("[SoCIN_Torus] Routing incompatible with the topology");
-        }
-    }
     // Allocating the number of routers needed
     u_ROUTER.resize(numInterfaces,NULL);
 

diff --git a/SoCIN_single_unit/SoCIN_Unit.cpp b/SoCIN_single_unit/SoCIN_Unit.cpp
@@ -5,12 +5,6 @@
 SoCIN_Unit::SoCIN_Unit(sc_module_name mn)
     : INoC_VC( mn, (X_SIZE*Y_SIZE) , NUM_VC)
 {
-    IRouting* tester = PLUGIN_MANAGER->routingInstance("Tester",0,5);
-    if(tester != NULL) {
-        if( tester->supportedTopology() != this->topologyType() ) {
-            throw std::runtime_error("[SoCIN_Unit] Routing incompatible with the topology");
-        }
-    }
     // Allocating the number of routers needed
     u_ROUTER.resize(1,NULL);