fix weights between router and node.

.gitignore

@@ -3,3 +3,7 @@
 ._*
 .Apple*
 .DS_Store
+.vscode/**
+.local/**
+**/.gdb*
+**/peda*

src/allocators/allocator.cpp

@@ -49,8 +49,8 @@
 //==================================================
 
 Allocator::Allocator( Module *parent, const string& name,
-		      int inputs, int outputs ) :
-Module( parent, name ), _inputs( inputs ), _outputs( outputs ), _dirty( false )
+		      int inputs, int outputs, Module *clock ) :
+Module( parent, name, clock ), _inputs( inputs ), _outputs( outputs ), _dirty( false )
 {
   _inmatch.resize(_inputs, -1);   
   _outmatch.resize(_outputs, -1);
@@ -112,8 +112,8 @@ void Allocator::PrintGrants( ostream * os ) const
 //==================================================
 
 DenseAllocator::DenseAllocator( Module *parent, const string& name,
-				int inputs, int outputs ) :
-  Allocator( parent, name, inputs, outputs )
+				int inputs, int outputs, Module *clock ) :
+  Allocator( parent, name, inputs, outputs, clock )
 {
   _request.resize(_inputs);
 
@@ -256,8 +256,8 @@ void DenseAllocator::PrintRequests( ostream * os ) const
 //==================================================
 
 SparseAllocator::SparseAllocator( Module *parent, const string& name,
-				  int inputs, int outputs ) :
-  Allocator( parent, name, inputs, outputs )
+				  int inputs, int outputs, Module *clock ) :
+  Allocator( parent, name, inputs, outputs, clock )
 {
   _in_req.resize(_inputs);
   _out_req.resize(_outputs);
@@ -445,30 +445,30 @@ Allocator *Allocator::NewAllocator( Module *parent, const string& name,
     }
   }
   if ( alloc_name == "max_size" ) {
-    a = new MaxSizeMatch( parent, name, inputs, outputs );
+    a = new MaxSizeMatch( parent, name, inputs, outputs, parent->GetClock() );
   } else if ( alloc_name == "pim" ) {
     int iters = param_str.empty() ? (config ? config->GetInt("alloc_iters") : 1) : atoi(param_str.c_str());
-    a = new PIM( parent, name, inputs, outputs, iters );
+    a = new PIM( parent, name, inputs, outputs, iters, parent->GetClock() );
   } else if ( alloc_name == "islip" ) {
     int iters = param_str.empty() ? (config ? config->GetInt("alloc_iters") : 1) : atoi(param_str.c_str());
-    a = new iSLIP_Sparse( parent, name, inputs, outputs, iters );
+    a = new iSLIP_Sparse( parent, name, inputs, outputs, iters, parent->GetClock() );
   } else if ( alloc_name == "loa" ) {
-    a = new LOA( parent, name, inputs, outputs );
+    a = new LOA( parent, name, inputs, outputs, parent->GetClock() );
   } else if ( alloc_name == "wavefront" ) {
-    a = new Wavefront( parent, name, inputs, outputs );
+    a = new Wavefront( parent, name, inputs, outputs, parent->GetClock() );
   } else if ( alloc_name == "rr_wavefront" ) {
-    a = new Wavefront( parent, name, inputs, outputs, true );
+    a = new Wavefront( parent, name, inputs, outputs, parent->GetClock(), true );
   } else if ( alloc_name == "select" ) {
     int iters = param_str.empty() ? (config ? config->GetInt("alloc_iters") : 1) : atoi(param_str.c_str());
-    a = new SelAlloc( parent, name, inputs, outputs, iters );
+    a = new SelAlloc( parent, name, inputs, outputs, iters, parent->GetClock() );
   } else if (alloc_name == "separable_input_first") {
     string arb_type = param_str.empty() ? (config ? config->GetStr("arb_type") : "round_robin") : param_str;
     a = new SeparableInputFirstAllocator( parent, name, inputs, outputs,
-					  arb_type );
+					  arb_type, parent->GetClock() );
   } else if (alloc_name == "separable_output_first") {
     string arb_type = param_str.empty() ? (config ? config->GetStr("arb_type") : "round_robin") : param_str;
     a = new SeparableOutputFirstAllocator( parent, name, inputs, outputs,
-					   arb_type );
+					   arb_type, parent->GetClock() );
   }
 
 //==================================================

src/allocators/allocator.hpp

@@ -56,7 +56,7 @@ class Allocator : public Module {
   };
 
   Allocator( Module *parent, const string& name,
-	     int inputs, int outputs );
+	     int inputs, int outputs, Module *clock );
 
   virtual void Clear( );
 
@@ -98,7 +98,7 @@ class DenseAllocator : public Allocator {
 
 public:
   DenseAllocator( Module *parent, const string& name,
-		  int inputs, int outputs );
+		  int inputs, int outputs, Module *clock );
 
   void Clear( );
 
@@ -134,7 +134,7 @@ class SparseAllocator : public Allocator {
 
 public:
   SparseAllocator( Module *parent, const string& name,
-		   int inputs, int outputs );
+		   int inputs, int outputs, Module *clock );
 
   void Clear( );
 

src/allocators/islip.cpp

@@ -34,8 +34,8 @@
 //#define DEBUG_ISLIP
 
 iSLIP_Sparse::iSLIP_Sparse( Module *parent, const string& name,
-			    int inputs, int outputs, int iters ) :
-  SparseAllocator( parent, name, inputs, outputs ),
+			    int inputs, int outputs, int iters, Module *clock ) :
+  SparseAllocator( parent, name, inputs, outputs, clock ),
   _iSLIP_iter(iters)
 {
   _gptrs.resize(_outputs, 0);

src/allocators/islip.hpp

@@ -40,7 +40,7 @@ class iSLIP_Sparse : public SparseAllocator {
 
 public:
   iSLIP_Sparse( Module *parent, const string& name,
-		int inputs, int outputs, int iters );
+		int inputs, int outputs, int iters, Module *clock );
 
   void Allocate( );
 };

src/allocators/loa.cpp

@@ -32,8 +32,8 @@
 #include "random_utils.hpp"
 
 LOA::LOA( Module *parent, const string& name,
-	  int inputs, int outputs ) :
-  DenseAllocator( parent, name, inputs, outputs )
+	  int inputs, int outputs, Module *clock ) :
+  DenseAllocator( parent, name, inputs, outputs, clock )
 {
   _req.resize(inputs);
   _counts.resize(outputs);

src/allocators/loa.hpp

@@ -41,7 +41,7 @@ class LOA : public DenseAllocator {
 
 public:
   LOA( Module *parent, const string& name,
-       int inputs, int outputs );
+       int inputs, int outputs, Module *clock );
 
   void Allocate( );
 };

src/allocators/maxsize.cpp

@@ -69,8 +69,8 @@
 //#define PRINT_MATCHING
 
 MaxSizeMatch::MaxSizeMatch( Module *parent, const string& name,
-			    int inputs, int outputs ) :
-  DenseAllocator( parent, name, inputs, outputs )
+			    int inputs, int outputs, Module *clock ) :
+  DenseAllocator( parent, name, inputs, outputs, clock )
 {
   _from.resize(outputs);
   _s    = new int [inputs];

src/allocators/maxsize.hpp

@@ -42,7 +42,7 @@ class MaxSizeMatch : public DenseAllocator {
 
 public:
   MaxSizeMatch( Module *parent, const string& name,
-		int inputs, int ouputs ); 
+		int inputs, int ouputs, Module *clock ); 
   ~MaxSizeMatch( );
 
   void Allocate( );

src/allocators/pim.cpp

@@ -34,8 +34,8 @@
 //#define DEBUG_PIM
 
 PIM::PIM( Module *parent, const string& name,
-	  int inputs, int outputs, int iters ) :
-  DenseAllocator( parent, name, inputs, outputs ),
+	  int inputs, int outputs, int iters, Module *clock ) :
+  DenseAllocator( parent, name, inputs, outputs, clock ),
   _PIM_iter(iters)
 {
 }

src/allocators/pim.hpp

@@ -37,7 +37,7 @@ class PIM : public DenseAllocator {
 
 public:
   PIM( Module *parent, const string& name,
-       int inputs, int outputs, int iters );
+       int inputs, int outputs, int iters, Module *clock );
 
   ~PIM( );
 

src/allocators/selalloc.cpp

@@ -34,8 +34,8 @@
 //#define DEBUG_SELALLOC
 
 SelAlloc::SelAlloc( Module *parent, const string& name,
-		    int inputs, int outputs, int iters ) :
-  SparseAllocator( parent, name, inputs, outputs )
+		    int inputs, int outputs, int iters, Module *clock ) :
+  SparseAllocator( parent, name, inputs, outputs, clock )
 {
   _iter = iters;
 

src/allocators/selalloc.hpp

@@ -42,7 +42,7 @@ class SelAlloc : public SparseAllocator {
 
 public:
   SelAlloc( Module *parent, const string& name,
-	    int inputs, int outputs, int iters );
+	    int inputs, int outputs, int iter, Module *clock );
 
   void Allocate( );
 

src/allocators/separable.cpp

@@ -38,9 +38,8 @@
 #include "arbiter.hpp"
 
 SeparableAllocator::SeparableAllocator( Module* parent, const string& name,
-					int inputs, int outputs,
-					const string& arb_type )
-  : SparseAllocator( parent, name, inputs, outputs )
+					int inputs, int outputs,const string& arb_type, Module *clock )
+  : SparseAllocator( parent, name, inputs, outputs, clock )
 {
 
   _input_arb.resize(inputs);

src/allocators/separable.hpp

@@ -50,7 +50,7 @@ class SeparableAllocator : public SparseAllocator {
 public:
 
   SeparableAllocator( Module* parent, const string& name, int inputs,
-		      int outputs, const string& arb_type ) ;
+		      int outputs, const string& arb_type, Module *clock ) ;
 
   virtual ~SeparableAllocator() ;
 

src/allocators/separable_input_first.cpp

@@ -42,8 +42,8 @@
 
 SeparableInputFirstAllocator::
 SeparableInputFirstAllocator( Module* parent, const string& name, int inputs,
-			      int outputs, const string& arb_type )
-  : SeparableAllocator( parent, name, inputs, outputs, arb_type )
+			      int outputs, const string& arb_type, Module *clock )
+  : SeparableAllocator( parent, name, inputs, outputs, arb_type, clock )
 {}
 
 void SeparableInputFirstAllocator::Allocate() {

src/allocators/separable_input_first.hpp

@@ -43,7 +43,7 @@ class SeparableInputFirstAllocator : public SeparableAllocator {
 public:
 
   SeparableInputFirstAllocator( Module* parent, const string& name, int inputs,
-				int outputs, const string& arb_type ) ;
+				int outputs, const string& arb_type, Module *clock ) ;
 
   virtual void Allocate() ;
 

src/allocators/separable_output_first.cpp

@@ -42,8 +42,8 @@
 
 SeparableOutputFirstAllocator::
 SeparableOutputFirstAllocator( Module* parent, const string& name, int inputs,
-			       int outputs, const string& arb_type )
-  : SeparableAllocator( parent, name, inputs, outputs, arb_type )
+			       int outputs, const string& arb_type, Module *clock )
+  : SeparableAllocator( parent, name, inputs, outputs, arb_type, clock )
 {}
 
 void SeparableOutputFirstAllocator::Allocate() {

src/allocators/separable_output_first.hpp

@@ -41,7 +41,7 @@ class SeparableOutputFirstAllocator : public SeparableAllocator {
 public:
 
   SeparableOutputFirstAllocator( Module* parent, const string& name, int inputs,
-				 int outputs, const string& arb_type ) ;
+				 int outputs, const string& arb_type, Module *clock ) ;
 
   virtual void Allocate() ;
 

src/allocators/wavefront.cpp

@@ -35,8 +35,8 @@
 #include "wavefront.hpp"
 
 Wavefront::Wavefront( Module *parent, const string& name,
-		      int inputs, int outputs, bool skip_diags ) :
-  DenseAllocator( parent, name, inputs, outputs ),
+		      int inputs, int outputs, Module *clock, bool skip_diags ) :
+  DenseAllocator( parent, name, inputs, outputs, clock ),
   _last_in(-1), _last_out(-1), _skip_diags(skip_diags), 
   _square(max(inputs, outputs)), _pri(0), _num_requests(0)
 {

src/allocators/wavefront.hpp

@@ -47,7 +47,7 @@ class Wavefront : public DenseAllocator {
 
 public:
   Wavefront( Module *parent, const string& name,
-	     int inputs, int outputs, bool skip_diags = false );
+	     int inputs, int outputs, Module *clock, bool skip_diags = false );
 
   virtual void AddRequest( int in, int out, int label = 1, 
 			   int in_pri = 0, int out_pri = 0 );

src/arbiters/arbiter.cpp

@@ -41,8 +41,8 @@
 
 using namespace std ;
 
-Arbiter::Arbiter( Module *parent, const string &name, int size )
-  : Module( parent, name ),
+Arbiter::Arbiter( Module *parent, const string &name, int size, Module *clock )
+  : Module( parent, name, clock ),
     _size(size), _selected(-1), _highest_pri(numeric_limits<int>::min()),
     _best_input(-1), _num_reqs(0)
 {
@@ -93,9 +93,9 @@ Arbiter *Arbiter::NewArbiter( Module *parent, const string& name,
 {
   Arbiter *a = NULL;
   if(arb_type == "round_robin") {
-    a = new RoundRobinArbiter( parent, name, size );
+    a = new RoundRobinArbiter( parent, name, size, parent->GetClock() );
   } else if(arb_type == "matrix") {
-    a = new MatrixArbiter( parent, name, size );
+    a = new MatrixArbiter( parent, name, size, parent->GetClock() );
   } else if(arb_type.substr(0, 5) == "tree(") {
     size_t left = 4;
     size_t middle = arb_type.find_first_of(',');
@@ -105,7 +105,7 @@ Arbiter *Arbiter::NewArbiter( Module *parent, const string& name,
     string groups_str = arb_type.substr(left+1, middle-left-1);
     int groups = atoi(groups_str.c_str());
     string sub_arb_type = arb_type.substr(middle+1, right-middle-1);
-    a = new TreeArbiter( parent, name, size, groups, sub_arb_type );
+    a = new TreeArbiter( parent, name, size, groups, sub_arb_type, parent->GetClock() );
   } else assert(false);
   return a;
 }

src/arbiters/arbiter.hpp

@@ -58,7 +58,7 @@ class Arbiter : public Module {
 public:
   int  _num_reqs ;
   // Constructors
-  Arbiter( Module *parent, const string &name, int size ) ;
+  Arbiter( Module *parent, const string &name, int size, Module *clock ) ;
 
   // Print priority matrix to standard output
   virtual void PrintState() const = 0 ;

src/arbiters/matrix_arb.cpp

@@ -35,8 +35,8 @@
 #include <iostream>
 using namespace std ;
 
-MatrixArbiter::MatrixArbiter( Module *parent, const string &name, int size )
-  : Arbiter( parent, name, size ), _last_req(-1) {
+MatrixArbiter::MatrixArbiter( Module *parent, const string &name, int size, Module *clock )
+  : Arbiter( parent, name, size, clock ), _last_req(-1) {
   _matrix.resize(size);
   for ( int i = 0 ; i < size ; i++ ) {
     _matrix[i].resize(size);

src/arbiters/matrix_arb.hpp

@@ -50,7 +50,7 @@ class MatrixArbiter : public Arbiter {
 public:
 
   // Constructors
-  MatrixArbiter( Module *parent, const string &name, int size ) ;
+  MatrixArbiter( Module *parent, const string &name, int size, Module *clock ) ;
 
   // Print priority matrix to standard output
   virtual void PrintState() const ;

src/arbiters/prio_arb.cpp

@@ -33,8 +33,8 @@
 
 PriorityArbiter::PriorityArbiter( const Configuration &config,
 				  Module *parent, const string& name,
-				  int inputs ) 
-: Module( parent, name ), _rr_ptr(0), _inputs( inputs )
+				  int inputs, Module * clock ) 
+: Module( parent, name, clock ), _rr_ptr(0), _inputs( inputs )
 {
 
 }

src/arbiters/prio_arb.hpp

@@ -52,7 +52,7 @@ class PriorityArbiter : public Module {
 public:
   PriorityArbiter( const Configuration &config,
 		   Module *parent, const string& name,
-		   int inputs );
+		   int inputs, Module * clock );
 
   void Clear( );
 

src/arbiters/roundrobin_arb.cpp

@@ -38,8 +38,8 @@
 using namespace std ;
 
 RoundRobinArbiter::RoundRobinArbiter( Module *parent, const string &name,
-				      int size ) 
-  : Arbiter( parent, name, size ), _pointer( 0 ) {
+				      int size, Module *clock ) 
+  : Arbiter( parent, name, size, clock ), _pointer( 0 ) {
 }
 
 void RoundRobinArbiter::PrintState() const  {

src/arbiters/roundrobin_arb.hpp

@@ -44,7 +44,7 @@ class RoundRobinArbiter : public Arbiter {
 public:
 
   // Constructors
-  RoundRobinArbiter( Module *parent, const string &name, int size ) ;
+  RoundRobinArbiter( Module *parent, const string &name, int size, Module *clock ) ;
 
   // Print priority matrix to standard output
   virtual void PrintState() const ;