Add Filter block to TLM TB

Author: jgavillalobos

modules/Makefile

@@ -24,9 +24,10 @@ LIBDIR=-L. -L$(SYSTEMC)/lib-linux64
 ifdef USING_TLM_TB_EN
 EDGE_DIR=../edge-detector
 GRAY_DIR=../rgb2gray
+FILTER_DIR=../filter
 
-SRCDIRS=$(SRCDIR) $(EDGE_DIR)/src $(GRAY_DIR)/src
-INCDIR+=-I$(EDGE_DIR)/include -I$(GRAY_DIR)/include
+SRCDIRS=$(SRCDIR) $(EDGE_DIR)/src $(GRAY_DIR)/src $(FILTER_DIR)/src
+INCDIR+=-I$(EDGE_DIR)/include -I$(GRAY_DIR)/include -I$(FILTER_DIR)/include
 endif # USING_TLM_TB_EN
 
 ifdef INCLUDE_OPENCV

modules/filter/include/ips_filter_defines.h

@@ -0,0 +1,14 @@
+#ifndef IPS_FILTER_DEFINES
+#define IPS_FILTER_DEFINES
+
+#ifndef IPS_FILTER_KERNEL_SIZE
+#define IPS_FILTER_KERNEL_SIZE 3
+#endif // IPS_FILTER_KERNEL_SIZE
+
+#ifndef IPS_FILTER_PV_EN
+// N * N * copy_pixel_to_mem_time + mult + redux + copy_pixel_to_mem_time
+// Image is copied pixel by pixel
+#define DELAY_TIME (IPS_FILTER_KERNEL_SIZE * IPS_FILTER_KERNEL_SIZE * 1) + 4 + 2 + 1
+#endif // IPS_FILTER_PV_EN
+
+#endif // IPS_FILTER_DEFINES

modules/filter/include/ips_filter_lt_model.hpp

@@ -8,6 +8,9 @@
 #endif // IPS_DUMP_EN
 #include <systemc.h>
 
+#ifdef USING_TLM_TB_EN
+#include "ips_filter_defines.h"
+#endif
 
 /**
  * @brief Filter module.

modules/filter/src/tb_filter.cpp

@@ -1,3 +1,4 @@
+#ifndef USING_TLM_TB_EN
 #define int64  systemc_int64
 #define uint64 systemc_uint64
 #include <systemc.h>
@@ -28,7 +29,7 @@
 #define IPS_OUT_TYPE_TB float
 #endif // IPS_OUT_TYPE_TB
 #ifndef IPS_IMG_PATH_TB
-#define IPS_IMG_PATH_TB "../../tools/datagen/src/imgs/car_noisy_image.png"
+#define IPS_IMG_PATH_TB "../../tools/datagen/src/imgs/car_grayscale_image.jpg"
 #endif // IPS_IMG_PATH_TB
 
 #ifndef IPS_FILTER_PV_EN
@@ -335,3 +336,5 @@ int sc_main(int, char*[])
 #endif // IPS_DUMP_EN
   return 0;
 }
+
+#endif // USING_TLM_TB_EN

modules/router/Makefile

@@ -47,6 +47,11 @@ ifdef USING_TLM_TB_EN
 	LFLAGS += -DUSING_TLM_TB_EN
 endif # USING_TLM_TB_EN
 
+ifdef IPS_FILTER_LT_EN
+	CFLAGS += -DIPS_FILTER_LT_EN
+	LFLAGS += -DIPS_FILTER_LT_EN
+endif # IPS_FILTER_LT_EN
+
 .PHONY: print-all
 print-all:
 		@echo "Incdir is $(INCDIR)"

modules/router/include/ImportantDefines.h

@@ -6,4 +6,14 @@
 #define IMAG_ROWS 480
 #define IMAG_COLS 640
 
+#ifndef IPS_FILTER_KERNEL_SIZE
+#define IPS_FILTER_KERNEL_SIZE 3
+#endif // IPS_FILTER_KERNEL_SIZE
+#ifndef IPS_IN_TYPE_TB
+#define IPS_IN_TYPE_TB float
+#endif // IPS_IN_TYPE_TB
+#ifndef IPS_OUT_TYPE_TB
+#define IPS_OUT_TYPE_TB float
+#endif // IPS_OUT_TYPE_TB
+
 #endif IMPORTANTDEFINES_H

modules/router/include/ips_filter_tlm.hpp

@@ -0,0 +1,33 @@
+#ifndef IPS_FILTER_TLM_HPP
+#define IPS_FILTER_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 "ips_filter_lt_model.hpp"
+#include "../src/img_target.cpp"
+
+#include "ImportantDefines.h"
+
+//Extended Unification TLM
+struct ips_filter_tlm : public Filter<IPS_IN_TYPE_TB, IPS_OUT_TYPE_TB, IPS_FILTER_KERNEL_SIZE>, public img_target
+{
+    
+    SC_CTOR(ips_filter_tlm): Filter<IPS_IN_TYPE_TB, IPS_OUT_TYPE_TB, IPS_FILTER_KERNEL_SIZE>(Filter<IPS_IN_TYPE_TB, IPS_OUT_TYPE_TB, IPS_FILTER_KERNEL_SIZE>::name()), img_target(img_target::name()) {
+    }
+    
+    //Override do_when_transaction functions
+    virtual void do_when_read_transaction(unsigned char*& data, unsigned int data_length, sc_dt::uint64 address);
+    virtual void do_when_write_transaction(unsigned char*& data, unsigned int data_length, sc_dt::uint64 address);
+    
+    IPS_IN_TYPE_TB img_window[IPS_FILTER_KERNEL_SIZE * IPS_FILTER_KERNEL_SIZE];
+    IPS_OUT_TYPE_TB img_result;
+    
+};
+#endif // IPS_FILTER_TLM_HPP

modules/router/run_all.sh

@@ -2,15 +2,15 @@
 
 case $1 in
   "save_log")
-    make RGB2GRAY_PV_EN=1 EDGE_DETECTOR_AT_EN=1 USING_TLM_TB_EN=1 all > output.log
+    make RGB2GRAY_PV_EN=1 IPS_FILTER_LT_EN=1 EDGE_DETECTOR_AT_EN=1 USING_TLM_TB_EN=1 all > output.log
     ;;
   "print_all")
-    make RGB2GRAY_PV_EN=1 EDGE_DETECTOR_AT_EN=1 USING_TLM_TB_EN=1 print-all
+    make RGB2GRAY_PV_EN=1 IPS_FILTER_LT_EN=1 EDGE_DETECTOR_AT_EN=1 USING_TLM_TB_EN=1 print-all
     ;;
   "compile")
-    make RGB2GRAY_PV_EN=1 EDGE_DETECTOR_AT_EN=1 USING_TLM_TB_EN=1 compile
+    make RGB2GRAY_PV_EN=1 IPS_FILTER_LT_EN=1 EDGE_DETECTOR_AT_EN=1 USING_TLM_TB_EN=1 compile
     ;;
   *)
-    make RGB2GRAY_PV_EN=1 EDGE_DETECTOR_AT_EN=1 USING_TLM_TB_EN=1 all
+    make RGB2GRAY_PV_EN=1 IPS_FILTER_LT_EN=1 EDGE_DETECTOR_AT_EN=1 USING_TLM_TB_EN=1 all
     ;;
 esac

modules/router/src/ips_filter_tlm.cpp

@@ -0,0 +1,46 @@
+#ifndef IPS_FILTER_TLM_CPP
+#define IPS_FILTER_TLM_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 "ips_filter_tlm.hpp"
+
+#include "common_func.hpp"
+#include "ImportantDefines.h"
+
+void ips_filter_tlm::do_when_read_transaction(unsigned char*& data, unsigned int data_length, sc_dt::uint64 address)
+{
+  this->img_result = *(Filter<IPS_IN_TYPE_TB, IPS_OUT_TYPE_TB, IPS_FILTER_KERNEL_SIZE>::result_ptr);
+  memcpy(data, Filter<IPS_IN_TYPE_TB, IPS_OUT_TYPE_TB, IPS_FILTER_KERNEL_SIZE>::result_ptr, sizeof(IPS_OUT_TYPE_TB));
+}
+
+void ips_filter_tlm::do_when_write_transaction(unsigned char*&data, unsigned int data_length, sc_dt::uint64 address)
+{
+  IPS_OUT_TYPE_TB* result = new IPS_OUT_TYPE_TB;
+  IPS_IN_TYPE_TB* img_window = new IPS_IN_TYPE_TB[3 * 3];
+  
+  if ((IPS_FILTER_KERNEL_SIZE * IPS_FILTER_KERNEL_SIZE * sizeof(char)) != data_length)
+  {
+    SC_REPORT_FATAL("IPS_FILTER", "Illegal transaction size");
+  }
+  
+  for (int i = 0; i < IPS_FILTER_KERNEL_SIZE; i++)
+  {
+    for (int j = 0; j < IPS_FILTER_KERNEL_SIZE; j++)
+    {
+      *(img_window + ((i * IPS_FILTER_KERNEL_SIZE) + j)) = (IPS_IN_TYPE_TB)*(data + ((i * IPS_FILTER_KERNEL_SIZE) + j));
+      this->img_window[(i * IPS_FILTER_KERNEL_SIZE) + j] = (IPS_IN_TYPE_TB)*(data + ((i * IPS_FILTER_KERNEL_SIZE) + j));
+    }
+  }
+  
+  filter(img_window, result);
+}
+
+#endif // IPS_FILTER_TLM_CPP

modules/router/src/memory_tlm.cpp

@@ -14,6 +14,8 @@ using namespace std;
 
 #include "common_func.hpp"
 
+#include "AddressMap.h"
+
 void memory_tlm::do_when_read_transaction(unsigned char*& data, unsigned int data_length, sc_dt::uint64 address)
 {
   sc_uint<8> local_data[8];
@@ -28,9 +30,9 @@ void memory_tlm::do_when_read_transaction(unsigned char*& data, unsigned int dat
     local_data[i] = 0;
   }
   mem_data = (local_data[7], local_data[6], local_data[5], local_data[4], local_data[3], local_data[2], local_data[1], local_data[0]);
-  mem_address = address;
+  mem_address = address - MEM_START;
   mem_we = 0;
-  memcpy(data, (mem_array + address), data_length);
+  memcpy(data, (mem_array + address - MEM_START), data_length);
 }
 
 void memory_tlm::do_when_write_transaction(unsigned char*&data, unsigned int data_length, sc_dt::uint64 address)
@@ -47,14 +49,14 @@ void memory_tlm::do_when_write_transaction(unsigned char*&data, unsigned int dat
     local_data[i] = 0;
   }
   mem_data = (local_data[7], local_data[6], local_data[5], local_data[4], local_data[3], local_data[2], local_data[1], local_data[0]);
-  mem_address = address;
+  mem_address = address - MEM_START;
   mem_we = 1;
-  memcpy((mem_array + address), data, data_length);
+  memcpy((mem_array + address - MEM_START), data, data_length);
 }
 
 void memory_tlm::backdoor_write(unsigned char*&data, unsigned int data_length, sc_dt::uint64 address)
 {
-  memcpy((mem_array + address), data, data_length);
+  memcpy((mem_array + address - MEM_START), data, data_length);
 }
 
 #endif // MEMORY_TLM_CPP