Add sobel module

Author: RMorales25

VirtualPrototype/inc/ips_filter_tlm.hpp

@@ -5,10 +5,6 @@ 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"
@@ -21,7 +17,7 @@ struct ips_filter_tlm : public Filter<IPS_IN_TYPE_TB, IPS_OUT_TYPE_TB, IPS_FILTE
 
     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()) {
 
-        set_mem_attributes(IMG_FILTER_KERNEL_ADDRESS_LO, IMG_FILTER_KERNEL_ADDRESS_LO);
+        set_mem_attributes(IMG_FILTER_KERNEL_ADDRESS_LO, IMG_FILTER_KERNEL_SIZE);
     }
 
     //Override do_when_transaction functions

VirtualPrototype/inc/sobel_edge_detector_at_model.hpp

@@ -1,9 +1,8 @@
-#ifdef EDGE_DETECTOR_AT_EN
 #ifndef SOBEL_EDGE_DETECTOR_HPP
 #define SOBEL_EDGE_DETECTOR_HPP
+#define USING_TLM_TB_EN
 
 #include <systemc.h>
-#include "address_map.hpp"
 
 SC_MODULE(Edge_Detector)
 {
@@ -77,4 +76,3 @@ SC_MODULE(Edge_Detector)
 };
 
 #endif // SOBEL_EDGE_DETECTOR_HPP
-#endif // EDGE_DETECTOR_AT_EN

VirtualPrototype/inc/sobel_edge_detector_tlm.hpp

@@ -0,0 +1,29 @@
+#ifndef SOBEL_EDGE_DETECTOR_TLM_HPP
+#define SOBEL_EDGE_DETECTOR_TLM_HPP
+using namespace sc_core;
+using namespace sc_dt;
+using namespace std;
+
+#include "sobel_edge_detector_at_model.hpp"
+#include "../src/img_target.cpp"
+#include "address_map.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()) {
+        sobel_input = new sc_uint<8>[9];
+        set_mem_attributes(SOBEL_INPUT_0_ADDRESS_LO, SOBEL_INPUT_0_SIZE+SOBEL_INPUT_1_SIZE);
+    }
+
+    //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);
+
+    void read() override;
+    void write() override;
+
+    sc_uint<8> *sobel_input;
+};
+#endif // SOBEL_EDGE_DETECTOR_TLM_HPP

VirtualPrototype/src/sobel_edge_detector_at_model.cpp

@@ -1,8 +1,9 @@
-#ifdef EDGE_DETECTOR_AT_EN
 #ifndef SOBEL_EDGE_DETECTOR_CPP
 #define SOBEL_EDGE_DETECTOR_CPP
+#define USING_TLM_TB_EN
 
 #include "sobel_edge_detector_at_model.hpp"
+#include "address_map.hpp"
 
 void Edge_Detector::write()
 {
@@ -15,9 +16,9 @@ void Edge_Detector::wr()
     {
     wait(wr_t);
 #ifdef USING_TLM_TB_EN
-    if ((address - SOBEL_INPUT_0) == 0)
+    if ((address - SOBEL_INPUT_0_ADDRESS_LO) == 0)
 #else
-    if ((address.read() - SOBEL_INPUT_0) == 0)
+    if ((address.read() - SOBEL_INPUT_0_ADDRESS_LO) == 0)
 #endif // USING_TLM_TB_EN
     {
       int j = 0;
@@ -81,9 +82,9 @@ void Edge_Detector::wr()
       gotLocalWindow.notify(0, SC_NS);
     }
 #ifdef USING_TLM_TB_EN
-    else if ((address - SOBEL_INPUT_1) == 0)
+    else if ((address - SOBEL_INPUT_1_ADDRESS_LO) == 0)
 #else
-    else if ((address.read() - SOBEL_INPUT_1) == 0)
+    else if ((address.read() - SOBEL_INPUT_1_ADDRESS_LO) == 0)
 #endif // USING_TLM_TB_EN
     {
 #ifdef USING_TLM_TB_EN
@@ -110,9 +111,9 @@ void Edge_Detector::rd()
   {
     wait(rd_t);
 #ifdef USING_TLM_TB_EN
-    if ((address - SOBEL_OUTPUT) == 0)
+    if ((address - SOBEL_INPUT_0_ADDRESS_LO) == 0)
 #else
-    if ((address.read() - SOBEL_OUTPUT) == 0)
+    if ((address.read() - SOBEL_OUTPUT_ADDRESS_LO) == 0)
 #endif // USING_TLM_TB_EN
     {
       data = (sc_uint<32>(0), resultSobelGradientY, resultSobelGradientX);
@@ -211,4 +212,4 @@ void Edge_Detector::perform_sum_gradient_y()
 }
 
 #endif // SOBEL_EDGE_DETECTOR_CPP
-#endif // EDGE_DETECTOR_AT_EN
+

VirtualPrototype/src/sobel_edge_detector_tlm.cpp

@@ -6,51 +6,53 @@ 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_tlm.hpp"
+#include "address_map.hpp"
 
 #include "common_func.hpp"
 
 void sobel_edge_detector_tlm::do_when_read_transaction(unsigned char*& data, unsigned int data_length, sc_dt::uint64 address){
   short int sobel_results[4];
   sc_int<16> local_result;
-  
-  dbgimgtarmodprint("Calling do_when_read_transaction");
 
-  Edge_Detector::address = address;
+  Edge_Detector::address = (sc_uint<24>) address+SOBEL_OUTPUT_ADDRESS_LO;
   read();
 
-  for (int i = 0; i < 4; i++)
+  for (int i = 0; i < data_length; i++)
   {
-    local_result = Edge_Detector::data.range((i + 1) * 16 - 1, i * 16).to_int();
-    sobel_results[i] = (short int)local_result;
-    dbgimgtarmodprint("%0d", sobel_results[i]);
+    local_result = Edge_Detector::data.range((address + i + 1) * 16 - 1, (address+i) * 16).to_int();
+    sobel_results[address+i] = (short int)local_result;
+      *(data+i) = sobel_results[address+i];
+    //dbgimgtarmodprint("%0d", sobel_results[address+i]);
   }
 
-  memcpy(data, sobel_results, 4 * sizeof(short int));
 }
 
 void sobel_edge_detector_tlm::do_when_write_transaction(unsigned char*&data, unsigned int data_length, sc_dt::uint64 address)
 {
-  sc_uint<8> values[8];
-  
-  dbgimgtarmodprint("Calling do_when_write_transaction");
-  
-  for (int i = 0; i < 8; i++)
-  {
-    values[i] = *(data + i);
+  if (address < SOBEL_INPUT_0_SIZE) {
+    for (int i = 0; i < data_length; data++) {
+      this->sobel_input[address+i] = *(data+i);
+    }
   }
-  Edge_Detector::data = (values[7], values[6], values[5], values[4], values[3], values[2], values[1], values[0]);
-  Edge_Detector::address = address;
-  write();
+  else if (SOBEL_INPUT_0_SIZE <= address && address < SOBEL_INPUT_0_SIZE + SOBEL_INPUT_1_SIZE) {
+     for (int i = 0; i < data_length; data++) {
+      this->sobel_input[address+i-SOBEL_INPUT_0_SIZE] = *(data+i-SOBEL_INPUT_0_SIZE);
+    }
+  }
+
+  Edge_Detector::data = (this->sobel_input[7], this->sobel_input[6], this->sobel_input[5], this->sobel_input[4], this->sobel_input[3], this->sobel_input[2], this->sobel_input[1], this->sobel_input[0]);
+  Edge_Detector::address = address+SOBEL_INPUT_0_ADDRESS_LO;
+
+  if ((address == SOBEL_INPUT_0_SIZE-1) || (address == SOBEL_INPUT_0_SIZE+SOBEL_INPUT_1_SIZE-1)) {
+    write();
+  }
+  
 }
 
 void sobel_edge_detector_tlm::read()
 {
-  if ((Edge_Detector::address - SOBEL_OUTPUT) == 0)
+  if ((Edge_Detector::address - SOBEL_OUTPUT_ADDRESS_LO) == 0)
   {
     Edge_Detector::data = (sc_uint<32>(0), resultSobelGradientY, resultSobelGradientX);
   }