Add new dbgprint function to show file and line from which a print is comming from

Author: jgavillalobos

modules/router/include/common_func.hpp

@@ -0,0 +1,7 @@
+#ifndef COMMON_FUNC
+#define COMMON_FUNC
+
+#define dbgprint(FORMAT, ARGS...) \
+printf("%s -> %0d : " FORMAT "\n", __FILE__, __LINE__, ##ARGS)
+
+#endif // COMMON_FUNC

modules/router/src/img_initiator.cpp

@@ -16,6 +16,8 @@ using namespace std;
 #include "tlm_utils/simple_target_socket.h"
 #include "tlm_utils/peq_with_cb_and_phase.h"
 
+#include "common_func.hpp"
+
 //const char* tlm_enum_names[] = {"TLM_ACCEPTED", "TLM_UPDATED", "TLM_COMPLETED"}; 
 
 // Initiator module generating generic payload transactions   
@@ -74,9 +76,9 @@ struct img_initiator: sc_module
 
     data = reinterpret_cast<int*>(this->data);
     //-----------DEBUG-----------
-    printf("[DEBUG] Reading at Initiator: ");
+    dbgprint("Reading at Initiator: ");
     for (int i = 0; i < this->pending_transaction->get_data_length()/sizeof(int); ++i){
-      printf("%02x", *(reinterpret_cast<int*>(this->data)+i));
+      dbgprint("%02x", *(reinterpret_cast<int*>(this->data)+i));
     }
     printf("\n");
     //-----------DEBUG-----------
@@ -98,9 +100,9 @@ struct img_initiator: sc_module
     transaction->set_response_status(tlm::TLM_INCOMPLETE_RESPONSE); //Mandatory Initial Value
 
     //-----------DEBUG-----------
-    printf("[DEBUG] Writing: ");
+    dbgprint("Writing: ");
     for (int i = 0; i < data_length/sizeof(int); ++i){
-      printf("%02x", *(data+i));
+      dbgprint("%02x", *(data+i));
     }
     printf("\n");
     //-----------DEBUG-----------
@@ -118,16 +120,15 @@ struct img_initiator: sc_module
     //Begin Request
     phase = tlm::BEGIN_REQ;
     transaction->acquire();
-    cout << name() << " BEGIN_REQ SENT" << " TRANS ID " << 0 << " at time " << sc_time_stamp() << endl;
+    dbgprint("%s BEGIN_REQ SENT TRANS ID %0d at time %s", name(), 0, sc_time_stamp().to_string().c_str());
     pending_transaction = transaction;
     status = socket->nb_transport_fw(*transaction, phase, this->write_delay);  // Non-blocking transport call   
 
     // Check request status returned by target
     switch (status) {   
         //Case 1: Transaction was accepted
         case tlm::TLM_ACCEPTED: {
-          printf("%s:\t %s received -> Transaction ID %d at time %s\n", name(), "TLM_ACCEPTED", 0, sc_time_stamp());
-          //cout << name() << " TLM_ACCEPTED RECEIVED " << " TRANS ID " << transaction->transaction_id << " at time " << sc_time_stamp() << endl;
+          dbgprint("%s:\t %s received -> Transaction ID %d at time %s", name(), "TLM_ACCEPTED", 0, sc_time_stamp().to_string().c_str());
           check_transaction(*transaction);
           transaction->release();
           pending_transaction = 0;
@@ -137,17 +138,17 @@ struct img_initiator: sc_module
 
         //Not implementing Updated and Completed Status
         default: {
-          printf("%s:\t [ERROR] Invalid status received at initiator", name());
+          dbgprint("%s:\t [ERROR] Invalid status received at initiator", name());
           break;
         }
     }
 
     //Wait for response transaction
     wait(transaction_received_e);
     //-----------DEBUG-----------
-    printf("[DEBUG1] Reading at Initiator: ");
+    dbgprint("[DEBUG1] Reading at Initiator: ");
     for (int i = 0; i < this->data_length/sizeof(int); ++i){
-    printf("%02x", *(reinterpret_cast<int*>(this->data)+i));
+      dbgprint("%02x", *(reinterpret_cast<int*>(this->data)+i));
     }
     printf("\n");
     //-----------DEBUG-----------
@@ -162,20 +163,20 @@ struct img_initiator: sc_module
   { 
     //Call event queue
     m_peq.notify(trans, phase, delay);
-    cout<<"HERE"<<endl;
+    dbgprint("HERE");
     return tlm::TLM_ACCEPTED;
   }
 
   //Payload event and queue callback to handle transactions received from target
   void peq_cb(tlm::tlm_generic_payload& trans, const tlm::tlm_phase& phase)
   {
 
-    //printf("%s:\t %s received -> Transaction ID %d from address %x at time %s\n", name(), phase, this->id_extension->transaction_id, trans.get_address(), sc_time_stamp());
+    //dbgprint("%s:\t %s received -> Transaction ID %d from address %x at time %s\n", name(), phase, this->id_extension->transaction_id, trans.get_address(), sc_time_stamp());
     //cout << name() << " " <<hex << trans.get_address() << " BEGIN_RESP RECEIVED at " << sc_time_stamp() << endl;
     switch (phase) {
       case tlm::BEGIN_RESP: {
 
-        cout<<"HERE3"<<endl;
+        dbgprint("HERE3");
 
         trans.acquire();
         this->data_length = trans.get_data_length();
@@ -188,24 +189,24 @@ struct img_initiator: sc_module
         //Initiator dont care about confirming resp transaction. So nothing else to do.
 
         //-----------DEBUG-----------
-        printf("[DEBUG] Reading at Initiator: ");
+        dbgprint("[DEBUG] Reading at Initiator: ");
         for (int i = 0; i < trans.get_data_length()/sizeof(int); ++i){
-        printf("%02x", *(reinterpret_cast<int*>(trans.get_data_ptr())+i));
+          dbgprint("%02x", *(reinterpret_cast<int*>(trans.get_data_ptr())+i));
         }
         printf("\n");
         //-----------DEBUG-----------
 
-        cout<<"HERE3"<<endl;
+        dbgprint("HERE3");
 
         transaction_received_e.notify();
         //-----------DEBUG-----------
-        printf("[DEBUG] Reading at Initiator: ");
+        dbgprint("[DEBUG] Reading at Initiator: ");
         for (int i = 0; i < this->data_length/sizeof(int); ++i){
-        printf("%02x", *(reinterpret_cast<int*>(this->data)+i));
+          dbgprint("%02x", *(reinterpret_cast<int*>(this->data)+i));
         }
         printf("\n");
         //-----------DEBUG-----------
-        cout<<"HERE10"<<endl;
+        dbgprint("HERE10");
         break;
       }
       default: {

modules/router/src/img_target.cpp

@@ -11,6 +11,8 @@ using namespace std;
 #include "tlm_utils/simple_target_socket.h"
 #include "tlm_utils/peq_with_cb_and_phase.h"
 
+#include "common_func.hpp"
+
 //For an internal response phase
 DECLARE_EXTENDED_PHASE(internal_processing_ph);
 
@@ -71,7 +73,7 @@ struct img_target: sc_module
         switch (phase) {
             //Case 1: Target is receiving the first transaction of communication -> BEGIN_REQ
             case tlm::BEGIN_REQ: {
-                cout << name() << " BEGIN_REQ RECEIVED" << " TRANS ID " << 0 << " at time " << sc_time_stamp() << endl;      
+                dbgprint("%s BEGIN_REQ RECEIVED TRANS ID %0d at time %s", name(), 0, sc_time_stamp().to_string().c_str());
                 //Check for errors here
 
                 // Increment the transaction reference count
@@ -90,7 +92,7 @@ struct img_target: sc_module
             }
             default: {
                 if (phase == internal_processing_ph){
-                    cout << "INTERNAL PHASE: PROCESSING TRANSACTION" << endl;
+                    dbgprint("INTERNAL PHASE: PROCESSING TRANSACTION");
                     process_transaction(trans);
                 }
                 break;
@@ -106,20 +108,20 @@ struct img_target: sc_module
 
         response_phase = tlm::BEGIN_RESP;
         status = socket->nb_transport_bw(trans, response_phase, response_delay);
-        cout << "HERE" << endl;
+        dbgprint("HERE");
 
         //Check Initiator response
         switch(status) {
             case tlm::TLM_ACCEPTED: {
-                cout << name() << " TLM_ACCEPTED RECEIVED" << " TRANS ID " << 0 <<  " at time " << sc_time_stamp() << endl;
+                dbgprint("%s TLM_ACCEPTED RECEIVED TRANS ID %0d at time %s", name(), 0, sc_time_stamp().to_string().c_str());
                 // Target only care about acknowledge of the succesful response
                 trans.release();
                 break;
             }
 
             //Not implementing Updated and Completed Status
             default: {
-                printf("%s:\t [ERROR] Invalid status received at target", name());
+                dbgprint("%s:\t [ERROR] Invalid status received at target", name());
                 break;
             }
         }
@@ -140,7 +142,7 @@ struct img_target: sc_module
         tlm::tlm_sync_enum status;
         tlm::tlm_phase phase;
 
-        cout << name() << " Processing transaction: " << 0 << endl;
+        dbgprint("%s Processing transaction: %0d", name(), 0);
 
         //get variables from transaction
         tlm::tlm_command cmd      = trans.get_command();   
@@ -154,12 +156,13 @@ struct img_target: sc_module
         switch(cmd) {
             case tlm::TLM_READ_COMMAND: {
                 unsigned char* response_data_ptr;
+                response_data_ptr = (unsigned char*)malloc(2 * sizeof(int));
                 this->do_when_read_transaction(response_data_ptr);
                 //Add read according to length
                 //-----------DEBUG-----------
-                printf("[DEBUG] Reading: ");
+                dbgprint("[DEBUG] Reading: ");
                 for (int i = 0; i < len/sizeof(int); ++i){
-                printf("%02x", *(reinterpret_cast<int*>(response_data_ptr)+i));
+                  dbgprint("%02x", *(reinterpret_cast<int*>(response_data_ptr)+i));
                 }
                 printf("\n");
                 //-----------DEBUG-----------
@@ -169,21 +172,21 @@ struct img_target: sc_module
             case tlm::TLM_WRITE_COMMAND: {
                 this->do_when_write_transaction(data_ptr);
                 //-----------DEBUG-----------
-                printf("[DEBUG] Writing: ");
+                dbgprint("[DEBUG] Writing: ");
                 for (int i = 0; i < len/sizeof(int); ++i){
-                printf("%02x", *(reinterpret_cast<int*>(data_ptr)+i));
+                  dbgprint("%02x", *(reinterpret_cast<int*>(data_ptr)+i));
                 }
                 printf("\n");
                 //-----------DEBUG-----------
                 break;
             }
             default: {
-                cout << " ERROR " << "Command " << cmd << "is NOT valid" << endl;
+                dbgprint("ERROR Command %0d is NOT valid", cmd);
             }
         }
 
         //Send response
-        cout << name() << " BEGIN_RESP SENT" << " TRANS ID " << 0 <<  " at time " << sc_time_stamp() << endl;
+        dbgprint("%s BEGIN_RESP SENT TRANS ID %0d at time %s", name(), 0, sc_time_stamp().to_string().c_str());
         send_response(trans);
     }
 };

modules/router/src/sobel_edge_detector_tlm.cpp

@@ -11,22 +11,23 @@ using namespace std;
 #include "tlm_utils/peq_with_cb_and_phase.h"
 
 #include "sobel_edge_detector_tlm.hpp"
-// #include "tlm_transaction.cpp"
+
+#include "common_func.hpp"
 
 void sobel_edge_detector_tlm::do_when_read_transaction(unsigned char*& data){
         int sobel_results[2];
 
         sobel_results[0] = obtain_sobel_gradient_x();
         sobel_results[1] = obtain_sobel_gradient_y();
-        cout << sobel_results[0] << endl;
-        cout << sobel_results[1] << endl;
+        dbgprint("%0d", sobel_results[0]);
+        dbgprint("%0d", sobel_results[1]);
         memcpy(data, &sobel_results[0], 2*sizeof(int));
     }
 void sobel_edge_detector_tlm::do_when_write_transaction(unsigned char*&data){
     int window[3][3];
     for (int* i = reinterpret_cast<int*>(data), row = 0, col = 0; i - reinterpret_cast<int*>(data) < 9; i++) {
         window[row][col] = *i;
-        printf("VAL: %0d -> %0d", i-reinterpret_cast<int*>(data), *i);
+        dbgprint("VAL: %0d -> %0d", i-reinterpret_cast<int*>(data), *i);
         row++;
         if (row == 3) {
             row = 0;

modules/router/src/tb_edge_detector_tlm.cpp

@@ -27,6 +27,8 @@ using namespace std;
 #include "sobel_edge_detector_tlm.hpp"
 #include "img_initiator.cpp"
 
+#include "common_func.hpp"
+
 SC_MODULE(Tb_top)
 {
   img_initiator *initiator;
@@ -182,21 +184,21 @@ SC_MODULE(Tb_top)
           }
         }
         initiator->write(local_window_ptr, 0, 9*4);
-        printf("OUTSIDE");
+        dbgprint("OUTSIDE");
         wait(sc_time(100, SC_NS));
-        printf("OUTSIDE");
+        dbgprint("OUTSIDE");
         int* data_returned = new int;
         initiator->read(data_returned, 0, 2*4);
-        // printf("OUTSIDE");
-        printf("Data_returned: %0d\n", *data_returned);
-        printf("Data_returned: %0d\n", *(data_returned+1));
+        // dbgprint("OUTSIDE");
+        dbgprint("Data_returned: %0d\n", *data_returned);
+        dbgprint("Data_returned: %0d\n", *(data_returned+1));
 
         //edge_detector_DUT->set_local_window(localWindow);
         localGradientX = edge_detector_DUT->obtain_sobel_gradient_x();
         localGradientY = edge_detector_DUT->obtain_sobel_gradient_y();
 
-        printf("Data_returned2: %0d\n", localGradientX);
-        printf("Data_returned2: %0d\n", localGradientY);
+        dbgprint("Data_returned2: %0d\n", localGradientX);
+        dbgprint("Data_returned2: %0d\n", localGradientY);
 
 
         //initiator->write(&localWindow[0][0]+8, 1);
@@ -226,10 +228,10 @@ SC_MODULE(Tb_top)
 
         localResult = (int)sqrt((float)(pow((int)localGradientX, 2)) + (float)(pow((int)localGradientY, 2)));
 #endif // EDGE_DETECTOR_AT_EN
-        cout << "HERE01" << endl;
+        dbgprint("HERE01");
         localGradientX = *data_returned;
         localGradientY = *(data_returned+1);
-        cout << "HERE01" << endl;
+        dbgprint("HERE01");
 
         localResult = (int)sqrt((float)(pow(localGradientX, 2)) + (float)(pow(localGradientY, 2)));
 #ifdef TEST_NORMALIZE_MAGNITUDE
@@ -268,7 +270,7 @@ SC_MODULE(Tb_top)
 #if defined(EDGE_DETECTOR_LT_EN) || defined(EDGE_DETECTOR_AT_EN)
         current_number_of_pixels++;
         if (((((float)(current_number_of_pixels)) / ((float)(total_number_of_pixels))) * 100.0) >= next_target_of_completion) {
-          std::cout << "@" << sc_time_stamp() << " Image processing completed at " << next_target_of_completion << std::endl;
+          dbgprint("At time %s Image processing completed at %0d", sc_time_stamp().to_string().c_str(), next_target_of_completion);
           next_target_of_completion += 10.0;
         }
 #endif // EDGE_DETECTOR_LT_EN || EDGE_DETECTOR_AT_EN
@@ -355,7 +357,7 @@ int sc_main(int, char*[])
 
   sc_start();
 
-  std::cout << "@" << sc_time_stamp() << " Terminating simulation" << std::endl;
+  dbgprint("At time %s Terminating simulation", sc_time_stamp().to_string().c_str());
   sc_close_vcd_trace_file(wf);
 
   return 0;