From 6103de7ae96a113b15be47742b8e02fa4c56e738 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sun, 30 Dec 2018 13:24:44 +0100 Subject: [PATCH] Adopted changes to sc-components --- .cproject | 25 ++++++++++++++----- .settings/language.settings.xml | 8 +++--- CMakeLists.txt | 7 ++++-- conanfile.txt | 2 ++ .../scv_tr_recording_example.cpp | 2 ++ sc-components | 2 +- 6 files changed, 32 insertions(+), 14 deletions(-) diff --git a/.cproject b/.cproject index ec11919..f3b6b26 100644 --- a/.cproject +++ b/.cproject @@ -3,7 +3,13 @@ - + + + + + + + @@ -13,11 +19,11 @@ - + - + @@ -25,8 +31,11 @@ - + + + @@ -56,11 +69,11 @@ - + - + diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 9217dc6..233e805 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,13 +5,13 @@ - + - + @@ -19,13 +19,11 @@ - + - - diff --git a/CMakeLists.txt b/CMakeLists.txt index ef11123..dca1266 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.3) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/sc-components/cmake) set(ENABLE_SCV TRUE CACHE BOOL "Enable use of SCV") +set(ENABLE_SHARED TRUE CACHE BOOL "Build shared libraries") include(GitFunctions) get_branch_from_git() @@ -17,12 +18,14 @@ set(GIT_SUBMODULE_BRANCH_sc-components ${GIT_BRANCH}) include(GNUInstallDirs) include(Submodules) include(Conan) +include(BuildType) #enable_testing() set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-march=native" COMPILER_SUPPORTS_MARCH_NATIVE) @@ -36,8 +39,8 @@ endif() if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(warnings "-Wall -Wextra -Werror") - set(CMAKE_CXX_FLAG_RELEASE "-O2 -DNDEBUG") - set(CMAKE_C_FLAG_RELEASE "-O2 -DNDEBUG") + set(CMAKE_CXX_FLAG_RELEASE "-O3 -DNDEBUG") + set(CMAKE_C_FLAG_RELEASE "-O3 -DNDEBUG") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") set(warnings "/W4 /WX /EHsc") endif() diff --git a/conanfile.txt b/conanfile.txt index 08af144..6f2500c 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,6 @@ [requires] gsl_microsoft/20180102@bincrafters/stable + fmt/5.2.1@bincrafters/stable spdlog/0.16.3@bincrafters/stable SystemC/2.3.2@minres/stable SystemCVerification/2.0.1@minres/stable @@ -10,6 +11,7 @@ txt [options] + fmt:header_only=True SystemC:stdcxx=11 SystemC:shared=True SystemCVerification:stdcxx=11 diff --git a/examples/transaction_recording/scv_tr_recording_example.cpp b/examples/transaction_recording/scv_tr_recording_example.cpp index 0f4f201..e1ef212 100644 --- a/examples/transaction_recording/scv_tr_recording_example.cpp +++ b/examples/transaction_recording/scv_tr_recording_example.cpp @@ -18,6 +18,7 @@ #include "scv.h" #include "scc/scv_tr_db.h" #include "scc/report.h" +#include "scc/value_registry.h" // text 11308µs/11602µs // compressed 10365µs/ 9860µs @@ -366,6 +367,7 @@ int sc_main(int argc, char *argv[]) { sc_signal data_rdy; sc_signal> bus_data; + scc::value_registry registry; // create modules/channels test t("t"); rw_pipelined_transactor tr("tr"); diff --git a/sc-components b/sc-components index 6e0a8f8..ae1b9cc 160000 --- a/sc-components +++ b/sc-components @@ -1 +1 @@ -Subproject commit 6e0a8f8d259e4d8cca8b38dc089ed08f10db3a2d +Subproject commit ae1b9ccfede4a5a7e12ba68416cb8a0767752887