Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/54308 )
Change subject: ext: In sst, don't assume existing imports in python blobs.
......................................................................
ext: In sst, don't assume existing imports in python blobs.
When executing blobs of python code in the gem5 sst integration, don't
assume previous blobs have already imported modules. Import them
explicitly instead.
Change-Id: I3aa008ffa092cf8ad82ad057eb73bc9de4bf77c5
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/54308
Maintainer: Gabe Black <gabe.bl...@gmail.com>
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M ext/sst/gem5.cc
1 file changed, 23 insertions(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/ext/sst/gem5.cc b/ext/sst/gem5.cc
index 286f519..01ea3eb 100644
--- a/ext/sst/gem5.cc
+++ b/ext/sst/gem5.cc
@@ -194,6 +194,7 @@
initPython(args.size(), &args[0]);
const std::vector<std::string> m5_instantiate_commands = {
+ "import m5",
"m5.instantiate()"
};
execPythonCommands(m5_instantiate_commands);
@@ -201,7 +202,10 @@
// calling SimObject.startup()
const std::vector<std::string> simobject_setup_commands = {
"import atexit",
- "import _m5",
+ "import _m5.core",
+ "import m5",
+ "import m5.stats",
+ "import m5.objects.Root",
"root = m5.objects.Root.getInstance()",
"for obj in root.descendants(): obj.startup()",
"atexit.register(m5.stats.dump)",
@@ -258,6 +262,7 @@
);
// output gem5 stats
const std::vector<std::string> output_stats_commands = {
+ "import m5.stats"
"m5.stats.dump()"
};
execPythonCommands(output_stats_commands);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/54308
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-2
Gerrit-Change-Id: I3aa008ffa092cf8ad82ad057eb73bc9de4bf77c5
Gerrit-Change-Number: 54308
Gerrit-PatchSet: 2
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Hoa Nguyen <hoanguyen.yds....@gmail.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
