SystemC/SystemC-Components-Test
8
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
Conflicts:
	.cproject
	.settings/language.settings.xml
	CMakeLists.txt
	examples/simple_system/gpio.cpp
	examples/simple_system/plic.cpp
	sc-components
This commit is contained in:
Eyck Jentzsch
2021-06-01 18:21:49 +02:00
parent 5a0edc5e00 6cc42f08b3
commit 406e04377d
22 changed files with 89 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/sim_performance/sc_main.cpp
View File

@@ -23,7 +23,6 @@
#include "top.h"
#include <scc/perf_estimator.h>
#include <scc/report.h>
#include <scc/scv_tr_db.h>
#include <scc/tracer.h>
#include <boost/program_options.hpp>
@@ -88,19 +87,19 @@ int sc_main(int argc, char *argv[]) {
// run simulation
///////////////////////////////////////////////////////////////////////////
sc_start(sc_core::sc_time(1, sc_core::SC_MS));
if(sc_is_running()) {
if(sc_core::sc_is_running()) {
SCCERR() << "simulation timed out"; // calls sc_stop
sc_core::sc_stop();
}
} catch(sc_report& e) {
} catch(sc_core::sc_report& e) {
SCCERR() << "Caught sc_report exception during simulation: " << e.what() << ":" << e.get_msg();
} catch(std::exception& e) {
SCCERR() << "Caught exception during simulation: " << e.what();
} catch(...) {
SCCERR() << "Caught unspecified exception during simulation";
}
auto errcnt = sc_report_handler::get_count(SC_ERROR);
auto warncnt = sc_report_handler::get_count(SC_WARNING);
auto errcnt = sc_core::sc_report_handler::get_count(sc_core::SC_ERROR);
auto warncnt = sc_core::sc_report_handler::get_count(sc_core::SC_WARNING);
SCCINFO() << "simulation finished, " << errcnt << " error" << (errcnt == 1 ? "" : "s") << " and " << warncnt << " warning"
<< (warncnt == 1 ? "" : "s");
return errcnt + warncnt;