Mahyar Samani has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/31434 )
Change subject: sim: Fixed error when compiling gem5 with dramsim2.
......................................................................
sim: Fixed error when compiling gem5 with dramsim2.
Compiling gem5 with dramsim2 included fails due to some inconsistencies in
including SimObjects. In this patch this issue is fixed along with
temporarily disabling -Werror=nonnull-compare in CCFLAGS. Also, the remote
for cloning dramsim2 has been changed.
Change-Id: Ia24095150d026d736352aaf0d735b7554ede10bb
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31434
Reviewed-by: Jason Lowe-Power <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
---
M ext/dramsim2/README
M ext/dramsim2/SConscript
M src/mem/DRAMSim2.py
3 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/ext/dramsim2/README b/ext/dramsim2/README
index f83e3f0..7c5535d 100644
--- a/ext/dramsim2/README
+++ b/ext/dramsim2/README
@@ -2,7 +2,7 @@
1. Download DRAMSim2
1.1 Go to ext/dramsim2 (this directory)
- 1.2 Clone DRAMSim2: git clone
git://github.com/dramninjasUMD/DRAMSim2.git
+ 1.2 Clone DRAMSim2: git clone [email protected]:umd-memsys/DRAMSim2.git
2. Compile gem5
2.1 Business as usual
diff --git a/ext/dramsim2/SConscript b/ext/dramsim2/SConscript
index bc4c047..869d220 100644
--- a/ext/dramsim2/SConscript
+++ b/ext/dramsim2/SConscript
@@ -73,7 +73,7 @@
# DRAMSim2 violates some of the warning flags used by gem5, so
# we explicitly disable them here
dramenv = main.Clone()
-dramenv.Append(CCFLAGS=['-Wno-unused-value'])
+dramenv.Append(CCFLAGS=['-Wno-unused-value', '-Wno-error=nonnull-compare'])
# If we are using clang, there are more flags to disable
if main['CLANG']:
diff --git a/src/mem/DRAMSim2.py b/src/mem/DRAMSim2.py
index aa83729..bf5143f 100644
--- a/src/mem/DRAMSim2.py
+++ b/src/mem/DRAMSim2.py
@@ -34,7 +34,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from m5.params import *
-from AbstractMemory import *
+from m5.objects.AbstractMemory import *
# A wrapper for DRAMSim2 multi-channel memory controller
class DRAMSim2(AbstractMemory):
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31434
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: Ia24095150d026d736352aaf0d735b7554ede10bb
Gerrit-Change-Number: 31434
Gerrit-PatchSet: 3
Gerrit-Owner: Mahyar Samani <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Mahyar Samani <[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
