add scv-tr to build system

Minres · Jul 21, 2021 · f26bfa9 · f26bfa9
1 parent ccc39e9
commit f26bfa9
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 1,360 deletions.
diff --git a/src/sysc/CMakeLists.txt b/src/sysc/CMakeLists.txt
@@ -53,14 +53,12 @@ set(LIB_SOURCES
     tlm/scc/pe/parallel_pe.cpp
 )
 
-if(SCV_FOUND )
-    if(ZLIB_FOUND)
-        set(LIB_SOURCES ${LIB_SOURCES} scc/scv/scv_tr_compressed.cpp)
-    endif(ZLIB_FOUND)
-    if(ENABLE_SQLITE)
-        set(LIB_SOURCES ${LIB_SOURCES} scc/scv/scv_tr_binary.cpp)
-	    set(LIB_SOURCES ${LIB_SOURCES} scc/scv/scv_tr_sqlite.cpp scc/scv/sqlite3.c )
-    endif()
+if(ZLIB_FOUND)
+    set(LIB_SOURCES ${LIB_SOURCES} scc/scv/scv_tr_compressed.cpp)
+endif(ZLIB_FOUND)
+if(ENABLE_SQLITE)
+    set(LIB_SOURCES ${LIB_SOURCES} scc/scv/scv_tr_binary.cpp)
+    set(LIB_SOURCES ${LIB_SOURCES} scc/scv/scv_tr_sqlite.cpp scc/scv/sqlite3.c )
 endif()
 if(CCI_FOUND)
     set(LIB_SOURCES ${LIB_SOURCES} 
@@ -106,6 +104,12 @@ if(SCV_FOUND)
     if(ENABLE_SQLITE)
         target_compile_definitions(${PROJECT_NAME} PRIVATE WITH_SQLITE)
     endif()
+else()
+	message("Building SCC with SCV-TR support")
+    target_link_libraries (${PROJECT_NAME} PUBLIC scv-tr)
+    if(ENABLE_SQLITE)
+        target_compile_definitions(${PROJECT_NAME} PRIVATE WITH_SQLITE)
+    endif()
 endif()
 
 if(CLANG_TIDY_EXE)

diff --git a/src/sysc/scc/tracer.cpp b/src/sysc/scc/tracer.cpp
@@ -24,9 +24,11 @@
 
 #include "scc/report.h"
 #include "scc/utilities.h"
-#ifdef WITH_SCV
 #include "scv/scv_tr_db.h"
+#ifdef WITH_SCV
 #include <scv.h>
+#else
+#include <scv-tr.h>
 #endif
 #include <cstring>
 #include <iostream>
@@ -37,16 +39,13 @@ using namespace scc;
 
 tracer::tracer(std::string const&& name, file_type type, bool enable)
 : tracer_base(sc_core::sc_module_name(sc_core::sc_gen_unique_name("tracer")))
-#ifdef WITH_SCV
 , txdb(nullptr)
-#endif
 {
     if(enable) {
         trf = sc_create_vcd_trace_file(name.c_str());
         trf->set_time_unit(1, SC_PS);
         owned = true;
     }
-#ifdef WITH_SCV
     if(type != NONE) {
         std::stringstream ss;
         ss << name;
@@ -73,7 +72,6 @@ tracer::tracer(std::string const&& name, file_type type, bool enable)
         txdb = new scv_tr_db(ss.str().c_str());
         scv_tr_db::set_default_db(txdb);
     }
-#endif
 }
 
 void tracer::end_of_elaboration() {
@@ -83,7 +81,5 @@ void tracer::end_of_elaboration() {
 }
 
 tracer::~tracer() {
-#ifdef WITH_SCV
     delete txdb;
-#endif
 }
diff --git a/src/sysc/scc/tracer.h b/src/sysc/scc/tracer.h
@@ -18,12 +18,11 @@
 #define _SCC_TRACER_H_
 
 #include "tracer_base.h"
-#ifdef WITH_SCV
-class scv_tr_db;
-#endif
 #include <string>
 #include <vector>
 
+class scv_tr_db;
+
 namespace sc_core {
 class sc_object;
 class sc_trace_file;
@@ -71,9 +70,7 @@ class tracer : public tracer_base {
 
 protected:
     void end_of_elaboration() override;
-#ifdef WITH_SCV
     scv_tr_db* txdb;
-#endif
 };
 
 } /* namespace scc */

diff --git a/src/sysc/scc_sysc.h b/src/sysc/scc_sysc.h
@@ -36,7 +36,6 @@
 #include "scc/tracer_base.h"
 #include "scc/utilities.h"
 #include "scc/value_registry.h"
-#ifdef WITH_SCV
 #include "scc/scv/scv_tr_db.h"
 #include "scc/scv/sqlite3.h"
 #include "tlm/scc/scv/tlm_recorder.h"
@@ -47,7 +46,6 @@
 #include "tlm/scc/scv/tlm_rec_target_socket.h"
 #include "tlm/scc/scv/tlm_recording_extension.h"
 #include "tlm/scc/scv/tlm_extension_recording_registry.h"
-#endif
 
 #include "tlm/scc/initiator_mixin.h"
 #include "tlm/scc/tlm2_pv_av.h"

diff --git a/src/sysc/tlm/scc/scv/tlm_extension_recording_registry.h b/src/sysc/tlm/scc/scv/tlm_extension_recording_registry.h
@@ -17,7 +17,11 @@
 #ifndef TLM_RECORDER_REGISTRY_H_
 #define TLM_RECORDER_REGISTRY_H_
 
+#ifdef WITH_SCV
 #include <scv.h>
+#else
+#include <scv-tr.h>
+#endif
 #include <tlm>
 
 namespace tlm {

diff --git a/src/sysc/tlm/scc/scv/tlm_gp_data_ext.h b/src/sysc/tlm/scc/scv/tlm_gp_data_ext.h
@@ -17,7 +17,11 @@
 #ifndef TLM_GP_DATA_EXT_H_
 #define TLM_GP_DATA_EXT_H_
 
+#ifdef WITH_SCV
 #include <scv.h>
+#else
+#include <scv-tr.h>
+#endif
 #include <tlm/scc/scv/tlm_gp_data.h>
 
 template <> class scv_extensions<tlm::tlm_command> : public scv_enum_base<tlm::tlm_command> {

diff --git a/src/sysc/tlm/scc/scv/tlm_rec_initiator_socket.h b/src/sysc/tlm/scc/scv/tlm_rec_initiator_socket.h
@@ -17,9 +17,7 @@
 #ifndef TLM_REC_INITIATOR_SOCKET_H_
 #define TLM_REC_INITIATOR_SOCKET_H_
 
-#ifdef WITH_SCV
 #include <tlm/scc/scv/tlm_recorder.h>
-#endif
 #include <tlm>
 
 namespace tlm {
@@ -31,14 +29,6 @@ template <unsigned int BUSWIDTH = 32, typename TYPES = tlm::tlm_base_protocol_ty
           sc_core::sc_port_policy POL = sc_core::SC_ONE_OR_MORE_BOUND
 #endif
           >
-#ifndef WITH_SCV
-using tlm_rec_initiator_socket = tlm::tlm_initiator_socket<BUSWIDTH, TYPES, N
-#if !(defined SYSTEMC_VERSION & SYSTEMC_VERSION <= 20050714)
-                                                           ,
-                                                           POL
-#endif
-                                                           >;
-#else
 class tlm_rec_initiator_socket : public tlm::tlm_initiator_socket<BUSWIDTH, TYPES, N
 #if !(defined SYSTEMC_VERSION & SYSTEMC_VERSION <= 20050714)
                                                                   ,
@@ -132,8 +122,7 @@ class tlm_rec_initiator_socket : public tlm::tlm_initiator_socket<BUSWIDTH, TYPE
     sc_core::sc_port<tlm::tlm_bw_transport_if<TYPES>> bw_port;
     scv::tlm_recorder<TYPES> recorder;
 };
-#endif
-} // namespace scv4tlm
+} // namespace scv
 } // namespace scc
 } // namespace tlm
 

diff --git a/src/sysc/tlm/scc/scv/tlm_rec_target_socket.h b/src/sysc/tlm/scc/scv/tlm_rec_target_socket.h
@@ -17,9 +17,7 @@
 #ifndef TLM_REC_TARGET_SOCKET_H_
 #define TLM_REC_TARGET_SOCKET_H_
 
-#ifdef WITH_SCV
 #include <tlm/scc/scv/tlm_recorder.h>
-#endif
 #include <tlm>
 
 namespace tlm {
@@ -31,14 +29,6 @@ template <unsigned int BUSWIDTH = 32, typename TYPES = tlm::tlm_base_protocol_ty
           sc_core::sc_port_policy POL = sc_core::SC_ONE_OR_MORE_BOUND
 #endif
           >
-#ifndef WITH_SCV
-using tlm_rec_target_socket = tlm::tlm_target_socket<BUSWIDTH, TYPES, N
-#if !(defined SYSTEMC_VERSION & SYSTEMC_VERSION <= 20050714)
-                                                     ,
-                                                     POL
-#endif
-                                                     >;
-#else
 class tlm_rec_target_socket : public tlm::tlm_target_socket<BUSWIDTH, TYPES, N
 #if !(defined SYSTEMC_VERSION & SYSTEMC_VERSION <= 20050714)
                                                             ,
@@ -125,8 +115,7 @@ class tlm_rec_target_socket : public tlm::tlm_target_socket<BUSWIDTH, TYPES, N
     sc_core::sc_port<fw_interface_type> fw_port;
     scv::tlm_recorder<TYPES> recorder;
 };
-#endif
-} // namespace scv4tlm
+} // namespace scv
 } // namespace scc
 } // namespace tlm
 

diff --git a/src/sysc/tlm/scc/scv/tlm_recorder.h b/src/sysc/tlm/scc/scv/tlm_recorder.h
@@ -23,7 +23,11 @@
 #include <array>
 #include <unordered_map>
 #include <regex>
+#ifdef WITH_SCV
 #include <scv.h>
+#else
+#include <scv-tr.h>
+#endif
 #include <string>
 #include <tlm/scc/tlm_mm.h>
 #include <tlm>
@@ -263,8 +267,8 @@ public virtual tlm::tlm_bw_transport_if<TYPES> {
     std::array<scv_tr_generator<std::string, std::string>*, 2> nb_trHandle{{nullptr, nullptr}};
     //! transaction generator handle for non-blocking transactions with annotated delays
     std::array<scv_tr_generator<>*, 2> nb_trTimedHandle{{nullptr, nullptr}};
-    map<uint64, scv_tr_handle> nbtx_req_handle_map;
-    map<uint64, scv_tr_handle> nbtx_last_req_handle_map;
+    std::map<uint64, scv_tr_handle> nbtx_req_handle_map;
+    std::map<uint64, scv_tr_handle> nbtx_last_req_handle_map;
 
     //! dmi transaction recording stream handle
     scv_tr_stream* dmi_streamHandle{nullptr};

diff --git a/src/sysc/tlm/scc/scv/tlm_recording_extension.h b/src/sysc/tlm/scc/scv/tlm_recording_extension.h
@@ -18,7 +18,11 @@
 #define _SCV4TLM_TLM_RECORDING_EXTENSION_H_
 
 #include <array>
+#ifdef WITH_SCV
 #include <scv.h>
+#else
+#include <scv-tr.h>
+#endif
 #include <tlm>
 
 namespace tlm {

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -26,4 +26,4 @@ install(TARGETS jsoncpp
 # build tlm-interfaces
 ###############################################################################
 add_subdirectory(axi_chi)
-                 
+add_subdirectory(scv-tr)
diff --git a/third_party/axi_chi b/third_party/axi_chi
diff --git a/third_party/scv-tr/src/CMakeLists.txt b/third_party/scv-tr/src/CMakeLists.txt
@@ -14,5 +14,5 @@ add_library(${PROJECT_NAME}
 	scv/scv_util.cpp
 )
 
-target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/scv)
+target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories(${PROJECT_NAME} PUBLIC $ENV{SYSTEMC_HOME}/include)
diff --git a/third_party/scv-tr/src/scv.h → third_party/scv-tr/src/scv-tr.h b/third_party/scv-tr/src/scv.h → third_party/scv-tr/src/scv-tr.h
@@ -47,7 +47,7 @@
 
 #include "scv/scv_util.h"
 #include "scv/scv_debug.h"
-#include "scv/scv_expression.h"
+//#include "scv/scv_expression.h"
 #include "scv/scv_introspection.h"
 #include "scv/scv_report.h"
 #include "scv/scv_object_if.h"