Zhengrong Wang has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/67859?usp=email )
Change subject: mem-dram: Make sure SHOW_SIM_OUTPUT is in global namespace.
......................................................................
mem-dram: Make sure SHOW_SIM_OUTPUT is in global namespace.
As stated in the comment, SHOW_SIM_OUTPUT is declared extern
in the DRAMSim2 print macros. Therefore, it should be defined
in the global namespace, not in gem5 namespace.
Change-Id: I05245a48ac706b46085ffa8d00db3725ce16a89e
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67859
Maintainer: Jason Lowe-Power <power...@gmail.com>
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/mem/dramsim2_wrapper.cc
1 file changed, 23 insertions(+), 6 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/dramsim2_wrapper.cc b/src/mem/dramsim2_wrapper.cc
index c622c1c..b9bcf14 100644
--- a/src/mem/dramsim2_wrapper.cc
+++ b/src/mem/dramsim2_wrapper.cc
@@ -54,12 +54,6 @@
#include "base/compiler.hh"
#include "base/logging.hh"
-namespace gem5
-{
-
-namespace memory
-{
-
/**
* DRAMSim2 requires SHOW_SIM_OUTPUT to be defined (declared extern in
* the DRAMSim2 print macros), otherwise we get linking errors due to
@@ -67,6 +61,12 @@
*/
int SHOW_SIM_OUTPUT = 0;
+namespace gem5
+{
+
+namespace memory
+{
+
DRAMSim2Wrapper::DRAMSim2Wrapper(const std::string& config_file,
const std::string& system_file,
const std::string& working_dir,
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/67859?usp=email
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: I05245a48ac706b46085ffa8d00db3725ce16a89e
Gerrit-Change-Number: 67859
Gerrit-PatchSet: 2
Gerrit-Owner: Zhengrong Wang <seanyukig...@gmail.com>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-Reviewer: Zhengrong Wang <seanyukig...@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
