Merge pull request #24 from ErickOF/feature-tlm_router

Adding feature TLM router

Author: ErickOF

.gitignore

@@ -231,4 +231,6 @@ tools/datagen/src/imgs/*_sobel_*
 
 # Ignore VCD files
 *.vcd
-test
+test
+*.zst
+.vscode

modules/Makefile

@@ -3,15 +3,15 @@ TARGET?=test
 
 # Compiler
 CC=g++
-CFLAGS=-Wall -I. -O3 -g -Wextra -Wunused-function
+CFLAGS=-Wall -Wextra -fsanitize=address -fsanitize=undefined -I. -O3 -g
 
 ifdef USE_CPP17
 CFLAGS+=-std=c++17
-endif
+endif # USE_CPP17
 
 # Target
 LD=g++
-LFLAGS=-Wall -I. -lm -g
+LFLAGS=-Wall -fsanitize=address -fsanitize=undefined -I. -lm -g
 LIBS=-lsystemc -lm
 
 # Source directories
@@ -21,6 +21,17 @@ BINDIR=./
 INCDIR=-I. -I./include -I$(SYSTEMC)/include -Ibasic_protocol -I$(SYSTEMC)/include/tlm_core/tlm_2
 LIBDIR=-L. -L$(SYSTEMC)/lib-linux64
 
+ifdef USING_TLM_TB_EN
+EDGE_DIR=../edge-detector
+GRAY_DIR=../rgb2gray
+FILTER_DIR=../filter
+UNIFICATION_DIR=../unification
+COMPRESSION_DIR=../compression
+
+SRCDIRS=$(SRCDIR) $(EDGE_DIR)/src $(GRAY_DIR)/src $(FILTER_DIR)/src $(UNIFICATION_DIR)/src $(COMPRESSION_DIR)/src
+INCDIR+=-I$(EDGE_DIR)/include -I$(GRAY_DIR)/include -I$(FILTER_DIR)/include -I$(UNIFICATION_DIR)/include -I$(COMPRESSION_DIR)/include
+endif # USING_TLM_TB_EN
+
 ifdef INCLUDE_OPENCV
 # Target
 LIBS+=-lopencv_imgcodecs -lopencv_core -lopencv_highgui -lopencv_imgproc
@@ -35,15 +46,38 @@ LFLAGS += $(shell pkg-config --libs opencv4)
 endif # INCLUDE_OPENCV_PKG
 endif # INCLUDE_OPENCV
 
+ifndef USING_TLM_TB_EN
 SOURCES := $(wildcard $(SRCDIR)/*.cpp)
 INCLUDES := $(wildcard $(INCDIR)/*.hpp)
 OBJECTS := $(SOURCES:$(SRCDIR)/%.cpp=$(OBJDIR)/%.o)
+else
+SOURCES = $(wildcard *.cpp) $(foreach DIR, $(SRCDIRS), $(wildcard $(DIR)/*.cpp))
+SOURCES_WITHOUT_PATH = $(notdir $(SOURCES))
+INCLUDES := $(wildcard $(INCDIR)/*.hpp)
+OBJECTS = $(SOURCES_WITHOUT_PATH:%.cpp=$(OBJDIR)/%.o)
+
+VPATH = $(sort $(dir $(SOURCES)))
+endif # USING_TLM_TB_EN
 
 $(BINDIR)/$(TARGET): clean $(OBJECTS)
 		@$(LD) $(OBJECTS) $(LFLAGS) $(LIBS) $(LIBDIR) -o $@
 
+ifndef USING_TLM_TB_EN
 $(OBJECTS): $(OBJDIR)/%.o : $(SRCDIR)/%.cpp
 		@$(CC) $(CFLAGS) $(INCDIR) -c $< -o $@
+else
+$(OBJECTS): $(OBJDIR)/%.o : %.cpp
+		@$(CC) $(CFLAGS) $(INCDIR) -c $< -o $@
+endif # USING_TLM_TB_EN
+
+valgrind:
+	valgrind --leak-check=full -s ./$(TARGET)
+
+drmemory:
+	drmemory -- ./$(TARGET)
+
+heaptrack:
+	heaptrack ./$(TARGET)
 
 .PHONY: clean
 clean:

modules/communication/Makefile

@@ -0,0 +1,46 @@
+# Include common Makefile
+include ../Makefile
+
+# Defining preprocessor directive for debug
+ifdef IPS_DEBUG_EN
+	CFLAGS += -DIPS_DEBUG_EN
+	LFLAGS += -DIPS_DEBUG_EN
+endif # IPS_DEBUG_EN
+
+# Defining preprocessor directive for dumping enable
+ifdef IPS_DUMP_EN
+	CFLAGS += -DIPS_DUMP_EN
+	LFLAGS += -DIPS_DUMP_EN
+endif # IPS_DUMP_EN
+
+# Defining preprocessor directive for normalizing the resulting magnitude
+ifdef TEST_NORMALIZE_MAGNITUDE
+	CFLAGS += -DTEST_NORMALIZE_MAGNITUDE
+	LFLAGS += -DTEST_NORMALIZE_MAGNITUDE
+endif # TEST_NORMALIZE_MAGNITUDE
+
+# Defining preprocessor directive for using PV model
+ifdef EDGE_DETECTOR_PV_EN
+	CFLAGS += -DEDGE_DETECTOR_PV_EN
+	LFLAGS += -DEDGE_DETECTOR_PV_EN
+endif # EDGE_DETECTOR_PV_EN
+
+# Defining preprocessor directive for using PV model
+ifdef EDGE_DETECTOR_LT_EN
+	CFLAGS += -DEDGE_DETECTOR_LT_EN
+	LFLAGS += -DEDGE_DETECTOR_LT_EN
+endif # EDGE_DETECTOR_LT_EN
+
+# Defining preprocessor directive for using PV model
+ifdef EDGE_DETECTOR_AT_EN
+	CFLAGS += -DEDGE_DETECTOR_AT_EN
+	LFLAGS += -DEDGE_DETECTOR_AT_EN
+endif # EDGE_DETECTOR_AT_EN
+
+# Run the compiled file
+run:
+	@./test
+
+# Show waveform
+waveform:
+	@gtkwave edge_detector.vcd

modules/communication/include/sobel_edge_detector_lt_model.hpp

@@ -0,0 +1,43 @@
+#ifdef EDGE_DETECTOR_LT_EN
+#ifndef SOBEL_EDGE_DETECTOR_HPP
+#define SOBEL_EDGE_DETECTOR_HPP
+
+#include <systemc.h>
+
+SC_MODULE(Edge_Detector)
+{
+  
+  int localWindow[3][3];
+  
+  const int sobelGradientX[3][3] = {{-1,  0,  1},
+                                    {-2,  0,  2},
+                                    {-1,  0,  1}};
+  const int sobelGradientY[3][3] = {{-1, -2, -1},
+                                    { 0,  0,  0},
+                                    { 1,  2,  1}};
+  
+  int resultSobelGradientX;
+  int resultSobelGradientY;
+  
+  sc_event gotLocalWindow, finishedSobelGradientX, finishedSobelGradientY;
+  
+  SC_CTOR(Edge_Detector)
+  {
+    SC_THREAD(compute_sobel_gradient_x);
+    SC_THREAD(compute_sobel_gradient_y);
+  }
+  
+  void set_local_window(int window[3][3]);
+  
+  void compute_sobel_gradient_x();
+  
+  void compute_sobel_gradient_y();
+  
+  int obtain_sobel_gradient_x();
+  
+  int obtain_sobel_gradient_y();
+  
+};
+
+#endif // SOBEL_EDGE_DETECTOR_HPP
+#endif // EDGE_DETECTOR_LT_EN

modules/communication/include/sobel_edge_detector_tlm.hpp

@@ -0,0 +1,28 @@
+#ifndef SOBEL_EDGE_DETECTOR_TLM_HPP
+#define SOBEL_EDGE_DETECTOR_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 "sobel_edge_detector_lt_model.hpp"
+#include "img_target.hpp"
+
+//Extended Unification TLM
+struct sobel_edge_detector_tlm : public Edge_Detector, public img_target
+{
+    SC_CTOR(sobel_edge_detector_tlm): Edge_Detector(Edge_Detector::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 // SOBEL_EDGE_DETECTOR_TLM_HPP