summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/sst/ExtMaster.cc7
-rw-r--r--ext/sst/ExtMaster.hh4
-rw-r--r--ext/sst/ExtSlave.cc6
-rw-r--r--ext/sst/ExtSlave.hh4
-rw-r--r--ext/sst/gem5.cc16
-rw-r--r--ext/sst/gem5.hh4
-rw-r--r--ext/sst/libgem5.cc3
-rw-r--r--ext/sst/tests/test6_arm_4c.py2
8 files changed, 14 insertions, 32 deletions
diff --git a/ext/sst/ExtMaster.cc b/ext/sst/ExtMaster.cc
index e85c3d99d..24682485f 100644
--- a/ext/sst/ExtMaster.cc
+++ b/ext/sst/ExtMaster.cc
@@ -48,14 +48,9 @@
#undef fatal
#endif
-#include <core/sst_config.h>
-
#include <mem/packet.hh>
-#include <sst/core/component.h>
-#include <sst/core/params.h>
-#include <sst/core/link.h>
-#include <sst/elements/memHierarchy/memNIC.h>
+#include <elements/memHierarchy/memNIC.h>
using namespace SST;
using namespace SST::gem5;
diff --git a/ext/sst/ExtMaster.hh b/ext/sst/ExtMaster.hh
index 4a98bddf9..04e98e55f 100644
--- a/ext/sst/ExtMaster.hh
+++ b/ext/sst/ExtMaster.hh
@@ -48,8 +48,8 @@
#include <list>
#include <set>
-#include <sst/core/component.h>
-#include <sst/elements/memHierarchy/memEvent.h>
+#include <core/component.h>
+#include <elements/memHierarchy/memEvent.h>
#include <sim/sim_object.hh>
#include <mem/packet.hh>
diff --git a/ext/sst/ExtSlave.cc b/ext/sst/ExtSlave.cc
index 9f29dad8b..6251ba8d9 100644
--- a/ext/sst/ExtSlave.cc
+++ b/ext/sst/ExtSlave.cc
@@ -44,12 +44,6 @@
#include "gem5.hh"
-#include <core/sst_config.h>
-
-#include <sst/core/params.h>
-#include <sst/core/output.h>
-#include <sst/core/link.h>
-
#ifdef fatal // gem5 sets this
#undef fatal
#endif
diff --git a/ext/sst/ExtSlave.hh b/ext/sst/ExtSlave.hh
index 049caa95d..cef7c1e99 100644
--- a/ext/sst/ExtSlave.hh
+++ b/ext/sst/ExtSlave.hh
@@ -45,9 +45,7 @@
#ifndef EXT_SST_EXTSLAVE_HH
#define EXT_SST_EXTSLAVE_HH
-#include <sst/core/component.h>
-#include <sst/core/output.h>
-#include <sst/core/interfaces/simpleMem.h>
+#include <core/interfaces/simpleMem.h>
#include <sim/sim_object.hh>
#include <mem/packet.hh>
diff --git a/ext/sst/gem5.cc b/ext/sst/gem5.cc
index 3e66a6ece..7749d37d6 100644
--- a/ext/sst/gem5.cc
+++ b/ext/sst/gem5.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 ARM Limited
+// Copyright (c) 2015-2016 ARM Limited
// All rights reserved.
//
// The license below extends only to copyright in the software and shall
@@ -65,9 +65,7 @@
#endif
// More SST Headers
-#include <sst/core/params.h>
-#include <sst/core/link.h>
-#include <sst/core/timeConverter.h>
+#include <core/timeConverter.h>
using namespace SST;
using namespace SST::gem5;
@@ -76,11 +74,11 @@ gem5Component::gem5Component(ComponentId_t id, Params &params) :
SST::Component(id)
{
dbg.init("@t:gem5:@p():@l " + getName() + ": ", 0, 0,
- (Output::output_location_t)params.find_integer("comp_debug", 0));
+ (Output::output_location_t)params.find<int>("comp_debug", 0));
info.init("gem5:" + getName() + ": ", 0, 0, Output::STDOUT);
TimeConverter *clock = registerClock(
- params.find_string("frequency", "1GHz"),
+ params.find<std::string>("frequency", "1GHz"),
new Clock::Handler<gem5Component>(this, &gem5Component::clockTick));
// This sets how many gem5 cycles we'll need to simulate per clock tick
@@ -89,7 +87,7 @@ gem5Component::gem5Component(ComponentId_t id, Params &params) :
// Disable gem5's inform() messages.
want_info = false;
- std::string cmd = params.find_string("cmd", "");
+ std::string cmd = params.find<std::string>("cmd", "");
if (cmd.empty()) {
dbg.fatal(CALL_INFO, -1, "Component %s must have a 'cmd' parameter.\n",
getName().c_str());
@@ -106,7 +104,7 @@ gem5Component::gem5Component(ComponentId_t id, Params &params) :
}
std::vector<char*> flags;
- std::string gem5DbgFlags = params.find_string("gem5DebugFlags", "");
+ std::string gem5DbgFlags = params.find<std::string>("gem5DebugFlags", "");
splitCommandArgs(gem5DbgFlags, flags);
for (auto flag : flags) {
dbg.output(CALL_INFO, " Setting Debug Flag [%s]\n", flag);
@@ -162,7 +160,7 @@ gem5Component::finish(void)
for (auto m : masters) {
m->finish();
}
- info.output("Complete. Clocks Processed: %"PRIu64"\n", clocks_processed);
+ info.output("Complete. Clocks Processed: %" PRIu64"\n", clocks_processed);
}
bool
diff --git a/ext/sst/gem5.hh b/ext/sst/gem5.hh
index f6c487a84..0f1bed88d 100644
--- a/ext/sst/gem5.hh
+++ b/ext/sst/gem5.hh
@@ -48,8 +48,8 @@
#include <string>
#include <vector>
-#include <sst/core/component.h>
-#include <sst/core/output.h>
+#include <core/sst_config.h>
+#include <core/component.h>
#include <sim/simulate.hh>
diff --git a/ext/sst/libgem5.cc b/ext/sst/libgem5.cc
index a840789e5..93fa05b32 100644
--- a/ext/sst/libgem5.cc
+++ b/ext/sst/libgem5.cc
@@ -44,9 +44,6 @@
#include <core/sst_config.h>
-#include <sst/core/element.h>
-#include <sst/core/component.h>
-
#include "gem5.hh"
static
diff --git a/ext/sst/tests/test6_arm_4c.py b/ext/sst/tests/test6_arm_4c.py
index 0974829db..642760627 100644
--- a/ext/sst/tests/test6_arm_4c.py
+++ b/ext/sst/tests/test6_arm_4c.py
@@ -1,4 +1,4 @@
-# Copyright (c)2015 ARM Limited
+# Copyright (c) 2015-2016 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall