diff options
| author | Brad Beckmann <Brad.Beckmann@amd.com> | 2010-01-29 20:29:34 -0800 |
|---|---|---|
| committer | Brad Beckmann <Brad.Beckmann@amd.com> | 2010-01-29 20:29:34 -0800 |
| commit | 143d8ea698a832d80afb1a0cd6726cee1d47d4b5 (patch) | |
| tree | abfade3899e0dfde27e220a381dd8636a2785992 /src/mem/ruby/slicc_interface | |
| parent | 90aab239a150f8c998b16ff0a6c297ec0ef065c2 (diff) | |
| download | gem5-143d8ea698a832d80afb1a0cd6726cee1d47d4b5.tar.xz | |
ruby: removed last level cache support
Removed the last level cache support and MOESI_hammer's dependency on it.
Replaces the LLC support with the more generic MachineType count.
Diffstat (limited to 'src/mem/ruby/slicc_interface')
| -rw-r--r-- | src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc | 4 | ||||
| -rw-r--r-- | src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc index 4d37b0007..0821201e7 100644 --- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc +++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.cc @@ -31,8 +31,4 @@ #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh" #include "mem/ruby/system/CacheMemory.hh" -int getNumberOfLastLevelCaches() -{ - return CacheMemory::numberOfLastLevelCaches(); -} diff --git a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh index 69424c414..5ffd0f295 100644 --- a/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh +++ b/src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh @@ -42,6 +42,7 @@ #include "mem/ruby/common/NetDest.hh" #include "mem/protocol/GenericMachineType.hh" #include "mem/ruby/system/DirectoryMemory.hh" +#include "mem/protocol/MachineType.hh" #ifdef MACHINETYPE_L1Cache #define MACHINETYPE_L1CACHE_ENUM MachineType_L1Cache @@ -67,9 +68,6 @@ #define MACHINETYPE_DMA_ENUM MachineType_NUM #endif -// used to determine the number of acks to wait for -int getNumberOfLastLevelCaches(); - // used to determine the home directory // returns a value between 0 and total_directories_within_the_system inline @@ -152,5 +150,8 @@ extern inline GenericMachineType ConvertMachToGenericMach(MachineType machType) } } +extern inline int machineCount(MachineType machType) { + return MachineType_base_count(machType); +} #endif // COMPONENTMAPPINGFNS_H |