From 9927c70af936fc97ed025605351961adbc55d79d Mon Sep 17 00:00:00 2001 From: tmarcero Date: Mon, 28 Aug 2023 14:38:42 +0200 Subject: [PATCH 1/4] Fix warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - When we build the virtual platform we had the warning : "warning: comparison of integer expressions of different signedness: ‘int’ and ‘unsigned int’" --- report/include/scp/helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report/include/scp/helpers.h b/report/include/scp/helpers.h index a4bfc13..9303965 100644 --- a/report/include/scp/helpers.h +++ b/report/include/scp/helpers.h @@ -46,7 +46,7 @@ static std::string scp_txn_tostring(tlm::tlm_generic_payload& trans) { << (unsigned int)(ptr[i - 1]); } info << " status: " << trans.get_response_string() << " "; - for (int i = 0; i < tlm::max_num_extensions(); i++) { + for (unsigned int i = 0; i < tlm::max_num_extensions(); i++) { if (trans.get_extension(i)) { info << " extn:" << i; } From a77ea3845092f4b85cb2400814da608fd1286e9f Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Thu, 7 Sep 2023 16:56:56 +0200 Subject: [PATCH 2/4] Remove the use of ignore_preset_value as it's a huge performance drain, with no benefit here Signed-off-by: Mark Burton --- report/src/report.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/report/src/report.cpp b/report/src/report.cpp index ad6ce99..f5a87a7 100644 --- a/report/src/report.cpp +++ b/report/src/report.cpp @@ -572,11 +572,7 @@ sc_core::sc_verbosity cci_lookup(cci::cci_broker_handle broker, auto val = broker.get_preset_cci_value(param_name); if (val.is_int()) { - broker.ignore_unconsumed_preset_values( - [param_name](const std::pair& iv) - -> bool { return iv.first == param_name; }); broker.lock_preset_value(param_name); - return verbosity.at( std::min(val.get_int(), verbosity.size() - 1)); } From bd7fa97e003460930649620e246c882775fba560 Mon Sep 17 00:00:00 2001 From: Mark Burton Date: Thu, 7 Dec 2023 13:12:02 +0100 Subject: [PATCH 3/4] Change not to ! for MSVC Signed-off-by: Mark Burton --- report/include/scp/report.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report/include/scp/report.h b/report/include/scp/report.h index 6f02a02..4ba6f9a 100644 --- a/report/include/scp/report.h +++ b/report/include/scp/report.h @@ -450,7 +450,7 @@ class call_sc_name_fn // define a function IF NOT the method exists template auto operator()(TYPE* p) const - -> std::enable_if_t, const char*> { + -> std::enable_if_t, const char*> { return nullptr; } }; From 504a7b0f51584ff57cc9c7ea50476de8e1bbf767 Mon Sep 17 00:00:00 2001 From: tmarcero Date: Fri, 27 Oct 2023 10:23:49 +0200 Subject: [PATCH 4/4] Change the branches of the SystemC libraries and remove rapidjson. - Rapidjson is now handle by the CCI library so we can remove it. --- CMakeLists.txt | 5 +---- report/CMakeLists.txt | 20 ++------------------ tlm_extensions/initiator_id/CMakeLists.txt | 8 ++++---- tlm_extensions/path_trace/CMakeLists.txt | 8 ++++---- 4 files changed, 11 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ee2eeb7..f060b7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,11 +24,8 @@ cpmaddpackage( NAME SystemCLanguage GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git GIT_SHALLOW True - GIT_TAG master + GIT_TAG main ) -if(SystemCLanguage_ADDED) -set(SystemCLanguage_FOUND TRUE) -endif() cpmaddpackage( NAME initiator_id diff --git a/report/CMakeLists.txt b/report/CMakeLists.txt index 1df5317..c4b89d2 100644 --- a/report/CMakeLists.txt +++ b/report/CMakeLists.txt @@ -24,30 +24,14 @@ cpmaddpackage( NAME SystemCLanguage GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git GIT_SHALLOW True - GIT_TAG master + GIT_TAG main ) -cpmaddpackage( - NAME - RapidJSON - GIT_REPOSITORY - https://github.com/Tencent/rapidjson - GIT_TAG - e0f68a435610e70ab5af44fc6a90523d69b210b3 - GIT_SHALLOW - FALSE - OPTIONS - "RAPIDJSON_BUILD_TESTS OFF" - "RAPIDJSON_BUILD_DOC OFF" - "RAPIDJSON_BUILD_EXAMPLES OFF") - -set(RapidJSON_DIR "${RapidJSON_BINARY_DIR}") - cpmaddpackage( NAME SystemCCCI GIT_REPOSITORY ${GITHUB}accellera-official/cci.git GIT_SHALLOW True - GIT_TAG master + GIT_TAG main ) set(WITH_FMT "true" CACHE STRING "Include FMT library") diff --git a/tlm_extensions/initiator_id/CMakeLists.txt b/tlm_extensions/initiator_id/CMakeLists.txt index 446e6d7..ec7fd50 100644 --- a/tlm_extensions/initiator_id/CMakeLists.txt +++ b/tlm_extensions/initiator_id/CMakeLists.txt @@ -21,10 +21,10 @@ include(${cpm-cmake_SOURCE_DIR}/cmake/CPM.cmake) cpmaddpackage("${GITHUB}TheLartians/PackageProject.cmake.git@1.4.1") cpmaddpackage( - NAME SystemCLanguage - GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git - GIT_SHALLOW True - GIT_TAG master + NAME SystemCLanguage + GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git + GIT_SHALLOW True + GIT_TAG main ) add_library(${PROJECT_NAME} INTERFACE) diff --git a/tlm_extensions/path_trace/CMakeLists.txt b/tlm_extensions/path_trace/CMakeLists.txt index a105a95..bbd0a76 100644 --- a/tlm_extensions/path_trace/CMakeLists.txt +++ b/tlm_extensions/path_trace/CMakeLists.txt @@ -21,10 +21,10 @@ include(${cpm-cmake_SOURCE_DIR}/cmake/CPM.cmake) cpmaddpackage("${GITHUB}TheLartians/PackageProject.cmake.git@1.4.1") cpmaddpackage( - NAME SystemCLanguage - GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git - GIT_SHALLOW True - GIT_TAG master + NAME SystemCLanguage + GIT_REPOSITORY ${GITHUB}accellera-official/systemc.git + GIT_SHALLOW True + GIT_TAG main ) add_library(${PROJECT_NAME} INTERFACE)