summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCurtis Dunham <Curtis.Dunham@arm.com>2016-08-24 14:20:53 +0100
committerCurtis Dunham <Curtis.Dunham@arm.com>2016-08-24 14:20:53 +0100
commit5c0a7f98f85ea31ddaa22fcfa7b7f9c86d417e84 (patch)
tree3ee8e85301980e15fcebaa2065ec2c2eaefb9bef
parentd1abc287f6ae824b56e431774cae9bf6082486d6 (diff)
downloadgem5-5c0a7f98f85ea31ddaa22fcfa7b7f9c86d417e84.tar.xz
commit 15c633eea52f21dae8cb3a195823b3cdec7be491
Author: Curtis Dunham <Curtis.Dunham@arm.com> ext: update SST connector for SST 6.0
-rw-r--r--ext/sst/ExtMaster.cc2
-rw-r--r--ext/sst/ExtMaster.hh1
-rw-r--r--ext/sst/ExtSlave.cc3
-rw-r--r--ext/sst/ExtSlave.hh1
-rw-r--r--ext/sst/gem5.cc3
-rw-r--r--ext/sst/gem5.hh1
-rw-r--r--ext/sst/libgem5.cc3
-rw-r--r--ext/sst/tests/test6_arm_4c.py27
8 files changed, 20 insertions, 21 deletions
diff --git a/ext/sst/ExtMaster.cc b/ext/sst/ExtMaster.cc
index ce6f8ab7b..e85c3d99d 100644
--- a/ext/sst/ExtMaster.cc
+++ b/ext/sst/ExtMaster.cc
@@ -48,7 +48,7 @@
#undef fatal
#endif
-#include <sst_config.h>
+#include <core/sst_config.h>
#include <mem/packet.hh>
diff --git a/ext/sst/ExtMaster.hh b/ext/sst/ExtMaster.hh
index 2f68a406c..4a98bddf9 100644
--- a/ext/sst/ExtMaster.hh
+++ b/ext/sst/ExtMaster.hh
@@ -48,7 +48,6 @@
#include <list>
#include <set>
-#include <sst/core/serialization.h>
#include <sst/core/component.h>
#include <sst/elements/memHierarchy/memEvent.h>
diff --git a/ext/sst/ExtSlave.cc b/ext/sst/ExtSlave.cc
index 7575e46a6..9f29dad8b 100644
--- a/ext/sst/ExtSlave.cc
+++ b/ext/sst/ExtSlave.cc
@@ -44,8 +44,7 @@
#include "gem5.hh"
-#include <sst_config.h>
-#include <sst/core/serialization.h>
+#include <core/sst_config.h>
#include <sst/core/params.h>
#include <sst/core/output.h>
diff --git a/ext/sst/ExtSlave.hh b/ext/sst/ExtSlave.hh
index de91a6f7b..049caa95d 100644
--- a/ext/sst/ExtSlave.hh
+++ b/ext/sst/ExtSlave.hh
@@ -45,7 +45,6 @@
#ifndef EXT_SST_EXTSLAVE_HH
#define EXT_SST_EXTSLAVE_HH
-#include <sst/core/serialization.h>
#include <sst/core/component.h>
#include <sst/core/output.h>
#include <sst/core/interfaces/simpleMem.h>
diff --git a/ext/sst/gem5.cc b/ext/sst/gem5.cc
index a468e3e82..3e66a6ece 100644
--- a/ext/sst/gem5.cc
+++ b/ext/sst/gem5.cc
@@ -42,9 +42,8 @@
//
// For license information, see the LICENSE file in the current directory.
-#include <sst_config.h>
+#include <core/sst_config.h>
#include <Python.h> // Before serialization to prevent spurious warnings
-#include <sst/core/serialization.h>
#include "gem5.hh"
diff --git a/ext/sst/gem5.hh b/ext/sst/gem5.hh
index 6b2f1a17e..f6c487a84 100644
--- a/ext/sst/gem5.hh
+++ b/ext/sst/gem5.hh
@@ -48,7 +48,6 @@
#include <string>
#include <vector>
-#include <sst/core/serialization.h>
#include <sst/core/component.h>
#include <sst/core/output.h>
diff --git a/ext/sst/libgem5.cc b/ext/sst/libgem5.cc
index f490d6f84..a840789e5 100644
--- a/ext/sst/libgem5.cc
+++ b/ext/sst/libgem5.cc
@@ -42,9 +42,8 @@
//
// For license information, see the LICENSE file in the current directory.
-#include <sst_config.h>
+#include <core/sst_config.h>
-#include <sst/core/serialization.h>
#include <sst/core/element.h>
#include <sst/core/component.h>
diff --git a/ext/sst/tests/test6_arm_4c.py b/ext/sst/tests/test6_arm_4c.py
index bf2cb9ab8..0974829db 100644
--- a/ext/sst/tests/test6_arm_4c.py
+++ b/ext/sst/tests/test6_arm_4c.py
@@ -52,18 +52,24 @@ def getenv(name):
pass
return res
+def debug(d):
+ try:
+ r = int(getenv(d))
+ except ValueError:
+ return 0
+ return r
+
baseCacheParams = ({
- "debug" :getenv("DEBUG"),
+ "debug" :debug("DEBUG"),
"debug_level" : 6,
"coherence_protocol" : "MSI",
"replacement_policy" : "LRU",
"cache_line_size" : 64,
- "cache_frequency" : clockRate,
- "statistics" : 1
+ "cache_frequency" : clockRate
})
l1CacheParams = ({
- "debug" : getenv("DEBUG"),
+ "debug" : debug("DEBUG"),
"debug_level" : 6,
"L1" : 1,
"cache_size" : "64 KB",
@@ -73,7 +79,7 @@ l1CacheParams = ({
})
l2CacheParams = ({
- "debug" : getenv("DEBUG"),
+ "debug" : debug("DEBUG"),
"debug_level" : 6,
"L1" : 0,
"cache_size" : "256 KB",
@@ -87,8 +93,8 @@ l2CacheParams = ({
GEM5 = sst.Component("system", "gem5.gem5")
GEM5.addParams({
- "comp_debug" : getenv("GEM5_DEBUG"),
- "gem5DebugFlags" : getenv("M5_DEBUG"),
+ "comp_debug" : debug("GEM5_DEBUG"),
+ "gem5DebugFlags" : debug("M5_DEBUG"),
"frequency" : clockRate,
"cmd" : "configs/example/fs.py --num-cpus 4 --disk-image=vexpress64-openembedded_minimal-armv8_20130623-376.img --root-device=/dev/sda2 --kernel=vmlinux.aarch64.20140821 --dtb-filename=vexpress.aarch64.20140821.dtb --mem-size=256MB --machine-type=VExpress_EMM64 --cpu-type=timing --external-memory-system=sst"
})
@@ -96,7 +102,7 @@ GEM5.addParams({
bus = sst.Component("membus", "memHierarchy.Bus")
bus.addParams({
"bus_frequency": "2GHz",
- "debug" : getenv("DEBUG"),
+ "debug" : debug("DEBUG"),
"debug_level" : 8
})
@@ -154,8 +160,7 @@ l2cache = sst.Component("l2cache", "memHierarchy.Cache")
l2cache.addParams(baseCacheParams)
l2cache.addParams(l2CacheParams)
l2cache.addParams({
- "network_address" : "2",
- "directory_at_next_level" : "1"
+ "network_address" : "2"
})
link = sst.Link("l2cache_bus_link")
@@ -168,7 +173,7 @@ memory.addParams({
"access_time" : "25 ns",
"backend.mem_size" : 256,
"clock" : "2GHz",
- "debug" : getenv("DEBUG"),
+ "debug" : debug("DEBUG"),
"range_start" : 0, # 2 * (1024 ** 3), # it's behind a directory controller.
})