Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/7881
Change subject: mem: Standardize mem folder header guards
......................................................................
mem: Standardize mem folder header guards
Standardize all header guards in the mem directory according to the most
frequent patterns. In general they have the form:
mem: __FOLDER_TREE_FILE_NAME_HH__
ruby: __FOLDER_TREE_FILENAME_HH__
Change-Id: I983853e292deb302becf151bf0e970057dc24774
---
M src/mem/abstract_mem.hh
M src/mem/cache/tags/base.hh
M src/mem/cache/tags/base_set_assoc.hh
M src/mem/external_master.hh
M src/mem/external_slave.hh
M src/mem/fs_translating_port_proxy.hh
M src/mem/hmc_controller.hh
M src/mem/ruby/common/BoolVec.hh
M src/mem/ruby/common/IntVec.hh
M src/mem/ruby/common/MachineID.hh
M src/mem/ruby/common/TypeDefines.hh
M src/mem/ruby/filters/LSB_CountingBloomFilter.hh
M src/mem/ruby/network/BasicLink.hh
M src/mem/ruby/network/BasicRouter.hh
M src/mem/ruby/network/MessageBuffer.hh
M src/mem/ruby/network/fault_model/FaultModel.hh
M src/mem/ruby/network/garnet2.0/CommonTypes.hh
M src/mem/ruby/network/garnet2.0/Credit.hh
M src/mem/ruby/network/garnet2.0/CreditLink.hh
M src/mem/ruby/network/garnet2.0/CrossbarSwitch.hh
M src/mem/ruby/network/garnet2.0/GarnetLink.hh
M src/mem/ruby/network/garnet2.0/GarnetNetwork.hh
M src/mem/ruby/network/garnet2.0/InputUnit.hh
M src/mem/ruby/network/garnet2.0/NetworkInterface.hh
M src/mem/ruby/network/garnet2.0/NetworkLink.hh
M src/mem/ruby/network/garnet2.0/OutVcState.hh
M src/mem/ruby/network/garnet2.0/OutputUnit.hh
M src/mem/ruby/network/garnet2.0/Router.hh
M src/mem/ruby/network/garnet2.0/RoutingUnit.hh
M src/mem/ruby/network/garnet2.0/SwitchAllocator.hh
M src/mem/ruby/network/garnet2.0/VirtualChannel.hh
M src/mem/ruby/network/garnet2.0/flit.hh
M src/mem/ruby/network/garnet2.0/flitBuffer.hh
M src/mem/ruby/network/simple/SimpleLink.hh
M src/mem/ruby/slicc_interface/RubyRequest.hh
M src/mem/ruby/slicc_interface/RubySlicc_Util.hh
M src/mem/ruby/system/CacheRecorder.hh
M src/mem/ruby/system/RubySystem.hh
M src/mem/ruby/system/VIPERCoalescer.hh
M src/mem/simple_mem.hh
40 files changed, 124 insertions(+), 115 deletions(-)
diff --git a/src/mem/abstract_mem.hh b/src/mem/abstract_mem.hh
index 31d34f0..b57f73b 100644
--- a/src/mem/abstract_mem.hh
+++ b/src/mem/abstract_mem.hh
@@ -46,8 +46,8 @@
* AbstractMemory declaration
*/
-#ifndef __ABSTRACT_MEMORY_HH__
-#define __ABSTRACT_MEMORY_HH__
+#ifndef __MEM_ABSTRACT_MEMORY_HH__
+#define __MEM_ABSTRACT_MEMORY_HH__
#include "mem/mem_object.hh"
#include "params/AbstractMemory.hh"
@@ -319,4 +319,4 @@
};
-#endif //__ABSTRACT_MEMORY_HH__
+#endif //__MEM_ABSTRACT_MEMORY_HH__
diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh
index 4caf6de..5c9f46a 100644
--- a/src/mem/cache/tags/base.hh
+++ b/src/mem/cache/tags/base.hh
@@ -46,8 +46,8 @@
* Declaration of a common base class for cache tagstore objects.
*/
-#ifndef __BASE_TAGS_HH__
-#define __BASE_TAGS_HH__
+#ifndef __MEM_CACHE_TAGS_BASE_HH__
+#define __MEM_CACHE_TAGS_BASE_HH__
#include <string>
@@ -268,4 +268,4 @@
virtual void process() { tags->computeStats(); };
};
-#endif //__BASE_TAGS_HH__
+#endif //__MEM_CACHE_TAGS_BASE_HH__
diff --git a/src/mem/cache/tags/base_set_assoc.hh
b/src/mem/cache/tags/base_set_assoc.hh
index 4049b84..ef4c68b 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -45,8 +45,8 @@
* Declaration of a base set associative tag store.
*/
-#ifndef __MEM_CACHE_TAGS_BASESETASSOC_HH__
-#define __MEM_CACHE_TAGS_BASESETASSOC_HH__
+#ifndef __MEM_CACHE_TAGS_BASE_SET_ASSOC_HH__
+#define __MEM_CACHE_TAGS_BASE_SET_ASSOC_HH__
#include <cassert>
#include <cstring>
@@ -365,4 +365,4 @@
}
};
-#endif // __MEM_CACHE_TAGS_BASESETASSOC_HH__
+#endif //__MEM_CACHE_TAGS_BASE_SET_ASSOC_HH__
diff --git a/src/mem/external_master.hh b/src/mem/external_master.hh
index 7303de0..d27cb4d 100644
--- a/src/mem/external_master.hh
+++ b/src/mem/external_master.hh
@@ -57,8 +57,8 @@
* The external port must provide a gem5 MasterPort interface.
*/
-#ifndef __MEM_EXTERNAL_MASTER__
-#define __MEM_EXTERNAL_MASTER__
+#ifndef __MEM_EXTERNAL_MASTER_HH__
+#define __MEM_EXTERNAL_MASTER_HH__
#include "mem/mem_object.hh"
#include "params/ExternalMaster.hh"
@@ -135,4 +135,4 @@
};
-#endif // __MEM_EXTERNAL_MASTER__
+#endif //__MEM_EXTERNAL_MASTER_HH__
diff --git a/src/mem/external_slave.hh b/src/mem/external_slave.hh
index d178223..2bb0be8 100644
--- a/src/mem/external_slave.hh
+++ b/src/mem/external_slave.hh
@@ -57,8 +57,8 @@
* object).
*/
-#ifndef __MEM_EXTERNAL_SLAVE__
-#define __MEM_EXTERNAL_SLAVE__
+#ifndef __MEM_EXTERNAL_SLAVE_HH__
+#define __MEM_EXTERNAL_SLAVE_HH__
#include "mem/mem_object.hh"
#include "params/ExternalSlave.hh"
@@ -139,4 +139,4 @@
};
-#endif // __MEM_EXTERNAL_SLAVE__
+#endif //__MEM_EXTERNAL_SLAVE_HH__
diff --git a/src/mem/fs_translating_port_proxy.hh
b/src/mem/fs_translating_port_proxy.hh
index 8120f96..e7b74d0 100644
--- a/src/mem/fs_translating_port_proxy.hh
+++ b/src/mem/fs_translating_port_proxy.hh
@@ -56,8 +56,8 @@
* the system.
*/
-#ifndef __MEM_FS_PORT_PROXY_HH__
-#define __MEM_FS_PORT_PROXY_HH__
+#ifndef __MEM_FS_TRANSLATING_PORT_PROXY_HH__
+#define __MEM_FS_TRANSLATING_PORT_PROXY_HH__
#include "mem/port_proxy.hh"
@@ -102,4 +102,4 @@
void CopyStringOut(ThreadContext *tc, char *dst, Addr vaddr, size_t
maxlen);
void CopyStringIn(ThreadContext *tc, const char *src, Addr vaddr);
-#endif //__MEM_FS_PORT_PROXY_HH__
+#endif //__MEM_FS_TRANSLATING_PORT_PROXY_HH__
diff --git a/src/mem/hmc_controller.hh b/src/mem/hmc_controller.hh
index cec9425..fd6cb0b 100644
--- a/src/mem/hmc_controller.hh
+++ b/src/mem/hmc_controller.hh
@@ -46,8 +46,8 @@
* HMCController declaration
*/
-#ifndef __HMC_CONTROLLER__
-#define __HMC_CONTROLLER__
+#ifndef __MEM_HMC_CONTROLLER_HH__
+#define __MEM_HMC_CONTROLLER_HH__
#include "mem/noncoherent_xbar.hh"
#include "mem/port.hh"
@@ -100,4 +100,4 @@
int rotate_counter();
};
-#endif //__HMC_CONTROLLER__
+#endif //__MEM_HMC_CONTROLLER_HH__
diff --git a/src/mem/ruby/common/BoolVec.hh b/src/mem/ruby/common/BoolVec.hh
index 0323ecc..95df602 100644
--- a/src/mem/ruby/common/BoolVec.hh
+++ b/src/mem/ruby/common/BoolVec.hh
@@ -37,9 +37,14 @@
* Authors: Brad Beckmann
*/
+#ifndef __MEM_RUBY_COMMON_BOOLVEC_HH__
+#define __MEM_RUBY_COMMON_BOOLVEC_HH__
+
#include <ostream>
#include <vector>
typedef std::vector<bool> BoolVec;
std::ostream& operator<<(std::ostream& os, const std::vector<bool>&
myvector);
+
+#endif //__MEM_RUBY_COMMON_BOOLVEC_HH__
diff --git a/src/mem/ruby/common/IntVec.hh b/src/mem/ruby/common/IntVec.hh
index 13e213a..62dae23 100644
--- a/src/mem/ruby/common/IntVec.hh
+++ b/src/mem/ruby/common/IntVec.hh
@@ -33,9 +33,14 @@
* Authors: Brad Beckmann
*/
+#ifndef __MEM_RUBY_COMMON_INTVEC_HH__
+#define __MEM_RUBY_COMMON_INTVEC_HH__
+
#include <ostream>
#include <vector>
typedef std::vector<int> IntVec;
std::ostream& operator<<(std::ostream& os, const std::vector<int>&
myvector);
+
+#endif //__MEM_RUBY_COMMON_INTVEC_HH__
diff --git a/src/mem/ruby/common/MachineID.hh
b/src/mem/ruby/common/MachineID.hh
index a28b0af..8fe8f80 100644
--- a/src/mem/ruby/common/MachineID.hh
+++ b/src/mem/ruby/common/MachineID.hh
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SYSTEM_MACHINEID_HH__
-#define __MEM_RUBY_SYSTEM_MACHINEID_HH__
+#ifndef __MEM_RUBY_COMMON_MACHINEID_HH__
+#define __MEM_RUBY_COMMON_MACHINEID_HH__
#include <iostream>
#include <string>
@@ -84,4 +84,4 @@
return out;
}
-#endif // __MEM_RUBY_SYSTEM_MACHINEID_HH__
+#endif // __MEM_RUBY_COMMON_MACHINEID_HH__
diff --git a/src/mem/ruby/common/TypeDefines.hh
b/src/mem/ruby/common/TypeDefines.hh
index f29efe8..90be1c6 100644
--- a/src/mem/ruby/common/TypeDefines.hh
+++ b/src/mem/ruby/common/TypeDefines.hh
@@ -27,11 +27,11 @@
*/
-#ifndef TYPEDEFINES_H
-#define TYPEDEFINES_H
+#ifndef __MEM_RUBY_COMMON_TYPEDEFINES_HH__
+#define __MEM_RUBY_COMMON_TYPEDEFINES_HH__
typedef unsigned int LinkID;
typedef unsigned int NodeID;
typedef unsigned int SwitchID;
-#endif
+#endif //__MEM_RUBY_COMMON_TYPEDEFINES_HH__
diff --git a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
index e0e263a..05749be 100644
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.hh
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_FILTERS_LSBCOUNTINGBLOOMFILTER_HH__
-#define __MEM_RUBY_FILTERS_LSBCOUNTINGBLOOMFILTER_HH__
+#ifndef __MEM_RUBY_FILTERS_LSB_COUNTINGBLOOMFILTER_HH__
+#define __MEM_RUBY_FILTERS_LSB_COUNTINGBLOOMFILTER_HH__
#include <iostream>
#include <vector>
@@ -68,4 +68,4 @@
int m_count;
};
-#endif // __MEM_RUBY_FILTERS_LSBCOUNTINGBLOOMFILTER_HH__
+#endif //__MEM_RUBY_FILTERS_LSB_COUNTINGBLOOMFILTER_HH__
diff --git a/src/mem/ruby/network/BasicLink.hh
b/src/mem/ruby/network/BasicLink.hh
index 188f629..39c2096 100644
--- a/src/mem/ruby/network/BasicLink.hh
+++ b/src/mem/ruby/network/BasicLink.hh
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_NETWORK_BASIC_LINK_HH__
-#define __MEM_RUBY_NETWORK_BASIC_LINK_HH__
+#ifndef __MEM_RUBY_NETWORK_BASICLINK_HH__
+#define __MEM_RUBY_NETWORK_BASICLINK_HH__
#include <iostream>
#include <string>
@@ -85,4 +85,4 @@
friend class Topology;
};
-#endif // __MEM_RUBY_NETWORK_BASIC_LINK_HH__
+#endif //__MEM_RUBY_NETWORK_BASICLINK_HH__
diff --git a/src/mem/ruby/network/BasicRouter.hh
b/src/mem/ruby/network/BasicRouter.hh
index 2c89056..a74dadb 100644
--- a/src/mem/ruby/network/BasicRouter.hh
+++ b/src/mem/ruby/network/BasicRouter.hh
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_NETWORK_BASIC_ROUTER_HH__
-#define __MEM_RUBY_NETWORK_BASIC_ROUTER_HH__
+#ifndef __MEM_RUBY_NETWORK_BASICROUTER_HH__
+#define __MEM_RUBY_NETWORK_BASICROUTER_HH__
#include <iostream>
#include <string>
@@ -62,4 +62,4 @@
return out;
}
-#endif // __MEM_RUBY_NETWORK_BASIC_ROUTER_HH__
+#endif //__MEM_RUBY_NETWORK_BASICROUTER_HH__
diff --git a/src/mem/ruby/network/MessageBuffer.hh
b/src/mem/ruby/network/MessageBuffer.hh
index 6694830..69a0fb3 100644
--- a/src/mem/ruby/network/MessageBuffer.hh
+++ b/src/mem/ruby/network/MessageBuffer.hh
@@ -31,8 +31,8 @@
* that they can be dequeued after a given delta time has expired.
*/
-#ifndef __MEM_RUBY_BUFFERS_MESSAGEBUFFER_HH__
-#define __MEM_RUBY_BUFFERS_MESSAGEBUFFER_HH__
+#ifndef __MEM_RUBY_NETWORK_MESSAGEBUFFER_HH__
+#define __MEM_RUBY_NETWORK_MESSAGEBUFFER_HH__
#include <algorithm>
#include <cassert>
@@ -212,4 +212,4 @@
return out;
}
-#endif // __MEM_RUBY_BUFFERS_MESSAGEBUFFER_HH__
+#endif //__MEM_RUBY_NETWORK_MESSAGEBUFFER_HH__
diff --git a/src/mem/ruby/network/fault_model/FaultModel.hh
b/src/mem/ruby/network/fault_model/FaultModel.hh
index f2f355b..6c68c7b 100644
--- a/src/mem/ruby/network/fault_model/FaultModel.hh
+++ b/src/mem/ruby/network/fault_model/FaultModel.hh
@@ -37,8 +37,8 @@
* Proceedings of the 48th Design Automation Conference (DAC'11)
*/
-#ifndef __MEM_RUBY_NETWORK_FAULT_MODEL_HH__
-#define __MEM_RUBY_NETWORK_FAULT_MODEL_HH__
+#ifndef __MEM_RUBY_NETWORK_FAULT_MODEL_FAULTMODEL_HH__
+#define __MEM_RUBY_NETWORK_FAULT_MODEL_FAULTMODEL_HH__
// tool limitations and fixed inputs
#define MAX_VCs 40
@@ -138,4 +138,4 @@
std::vector <int> temperature_weights;
};
-#endif // __MEM_RUBY_NETWORK_FAULT_MODEL_HH__
+#endif //__MEM_RUBY_NETWORK_FAULT_MODEL_FAULTMODEL_HH__
diff --git a/src/mem/ruby/network/garnet2.0/CommonTypes.hh
b/src/mem/ruby/network/garnet2.0/CommonTypes.hh
index 63fc464..3a8c84a 100644
--- a/src/mem/ruby/network/garnet2.0/CommonTypes.hh
+++ b/src/mem/ruby/network/garnet2.0/CommonTypes.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_COMMONTYPES_HH__
-#define __MEM_RUBY_NETWORK_GARNET_COMMONTYPES_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_COMMONTYPES_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_COMMONTYPES_HH__
#include "mem/ruby/common/NetDest.hh"
@@ -62,4 +62,4 @@
#define INFINITE_ 10000
-#endif // __MEM_RUBY_NETWORK_GARNET_COMMONTYPES_HH__
+#endif //__MEM_RUBY_NETWORK_GARNET2_0_COMMONTYPES_HH__
diff --git a/src/mem/ruby/network/garnet2.0/Credit.hh
b/src/mem/ruby/network/garnet2.0/Credit.hh
index c2984e9..7771484 100644
--- a/src/mem/ruby/network/garnet2.0/Credit.hh
+++ b/src/mem/ruby/network/garnet2.0/Credit.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_CREDIT_HH__
-#define __MEM_RUBY_NETWORK_GARNET_CREDIT_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_CREDIT_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_CREDIT_HH__
#include <cassert>
#include <iostream>
@@ -57,4 +57,4 @@
bool m_is_free_signal;
};
-#endif // __MEM_RUBY_NETWORK_GARNET_CREDIT_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_CREDIT_HH__
diff --git a/src/mem/ruby/network/garnet2.0/CreditLink.hh
b/src/mem/ruby/network/garnet2.0/CreditLink.hh
index 207fb86..8d6da67 100644
--- a/src/mem/ruby/network/garnet2.0/CreditLink.hh
+++ b/src/mem/ruby/network/garnet2.0/CreditLink.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_CREDIT_LINK_HH__
-#define __MEM_RUBY_NETWORK_GARNET_CREDIT_LINK_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_CREDITLINK_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_CREDITLINK_HH__
#include "mem/ruby/network/garnet2.0/NetworkLink.hh"
#include "params/CreditLink.hh"
@@ -44,4 +44,4 @@
CreditLink(const Params *p) : NetworkLink(p) {}
};
-#endif // __MEM_RUBY_NETWORK_GARNET_CREDIT_LINK_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_CREDITLINK_HH__
diff --git a/src/mem/ruby/network/garnet2.0/CrossbarSwitch.hh
b/src/mem/ruby/network/garnet2.0/CrossbarSwitch.hh
index bca3a92..9d4fee5 100644
--- a/src/mem/ruby/network/garnet2.0/CrossbarSwitch.hh
+++ b/src/mem/ruby/network/garnet2.0/CrossbarSwitch.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_CROSSBAR_SWITCH_HH__
-#define __MEM_RUBY_NETWORK_GARNET_CROSSBAR_SWITCH_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_CROSSBARSWITCH_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_CROSSBARSWITCH_HH__
#include <iostream>
#include <vector>
@@ -70,4 +70,4 @@
std::vector<OutputUnit *> m_output_unit;
};
-#endif // __MEM_RUBY_NETWORK_GARNET_CROSSBAR_SWITCH_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_CROSSBARSWITCH_HH__
diff --git a/src/mem/ruby/network/garnet2.0/GarnetLink.hh
b/src/mem/ruby/network/garnet2.0/GarnetLink.hh
index 7311e93..55164b6 100644
--- a/src/mem/ruby/network/garnet2.0/GarnetLink.hh
+++ b/src/mem/ruby/network/garnet2.0/GarnetLink.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_LINK_HH__
-#define __MEM_RUBY_NETWORK_GARNET_LINK_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_GARNETLINK_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_GARNETLINK_HH__
#include <iostream>
#include <string>
@@ -94,4 +94,4 @@
return out;
}
-#endif // __MEM_RUBY_NETWORK_GARNET_LINK_HH__
+#endif //__MEM_RUBY_NETWORK_GARNET2_0_GARNETLINK_HH__
diff --git a/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh
b/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh
index 3ced887..d8cbb08 100644
--- a/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_NETWORK_HH__
-#define __MEM_RUBY_NETWORK_GARNET_NETWORK_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_GARNETNETWORK_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_GARNETNETWORK_HH__
#include <iostream>
#include <vector>
@@ -205,4 +205,4 @@
return out;
}
-#endif // __MEM_RUBY_NETWORK_GARNET_NETWORK_HH__
+#endif //__MEM_RUBY_NETWORK_GARNET2_0_GARNETNETWORK_HH__
diff --git a/src/mem/ruby/network/garnet2.0/InputUnit.hh
b/src/mem/ruby/network/garnet2.0/InputUnit.hh
index 26803ed..c2cbd58 100644
--- a/src/mem/ruby/network/garnet2.0/InputUnit.hh
+++ b/src/mem/ruby/network/garnet2.0/InputUnit.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_INPUT_UNIT_HH__
-#define __MEM_RUBY_NETWORK_GARNET_INPUT_UNIT_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_INPUTUNIT_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_INPUTUNIT_HH__
#include <iostream>
#include <vector>
@@ -167,4 +167,4 @@
std::vector<double> m_num_buffer_reads;
};
-#endif // __MEM_RUBY_NETWORK_GARNET_INPUT_UNIT_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_INPUTUNIT_HH__
diff --git a/src/mem/ruby/network/garnet2.0/NetworkInterface.hh
b/src/mem/ruby/network/garnet2.0/NetworkInterface.hh
index 2dfb2d2..3b77371 100644
--- a/src/mem/ruby/network/garnet2.0/NetworkInterface.hh
+++ b/src/mem/ruby/network/garnet2.0/NetworkInterface.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_NETWORK_INTERFACE_HH__
-#define __MEM_RUBY_NETWORK_GARNET_NETWORK_INTERFACE_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_NETWORKINTERFACE_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_NETWORKINTERFACE_HH__
#include <iostream>
#include <vector>
@@ -118,4 +118,4 @@
void incrementStats(flit *t_flit);
};
-#endif // __MEM_RUBY_NETWORK_GARNET_NETWORK_INTERFACE_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_NETWORKINTERFACE_HH__
diff --git a/src/mem/ruby/network/garnet2.0/NetworkLink.hh
b/src/mem/ruby/network/garnet2.0/NetworkLink.hh
index 10399ec..98fb7b9 100644
--- a/src/mem/ruby/network/garnet2.0/NetworkLink.hh
+++ b/src/mem/ruby/network/garnet2.0/NetworkLink.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_NETWORK_LINK_HH__
-#define __MEM_RUBY_NETWORK_GARNET_NETWORK_LINK_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_NETWORKLINK_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_NETWORKLINK_HH__
#include <iostream>
#include <vector>
@@ -86,4 +86,4 @@
std::vector<unsigned int> m_vc_load;
};
-#endif // __MEM_RUBY_NETWORK_GARNET_NETWORK_LINK_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_NETWORKLINK_HH__
diff --git a/src/mem/ruby/network/garnet2.0/OutVcState.hh
b/src/mem/ruby/network/garnet2.0/OutVcState.hh
index b9c008d..673b209 100644
--- a/src/mem/ruby/network/garnet2.0/OutVcState.hh
+++ b/src/mem/ruby/network/garnet2.0/OutVcState.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_OUTVC_STATE_HH__
-#define __MEM_RUBY_NETWORK_GARNET_OUTVC_STATE_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_OUTVCSTATE_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_OUTVCSTATE_HH__
#include "mem/ruby/network/garnet2.0/CommonTypes.hh"
#include "mem/ruby/network/garnet2.0/GarnetNetwork.hh"
@@ -67,4 +67,4 @@
int m_max_credit_count;
};
-#endif // __MEM_RUBY_NETWORK_GARNET_OUTVC_STATE_HH__
+#endif //__MEM_RUBY_NETWORK_GARNET2_0_OUTVCSTATE_HH__
diff --git a/src/mem/ruby/network/garnet2.0/OutputUnit.hh
b/src/mem/ruby/network/garnet2.0/OutputUnit.hh
index 7b6d549..fba8343 100644
--- a/src/mem/ruby/network/garnet2.0/OutputUnit.hh
+++ b/src/mem/ruby/network/garnet2.0/OutputUnit.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_OUTPUT_UNIT_HH__
-#define __MEM_RUBY_NETWORK_GARNET_OUTPUT_UNIT_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_OUTPUTUNIT_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_OUTPUTUNIT_HH__
#include <iostream>
#include <vector>
@@ -110,4 +110,4 @@
};
-#endif // __MEM_RUBY_NETWORK_GARNET_OUTPUT_UNIT_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_OUTPUTUNIT_HH__
diff --git a/src/mem/ruby/network/garnet2.0/Router.hh
b/src/mem/ruby/network/garnet2.0/Router.hh
index a9ce5f8..fa118b4 100644
--- a/src/mem/ruby/network/garnet2.0/Router.hh
+++ b/src/mem/ruby/network/garnet2.0/Router.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_ROUTER_HH__
-#define __MEM_RUBY_NETWORK_GARNET_ROUTER_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_ROUTER_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_ROUTER_HH__
#include <iostream>
#include <vector>
@@ -137,4 +137,4 @@
Stats::Scalar m_crossbar_activity;
};
-#endif // __MEM_RUBY_NETWORK_GARNET_ROUTER_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_ROUTER_HH__
diff --git a/src/mem/ruby/network/garnet2.0/RoutingUnit.hh
b/src/mem/ruby/network/garnet2.0/RoutingUnit.hh
index 46b0969..0623e54 100644
--- a/src/mem/ruby/network/garnet2.0/RoutingUnit.hh
+++ b/src/mem/ruby/network/garnet2.0/RoutingUnit.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_ROUTING_UNIT_HH__
-#define __MEM_RUBY_NETWORK_GARNET_ROUTING_UNIT_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_ROUTINGUNIT_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_ROUTINGUNIT_HH__
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/common/NetDest.hh"
@@ -86,4 +86,4 @@
std::map<PortDirection, int> m_outports_dirn2idx;
};
-#endif // __MEM_RUBY_NETWORK_GARNET_ROUTING_UNIT_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_ROUTINGUNIT_HH__
diff --git a/src/mem/ruby/network/garnet2.0/SwitchAllocator.hh
b/src/mem/ruby/network/garnet2.0/SwitchAllocator.hh
index 7515b73..2b16afc 100644
--- a/src/mem/ruby/network/garnet2.0/SwitchAllocator.hh
+++ b/src/mem/ruby/network/garnet2.0/SwitchAllocator.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_SWITCH_ALLOCATOR_HH__
-#define __MEM_RUBY_NETWORK_GARNET_SWITCH_ALLOCATOR_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_SWITCHALLOCATOR_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_SWITCHALLOCATOR_HH__
#include <iostream>
#include <vector>
@@ -87,4 +87,4 @@
std::vector<OutputUnit *> m_output_unit;
};
-#endif // __MEM_RUBY_NETWORK_GARNET_SWITCH_ALLOCATOR_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_SWITCHALLOCATOR_HH__
diff --git a/src/mem/ruby/network/garnet2.0/VirtualChannel.hh
b/src/mem/ruby/network/garnet2.0/VirtualChannel.hh
index d5f7687..1c92718 100644
--- a/src/mem/ruby/network/garnet2.0/VirtualChannel.hh
+++ b/src/mem/ruby/network/garnet2.0/VirtualChannel.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_VIRTUAL_CHANNEL_HH__
-#define __MEM_RUBY_NETWORK_GARNET_VIRTUAL_CHANNEL_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_VIRTUALCHANNEL_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_VIRTUALCHANNEL_HH__
#include <utility>
@@ -98,4 +98,4 @@
int m_output_vc;
};
-#endif // __MEM_RUBY_NETWORK_GARNET_VIRTUAL_CHANNEL_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_VIRTUALCHANNEL_HH__
diff --git a/src/mem/ruby/network/garnet2.0/flit.hh
b/src/mem/ruby/network/garnet2.0/flit.hh
index 419450b..da582ef 100644
--- a/src/mem/ruby/network/garnet2.0/flit.hh
+++ b/src/mem/ruby/network/garnet2.0/flit.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_FLIT_HH__
-#define __MEM_RUBY_NETWORK_GARNET_FLIT_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_FLIT_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_FLIT_HH__
#include <cassert>
#include <iostream>
@@ -121,4 +121,4 @@
return out;
}
-#endif // __MEM_RUBY_NETWORK_GARNET_FLIT_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_FLIT_HH__
diff --git a/src/mem/ruby/network/garnet2.0/flitBuffer.hh
b/src/mem/ruby/network/garnet2.0/flitBuffer.hh
index d98fe8b..1c070ea 100644
--- a/src/mem/ruby/network/garnet2.0/flitBuffer.hh
+++ b/src/mem/ruby/network/garnet2.0/flitBuffer.hh
@@ -31,8 +31,8 @@
*/
-#ifndef __MEM_RUBY_NETWORK_GARNET_FLIT_BUFFER_HH__
-#define __MEM_RUBY_NETWORK_GARNET_FLIT_BUFFER_HH__
+#ifndef __MEM_RUBY_NETWORK_GARNET2_0_FLITBUFFER_HH__
+#define __MEM_RUBY_NETWORK_GARNET2_0_FLITBUFFER_HH__
#include <algorithm>
#include <iostream>
@@ -91,4 +91,4 @@
return out;
}
-#endif // __MEM_RUBY_NETWORK_GARNET_FLIT_BUFFER_HH__
+#endif // __MEM_RUBY_NETWORK_GARNET2_0_FLITBUFFER_HH__
diff --git a/src/mem/ruby/network/simple/SimpleLink.hh
b/src/mem/ruby/network/simple/SimpleLink.hh
index ed98ec7..3ca2356 100644
--- a/src/mem/ruby/network/simple/SimpleLink.hh
+++ b/src/mem/ruby/network/simple/SimpleLink.hh
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_NETWORK_SIMPLE_LINK_HH__
-#define __MEM_RUBY_NETWORK_SIMPLE_LINK_HH__
+#ifndef __MEM_RUBY_NETWORK_SIMPLE_SIMPLELINK_HH__
+#define __MEM_RUBY_NETWORK_SIMPLE_SIMPLELINK_HH__
#include <iostream>
#include <string>
@@ -79,4 +79,4 @@
return out;
}
-#endif // __MEM_RUBY_NETWORK_SIMPLE_LINK_HH__
+#endif //__MEM_RUBY_NETWORK_SIMPLE_SIMPLELINK_HH__
diff --git a/src/mem/ruby/slicc_interface/RubyRequest.hh
b/src/mem/ruby/slicc_interface/RubyRequest.hh
index 772441b..6c84f38 100644
--- a/src/mem/ruby/slicc_interface/RubyRequest.hh
+++ b/src/mem/ruby/slicc_interface/RubyRequest.hh
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __MEM_RUBY_SLICC_INTERFACE_RUBY_REQUEST_HH__
-#define __MEM_RUBY_SLICC_INTERFACE_RUBY_REQUEST_HH__
+#ifndef __MEM_RUBY_SLICC_INTERFACE_RUBYREQUEST_HH__
+#define __MEM_RUBY_SLICC_INTERFACE_RUBYREQUEST_HH__
#include <ostream>
#include <vector>
@@ -165,4 +165,4 @@
return out;
}
-#endif // __MEM_RUBY_SLICC_INTERFACE_RUBY_REQUEST_HH__
+#endif //__MEM_RUBY_SLICC_INTERFACE_RUBYREQUEST_HH__
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
index 4fe065a..e3d4f0b 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
@@ -31,8 +31,8 @@
* These are the functions that exported to slicc from ruby.
*/
-#ifndef __MEM_RUBY_SLICC_INTERFACE_RUBYSLICCUTIL_HH__
-#define __MEM_RUBY_SLICC_INTERFACE_RUBYSLICCUTIL_HH__
+#ifndef __MEM_RUBY_SLICC_INTERFACE_RUBYSLICC_UTIL_HH__
+#define __MEM_RUBY_SLICC_INTERFACE_RUBYSLICC_UTIL_HH__
#include <cassert>
@@ -183,4 +183,4 @@
return count;
}
-#endif // __MEM_RUBY_SLICC_INTERFACE_RUBYSLICCUTIL_HH__
+#endif //__MEM_RUBY_SLICC_INTERFACE_RUBYSLICC_UTIL_HH__
diff --git a/src/mem/ruby/system/CacheRecorder.hh
b/src/mem/ruby/system/CacheRecorder.hh
index 822b370..7748b4c 100644
--- a/src/mem/ruby/system/CacheRecorder.hh
+++ b/src/mem/ruby/system/CacheRecorder.hh
@@ -32,8 +32,8 @@
* time. Also dump the requests to a gziped file.
*/
-#ifndef __MEM_RUBY_RECORDER_CACHERECORDER_HH__
-#define __MEM_RUBY_RECORDER_CACHERECORDER_HH__
+#ifndef __MEM_RUBY_SYSTEM_CACHERECORDER_HH__
+#define __MEM_RUBY_SYSTEM_CACHERECORDER_HH__
#include <vector>
@@ -126,4 +126,4 @@
return out;
}
-#endif // __MEM_RUBY_RECORDER_CACHERECORDER_HH__
+#endif //__MEM_RUBY_SYSTEM_CACHERECORDER_HH__
diff --git a/src/mem/ruby/system/RubySystem.hh
b/src/mem/ruby/system/RubySystem.hh
index 407a253..5d10991 100644
--- a/src/mem/ruby/system/RubySystem.hh
+++ b/src/mem/ruby/system/RubySystem.hh
@@ -32,8 +32,8 @@
* components of the system
*/
-#ifndef __MEM_RUBY_SYSTEM_SYSTEM_HH__
-#define __MEM_RUBY_SYSTEM_SYSTEM_HH__
+#ifndef __MEM_RUBY_SYSTEM_RUBYSYSTEM_HH__
+#define __MEM_RUBY_SYSTEM_RUBYSYSTEM_HH__
#include "base/callback.hh"
#include "base/output.hh"
@@ -151,4 +151,4 @@
void process() { m_ruby_system->collateStats(); }
};
-#endif // __MEM_RUBY_SYSTEM_SYSTEM_HH__
+#endif //__MEM_RUBY_SYSTEM_RUBYSYSTEM_HH__
diff --git a/src/mem/ruby/system/VIPERCoalescer.hh
b/src/mem/ruby/system/VIPERCoalescer.hh
index af6e44e..7624102 100644
--- a/src/mem/ruby/system/VIPERCoalescer.hh
+++ b/src/mem/ruby/system/VIPERCoalescer.hh
@@ -33,8 +33,8 @@
* Author: Sooraj Puthoor
*/
-#ifndef __MEM_RUBY_SYSTEM_VI_COALESCER_HH__
-#define __MEM_RUBY_SYSTEM_VI_COALESCER_HH__
+#ifndef __MEM_RUBY_SYSTEM_VIPERCOALESCER_HH__
+#define __MEM_RUBY_SYSTEM_VIPERCOALESCER_HH__
#include <iostream>
@@ -71,5 +71,4 @@
uint64_t m_max_inv_per_cycle;
uint64_t m_max_wb_per_cycle;
};
-#endif // __MEM_RUBY_SYSTEM_VI_COALESCER_HH__
-
+#endif //__MEM_RUBY_SYSTEM_VIPERCOALESCER_HH__
diff --git a/src/mem/simple_mem.hh b/src/mem/simple_mem.hh
index 6636f2c..307981b 100644
--- a/src/mem/simple_mem.hh
+++ b/src/mem/simple_mem.hh
@@ -46,8 +46,8 @@
* SimpleMemory declaration
*/
-#ifndef __SIMPLE_MEMORY_HH__
-#define __SIMPLE_MEMORY_HH__
+#ifndef __MEM_SIMPLE_MEMORY_HH__
+#define __MEM_SIMPLE_MEMORY_HH__
#include <list>
@@ -203,4 +203,4 @@
};
-#endif //__SIMPLE_MEMORY_HH__
+#endif //__MEM_SIMPLE_MEMORY_HH__
--
To view, visit https://gem5-review.googlesource.com/7881
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I983853e292deb302becf151bf0e970057dc24774
Gerrit-Change-Number: 7881
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <mr.da...@gmail.com>
Gerrit-Reviewer: Daniel Carvalho <oda...@yahoo.com.br>
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
