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

ruby: Make ruby #includes use full paths to the files they're including.

Browse source 
This basically means changing all #include statements and changing
autogenerated code so that it generates the correct paths.  Because
slicc generates #includes, I had to hard code the include paths to
mem/protocol.
This commit is contained in:
Nathan Binkert 2009-05-11 10:38:45 -07:00
parent d8c592a05d
commit 24da30e317
344 changed files with 1464 additions and 1471 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mem/gems_common/Allocator.hh
View file

@ -23,7 +23,7 @@
#ifndef ALLOCATOR_H
#define ALLOCATOR_H
#include "Vector.hh"
#include "mem/gems_common/Vector.hh"
template <class TYPE>
class Allocator {

2
src/mem/gems_common/Map.hh
View file

@ -34,7 +34,7 @@
#ifndef MAP_H
#define MAP_H
#include "Vector.hh"
#include "mem/gems_common/Vector.hh"
namespace __gnu_cxx {
template <> struct hash <std::string>

2
src/mem/gems_common/PrioHeap.hh
View file

@ -29,7 +29,7 @@
#ifndef PRIOHEAP_H
#define PRIOHEAP_H
#include "Vector.hh"
#include "mem/gems_common/Vector.hh"
typedef unsigned int HeapIndex;

4
src/mem/gems_common/RefCnt_tester.cc
View file

@ -30,8 +30,8 @@
* Code used to test the RefCnt class
*/
#include "RefCnt.hh"
#include "RefCountable.hh"
#include "mem/gems_common/RefCnt.hh"
#include "mem/gems_common/RefCountable.hh"
class Foo : public RefCountable {
public:

2
src/mem/gems_common/RefCountable.hh
View file

@ -33,7 +33,7 @@
#ifndef REFCOUNTABLE_H
#define REFCOUNTABLE_H
#include "RefCnt.hh"
#include "mem/gems_common/RefCnt.hh"
class RefCountable {
public:

2
src/mem/gems_common/Vector.hh
View file

@ -38,7 +38,7 @@
#ifndef VECTOR_H
#define VECTOR_H
#include "std-includes.hh"
#include "mem/gems_common/std-includes.hh"
template <class TYPE>
class Vector

6
src/mem/gems_common/ioutil/attrlex.ll
View file

@ -68,7 +68,7 @@ WHITESPACE [ \t]
%{
#include "Global.hh"
#include "mem/ruby/common/Global.hh"
using namespace std;
#include <string>
@ -80,12 +80,12 @@ using namespace std;
// #include "simics/api.h"
// };
#include "FakeSimicsDataTypes.hh"
#include "mem/gems_common/ioutil/FakeSimicsDataTypes.hh"
// CM: simics 1.6.5 API redefines fwrite, much to my chagrin
#undef fwrite
#undef printf
#include "attrparse.h"
#include "mem/gems_common/ioutil/attrparse.hh"
#define MAX_INCLUDE_DEPTH 10

6
src/mem/gems_common/ioutil/attrparse.yy
View file

@ -65,7 +65,7 @@
/* Includes */
/*------------------------------------------------------------------------*/
#include "Global.hh"
#include "mem/ruby/common/Global.hh"
using namespace std;
#include <string>
@ -77,9 +77,9 @@ using namespace std;
// #include "simics/api.h"
// };
#include "FakeSimicsDataTypes.hh"
#include "mem/gems_common/ioutil/FakeSimicsDataTypes.hh"
#include "confio.hh"
#include "mem/gems_common/ioutil/confio.hh"
// CM FIX: if I wasn't working on a paper: I'd re-write the grammer to
// be left (or right) recursive, which ever is more efficient

4
src/mem/gems_common/ioutil/confio.cc
View file

@ -34,7 +34,7 @@
/* Includes */
/*------------------------------------------------------------------------*/
#include "Global.hh"
#include "mem/ruby/common/Global.hh"
#define SIM_HALT ASSERT(0)
using namespace std;
@ -59,7 +59,7 @@ using namespace std;
// #endif
// };
#include "confio.hh"
#include "mem/gems_common/ioutil/confio.hh"
/*------------------------------------------------------------------------*/
/* Macro declarations */

2
src/mem/gems_common/ioutil/confio.hh
View file

@ -33,7 +33,7 @@
/* Includes */
/*------------------------------------------------------------------------*/
#include "FakeSimicsDataTypes.hh"
#include "mem/gems_common/ioutil/FakeSimicsDataTypes.hh"
/*------------------------------------------------------------------------*/
/* Macro declarations */

18
src/mem/gems_common/ioutil/initvar.cc
View file

@ -70,10 +70,10 @@ using namespace std;
// #endif
// };
#include "Global.hh"
#include "mem/ruby/common/Global.hh"
#include "confio.hh"
#include "initvar.hh"
#include "mem/gems_common/ioutil/confio.hh"
#include "mem/gems_common/ioutil/initvar.hh"
/*------------------------------------------------------------------------*/
/* Variable declarations */
@ -94,7 +94,7 @@ using namespace std;
char *NAME;
#define PARAM_ARRAY( PTYPE, NAME, ARRAY_SIZE ) \
PTYPE NAME[ARRAY_SIZE];
#include "config.hh"
#include "mem/ruby/config/config.hh"
#undef PARAM
#undef PARAM_UINT
#undef PARAM_ULONG
@ -151,7 +151,7 @@ initvar_t::~initvar_t( )
NAME = NULL; \
}
#define PARAM_ARRAY( PTYPE, NAME, ARRAY_SIZE )
#include "config.hh"
#include "mem/ruby/config/config.hh"
#undef PARAM
#undef PARAM_UINT
#undef PARAM_ULONG
@ -204,7 +204,7 @@ void initvar_t::init_config_reader( const char *initString )
initvar_get_attr, (void *) name, \
initvar_set_attr, (void *) name );
#include "config.hh"
#include "mem/ruby/config/config.hh"
#undef PARAM
#undef PARAM_UINT
#undef PARAM_ULONG
@ -380,7 +380,7 @@ static attr_value_t initvar_get_attr( void *ptr, void *obj )
return (ret); \
}
#include "config.hh"
#include "mem/ruby/config/config.hh"
#undef PARAM
#undef PARAM_UINT
#undef PARAM_ULONG
@ -464,7 +464,7 @@ static set_error_t initvar_set_attr( void *ptr, void *obj,
return Sim_Set_Ok; \
}
#include "config.hh"
#include "mem/ruby/config/config.hh"
#undef PARAM
#undef PARAM_UINT
#undef PARAM_ULONG
@ -564,7 +564,7 @@ void initvar_t::list_param( FILE *fp )
} \
fprintf( fp, ")\n" );
#include "config.hh"
#include "mem/ruby/config/config.hh"
#undef PARAM
#undef PARAM_UINT
#undef PARAM_ULONG

2
src/mem/gems_common/ioutil/vardecl.hh
View file

@ -59,7 +59,7 @@
extern char *NAME;
#define PARAM_ARRAY( PTYPE, NAME, ARRAY_SIZE ) \
extern PTYPE NAME[ARRAY_SIZE];
#include "config.hh"
#include "mem/ruby/config/config.hh"
#undef PARAM
#undef PARAM_UINT
#undef PARAM_ULONG

2
src/mem/gems_common/util.cc
View file

@ -31,7 +31,7 @@
*/
#include "assert.h"
#include "util.hh"
#include "mem/gems_common/util.hh"
// Split a string into a head and tail strings on the specified
// character. Return the head and the string passed in is modified by

2
src/mem/gems_common/util.hh
View file

@ -33,7 +33,7 @@
#ifndef UTIL_H
#define UTIL_H
#include "std-includes.hh"
#include "mem/gems_common/std-includes.hh"
string string_split(string& str, char split_character);
string bool_to_string(bool value);

4
src/mem/ruby/buffers/MessageBuffer.cc
View file

@ -31,8 +31,8 @@
* $Id$
*/
#include "MessageBuffer.hh"
#include "RubyConfig.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
#include "mem/ruby/config/RubyConfig.hh"
MessageBuffer::MessageBuffer()
{

14
src/mem/ruby/buffers/MessageBuffer.hh
View file

@ -38,13 +38,13 @@
#ifndef MESSAGEBUFFER_H
#define MESSAGEBUFFER_H
#include "Global.hh"
#include "MessageBufferNode.hh"
#include "Consumer.hh"
#include "RubyEventQueue.hh"
#include "Message.hh"
#include "PrioHeap.hh"
#include "util.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/buffers/MessageBufferNode.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
#include "mem/ruby/slicc_interface/Message.hh"
#include "mem/gems_common/PrioHeap.hh"
#include "mem/gems_common/util.hh"
class Chip;

2
src/mem/ruby/buffers/MessageBufferNode.cc
View file

@ -27,7 +27,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "MessageBufferNode.hh"
#include "mem/ruby/buffers/MessageBufferNode.hh"
void MessageBufferNode::print(ostream& out) const
{

4
src/mem/ruby/buffers/MessageBufferNode.hh
View file

@ -30,8 +30,8 @@
#ifndef MESSAGEBUFFERNODE_H
#define MESSAGEBUFFERNODE_H
#include "Global.hh"
#include "Message.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/slicc_interface/Message.hh"
class MessageBufferNode {
public:

2
src/mem/ruby/common/Address.cc
View file

@ -31,7 +31,7 @@
* $Id$
*/
#include "Address.hh"
#include "mem/ruby/common/Address.hh"
void Address::output(ostream& out) const
{

8
src/mem/ruby/common/Address.hh
View file

@ -25,10 +25,10 @@
#define ADDRESS_H
#include <iomanip>
#include "Global.hh"
#include "RubyConfig.hh"
#include "NodeID.hh"
#include "MachineID.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/config/RubyConfig.hh"
#include "mem/ruby/system/NodeID.hh"
#include "mem/ruby/system/MachineID.hh"
const int ADDRESS_WIDTH = 64; // address width in bytes

4
src/mem/ruby/common/BigSet.cc
View file

@ -27,8 +27,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "Set.hh"
#include "RubyConfig.hh"
#include "mem/ruby/common/Set.hh"
#include "mem/ruby/config/RubyConfig.hh"
Set::Set()
{

8
src/mem/ruby/common/BigSet.hh
View file

@ -33,10 +33,10 @@
#ifndef SET_H
#define SET_H
#include "Global.hh"
#include "Vector.hh"
#include "NodeID.hh"
#include "RubyConfig.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/gems_common/Vector.hh"
#include "mem/ruby/system/NodeID.hh"
#include "mem/ruby/config/RubyConfig.hh"
enum PresenceBit {NotPresent, Present};

4
src/mem/ruby/common/Consumer.hh
View file

@ -39,8 +39,8 @@
#ifndef CONSUMER_H
#define CONSUMER_H
#include "Global.hh"
#include "RubyEventQueue.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
class MessageBuffer;

2
src/mem/ruby/common/DataBlock.cc
View file

@ -31,7 +31,7 @@
* $Id$
*/
#include "DataBlock.hh"
#include "mem/ruby/common/DataBlock.hh"
DataBlock::DataBlock()
{

6
src/mem/ruby/common/DataBlock.hh
View file

@ -30,9 +30,9 @@
#ifndef DATABLOCK_H
#define DATABLOCK_H
#include "Global.hh"
#include "RubyConfig.hh"
#include "Vector.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/config/RubyConfig.hh"
#include "mem/gems_common/Vector.hh"
class DataBlock {
public:

6
src/mem/ruby/common/Debug.cc
View file

@ -35,9 +35,9 @@
#include <fstream>
#include <stdarg.h>
#include "Global.hh"
#include "Debug.hh"
#include "RubyEventQueue.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/common/Debug.hh"
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
class Debug;
extern Debug* g_debug_ptr;

2
src/mem/ruby/common/Driver.cc
View file

@ -27,7 +27,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "Driver.hh"
#include "mem/ruby/common/Driver.hh"
Driver::Driver()
{

14
src/mem/ruby/common/Driver.hh
View file

@ -30,10 +30,10 @@
#ifndef DRIVER_H
#define DRIVER_H
#include "Global.hh"
#include "Consumer.hh"
#include "NodeID.hh"
#include "CacheRequestType.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/system/NodeID.hh"
#include "mem/protocol/CacheRequestType.hh"
class RubySystem;
class SubBlock;
@ -62,15 +62,15 @@ public:
virtual void notifyTrapStart( int procID, const Address & handlerPC, int threadID, int smtThread ) { assert(0); } //called by Sequencer
virtual void notifyTrapComplete( int procID, const Address & newPC, int smtThread ) {assert(0); } // called by Sequencer
virtual int getOpalTransactionLevel(int procID, int thread) const {
cout << "Driver.hh getOpalTransactionLevel() " << endl;
cout << "mem/ruby/common/Driver.hh getOpalTransactionLevel() " << endl;
return 0; } //called by Sequencer
virtual void addThreadDependency(int procID, int requestor_thread, int conflict_thread) const { assert(0);}
virtual uint64 getOpalTime(int procID) const{ return 0; } //called by Sequencer
virtual uint64 getOpalTimestamp(int procID, int thread) const{
cout << "Driver.hh getOpalTimestamp " << endl;
cout << "mem/ruby/common/Driver.hh getOpalTimestamp " << endl;
return 0; } // called by Sequencer
virtual int inTransaction(int procID, int thread ) const{
cout << "Driver.hh inTransaction " << endl;
cout << "mem/ruby/common/Driver.hh inTransaction " << endl;
return false; } //called by Sequencer
virtual void printDebug(){} //called by Sequencer

2
src/mem/ruby/common/Global.cc
View file

@ -27,7 +27,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "Global.hh"
#include "mem/ruby/common/Global.hh"
RubyEventQueue* g_eventQueue_ptr = NULL;
RubySystem* g_system_ptr = NULL;

4
src/mem/ruby/common/Global.hh
View file

@ -78,8 +78,8 @@ typedef uint64 pa_t;
typedef integer_t simtime_t;
// external includes for all classes
#include "std-includes.hh"
#include "Debug.hh"
#include "mem/gems_common/std-includes.hh"
#include "mem/ruby/common/Debug.hh"
// simple type declarations
typedef Time LogicalTime;

2
src/mem/ruby/common/Histogram.cc
View file

@ -32,7 +32,7 @@
*
*/
#include "Histogram.hh"
#include "mem/ruby/common/Histogram.hh"
Histogram::Histogram(int binsize, int bins)
{

4
src/mem/ruby/common/Histogram.hh
View file

@ -37,8 +37,8 @@
#ifndef HISTOGRAM_H
#define HISTOGRAM_H
#include "Global.hh"
#include "Vector.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/gems_common/Vector.hh"
class Histogram {
public:

2
src/mem/ruby/common/Message.cc
View file

@ -31,4 +31,4 @@
* $Id$
*/
#include "Message.hh"
#include "mem/ruby/slicc_interface/Message.hh"

6
src/mem/ruby/common/NetDest.cc
View file

@ -36,9 +36,9 @@
*
*/
#include "NetDest.hh"
#include "RubyConfig.hh"
#include "Protocol.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/config/RubyConfig.hh"
#include "mem/protocol/Protocol.hh"
NetDest::NetDest()
{

14
src/mem/ruby/common/NetDest.hh
View file

@ -44,13 +44,13 @@
#ifndef NETDEST_H
#define NETDEST_H
#include "Global.hh"
#include "Vector.hh"
#include "NodeID.hh"
#include "MachineID.hh"
#include "RubyConfig.hh"
#include "Set.hh"
#include "MachineType.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/gems_common/Vector.hh"
#include "mem/ruby/system/NodeID.hh"
#include "mem/ruby/system/MachineID.hh"
#include "mem/ruby/config/RubyConfig.hh"
#include "mem/ruby/common/Set.hh"
#include "mem/protocol/MachineType.hh"
class Set;

4
src/mem/ruby/common/OptBigSet.cc
View file

@ -39,8 +39,8 @@
// modified (rewritten) 05/20/05 by Dan Gibson to accomimdate FASTER >32 bit
// set sizes
#include "Set.hh"
#include "RubyConfig.hh"
#include "mem/ruby/common/Set.hh"
#include "mem/ruby/config/RubyConfig.hh"
#if __amd64__ || __LP64__
#define __64BITS__

8
src/mem/ruby/common/OptBigSet.hh
View file

@ -45,10 +45,10 @@
#ifndef SET_H
#define SET_H
#include "Global.hh"
#include "Vector.hh"
#include "NodeID.hh"
#include "RubyConfig.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/gems_common/Vector.hh"
#include "mem/ruby/system/NodeID.hh"
#include "mem/ruby/config/RubyConfig.hh"
// gibson 05/20/05
// enum PresenceBit {NotPresent, Present};

4
src/mem/ruby/common/Set.cc
View file

@ -36,8 +36,8 @@
*
*/
#include "Set.hh"
#include "RubyConfig.hh"
#include "mem/ruby/common/Set.hh"
#include "mem/ruby/config/RubyConfig.hh"
#ifdef OPTBIGSET
#include "OptBigSet.cc"

12
src/mem/ruby/common/Set.hh
View file

@ -44,20 +44,20 @@
#define OPTBIGSET
#ifdef OPTBIGSET
#include "OptBigSet.hh"
#include "mem/ruby/common/OptBigSet.hh"
#else
#ifdef BIGSET
#include "BigSet.hh" // code to supports sets larger than 32
#include "mem/ruby/common/BigSet.hh" // code to supports sets larger than 32
#else
#ifndef SET_H
#define SET_H
#include "Global.hh"
#include "Vector.hh"
#include "NodeID.hh"
#include "RubyConfig.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/gems_common/Vector.hh"
#include "mem/ruby/system/NodeID.hh"
#include "mem/ruby/config/RubyConfig.hh"
class Set {
public:

2
src/mem/ruby/common/SubBlock.cc
View file

@ -31,7 +31,7 @@
* $Id$
*/
#include "SubBlock.hh"
#include "mem/ruby/common/SubBlock.hh"
SubBlock::SubBlock(const Address& addr, int size)
{

10
src/mem/ruby/common/SubBlock.hh
View file

@ -35,11 +35,11 @@
#ifndef SubBlock_H
#define SubBlock_H
#include "Global.hh"
#include "Address.hh"
#include "RubyConfig.hh"
#include "DataBlock.hh"
#include "Vector.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/common/Address.hh"
#include "mem/ruby/config/RubyConfig.hh"
#include "mem/ruby/common/DataBlock.hh"
#include "mem/gems_common/Vector.hh"
class SubBlock {
public:

10
src/mem/ruby/config/RubyConfig.cc
View file

@ -36,10 +36,10 @@
*
*/
#include "RubyConfig.hh"
#include "protocol_name.hh"
#include "util.hh"
#include "Protocol.hh"
#include "mem/ruby/config/RubyConfig.hh"
#include "mem/protocol/protocol_name.hh"
#include "mem/gems_common/util.hh"
#include "mem/protocol/Protocol.hh"
#define CHECK_POWER_OF_2(N) { if (!is_power_of_2(N)) { ERROR_MSG(#N " must be a power of 2."); }}
#define CHECK_ZERO(N) { if (N != 0) { ERROR_MSG(#N " must be zero at initialization."); }}
@ -163,7 +163,7 @@ static void print_parameters(ostream& out)
} \
#include "config.hh"
#include "mem/ruby/config/config.hh"
#undef PARAM
#undef PARAM_UINT
#undef PARAM_ULONG

6
src/mem/ruby/config/RubyConfig.hh
View file

@ -40,9 +40,9 @@
#ifndef RUBYCONFIG_H
#define RUBYCONFIG_H
#include "Global.hh"
#include "vardecl.hh"
#include "NodeID.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/gems_common/ioutil/vardecl.hh"
#include "mem/ruby/system/NodeID.hh"
#define MEMORY_LATENCY RubyConfig::memoryResponseLatency()
#define ABORT_DELAY m_chip_ptr->getTransactionManager(m_version)->getAbortDelay()

14
src/mem/ruby/eventqueue/RubyEventQueue.cc
View file

@ -31,13 +31,13 @@
* $Id$
*/
#include "RubyEventQueue.hh"
#include "RubyConfig.hh"
#include "Consumer.hh"
#include "Profiler.hh"
#include "System.hh"
#include "PrioHeap.hh"
#include "RubyEventQueueNode.hh"
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
#include "mem/ruby/config/RubyConfig.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/profiler/Profiler.hh"
#include "mem/ruby/system/System.hh"
#include "mem/gems_common/PrioHeap.hh"
#include "mem/ruby/eventqueue/RubyEventQueueNode.hh"
// Class public method definitions

4
src/mem/ruby/eventqueue/RubyEventQueue.hh
View file

@ -59,8 +59,8 @@
#ifndef RUBYEVENTQUEUE_H
#define RUBYEVENTQUEUE_H
#include "Global.hh"
#include "Vector.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/gems_common/Vector.hh"
class Consumer;
template <class TYPE> class PrioHeap;

2
src/mem/ruby/eventqueue/RubyEventQueueNode.cc
View file

@ -32,7 +32,7 @@
*
*/
#include "RubyEventQueueNode.hh"
#include "mem/ruby/eventqueue/RubyEventQueueNode.hh"
void RubyEventQueueNode::print(ostream& out) const
{

2
src/mem/ruby/eventqueue/RubyEventQueueNode.hh
View file

@ -35,7 +35,7 @@
#ifndef RUBYEVENTQUEUENODE_H
#define RUBYEVENTQUEUENODE_H
#include "Global.hh"
#include "mem/ruby/common/Global.hh"
class Consumer;
class RubyEventQueueNode {

20
src/mem/ruby/init.cc
View file

@ -36,25 +36,25 @@
*
*/
#include "Global.hh"
#include "RubyEventQueue.hh"
#include "System.hh"
#include "Debug.hh"
#include "Profiler.hh"
#include "Tester.hh"
#include "init.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
#include "mem/ruby/system/System.hh"
#include "mem/ruby/common/Debug.hh"
#include "mem/ruby/profiler/Profiler.hh"
#include "mem/ruby/tester/Tester.hh"
#include "mem/ruby/init.hh"
using namespace std;
#include <string>
#include <map>
#include <stdlib.h>
#include "confio.hh"
#include "initvar.hh"
#include "mem/gems_common/ioutil/confio.hh"
#include "mem/gems_common/ioutil/initvar.hh"
// A generated file containing the default parameters in string form
// The defaults are stored in the variable global_default_param
#include "default_param.hh"
#include "mem/protocol/default_param.hh"
static initvar_t *ruby_initvar_obj = NULL;

6
src/mem/ruby/network/Network.hh
View file

@ -46,9 +46,9 @@
#ifndef NETWORK_H
#define NETWORK_H
#include "Global.hh"
#include "NodeID.hh"
#include "MessageSizeType.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/system/NodeID.hh"
#include "mem/protocol/MessageSizeType.hh"
class NetDest;
class MessageBuffer;

2
src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh
View file

@ -7,7 +7,7 @@
#ifndef CREDIT_LINK_D_H
#define CREDIT_LINK_D_H
#include "NetworkLink_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
class CreditLink_d : public NetworkLink_d {
public:

18
src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc
View file

@ -33,15 +33,15 @@
*
* */
#include "GarnetNetwork_d.hh"
#include "MachineType.hh"
#include "NetworkInterface_d.hh"
#include "MessageBuffer.hh"
#include "Router_d.hh"
#include "Topology.hh"
#include "NetworkLink_d.hh"
#include "CreditLink_d.hh"
#include "NetDest.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
#include "mem/protocol/MachineType.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
#include "mem/ruby/network/simple/Topology.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
#include "mem/ruby/common/NetDest.hh"
GarnetNetwork_d::GarnetNetwork_d(int nodes)
{

8
src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh
View file

@ -36,10 +36,10 @@
#ifndef GARNETNETWORK_D_H
#define GARNETNETWORK_D_H
#include "NetworkHeader.hh"
#include "Vector.hh"
#include "NetworkConfig.hh"
#include "Network.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/gems_common/Vector.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
#include "mem/ruby/network/Network.hh"
class NetworkInterface_d;
class MessageBuffer;

4
src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc
View file

@ -33,8 +33,8 @@
*
* */
#include "InputUnit_d.hh"
#include "Router_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
InputUnit_d::InputUnit_d(int id, Router_d *router)
{

14
src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh
View file

@ -36,13 +36,13 @@
#ifndef INPUT_UNIT_D_H
#define INPUT_UNIT_D_H
#include "NetworkHeader.hh"
#include "flitBuffer_d.hh"
#include "Consumer.hh"
#include "Vector.hh"
#include "VirtualChannel_d.hh"
#include "NetworkLink_d.hh"
#include "CreditLink_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/gems_common/Vector.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
class Router_d;

4
src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh
View file

@ -36,8 +36,8 @@
#ifndef NETWORK_HEADER_H
#define NETWORK_HEADER_H
#include "Global.hh"
#include "NodeID.hh"
#include "mem/ruby/common/Global.hh"
#include "mem/ruby/system/NodeID.hh"
using namespace std;
using namespace __gnu_cxx;

8
src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc
View file

@ -33,10 +33,10 @@
*
* */
#include "NetworkInterface_d.hh"
#include "MessageBuffer.hh"
#include "flitBuffer_d.hh"
#include "NetworkMessage.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
#include "mem/ruby/slicc_interface/NetworkMessage.hh"
NetworkInterface_d::NetworkInterface_d(int id, int virtual_networks, GarnetNetwork_d *network_ptr)
{

16
src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh
View file

@ -36,14 +36,14 @@
#ifndef NET_INTERFACE_D_H
#define NET_INTERFACE_D_H
#include "NetworkHeader.hh"
#include "GarnetNetwork_d.hh"
#include "Vector.hh"
#include "Consumer.hh"
#include "Message.hh"
#include "NetworkLink_d.hh"
#include "CreditLink_d.hh"
#include "OutVcState_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
#include "mem/gems_common/Vector.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/slicc_interface/Message.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh"
class NetworkMessage;
class MessageBuffer;

6
src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc
View file

@ -33,9 +33,9 @@
*
* */
#include "NetworkLink_d.hh"
#include "NetworkConfig.hh"
#include "GarnetNetwork_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
NetworkLink_d::NetworkLink_d(int id)
{

10
src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh
View file

@ -36,11 +36,11 @@
#ifndef NETWORK_LINK_D_H
#define NETWORK_LINK_D_H
#include "NetworkHeader.hh"
#include "Consumer.hh"
#include "flitBuffer_d.hh"
#include "PrioHeap.hh"
#include "power_bus.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
#include "mem/gems_common/PrioHeap.hh"
#include "mem/ruby/network/orion/power_bus.hh"
class GarnetNetwork_d;

6
src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc
View file

@ -33,9 +33,9 @@
*
* */
#include "OutVcState_d.hh"
#include "NetworkConfig.hh"
#include "RubyEventQueue.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
#include "mem/ruby/eventqueue/RubyEventQueue.hh"
OutVcState_d::OutVcState_d(int id)
{

2
src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh
View file

@ -36,7 +36,7 @@
#ifndef OUT_VC_STATE_D_H
#define OUT_VC_STATE_D_H
#include "NetworkHeader.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
class OutVcState_d {
public:

6
src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc
View file

@ -33,9 +33,9 @@
*
* */
#include "OutputUnit_d.hh"
#include "Router_d.hh"
#include "NetworkConfig.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
OutputUnit_d::OutputUnit_d(int id, Router_d *router)
{

12
src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh
View file

@ -36,12 +36,12 @@
#ifndef OUTPUT_UNIT_D_H
#define OUTPUT_UNIT_D_H
#include "NetworkHeader.hh"
#include "Consumer.hh"
#include "flitBuffer_d.hh"
#include "OutVcState_d.hh"
#include "NetworkLink_d.hh"
#include "CreditLink_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
class Router_d;

20
src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc
View file

@ -33,16 +33,16 @@
*
* */
#include "Router_d.hh"
#include "GarnetNetwork_d.hh"
#include "NetworkLink_d.hh"
#include "CreditLink_d.hh"
#include "InputUnit_d.hh"
#include "OutputUnit_d.hh"
#include "RoutingUnit_d.hh"
#include "VCallocator_d.hh"
#include "SWallocator_d.hh"
#include "Switch_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh"
Router_d::Router_d(int id, GarnetNetwork_d *network_ptr)
{

10
src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh
View file

@ -35,11 +35,11 @@
#ifndef ROUTER_D_H
#define ROUTER_D_H
#include "NetworkHeader.hh"
#include "Vector.hh"
#include "flit_d.hh"
#include "NetDest.hh"
#include "power_router_init.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/gems_common/Vector.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/network/orion/power_router_init.hh"
class GarnetNetwork_d;
class NetworkLink_d;

8
src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc
View file

@ -33,10 +33,10 @@
*
* */
#include "RoutingUnit_d.hh"
#include "Router_d.hh"
#include "InputUnit_d.hh"
#include "NetworkMessage.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
#include "mem/ruby/slicc_interface/NetworkMessage.hh"
RoutingUnit_d::RoutingUnit_d(Router_d *router)
{

8
src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh
View file

@ -36,10 +36,10 @@
#ifndef ROUTING_UNIT_D_H
#define ROUTING_UNIT_D_H
#include "NetworkHeader.hh"
#include "Consumer.hh"
#include "flit_d.hh"
#include "NetDest.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
#include "mem/ruby/common/NetDest.hh"
class InputUnit_d;
class Router_d;

10
src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc
View file

@ -33,11 +33,11 @@
*
* */
#include "SWallocator_d.hh"
#include "Router_d.hh"
#include "InputUnit_d.hh"
#include "OutputUnit_d.hh"
#include "GarnetNetwork_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
SWallocator_d::SWallocator_d(Router_d *router)
{

4
src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh
View file

@ -36,8 +36,8 @@
#ifndef SW_ALLOCATOR_D_H
#define SW_ALLOCATOR_D_H
#include "NetworkHeader.hh"
#include "Consumer.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/common/Consumer.hh"
class Router_d;
class InputUnit_d;

6
src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc
View file

@ -33,9 +33,9 @@
*
* */
#include "Switch_d.hh"
#include "Router_d.hh"
#include "OutputUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
Switch_d::Switch_d(Router_d *router)
{

6
src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh
View file

@ -36,9 +36,9 @@
#ifndef SWITCH_D_H
#define SWITCH_D_H
#include "NetworkHeader.hh"
#include "Consumer.hh"
#include "flitBuffer_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
class Router_d;
class OutputUnit_d;

12
src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc
View file

@ -33,12 +33,12 @@
*
* */
#include "NetworkConfig.hh"
#include "VCallocator_d.hh"
#include "Router_d.hh"
#include "InputUnit_d.hh"
#include "OutputUnit_d.hh"
#include "GarnetNetwork_d.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
VCallocator_d::VCallocator_d(Router_d *router)
{

4
src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh
View file

@ -36,8 +36,8 @@
#ifndef VC_ALLOCATOR_D_H
#define VC_ALLOCATOR_D_H
#include "NetworkHeader.hh"
#include "Consumer.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/common/Consumer.hh"
class Router_d;
class InputUnit_d;

2
src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc
View file

@ -33,7 +33,7 @@
*
* */
#include "VirtualChannel_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh"
VirtualChannel_d::VirtualChannel_d(int id)
{

4
src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh
View file

@ -36,8 +36,8 @@
#ifndef VIRTUAL_CHANNEL_D_H
#define VIRTUAL_CHANNEL_D_H
#include "NetworkHeader.hh"
#include "flitBuffer_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
class VirtualChannel_d {
public:

2
src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc
View file

@ -33,7 +33,7 @@
*
* */
#include "flitBuffer_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
flitBuffer_d::flitBuffer_d()
{

6
src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh
View file

@ -36,9 +36,9 @@
#ifndef FLIT_BUFFER_D_H
#define FLIT_BUFFER_D_H
#include "NetworkHeader.hh"
#include "PrioHeap.hh"
#include "flit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/gems_common/PrioHeap.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
class flitBuffer_d {
public:

2
src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc
View file

@ -33,7 +33,7 @@
*
* */
#include "flit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
flit_d::flit_d(int id, int vc, int vnet, int size, MsgPtr msg_ptr)
{

4
src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh
View file

@ -37,8 +37,8 @@
#ifndef FLIT_D_H
#define FLIT_D_H
#include "NetworkHeader.hh"
#include "Message.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/slicc_interface/Message.hh"
class flit_d {
public:

6
src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh
View file

@ -35,9 +35,9 @@
#ifndef FLEXIBLE_CONSUMER_H
#define FLEXIBLE_CONSUMER_H
#include "Consumer.hh"
#include "NetworkHeader.hh"
#include "NetDest.hh"
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/common/NetDest.hh"
class FlexibleConsumer : public Consumer {
public:

20
src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc
View file

@ -33,16 +33,16 @@
*
* */
#include "GarnetNetwork.hh"
#include "MachineType.hh"
#include "NetworkInterface.hh"
#include "MessageBuffer.hh"
#include "Router.hh"
#include "Topology.hh"
#include "SimpleNetwork.hh"
#include "GarnetNetwork_d.hh"
#include "NetworkLink.hh"
#include "NetDest.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
#include "mem/protocol/MachineType.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh"
#include "mem/ruby/network/simple/Topology.hh"
#include "mem/ruby/network/simple/SimpleNetwork.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
#include "mem/ruby/common/NetDest.hh"
// calls new to abstract away from the network
Network* Network::createNetwork(int nodes)

8
src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh
View file

@ -36,10 +36,10 @@
#ifndef GARNET_NETWORK_H
#define GARNET_NETWORK_H
#include "NetworkHeader.hh"
#include "Vector.hh"
#include "NetworkConfig.hh"
#include "Network.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/gems_common/Vector.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
#include "mem/ruby/network/Network.hh"
class NetworkInterface;
class MessageBuffer;

2
src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc
View file

@ -33,7 +33,7 @@
*
* */
#include "InVcState.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh"
InVcState::InVcState(int id)
{

2
src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh
View file

@ -37,7 +37,7 @@
#ifndef IN_VC_STATE_H
#define IN_VC_STATE_H
#include "NetworkHeader.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
class InVcState {
public:

6
src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh
View file

@ -38,9 +38,9 @@
#ifndef NETWORKCONFIG_H
#define NETWORKCONFIG_H
#include "NetworkHeader.hh"
#include "util.hh"
#include "RubyConfig.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/gems_common/util.hh"
#include "mem/ruby/config/RubyConfig.hh"
class NetworkConfig {
public:

8
src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc
View file

@ -33,10 +33,10 @@
*
* */
#include "NetworkInterface.hh"
#include "MessageBuffer.hh"
#include "flitBuffer.hh"
#include "NetworkMessage.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
#include "mem/ruby/slicc_interface/NetworkMessage.hh"
NetworkInterface::NetworkInterface(int id, int virtual_networks, GarnetNetwork *network_ptr)
{

14
src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh
View file

@ -35,13 +35,13 @@
#ifndef NET_INTERFACE_H
#define NET_INTERFACE_H
#include "NetworkHeader.hh"
#include "GarnetNetwork.hh"
#include "Vector.hh"
#include "FlexibleConsumer.hh"
#include "Message.hh"
#include "NetworkLink.hh"
#include "OutVcState.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
#include "mem/gems_common/Vector.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh"
#include "mem/ruby/slicc_interface/Message.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
class NetworkMessage;
class MessageBuffer;

6
src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc
View file

@ -33,9 +33,9 @@
*
* */
#include "NetworkLink.hh"
#include "NetworkConfig.hh"
#include "GarnetNetwork.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
NetworkLink::NetworkLink(int id, int latency, GarnetNetwork *net_ptr)
{

10
src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh
View file

@ -35,11 +35,11 @@
#ifndef NETWORK_LINK_H
#define NETWORK_LINK_H
#include "NetworkHeader.hh"
#include "FlexibleConsumer.hh"
#include "flitBuffer.hh"
#include "PrioHeap.hh"
#include "NetDest.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
#include "mem/gems_common/PrioHeap.hh"
#include "mem/ruby/common/NetDest.hh"
class GarnetNetwork;

2
src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc
View file

@ -33,7 +33,7 @@
*
* */
#include "OutVcState.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
OutVcState::OutVcState(int id)
{

2
src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh
View file

@ -36,7 +36,7 @@
#ifndef OUT_VC_STATE_H
#define OUT_VC_STATE_H
#include "NetworkHeader.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
class OutVcState {
public:

10
src/mem/ruby/network/garnet-flexible-pipeline/Router.cc
View file

@ -33,11 +33,11 @@
*
* */
#include "Router.hh"
#include "NetworkMessage.hh"
#include "InVcState.hh"
#include "OutVcState.hh"
#include "VCarbiter.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh"
#include "mem/ruby/slicc_interface/NetworkMessage.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh"
Router::Router(int id, GarnetNetwork *network_ptr)
{

18
src/mem/ruby/network/garnet-flexible-pipeline/Router.hh
View file

@ -36,15 +36,15 @@
#ifndef ROUTER_H
#define ROUTER_H
#include "NetworkHeader.hh"
#include "GarnetNetwork.hh"
#include "FlexibleConsumer.hh"
#include "PrioHeap.hh"
#include "NetworkLink.hh"
#include "NetDest.hh"
#include "flitBuffer.hh"
#include "InVcState.hh"
#include "OutVcState.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh"
#include "mem/gems_common/PrioHeap.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
#include "mem/ruby/common/NetDest.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
class VCarbiter;

4
src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc
View file

@ -33,8 +33,8 @@
*
* */
#include "VCarbiter.hh"
#include "Router.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh"
VCarbiter::VCarbiter(Router *router)
{

4
src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh
View file

@ -36,8 +36,8 @@
#ifndef VC_ARBITER_H
#define VC_ARBITER_H
#include "NetworkHeader.hh"
#include "Consumer.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/common/Consumer.hh"
class Router;

2
src/mem/ruby/network/garnet-flexible-pipeline/flit.cc
View file

@ -33,7 +33,7 @@
*
* */
#include "flit.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/flit.hh"
flit::flit(int id, int vc, int vnet, int size, MsgPtr msg_ptr)
{

4
src/mem/ruby/network/garnet-flexible-pipeline/flit.hh
View file

@ -33,8 +33,8 @@
*
* */
#include "NetworkHeader.hh"
#include "Message.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/ruby/slicc_interface/Message.hh"
#ifndef FLIT_H
#define FLIT_H

2
src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc
View file

@ -33,7 +33,7 @@
*
* */
#include "flitBuffer.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
flitBuffer::flitBuffer()
{

6
src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh
View file

@ -36,9 +36,9 @@
#ifndef FLIT_BUFFER_H
#define FLIT_BUFFER_H
#include "NetworkHeader.hh"
#include "PrioHeap.hh"
#include "flit.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
#include "mem/gems_common/PrioHeap.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/flit.hh"
class flitBuffer {
public:

22
src/mem/ruby/network/orion/NetworkPower.cc
View file

@ -29,17 +29,17 @@
#include <stdio.h>
#include <math.h>
#include "power_router_init.hh"
#include "power_array.hh"
#include "power_crossbar.hh"
#include "power_arbiter.hh"
#include "power_bus.hh"
#include "NetworkPower.hh"
#include "Router_d.hh"
#include "NetworkLink_d.hh"
#include "GarnetNetwork_d.hh"
#include "SIM_port.hh"
#include "parm_technology.hh"
#include "mem/ruby/network/orion/power_router_init.hh"
#include "mem/ruby/network/orion/power_array.hh"
#include "mem/ruby/network/orion/power_crossbar.hh"
#include "mem/ruby/network/orion/power_arbiter.hh"
#include "mem/ruby/network/orion/power_bus.hh"
#include "mem/ruby/network/orion/NetworkPower.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
#include "mem/ruby/network/orion/SIM_port.hh"
#include "mem/ruby/network/orion/parm_technology.hh"
/* --------- Static energy calculation functions ------------ */

Some files were not shown because too many files have changed in this diff Show more