Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/54383 )
Change subject: misc: Merge branch 'release-staging-v21-2' into develop
......................................................................
misc: Merge branch 'release-staging-v21-2' into develop
Change-Id: Icc03e585d87cf89ed844a0249c365cc296fa2d14
---
M ext/sst/gem5.cc
2 files changed, 30 insertions(+), 19 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/ext/sst/gem5.cc b/ext/sst/gem5.cc
index abefb52..7af0eed 100644
--- a/ext/sst/gem5.cc
+++ b/ext/sst/gem5.cc
@@ -382,21 +382,6 @@
// Initialize gem5 special signal handling.
gem5::initSignals();
-<<<<<<< HEAD (735f76 mem-cache: Added stats filtering both useful and
spanPage pr)
- if (!Py_IsInitialized())
- py::initialize_interpreter(false, argc, _argv);
-
- auto importer = py::module_::import("importer");
- importer.attr("install")();
-
- try {
- py::module_::import("m5").attr("main")();
- } catch (py::error_already_set &e) {
- if (!e.matches(PyExc_SystemExit)) {
- std::cerr << e.what();
- output.output(CALL_INFO, "Calling m5.main(...) failed.\n");
- }
-=======
if (!Py_IsInitialized()) {
py::initialize_interpreter(true, argc, _argv);
} else {
@@ -417,10 +402,7 @@
// Fill it with our argvs.
for (int i = 0; i < argc; i++)
py_argv.append(_argv[i]);
->>>>>>> BRANCH (c7689b ext: Fix dumping stats error at the end of
simulation)
}
-<<<<<<< HEAD (735f76 mem-cache: Added stats filtering both useful and
spanPage pr)
-=======
auto importer = py::module_::import("importer");
importer.attr("install")();
@@ -433,7 +415,6 @@
output.output(CALL_INFO, "Calling m5.main(...) failed.\n");
}
}
->>>>>>> BRANCH (c7689b ext: Fix dumping stats error at the end of
simulation)
}
void
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54383
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Icc03e585d87cf89ed844a0249c365cc296fa2d14
Gerrit-Change-Number: 54383
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby Bruce <[email protected]>
Gerrit-Reviewer: Bobby Bruce <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
