Add RGB2GRAY module for testing with TLM

jgavillalobos · ErickOF · commit 00982c70f6e8 · 2024-07-20T00:53:47.000-06:00
diff --git a/modules/Makefile b/modules/Makefile
@@ -22,8 +22,11 @@ INCDIR=-I. -I./include -I$(SYSTEMC)/include -Ibasic_protocol -I$(SYSTEMC)/includ
 LIBDIR=-L. -L$(SYSTEMC)/lib-linux64
 
 ifdef USING_TLM_TB_EN
-SRCDIRS=$(SRCDIR) ../edge-detector/src
-INCDIR+=-I../edge-detector/include
+EDGE_DIR=../edge-detector
+GRAY_DIR=../rgb2gray
+
+SRCDIRS=$(SRCDIR) $(EDGE_DIR)/src $(GRAY_DIR)/src
+INCDIR+=-I$(EDGE_DIR)/include -I$(GRAY_DIR)/include
 endif # USING_TLM_TB_EN
 
 ifdef INCLUDE_OPENCV
diff --git a/modules/rgb2gray/include/rgb2gray_pv_model.hpp b/modules/rgb2gray/include/rgb2gray_pv_model.hpp
@@ -20,7 +20,7 @@ SC_MODULE(Rgb2Gray)
   
   void compute_gray_value();
   
-  char obtain_gray_value();
+  unsigned char obtain_gray_value();
 
 };
 
diff --git a/modules/rgb2gray/src/rgb2gray_pv_model.cpp b/modules/rgb2gray/src/rgb2gray_pv_model.cpp
@@ -16,7 +16,7 @@ void Rgb2Gray::compute_gray_value()
   this->gray_value = 0.299 * this->r + 0.587 * this->g + 0.114 * this->b;
 }
 
-char Rgb2Gray::obtain_gray_value()
+unsigned char Rgb2Gray::obtain_gray_value()
 {
   compute_gray_value();
 
diff --git a/modules/rgb2gray/src/tb_rgb2gray.cpp b/modules/rgb2gray/src/tb_rgb2gray.cpp
@@ -1,3 +1,4 @@
+#ifndef USING_TLM_TB_EN
 #define int64  systemc_int64
 #define uint64 systemc_uint64
 #include <systemc.h>
@@ -71,3 +72,4 @@ int sc_main(int, char*[])
 
   return 0;
 }
+#endif USING_TLM_TB_EN
diff --git a/modules/router/Makefile b/modules/router/Makefile
@@ -20,6 +20,11 @@ ifdef TEST_NORMALIZE_MAGNITUDE
 endif # TEST_NORMALIZE_MAGNITUDE
 
 # Defining preprocessor directive for using PV model
+ifdef RGB2GRAY_PV_EN
+	CFLAGS += -DRGB2GRAY_PV_EN
+	LFLAGS += -DRGB2GRAY_PV_EN
+endif # RGB2GRAY_PV_EN
+
 ifdef EDGE_DETECTOR_PV_EN
 	CFLAGS += -DEDGE_DETECTOR_PV_EN
 	LFLAGS += -DEDGE_DETECTOR_PV_EN
diff --git a/modules/router/include/common_func.hpp b/modules/router/include/common_func.hpp
@@ -2,6 +2,12 @@
 #define COMMON_FUNC
 
 #define dbgprint(FORMAT, ARGS...) \
-printf("%s -> %0d : " FORMAT "\n", __FILE__, __LINE__, ##ARGS)
+printf("%s(%0d) : " FORMAT "\n", __FILE__, __LINE__, ##ARGS)
+
+#define dbgmodprint(FORMAT, ARGS...) \
+printf("%s(%0d) [%s] : " FORMAT "\n", __FILE__, __LINE__, this->name(), ##ARGS)
+
+#define dbgimgtarmodprint(FORMAT, ARGS...) \
+printf("%s(%0d) [%s] : " FORMAT "\n", __FILE__, __LINE__, img_target::name(), ##ARGS)
 
 #endif // COMMON_FUNC
diff --git a/modules/router/include/img_generic_extension.hpp b/modules/router/include/img_generic_extension.hpp
@@ -0,0 +1,24 @@
+#ifndef IMG_GENERIC_EXTENSION_HPP
+#define IMG_GENERIC_EXTENSION_HPP
+#include "systemc.h"
+using namespace sc_core;
+using namespace sc_dt;
+using namespace std;
+
+#include "tlm.h"
+#include "tlm_utils/simple_initiator_socket.h"
+#include "tlm_utils/simple_target_socket.h"
+#include "tlm_utils/peq_with_cb_and_phase.h"
+
+struct img_generic_extension : tlm::tlm_extension<img_generic_extension>
+{
+  img_generic_extension() : transaction_number(0) {}
+  
+  virtual tlm::tlm_extension_base* clone() const;
+
+  virtual void copy_from(tlm::tlm_extension_base const &ext);
+  
+  unsigned int transaction_number;
+};
+
+#endif // IMG_GENERIC_EXTENSION_HPP
diff --git a/modules/router/include/rgb2gray_tlm.hpp b/modules/router/include/rgb2gray_tlm.hpp
@@ -0,0 +1,28 @@
+#ifndef RGB2GRAY_TLM_HPP
+#define RGB2GRAY_TLM_HPP
+#include "systemc.h"
+using namespace sc_core;
+using namespace sc_dt;
+using namespace std;
+
+#include "tlm.h"
+#include "tlm_utils/simple_initiator_socket.h"
+#include "tlm_utils/simple_target_socket.h"
+#include "tlm_utils/peq_with_cb_and_phase.h"
+
+#include "rgb2gray_pv_model.hpp"
+#include "../src/img_target.cpp"
+
+//Extended Unification TLM
+struct rgb2gray_tlm : public Rgb2Gray, public img_target
+{
+
+    SC_CTOR(rgb2gray_tlm): Rgb2Gray(Rgb2Gray::name()), img_target(img_target::name()) {
+    }
+
+    //Override do_when_transaction functions
+    virtual void do_when_read_transaction(unsigned char*& data);
+    virtual void do_when_write_transaction(unsigned char*& data);
+
+};
+#endif // RGB2GRAY_TLM_HPP
diff --git a/modules/router/run_all.sh b/modules/router/run_all.sh
@@ -2,9 +2,12 @@
 
 case $1 in
   "save_log")
-    make EDGE_DETECTOR_LT_EN=1 USING_TLM_TB_EN=1 all > output.log
+    make RGB2GRAY_PV_EN=1 EDGE_DETECTOR_LT_EN=1 USING_TLM_TB_EN=1 all > output.log
+    ;;
+  "print_all")
+    make RGB2GRAY_PV_EN=1 EDGE_DETECTOR_LT_EN=1 USING_TLM_TB_EN=1 print-all
     ;;
   *)
-    make EDGE_DETECTOR_LT_EN=1 USING_TLM_TB_EN=1 all
+    make RGB2GRAY_PV_EN=1 EDGE_DETECTOR_LT_EN=1 USING_TLM_TB_EN=1 all
     ;;
 esac
diff --git a/modules/router/src/img_generic_extension.cpp b/modules/router/src/img_generic_extension.cpp
@@ -0,0 +1,27 @@
+#ifndef IMG_GENERIC_EXTENSION_CPP
+#define IMG_GENERIC_EXTENSION_CPP
+#include "systemc.h"
+using namespace sc_core;
+using namespace sc_dt;
+using namespace std;
+
+#include "tlm.h"
+#include "tlm_utils/simple_initiator_socket.h"
+#include "tlm_utils/simple_target_socket.h"
+#include "tlm_utils/peq_with_cb_and_phase.h"
+
+#include "img_generic_extension.hpp"
+
+tlm::tlm_extension_base* img_generic_extension::clone() const
+{
+  img_generic_extension* t = new img_generic_extension;
+  t->transaction_number = this->transaction_number;
+  return t;
+}
+
+void img_generic_extension::copy_from(tlm::tlm_extension_base const &ext)
+{
+  transaction_number = static_cast<img_generic_extension const &>(ext).transaction_number;
+}
+
+#endif // IMG_GENERIC_EXTENSION_CPP
diff --git a/modules/router/src/img_initiator.cpp b/modules/router/src/img_initiator.cpp
@@ -17,6 +17,7 @@ using namespace std;
 #include "tlm_utils/peq_with_cb_and_phase.h"
 
 #include "common_func.hpp"
+#include "img_generic_extension.hpp"
 
 //const char* tlm_enum_names[] = {"TLM_ACCEPTED", "TLM_UPDATED", "TLM_COMPLETED"}; 
 
@@ -33,6 +34,7 @@ struct img_initiator: sc_module
   unsigned int address;
   unsigned char* data;
   unsigned int data_length; 
+  unsigned int transaction_number;
 
   //Pointer to transaction in progress
   tlm::tlm_generic_payload* pending_transaction; 
@@ -44,8 +46,8 @@ struct img_initiator: sc_module
   sc_event transaction_received_e;
 
   //Delay
-  sc_time write_delay = sc_time(10, SC_NS);
-  sc_time read_delay = sc_time(10,SC_NS);
+  sc_time write_delay;
+  sc_time read_delay;
   
   //Constructor
   SC_CTOR(img_initiator)   
@@ -56,53 +58,59 @@ struct img_initiator: sc_module
   }
 
   //Method to send_reading transaction and wait for response
-  void read (int*& data, unsigned int address, unsigned int data_length){
+  void read (unsigned char*& data, unsigned int address, unsigned int data_length){
 
     //Create transaction and allocate it
     tlm::tlm_generic_payload* transaction = memory_manager.allocate();
+    img_generic_extension* img_ext = new img_generic_extension;
+    img_ext->transaction_number = this->transaction_number++;
     
     //Set transaction fields
     transaction->set_command(tlm::TLM_READ_COMMAND);
     transaction->set_address(address);
-    transaction->set_data_ptr(reinterpret_cast<unsigned char*>(data));
+    transaction->set_data_ptr(data);
     transaction->set_data_length(data_length); //In Bytes
     transaction->set_streaming_width(data_length);
     transaction->set_byte_enable_ptr(0);
     transaction->set_dmi_allowed(false); //Mandatory Initial Value
     transaction->set_response_status(tlm::TLM_INCOMPLETE_RESPONSE); //Mandatory Initial Value
+    transaction->set_extension(img_ext);
 
     //Send transaction
     this->send_transaction(transaction);
 
-    data = reinterpret_cast<int*>(this->data);
+    data = this->data;
     //-----------DEBUG-----------
-    dbgprint("Reading at Initiator: ");
+    dbgmodprint("Reading at Initiator: ");
     for (int i = 0; i < this->pending_transaction->get_data_length()/sizeof(int); ++i){
-      dbgprint("%02x", *(reinterpret_cast<int*>(this->data)+i));
+      dbgmodprint("%02x", *(reinterpret_cast<int*>(this->data)+i));
     }
     printf("\n");
     //-----------DEBUG-----------
   }
 
-  void write (int*& data, unsigned int address, unsigned int data_length){
+  void write (unsigned char*& data, unsigned int address, unsigned int data_length){
 
     //Create transaction and allocate it
     tlm::tlm_generic_payload* transaction = memory_manager.allocate();
+    img_generic_extension* img_ext = new img_generic_extension;
+    img_ext->transaction_number = this->transaction_number++;
 
     //Set transaction fields
     transaction->set_command(tlm::TLM_WRITE_COMMAND);
     transaction->set_address(address);
-    transaction->set_data_ptr(reinterpret_cast<unsigned char*>(data));
+    transaction->set_data_ptr(data);
     transaction->set_data_length(data_length); //In Bytes
     transaction->set_streaming_width(data_length);
     transaction->set_byte_enable_ptr(0);
     transaction->set_dmi_allowed(false); //Mandatory Initial Value
     transaction->set_response_status(tlm::TLM_INCOMPLETE_RESPONSE); //Mandatory Initial Value
+    transaction->set_extension(img_ext);
 
     //-----------DEBUG-----------
-    dbgprint("Writing: ");
+    dbgmodprint("Writing: ");
     for (int i = 0; i < data_length/sizeof(int); ++i){
-      dbgprint("%02x", *(data+i));
+      dbgmodprint("%02x", *(reinterpret_cast<int*>(data)+i));
     }
     printf("\n");
     //-----------DEBUG-----------
@@ -116,19 +124,21 @@ struct img_initiator: sc_module
     //Transaction Management Variables
     tlm::tlm_phase phase;
     tlm::tlm_sync_enum status;
+    img_generic_extension* img_ext;
 
     //Begin Request
     phase = tlm::BEGIN_REQ;
     transaction->acquire();
-    dbgprint("%s BEGIN_REQ SENT TRANS ID %0d at time %s", name(), 0, sc_time_stamp().to_string().c_str());
+    transaction->get_extension(img_ext);
+    dbgmodprint("BEGIN_REQ SENT TRANS ID %0d at time %s", img_ext->transaction_number, 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: {
-          dbgprint("%s:\t %s received -> Transaction ID %d at time %s", name(), "TLM_ACCEPTED", 0, sc_time_stamp().to_string().c_str());
+          dbgmodprint("%s received -> Transaction ID %d at time %s", "TLM_ACCEPTED", img_ext->transaction_number, sc_time_stamp().to_string().c_str());
           check_transaction(*transaction);
           transaction->release();
           pending_transaction = 0;
@@ -138,17 +148,17 @@ struct img_initiator: sc_module
 
         //Not implementing Updated and Completed Status
         default: {
-          dbgprint("%s:\t [ERROR] Invalid status received at initiator", name());
+          dbgmodprint("[ERROR] Invalid status received at initiator -> Transaction ID %d", img_ext->transaction_number);
           break;
         }
     }
 
     //Wait for response transaction
     wait(transaction_received_e);
     //-----------DEBUG-----------
-    dbgprint("[DEBUG1] Reading at Initiator: ");
+    dbgmodprint("[DEBUG1] Reading at Initiator: ");
     for (int i = 0; i < this->data_length/sizeof(int); ++i){
-      dbgprint("%02x", *(reinterpret_cast<int*>(this->data)+i));
+      dbgmodprint("%02x", *(reinterpret_cast<int*>(this->data)+i));
     }
     printf("\n");
     //-----------DEBUG-----------
@@ -163,20 +173,20 @@ struct img_initiator: sc_module
   { 
     //Call event queue
     m_peq.notify(trans, phase, delay);
-    dbgprint("HERE");
+    dbgmodprint("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)
   {
 
-    //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());
+    //dbgmodprint("%s received -> Transaction ID %d from address %x at time %s\n", 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: {
 
-        dbgprint("HERE3");
+        dbgmodprint("HERE3");
 
         trans.acquire();
         this->data_length = trans.get_data_length();
@@ -189,24 +199,24 @@ struct img_initiator: sc_module
         //Initiator dont care about confirming resp transaction. So nothing else to do.
 
         //-----------DEBUG-----------
-        dbgprint("[DEBUG] Reading at Initiator: ");
+        dbgmodprint("[DEBUG] Reading at Initiator: ");
         for (int i = 0; i < trans.get_data_length()/sizeof(int); ++i){
-          dbgprint("%02x", *(reinterpret_cast<int*>(trans.get_data_ptr())+i));
+          dbgmodprint("%02x", *(reinterpret_cast<int*>(trans.get_data_ptr())+i));
         }
         printf("\n");
         //-----------DEBUG-----------
 
-        dbgprint("HERE3");
+        dbgmodprint("HERE3");
 
         transaction_received_e.notify();
         //-----------DEBUG-----------
-        dbgprint("[DEBUG] Reading at Initiator: ");
+        dbgmodprint("[DEBUG] Reading at Initiator: ");
         for (int i = 0; i < this->data_length/sizeof(int); ++i){
-          dbgprint("%02x", *(reinterpret_cast<int*>(this->data)+i));
+          dbgmodprint("%02x", *(reinterpret_cast<int*>(this->data)+i));
         }
         printf("\n");
         //-----------DEBUG-----------
-        dbgprint("HERE10");
+        dbgmodprint("HERE10");
         break;
       }
       default: {
@@ -228,6 +238,17 @@ struct img_initiator: sc_module
     // Allow the memory manager to free the transaction object
     //trans.release();
   }
+  
+  void start_img_initiators()
+  {
+    transaction_number = 0;
+  }
+  
+  void set_delays(sc_time w_delay, sc_time r_delay)
+  {
+    this->write_delay = w_delay;
+    this->read_delay = r_delay;
+  }
 } ; 
 
 #endif
diff --git a/modules/router/src/img_target.cpp b/modules/router/src/img_target.cpp
diff --git a/modules/router/src/rgb2gray_tlm.cpp b/modules/router/src/rgb2gray_tlm.cpp
diff --git a/modules/router/src/sobel_edge_detector_tlm.cpp b/modules/router/src/sobel_edge_detector_tlm.cpp
diff --git a/modules/router/src/tb_edge_detector_tlm.cpp b/modules/router/src/tb_edge_detector_tlm.cpp

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ void Rgb2Gray::compute_gray_value()`
`16`	`16`	`this->gray_value = 0.299 * this->r + 0.587 * this->g + 0.114 * this->b;`
`17`	`17`	`}`
`18`	`18`
`19`		`-char Rgb2Gray::obtain_gray_value()`
	`19`	`+unsigned char Rgb2Gray::obtain_gray_value()`
`20`	`20`	`{`
`21`	`21`	`compute_gray_value();`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#ifndef USING_TLM_TB_EN`
`1`	`2`	`#define int64 systemc_int64`
`2`	`3`	`#define uint64 systemc_uint64`
`3`	`4`	`#include <systemc.h>`
`@@ -71,3 +72,4 @@ int sc_main(int, char*[])`
`71`	`72`
`72`	`73`	`return 0;`
`73`	`74`	`}`
	`75`	`+#endif USING_TLM_TB_EN`