Changeset 1016 for branches/reconfiguration/modules/dspin_router/caba/test/recovery_bcast_evaluation/synthetic_dspin_network/caba
- Timestamp:
- Sep 14, 2015, 9:42:16 AM (9 years ago)
- Location:
- branches/reconfiguration/modules/dspin_router/caba/test/recovery_bcast_evaluation/synthetic_dspin_network/caba
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/reconfiguration/modules/dspin_router/caba/test/recovery_bcast_evaluation/synthetic_dspin_network/caba/metadata/synthetic_dspin_network.sd
r1009 r1016 18 18 Uses('caba:dspin_broadcast_generator', 19 19 cmd_width=DSPIN_FLIT_WIDTH, 20 rsp_width=DSPIN_FLIT_WIDTH), 21 Uses('caba:dspin_packet_generator', 22 cmd_width=DSPIN_FLIT_WIDTH, 20 23 rsp_width=DSPIN_FLIT_WIDTH) 21 24 ], -
branches/reconfiguration/modules/dspin_router/caba/test/recovery_bcast_evaluation/synthetic_dspin_network/caba/source/include/synthetic_dspin_network.h
r1009 r1016 2 2 * 3 3 * SOCLIB_LGPL_HEADER_BEGIN 4 * 4 * 5 5 * This file is part of SoCLib, GNU LGPLv2.1. 6 * 6 * 7 7 * SoCLib is free software; you can redistribute it and/or modify it 8 8 * under the terms of the GNU Lesser General Public License as published 9 9 * by the Free Software Foundation; version 2.1 of the License. 10 * 10 * 11 11 * SoCLib is distributed in the hope that it will be useful, but 12 12 * WITHOUT ANY WARRANTY; without even the implied warranty of 13 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 14 * Lesser General Public License for more details. 15 * 15 * 16 16 * You should have received a copy of the GNU Lesser General Public 17 17 * License along with SoCLib; if not, write to the Free Software 18 18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 19 19 * 02110-1301 USA 20 * 20 * 21 21 * SOCLIB_LGPL_HEADER_END 22 22 * 23 * Authors : Cesar Armando Fuguet Tortolero 23 * Authors : Cesar Armando Fuguet Tortolero 24 24 * Date : jul 2015 25 25 * Copyright: UPMC - LIP6 … … 32 32 #include "caba_base_module.h" 33 33 #include "dspin_router.h" 34 35 #if UNICAST 36 #include "dspin_packet_generator.h" 37 #else 34 38 #include "dspin_broadcast_generator.h" 39 #endif 35 40 36 41 namespace soclib { … … 47 52 static const int DSPIN_GENERATOR_FIFO_DEPTH = 50; 48 53 54 #if UNICAST 55 typedef DspinPacketGenerator<DSPIN_WIDTH, DSPIN_WIDTH> 56 DspinNetworkGenerator; 57 #else 49 58 typedef DspinBroadcastGenerator<DSPIN_WIDTH, DSPIN_WIDTH> 50 59 DspinNetworkGenerator; 60 #endif 61 51 62 typedef DspinRouter<DSPIN_WIDTH> 52 63 DspinNetworkRouter; … … 54 65 DspinNetworkSignal; 55 66 56 67 57 68 public: 58 69 … … 71 82 void print_stats(const size_t x, const size_t y); 72 83 73 84 74 85 private: 75 86 76 87 const size_t m_x_size; 77 88 const size_t m_y_size; 78 89 79 90 DspinNetworkGenerator **dspinGenerator; 80 91 DspinNetworkRouter **dspinRouter; … … 83 94 DspinNetworkSignal ***sH; 84 95 DspinNetworkSignal ***sV; 85 96 86 97 sc_core::sc_signal<uint32_t>** sConfigRouter; 87 98 }; // end class SyntheticDspinNetwork -
branches/reconfiguration/modules/dspin_router/caba/test/recovery_bcast_evaluation/synthetic_dspin_network/caba/source/src/synthetic_dspin_network.cpp
r1009 r1016 2 2 * 3 3 * SOCLIB_LGPL_HEADER_BEGIN 4 * 4 * 5 5 * This file is part of SoCLib, GNU LGPLv2.1. 6 * 6 * 7 7 * SoCLib is free software; you can redistribute it and/or modify it 8 8 * under the terms of the GNU Lesser General Public License as published 9 9 * by the Free Software Foundation; version 2.1 of the License. 10 * 10 * 11 11 * SoCLib is distributed in the hope that it will be useful, but 12 12 * WITHOUT ANY WARRANTY; without even the implied warranty of 13 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 14 * Lesser General Public License for more details. 15 * 15 * 16 16 * You should have received a copy of the GNU Lesser General Public 17 17 * License along with SoCLib; if not, write to the Free Software 18 18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 19 19 * 02110-1301 USA 20 * 20 * 21 21 * SOCLIB_LGPL_HEADER_END 22 22 * 23 * Authors : Cesar Armando Fuguet Tortolero 23 * Authors : Cesar Armando Fuguet Tortolero 24 24 * Date : jul 2015 25 25 * Copyright: UPMC - LIP6 … … 34 34 namespace caba { 35 35 using namespace soclib::common; 36 36 37 37 38 38 SyntheticDspinNetwork::SyntheticDspinNetwork(sc_module_name name, … … 58 58 const int SRCID = (x << Y_WIDTH) | y; 59 59 generator_name << "generator[" << x << "][" << y << "]"; 60 #if UNICAST 61 const size_t PACKET_LENGTH = 8; 62 new(&dspinGenerator[x][y]) 63 DspinNetworkGenerator(generator_name.str().c_str(), 64 (size_t)SRCID, 65 PACKET_LENGTH, 66 load, 67 (size_t)DSPIN_GENERATOR_FIFO_DEPTH, 68 0 ); 69 #else 60 70 new(&dspinGenerator[x][y]) 61 71 DspinNetworkGenerator(generator_name.str().c_str(), … … 65 75 load, 66 76 DSPIN_GENERATOR_FIFO_DEPTH); 67 68 } 69 } 70 77 #endif 78 79 } 80 } 81 71 82 // DSPIN router instantiation 72 83 dspinRouter = (DspinNetworkRouter**) … … 74 85 75 86 for (size_t x = 0; x < m_x_size; ++x) { 76 87 dspinRouter[x] = (DspinNetworkRouter*) 77 88 malloc(sizeof(DspinNetworkRouter) * m_y_size); 78 89 … … 102 113 m_x_size, m_y_size); 103 114 104 115 105 116 // netlist 106 117 for (size_t x = 0; x < m_x_size; ++x) { … … 133 144 for (size_t x = 0; x < m_x_size; ++x) { 134 145 for (size_t y = 0; y < m_y_size; ++y) { 146 #if UNICAST 147 dspinGenerator[x][y].~DspinPacketGenerator(); 148 #else 135 149 dspinGenerator[x][y].~DspinBroadcastGenerator(); 150 #endif 136 151 dspinRouter[x][y].~DspinRouter(); 137 152 } … … 151 166 152 167 153 static inline uint32_t configRouter(int bypass_mode,154 int re allocation_dir,168 static inline uint32_t configRouter(int reallocation_dir, 169 int recovery_mode, 155 170 int blackhole_pos) 156 171 { 157 return (bypass_mode << 7) | (reallocation_dir << 4) | blackhole_pos; 172 return ((reallocation_dir & 0x7) << 5) | 173 ((recovery_mode & 0x1) << 4) | 174 (blackhole_pos & 0xF); 158 175 } 159 176 … … 164 181 for (size_t x = 0; x < m_x_size; ++x) { 165 182 for (size_t y = 0; y < m_y_size; ++y) { 166 const uint32_t CONFIG_NONE = configRouter(0, REQ_NOP, BH_NONE);183 const uint32_t CONFIG_NONE = configRouter(0, 0, NORMAL); 167 184 sConfigRouter[x][y].write(CONFIG_NONE); 168 185 } 169 186 } 170 187 171 188 172 189 // initialize mesh's boundary signals … … 184 201 } 185 202 } // end reset() 186 203 187 204 188 205 void SyntheticDspinNetwork::set_faulty_router(const size_t faulty_x, … … 199 216 // reconfigure the faulty router's contour 200 217 if (faulty_y < (m_y_size - 1)) { 201 const uint32_t CONFIG_N = configRouter( 1, REQ_SOUTH, BH_N);218 const uint32_t CONFIG_N = configRouter(REQ_SOUTH, 1, N_OF_X); 202 219 sConfigRouter[faulty_x][faulty_y + 1].write(CONFIG_N); 203 220 204 221 if (faulty_x > 0) { 205 const uint32_t CONFIG_NW = configRouter( 1, REQ_EAST, BH_NW);222 const uint32_t CONFIG_NW = configRouter(REQ_EAST, 1, NW_OF_X); 206 223 sConfigRouter[faulty_x - 1][faulty_y + 1].write(CONFIG_NW); 207 224 } 208 225 if (faulty_x < (m_x_size - 1)) { 209 const uint32_t CONFIG_NE = configRouter( 1, REQ_WEST, BH_NE);226 const uint32_t CONFIG_NE = configRouter(REQ_WEST, 1, NE_OF_X); 210 227 sConfigRouter[faulty_x + 1][faulty_y + 1].write(CONFIG_NE); 211 228 } … … 213 230 214 231 if (faulty_y > 0) { 215 const uint32_t CONFIG_S = configRouter( 1, REQ_NORTH, BH_S);232 const uint32_t CONFIG_S = configRouter(REQ_NORTH, 1, S_OF_X); 216 233 sConfigRouter[faulty_x][faulty_y - 1].write(CONFIG_S); 217 234 218 235 if (faulty_x > 0) { 219 const uint32_t CONFIG_SW = configRouter( 1, REQ_EAST, BH_SW);236 const uint32_t CONFIG_SW = configRouter(REQ_EAST, 1, SW_OF_X); 220 237 sConfigRouter[faulty_x - 1][faulty_y - 1].write(CONFIG_SW); 221 238 } 222 239 if (faulty_x < (m_x_size - 1)) { 223 const uint32_t CONFIG_SE = configRouter( 1, REQ_WEST, BH_SE);240 const uint32_t CONFIG_SE = configRouter(REQ_WEST, 1, SE_OF_X); 224 241 sConfigRouter[faulty_x + 1][faulty_y - 1].write(CONFIG_SE); 225 242 } … … 227 244 228 245 if (faulty_x > 0) { 229 const uint32_t CONFIG_W = configRouter( 1, REQ_EAST, BH_W);246 const uint32_t CONFIG_W = configRouter(REQ_EAST, 1, W_OF_X); 230 247 sConfigRouter[faulty_x - 1][faulty_y].write(CONFIG_W); 231 248 } 232 249 233 250 if (faulty_x < (m_x_size - 1)) { 234 const uint32_t CONFIG_E = configRouter( 1, REQ_WEST, BH_E);251 const uint32_t CONFIG_E = configRouter(REQ_WEST, 1, E_OF_X); 235 252 sConfigRouter[faulty_x + 1][faulty_y].write(CONFIG_E); 236 253 } … … 245 262 dspinGenerator[x][y].print_stats(); 246 263 } 247 264 248 265 249 266 } // end namespace caba … … 256 273 // indent-tabs-mode: nil 257 274 // End: 275 276 // vim: ts=4 : sts=4 : sw=4 : et
Note: See TracChangeset
for help on using the changeset viewer.