Add transaction ID tracking

Author: RMorales25

modules/router/src/img_router.cpp

@@ -73,6 +73,10 @@ struct img_router: sc_module
   //TLM Items queue
   sc_fifo<tlm_item> fw_fifo;
   sc_fifo<tlm_item> bw_fifo;
+
+  //DEBUG
+  unsigned int transaction_in_fw_path_id = 0;
+  unsigned int transaction_in_bw_path_id = 0;
 
   //Constructor
   SC_CTOR(img_router)   
@@ -144,7 +148,7 @@ struct img_router: sc_module
         wait(bw_fifo.data_read_event());
     }
     bw_fifo.nb_write(item);
-    //wait(bw_fifo.data_written_event());
+    wait(bw_fifo.data_written_event());
     dbgmodprint("[BW_FIFO] Pushed transaction #%0d", img_ext->transaction_number);
     return tlm::TLM_ACCEPTED;
   }
@@ -225,6 +229,7 @@ struct img_router: sc_module
     tlm::tlm_phase local_phase = phase;
 
     sc_dt::uint64 address = trans.get_address();
+    this->transaction_in_bw_path_id = img_ext->transaction_number;
 
     dbgmodprint("Received transaction #%0d with address %08X in backward path. Redirecting transaction to CPU", img_ext->transaction_number, address);
     target_socket->nb_transport_bw(trans, local_phase, this->bw_delay);
@@ -237,6 +242,7 @@ struct img_router: sc_module
     tlm::tlm_phase local_phase = phase;
 
     sc_dt::uint64 address = trans.get_address();
+    this->transaction_in_fw_path_id = img_ext->transaction_number;
 
     unsigned int initiator_id = decode_address(address);
     dbgmodprint("Received transaction #%0d with address %08X in forward path. Redirecting transaction through initiator %d", img_ext->transaction_number, address, initiator_id);

modules/router/src/img_target.cpp

@@ -38,6 +38,10 @@ struct img_target: sc_module
     //SC_EVENT
     sc_event send_response_e;
 
+
+    //DEBUG
+    unsigned int transaction_in_progress_id = 0;
+
     //Constructor
     SC_CTOR(img_target)   
     : socket("socket"), response_transaction(0), m_peq(this, &img_target::peq_cb) // Construct and name socket   
@@ -160,6 +164,7 @@ struct img_target: sc_module
         trans.get_extension(img_ext);
 
         dbgmodprint("Processing transaction: %0d", img_ext->transaction_number);
+        this->transaction_in_progress_id = img_ext->transaction_number;
 
         //Process transaction
         switch(cmd) {

modules/router/src/tb_edge_detector_tlm.cpp

@@ -827,6 +827,15 @@ int sc_main(int, char*[])
   Tb_top top("top");
 
   // Dump the desired signals
+  //Transaction tracking
+  sc_trace(wf, top.tb_initiator->transaction_sent_id, "tb_initiator_sent_trans_id");
+  sc_trace(wf, top.tb_initiator->transaction_received_id, "tb_initiator_received_trans_id");
+  sc_trace(wf, top.filter_DUT->transaction_in_progress_id, "filter_DUT_trans_id");
+  sc_trace(wf, top.edge_detector_DUT->transaction_in_progress_id, "edge_detector_DUT_trans_id");
+  sc_trace(wf, top.memory_DUT->transaction_in_progress_id, "memory_DUT_trans_id");
+  sc_trace(wf, top.router->transaction_in_bw_path_id, "router_bw_path_trans_id");
+  sc_trace(wf, top.router->transaction_in_fw_path_id, "router_fw_path_trans_id");
+
   sc_trace(wf, top.filter_DUT->img_window[0], "filter_window(0)(0)");
   sc_trace(wf, top.filter_DUT->img_window[1], "filter_window(0)(1)");
   sc_trace(wf, top.filter_DUT->img_window[2], "filter_window(0)(2)");