changeset fc1e41e88fd3 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=fc1e41e88fd3
description:
ruby: Remove the RubyCache/CacheMemory latency
The RubyCache (CacheMemory) latency parameter is only used for
top-level caches
instantiated for Ruby coherence protocols. However, the top-level cache
hit
latency is assessed by the Sequencer as accesses flow through to the
cache
hierarchy. Further, protocol state machines should be enforcing these
cache hit
latencies, but RubyCaches do not expose their latency to any existng
state
machines through the SLICC/C++ interface. Thus, the RubyCache latency
parameter
is superfluous for all caches. This is confusing for users.
As a step toward pushing L0/L1 cache hit latency into the top-level
cache
controllers, move their latencies out of the RubyCache declarations and
over to
their Sequencers. Eventually, these Sequencer parameters should be
exposed as
parameters to the top-level cache controllers, which should assess the
latency.
NOTE: Assessing these latencies in the cache controllers will require
modifying
each to eliminate instantaneous Ruby hit callbacks in transitions that
finish
accesses, which is likely a large undertaking.
diffstat:
configs/ruby/MESI_Three_Level.py | 16 ++++------------
configs/ruby/MESI_Two_Level.py | 12 +++---------
configs/ruby/MI_example.py | 5 ++---
configs/ruby/MOESI_CMP_directory.py | 12 +++---------
configs/ruby/MOESI_CMP_token.py | 12 +++---------
configs/ruby/MOESI_hammer.py | 18 +++++-------------
configs/ruby/Network_test.py | 5 ++---
src/mem/ruby/structures/Cache.py | 1 -
src/mem/ruby/structures/CacheMemory.cc | 1 -
src/mem/ruby/structures/CacheMemory.hh | 3 ---
src/mem/ruby/system/Sequencer.cc | 17 +++++++++++++----
src/mem/ruby/system/Sequencer.hh | 7 +++++++
src/mem/ruby/system/Sequencer.py | 6 ++++++
13 files changed, 48 insertions(+), 67 deletions(-)
diffs (277 lines):
diff -r b998b5a6c5f5 -r fc1e41e88fd3 configs/ruby/MESI_Three_Level.py
--- a/configs/ruby/MESI_Three_Level.py Tue Aug 11 11:39:23 2015 -0500
+++ b/configs/ruby/MESI_Three_Level.py Fri Aug 14 00:19:37 2015 -0500
@@ -37,19 +37,11 @@
from Ruby import send_evicts
#
-# Note: the L1 Cache latency is only used by the sequencer on fast path hits
+# Declare caches used by the protocol
#
-class L0Cache(RubyCache):
- latency = 1
-
-class L1Cache(RubyCache):
- latency = 5
-
-#
-# Note: the L2 Cache latency is not currently used
-#
-class L2Cache(RubyCache):
- latency = 15
+class L0Cache(RubyCache): pass
+class L1Cache(RubyCache): pass
+class L2Cache(RubyCache): pass
def define_options(parser):
parser.add_option("--num-clusters", type="int", default=1,
diff -r b998b5a6c5f5 -r fc1e41e88fd3 configs/ruby/MESI_Two_Level.py
--- a/configs/ruby/MESI_Two_Level.py Tue Aug 11 11:39:23 2015 -0500
+++ b/configs/ruby/MESI_Two_Level.py Fri Aug 14 00:19:37 2015 -0500
@@ -35,16 +35,10 @@
from Ruby import send_evicts
#
-# Note: the L1 Cache latency is only used by the sequencer on fast path hits
+# Declare caches used by the protocol
#
-class L1Cache(RubyCache):
- latency = 3
-
-#
-# Note: the L2 Cache latency is not currently used
-#
-class L2Cache(RubyCache):
- latency = 15
+class L1Cache(RubyCache): pass
+class L2Cache(RubyCache): pass
def define_options(parser):
return
diff -r b998b5a6c5f5 -r fc1e41e88fd3 configs/ruby/MI_example.py
--- a/configs/ruby/MI_example.py Tue Aug 11 11:39:23 2015 -0500
+++ b/configs/ruby/MI_example.py Fri Aug 14 00:19:37 2015 -0500
@@ -35,10 +35,9 @@
from Ruby import send_evicts
#
-# Note: the cache latency is only used by the sequencer on fast path hits
+# Declare caches used by the protocol
#
-class Cache(RubyCache):
- latency = 3
+class Cache(RubyCache): pass
def define_options(parser):
return
diff -r b998b5a6c5f5 -r fc1e41e88fd3 configs/ruby/MOESI_CMP_directory.py
--- a/configs/ruby/MOESI_CMP_directory.py Tue Aug 11 11:39:23 2015 -0500
+++ b/configs/ruby/MOESI_CMP_directory.py Fri Aug 14 00:19:37 2015 -0500
@@ -35,16 +35,10 @@
from Ruby import send_evicts
#
-# Note: the L1 Cache latency is only used by the sequencer on fast path hits
+# Declare caches used by the protocol
#
-class L1Cache(RubyCache):
- latency = 3
-
-#
-# Note: the L2 Cache latency is not currently used
-#
-class L2Cache(RubyCache):
- latency = 15
+class L1Cache(RubyCache): pass
+class L2Cache(RubyCache): pass
def define_options(parser):
return
diff -r b998b5a6c5f5 -r fc1e41e88fd3 configs/ruby/MOESI_CMP_token.py
--- a/configs/ruby/MOESI_CMP_token.py Tue Aug 11 11:39:23 2015 -0500
+++ b/configs/ruby/MOESI_CMP_token.py Fri Aug 14 00:19:37 2015 -0500
@@ -35,16 +35,10 @@
from Ruby import send_evicts
#
-# Note: the L1 Cache latency is only used by the sequencer on fast path hits
+# Declare caches used by the protocol
#
-class L1Cache(RubyCache):
- latency = 2
-
-#
-# Note: the L2 Cache latency is not currently used
-#
-class L2Cache(RubyCache):
- latency = 10
+class L1Cache(RubyCache): pass
+class L2Cache(RubyCache): pass
def define_options(parser):
parser.add_option("--l1-retries", type="int", default=1,
diff -r b998b5a6c5f5 -r fc1e41e88fd3 configs/ruby/MOESI_hammer.py
--- a/configs/ruby/MOESI_hammer.py Tue Aug 11 11:39:23 2015 -0500
+++ b/configs/ruby/MOESI_hammer.py Fri Aug 14 00:19:37 2015 -0500
@@ -35,22 +35,14 @@
from Ruby import send_evicts
#
-# Note: the L1 Cache latency is only used by the sequencer on fast path hits
+# Declare caches used by the protocol
#
-class L1Cache(RubyCache):
- latency = 2
-
+class L1Cache(RubyCache): pass
+class L2Cache(RubyCache): pass
#
-# Note: the L2 Cache latency is not currently used
+# Probe filter is a cache
#
-class L2Cache(RubyCache):
- latency = 10
-
-#
-# Probe filter is a cache, latency is not used
-#
-class ProbeFilter(RubyCache):
- latency = 1
+class ProbeFilter(RubyCache): pass
def define_options(parser):
parser.add_option("--allow-atomic-migration", action="store_true",
diff -r b998b5a6c5f5 -r fc1e41e88fd3 configs/ruby/Network_test.py
--- a/configs/ruby/Network_test.py Tue Aug 11 11:39:23 2015 -0500
+++ b/configs/ruby/Network_test.py Fri Aug 14 00:19:37 2015 -0500
@@ -34,10 +34,9 @@
from Ruby import create_topology
#
-# Note: the cache latency is only used by the sequencer on fast path hits
+# Declare caches used by the protocol
#
-class Cache(RubyCache):
- latency = 3
+class Cache(RubyCache): pass
def define_options(parser):
return
diff -r b998b5a6c5f5 -r fc1e41e88fd3 src/mem/ruby/structures/Cache.py
--- a/src/mem/ruby/structures/Cache.py Tue Aug 11 11:39:23 2015 -0500
+++ b/src/mem/ruby/structures/Cache.py Fri Aug 14 00:19:37 2015 -0500
@@ -37,7 +37,6 @@
cxx_class = 'CacheMemory'
cxx_header = "mem/ruby/structures/CacheMemory.hh"
size = Param.MemorySize("capacity in bytes");
- latency = Param.Cycles("");
assoc = Param.Int("");
replacement_policy = Param.ReplacementPolicy(PseudoLRUReplacementPolicy(),
"")
diff -r b998b5a6c5f5 -r fc1e41e88fd3 src/mem/ruby/structures/CacheMemory.cc
--- a/src/mem/ruby/structures/CacheMemory.cc Tue Aug 11 11:39:23 2015 -0500
+++ b/src/mem/ruby/structures/CacheMemory.cc Fri Aug 14 00:19:37 2015 -0500
@@ -60,7 +60,6 @@
p->start_index_bit, p->ruby_system)
{
m_cache_size = p->size;
- m_latency = p->latency;
m_cache_assoc = p->assoc;
m_replacementPolicy_ptr = p->replacement_policy;
m_replacementPolicy_ptr->setCache(this);
diff -r b998b5a6c5f5 -r fc1e41e88fd3 src/mem/ruby/structures/CacheMemory.hh
--- a/src/mem/ruby/structures/CacheMemory.hh Tue Aug 11 11:39:23 2015 -0500
+++ b/src/mem/ruby/structures/CacheMemory.hh Fri Aug 14 00:19:37 2015 -0500
@@ -96,7 +96,6 @@
AbstractCacheEntry* lookup(const Address& address);
const AbstractCacheEntry* lookup(const Address& address) const;
- Cycles getLatency() const { return m_latency; }
Cycles getTagLatency() const { return tagArray.getLatency(); }
Cycles getDataLatency() const { return dataArray.getLatency(); }
@@ -159,8 +158,6 @@
CacheMemory& operator=(const CacheMemory& obj);
private:
- Cycles m_latency;
-
// Data Members (m_prefix)
bool m_is_instruction_only_cache;
diff -r b998b5a6c5f5 -r fc1e41e88fd3 src/mem/ruby/system/Sequencer.cc
--- a/src/mem/ruby/system/Sequencer.cc Tue Aug 11 11:39:23 2015 -0500
+++ b/src/mem/ruby/system/Sequencer.cc Fri Aug 14 00:19:37 2015 -0500
@@ -58,6 +58,8 @@
m_instCache_ptr = p->icache;
m_dataCache_ptr = p->dcache;
+ m_data_cache_hit_latency = p->dcache_hit_latency;
+ m_inst_cache_hit_latency = p->icache_hit_latency;
m_max_outstanding_requests = p->max_outstanding_requests;
m_deadlock_threshold = p->deadlock_threshold;
@@ -65,6 +67,8 @@
assert(m_deadlock_threshold > 0);
assert(m_instCache_ptr != NULL);
assert(m_dataCache_ptr != NULL);
+ assert(m_data_cache_hit_latency > 0);
+ assert(m_inst_cache_hit_latency > 0);
m_usingNetworkTester = p->using_network_tester;
}
@@ -691,12 +695,17 @@
msg->getPhysicalAddress(),
RubyRequestType_to_string(secondary_type));
- Cycles latency(0); // initialzed to an null value
-
+ // The Sequencer currently assesses instruction and data cache hit latency
+ // for the top-level caches at the beginning of a memory access.
+ // TODO: Eventually, this latency should be moved to represent the actual
+ // cache access latency portion of the memory access. This will require
+ // changing cache controller protocol files to assess the latency on the
+ // access response path.
+ Cycles latency(0); // Initialize to zero to catch misconfigured latency
if (secondary_type == RubyRequestType_IFETCH)
- latency = m_instCache_ptr->getLatency();
+ latency = m_inst_cache_hit_latency;
else
- latency = m_dataCache_ptr->getLatency();
+ latency = m_data_cache_hit_latency;
// Send the message to the cache controller
assert(latency > 0);
diff -r b998b5a6c5f5 -r fc1e41e88fd3 src/mem/ruby/system/Sequencer.hh
--- a/src/mem/ruby/system/Sequencer.hh Tue Aug 11 11:39:23 2015 -0500
+++ b/src/mem/ruby/system/Sequencer.hh Fri Aug 14 00:19:37 2015 -0500
@@ -180,6 +180,13 @@
CacheMemory* m_dataCache_ptr;
CacheMemory* m_instCache_ptr;
+ // The cache access latency for top-level caches (L0/L1). These are
+ // currently assessed at the beginning of each memory access through the
+ // sequencer.
+ // TODO: Migrate these latencies into top-level cache controllers.
+ Cycles m_data_cache_hit_latency;
+ Cycles m_inst_cache_hit_latency;
+
typedef m5::hash_map<Address, SequencerRequest*> RequestTable;
RequestTable m_writeRequestTable;
RequestTable m_readRequestTable;
diff -r b998b5a6c5f5 -r fc1e41e88fd3 src/mem/ruby/system/Sequencer.py
--- a/src/mem/ruby/system/Sequencer.py Tue Aug 11 11:39:23 2015 -0500
+++ b/src/mem/ruby/system/Sequencer.py Fri Aug 14 00:19:37 2015 -0500
@@ -61,6 +61,12 @@
icache = Param.RubyCache("")
dcache = Param.RubyCache("")
+ # Cache latencies currently assessed at the beginning of each access
+ # NOTE: Setting these values to a value greater than one will result in
+ # O3 CPU pipeline bubbles and negatively impact performance
+ # TODO: Latencies should be migrated into each top-level cache controller
+ icache_hit_latency = Param.Cycles(1, "Inst cache hit latency")
+ dcache_hit_latency = Param.Cycles(1, "Data cache hit latency")
max_outstanding_requests = Param.Int(16,
"max requests (incl. prefetches) outstanding")
deadlock_threshold = Param.Cycles(500000,
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
