Changeset 1016 for branches/reconfiguration/modules/dspin_router/caba/test/recovery_bcast_evaluation/synthetic_dspin_network/caba/source/include/synthetic_dspin_network.h

Timestamp:

Sep 14, 2015, 9:42:16 AM (9 years ago)

Author:

cfuguet

Message:

reconf: dspin_router

• improve the code readability of the dspin_router model.

• update the unitary tests of the dspin_router to support the local gateway hardware barrier, and the memory cache scratchpad mode.

File:

• branches/reconfiguration/modules/dspin_router/caba/test/recovery_bcast_evaluation/synthetic_dspin_network/caba/source/include/synthetic_dspin_network.h (modified) (6 diffs)

branches/reconfiguration/modules/dspin_router/caba/test/recovery_bcast_evaluation/synthetic_dspin_network/caba/source/include/synthetic_dspin_network.h

@@ -2 +2 @@
  *
  * SOCLIB_LGPL_HEADER_BEGIN
- * 
+ *
  * This file is part of SoCLib, GNU LGPLv2.1.
- * 
+ *
  * SoCLib is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
  * by the Free Software Foundation; version 2.1 of the License.
- * 
+ *
  * SoCLib is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with SoCLib; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
- * 
+ *
  * SOCLIB_LGPL_HEADER_END
  *
- * Authors  : Cesar Armando Fuguet Tortolero 
+ * Authors  : Cesar Armando Fuguet Tortolero
  * Date     : jul 2015
  * Copyright: UPMC - LIP6
@@ -32 +32 @@
 #include "caba_base_module.h"
 #include "dspin_router.h"
+
+#if UNICAST
+#include "dspin_packet_generator.h"
+#else
 #include "dspin_broadcast_generator.h"
+#endif
 
 namespace soclib {
@@ -47 +52 @@
     static const int DSPIN_GENERATOR_FIFO_DEPTH = 50;
 
+#if UNICAST
+    typedef DspinPacketGenerator<DSPIN_WIDTH, DSPIN_WIDTH>
+    DspinNetworkGenerator;
+#else
     typedef DspinBroadcastGenerator<DSPIN_WIDTH, DSPIN_WIDTH>
     DspinNetworkGenerator;
+#endif
+
     typedef DspinRouter<DSPIN_WIDTH>
     DspinNetworkRouter;
@@ -54 +65 @@
     DspinNetworkSignal;
 
-      
+
 public:
 
@@ -71 +82 @@
     void print_stats(const size_t x, const size_t y);
 
-      
+
 private:
 
     const size_t m_x_size;
     const size_t m_y_size;
-      
+
     DspinNetworkGenerator **dspinGenerator;
     DspinNetworkRouter **dspinRouter;
@@ -83 +94 @@
     DspinNetworkSignal ***sH;
     DspinNetworkSignal ***sV;
-      
+
     sc_core::sc_signal<uint32_t>** sConfigRouter;
 };                  // end class SyntheticDspinNetwork