From aca869bf2dba8cc7a7b06be223b84fa0376a59e9 Mon Sep 17 00:00:00 2001 From: Tushar Krishna Date: Thu, 6 Oct 2016 14:35:14 -0400 Subject: ruby: rename ALPHA_Network_test protocol to Garnet_standalone. Over the past 6 years, we realized that the protocol is essentially used to run the garnet network in a standalone manner, and feed standard synthetic traffic patterns through it. --- src/mem/ruby/system/GPUCoalescer.cc | 6 +++--- src/mem/ruby/system/GPUCoalescer.hh | 2 +- src/mem/ruby/system/Sequencer.cc | 6 +++--- src/mem/ruby/system/Sequencer.hh | 2 +- src/mem/ruby/system/Sequencer.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/mem/ruby') diff --git a/src/mem/ruby/system/GPUCoalescer.cc b/src/mem/ruby/system/GPUCoalescer.cc index 1c57f6c4d..fefda4d47 100644 --- a/src/mem/ruby/system/GPUCoalescer.cc +++ b/src/mem/ruby/system/GPUCoalescer.cc @@ -142,7 +142,7 @@ GPUCoalescer::GPUCoalescer(const Params *p) m_data_cache_hit_latency = p->dcache_hit_latency; - m_usingNetworkTester = p->using_network_tester; + m_runningGarnetStandalone = p->garnet_standalone; assumingRfOCoherence = p->assume_rfo; } @@ -516,10 +516,10 @@ GPUCoalescer::writeCallback(Addr address, // For Alpha, properly handle LL, SC, and write requests with respect to // locked cache blocks. // - // Not valid for Network_test protocl + // Not valid for Garnet_standalone protocl // bool success = true; - if (!m_usingNetworkTester) + if (!m_runningGarnetStandalone) success = handleLlsc(address, request); if (request->m_type == RubyRequestType_Locked_RMW_Read) { diff --git a/src/mem/ruby/system/GPUCoalescer.hh b/src/mem/ruby/system/GPUCoalescer.hh index dbd47059c..fcf7cecf4 100644 --- a/src/mem/ruby/system/GPUCoalescer.hh +++ b/src/mem/ruby/system/GPUCoalescer.hh @@ -291,7 +291,7 @@ class GPUCoalescer : public RubyPort int m_load_waiting_on_store_cycles; int m_load_waiting_on_load_cycles; - bool m_usingNetworkTester; + bool m_runningGarnetStandalone; class GPUCoalescerWakeupEvent : public Event { diff --git a/src/mem/ruby/system/Sequencer.cc b/src/mem/ruby/system/Sequencer.cc index cf3edb904..982c1c811 100644 --- a/src/mem/ruby/system/Sequencer.cc +++ b/src/mem/ruby/system/Sequencer.cc @@ -71,7 +71,7 @@ Sequencer::Sequencer(const Params *p) assert(m_data_cache_hit_latency > 0); assert(m_inst_cache_hit_latency > 0); - m_usingNetworkTester = p->using_network_tester; + m_runningGarnetStandalone = p->garnet_standalone; } Sequencer::~Sequencer() @@ -386,10 +386,10 @@ Sequencer::writeCallback(Addr address, DataBlock& data, // For Alpha, properly handle LL, SC, and write requests with respect to // locked cache blocks. // - // Not valid for Network_test protocl + // Not valid for Garnet_standalone protocl // bool success = true; - if (!m_usingNetworkTester) + if (!m_runningGarnetStandalone) success = handleLlsc(address, request); // Handle SLICC block_on behavior for Locked_RMW accesses. NOTE: the diff --git a/src/mem/ruby/system/Sequencer.hh b/src/mem/ruby/system/Sequencer.hh index 2a2f49587..8c009b567 100644 --- a/src/mem/ruby/system/Sequencer.hh +++ b/src/mem/ruby/system/Sequencer.hh @@ -201,7 +201,7 @@ class Sequencer : public RubyPort int m_coreId; - bool m_usingNetworkTester; + bool m_runningGarnetStandalone; //! Histogram for number of outstanding requests per cycle. Stats::Histogram m_outstandReqHist; diff --git a/src/mem/ruby/system/Sequencer.py b/src/mem/ruby/system/Sequencer.py index 5b6a673da..ed142e914 100644 --- a/src/mem/ruby/system/Sequencer.py +++ b/src/mem/ruby/system/Sequencer.py @@ -73,7 +73,7 @@ class RubySequencer(RubyPort): "max requests (incl. prefetches) outstanding") deadlock_threshold = Param.Cycles(500000, "max outstanding cycles for a request before deadlock/livelock declared") - using_network_tester = Param.Bool(False, "") + garnet_standalone = Param.Bool(False, "") # id used by protocols that support multiple sequencers per controller # 99 is the dummy default value coreid = Param.Int(99, "CorePair core id") -- cgit v1.2.3