Changeset 994 for branches/reconfiguration/modules/dspin_router/caba/source/include

Timestamp:

May 24, 2015, 6:37:08 PM (10 years ago)

Author:

cfuguet

Message:

reconf: modify the broadcast routing function to support holes in the
mesh.

• Add a test platform in dspin_router directory that validates the introduced modifications.

File:

• branches/reconfiguration/modules/dspin_router/caba/source/include/dspin_router.h (modified) (5 diffs)

branches/reconfiguration/modules/dspin_router/caba/source/include/dspin_router.h

@@ -84 +84 @@
     DspinOutput<flit_width>     *p_out;
 
-    // reconfiguration port
-    sc_in<uint32_t>             *p_recovery_cfg;
-
     // constructor / destructor
     DspinRouter( sc_module_name  name,
@@ -95 +92 @@
                  const size_t    in_fifo_depth,
                  const size_t    out_fifo_depth,
-                 const bool      broadcast_supported = false );
+                 const bool      broadcast_supported = false,
+                 const bool      configuration_supported = false );
 
     ~DspinRouter();
@@ -107 +105 @@
         bool                 eop;
     } internal_flit_t;
+
+    // reconfiguration port
+    // port binding is performed with the bind_recovery_port() function
+    sc_in<uint32_t>             *p_recovery_cfg;
 
     // registers
@@ -135 +137 @@
     void    transition();
     void    genMoore();
+
     int     xfirst_route( size_t xdest, size_t ydest );
+    int     recovery_route( size_t xdest, size_t ydest );
     int     route( sc_uint<flit_width> data );
+
     int     broadcast_route( int iter, int source, sc_uint<flit_width> data );
     bool    is_broadcast( sc_uint<flit_width> data );
+    sc_uint<flit_width> compute_broadcast_header( int source );
 
-    // fault-recovery methods
     bool    is_destination_blackhole( size_t xdest, size_t ydest, int bhpos );
-    int     recovery_route( size_t xdest, size_t ydest );
-
-    public:
-
-    inline void set_disable_mask( int mask )
-    {
-        m_disable_mask = mask;
-    }
+    int     blackhole_position();
 
     inline bool is_network_recovery_enable()
@@ -161 +159 @@
     }
 
-    inline int blackhole_position()
+    inline bool is_reconfigurable()
     {
-        return (p_recovery_cfg->read() & 0xF);
+        return (p_recovery_cfg != NULL);
     }
 
-    void bind_recovery_port( sc_core::sc_signal<uint32_t> &s );
+    public:
+
+    inline void set_disable_mask( int mask )
+    {
+        m_disable_mask = mask;
+    }
+
+    void bind_recovery_port(sc_signal<uint32_t> &s);
 
     void print_trace();