sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ext: eliminate warnings in SST connector

Browse source 
Now compiles completely clean.
This commit is contained in:
Curtis Dunham 2016-09-02 14:58:15 +01:00
parent 5c0a7f98f8
commit 0da55e5dbc
8 changed files with 14 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/sst/ExtMaster.cc
View file

@ -48,14 +48,9 @@
#undef fatal #undef fatal
#endif #endif
#include <core/sst_config.h>
#include <mem/packet.hh> #include <mem/packet.hh>
#include <sst/core/component.h> #include <elements/memHierarchy/memNIC.h>
#include <sst/core/params.h>
#include <sst/core/link.h>
#include <sst/elements/memHierarchy/memNIC.h>
using namespace SST; using namespace SST;
using namespace SST::gem5; using namespace SST::gem5;

4
ext/sst/ExtMaster.hh
View file

@ -48,8 +48,8 @@
#include <list> #include <list>
#include <set> #include <set>
#include <sst/core/component.h> #include <core/component.h>
#include <sst/elements/memHierarchy/memEvent.h> #include <elements/memHierarchy/memEvent.h>
#include <sim/sim_object.hh> #include <sim/sim_object.hh>
#include <mem/packet.hh> #include <mem/packet.hh>

6
ext/sst/ExtSlave.cc
View file

@ -44,12 +44,6 @@
#include "gem5.hh" #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 #ifdef fatal // gem5 sets this
#undef fatal #undef fatal
#endif #endif

4
ext/sst/ExtSlave.hh
View file

@ -45,9 +45,7 @@
#ifndef EXT_SST_EXTSLAVE_HH #ifndef EXT_SST_EXTSLAVE_HH
#define EXT_SST_EXTSLAVE_HH #define EXT_SST_EXTSLAVE_HH
#include <sst/core/component.h> #include <core/interfaces/simpleMem.h>
#include <sst/core/output.h>
#include <sst/core/interfaces/simpleMem.h>
#include <sim/sim_object.hh> #include <sim/sim_object.hh>
#include <mem/packet.hh> #include <mem/packet.hh>

16
ext/sst/gem5.cc
View file

@ -1,4 +1,4 @@
// Copyright (c) 2015 ARM Limited // Copyright (c) 2015-2016 ARM Limited
// All rights reserved. // All rights reserved.
// //
// The license below extends only to copyright in the software and shall // The license below extends only to copyright in the software and shall
@ -65,9 +65,7 @@
#endif #endif
// More SST Headers // More SST Headers
#include <sst/core/params.h> #include <core/timeConverter.h>
#include <sst/core/link.h>
#include <sst/core/timeConverter.h>
using namespace SST; using namespace SST;
using namespace SST::gem5; using namespace SST::gem5;
@ -76,11 +74,11 @@ gem5Component::gem5Component(ComponentId_t id, Params &params) :
SST::Component(id) SST::Component(id)
{ {
dbg.init("@t:gem5:@p():@l " + getName() + ": ", 0, 0, 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); info.init("gem5:" + getName() + ": ", 0, 0, Output::STDOUT);
TimeConverter *clock = registerClock( TimeConverter *clock = registerClock(
params.find_string("frequency", "1GHz"), params.find<std::string>("frequency", "1GHz"),
new Clock::Handler<gem5Component>(this, &gem5Component::clockTick)); new Clock::Handler<gem5Component>(this, &gem5Component::clockTick));
// This sets how many gem5 cycles we'll need to simulate per clock tick // 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. // Disable gem5's inform() messages.
want_info = false; want_info = false;
std::string cmd = params.find_string("cmd", ""); std::string cmd = params.find<std::string>("cmd", "");
if (cmd.empty()) { if (cmd.empty()) {
dbg.fatal(CALL_INFO, -1, "Component %s must have a 'cmd' parameter.\n", dbg.fatal(CALL_INFO, -1, "Component %s must have a 'cmd' parameter.\n",
getName().c_str()); getName().c_str());
@ -106,7 +104,7 @@ gem5Component::gem5Component(ComponentId_t id, Params &params) :
} }
std::vector<char*> flags; std::vector<char*> flags;
std::string gem5DbgFlags = params.find_string("gem5DebugFlags", ""); std::string gem5DbgFlags = params.find<std::string>("gem5DebugFlags", "");
splitCommandArgs(gem5DbgFlags, flags); splitCommandArgs(gem5DbgFlags, flags);
for (auto flag : flags) { for (auto flag : flags) {
dbg.output(CALL_INFO, " Setting Debug Flag [%s]\n", flag); dbg.output(CALL_INFO, " Setting Debug Flag [%s]\n", flag);
@ -162,7 +160,7 @@ gem5Component::finish(void)
for (auto m : masters) { for (auto m : masters) {
m->finish(); m->finish();
} }
info.output("Complete. Clocks Processed: %"PRIu64"\n", clocks_processed); info.output("Complete. Clocks Processed: %" PRIu64"\n", clocks_processed);
} }
bool bool

4
ext/sst/gem5.hh
View file

@ -48,8 +48,8 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <sst/core/component.h> #include <core/sst_config.h>
#include <sst/core/output.h> #include <core/component.h>
#include <sim/simulate.hh> #include <sim/simulate.hh>

3
ext/sst/libgem5.cc
View file

@ -44,9 +44,6 @@
#include <core/sst_config.h> #include <core/sst_config.h>
#include <sst/core/element.h>
#include <sst/core/component.h>
#include "gem5.hh" #include "gem5.hh"
static static

2
ext/sst/tests/test6_arm_4c.py
View file

@ -1,4 +1,4 @@
# Copyright (c)2015 ARM Limited # Copyright (c) 2015-2016 ARM Limited
# All rights reserved. # All rights reserved.
# #
# The license below extends only to copyright in the software and shall # The license below extends only to copyright in the software and shall