ruby: Remove RubyMemoryControl and associated files

This patch removes the deprecated RubyMemoryControl. The DRAMCtrl
module should be used instead.

3 files changed, 0 insertions, 373 deletions

diff --git a/src/mem/ruby/profiler/MemCntrlProfiler.cc b/src/mem/ruby/profiler/MemCntrlProfiler.cc
deleted file mode 100644
index 0cfc1e629..000000000
--- a/src/mem/ruby/profiler/MemCntrlProfiler.cc
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "mem/ruby/profiler/MemCntrlProfiler.hh"
-
-using namespace std;
-
-MemCntrlProfiler::MemCntrlProfiler(const string& description,
-    int banks_per_rank, int ranks_per_dimm, int dimms_per_channel)
-{
-    m_description = description;
-    m_banks_per_rank = banks_per_rank;
-    m_ranks_per_dimm = ranks_per_dimm;
-    m_dimms_per_channel = dimms_per_channel;
-}
-
-MemCntrlProfiler::~MemCntrlProfiler()
-{
-}
-
-void
-MemCntrlProfiler::profileMemReq(int bank)
-{
-    m_memReq++;
-    m_memBankCount[bank]++;
-}
-
-void
-MemCntrlProfiler::profileMemBankBusy()
-{
-    m_memBankBusy++;
-}
-
-void
-MemCntrlProfiler::profileMemBusBusy()
-{
-    m_memBusBusy++;
-}
-
-void
-MemCntrlProfiler::profileMemReadWriteBusy()
-{
-    m_memReadWriteBusy++;
-}
-
-void
-MemCntrlProfiler::profileMemDataBusBusy()
-{
-    m_memDataBusBusy++;
-}
-
-void
-MemCntrlProfiler::profileMemTfawBusy()
-{
-    m_memTfawBusy++;
-}
-
-void
-MemCntrlProfiler::profileMemRefresh()
-{
-    m_memRefresh++;
-}
-
-void
-MemCntrlProfiler::profileMemRead()
-{
-    m_memRead++;
-}
-
-void
-MemCntrlProfiler::profileMemWrite()
-{
-    m_memWrite++;
-}
-
-void
-MemCntrlProfiler::profileMemWaitCycles(int cycles)
-{
-    m_memWaitCycles += cycles;
-}
-
-void
-MemCntrlProfiler::profileMemInputQ(int cycles)
-{
-    m_memInputQ += cycles;
-}
-
-void
-MemCntrlProfiler::profileMemBankQ(int cycles)
-{
-    m_memBankQ += cycles;
-}
-
-void
-MemCntrlProfiler::profileMemArbWait(int cycles)
-{
-    m_memArbWait += cycles;
-}
-
-void
-MemCntrlProfiler::profileMemRandBusy()
-{
-    m_memRandBusy++;
-}
-
-void
-MemCntrlProfiler::profileMemNotOld()
-{
-    m_memNotOld++;
-}
-
-void
-MemCntrlProfiler::regStats()
-{
-    m_memReq
-        .name(m_description + ".memReq")
-        .desc("Total number of memory requests")
-        .flags(Stats::nozero)
-        ;
-
-    m_memRead
-        .name(m_description + ".memRead")
-        .desc("Number of memory reads")
-        .flags(Stats::nozero)
-        ;
-
-    m_memWrite
-        .name(m_description + ".memWrite")
-        .desc("Number of memory writes")
-        .flags(Stats::nozero)
-        ;
-
-    m_memRefresh
-        .name(m_description + ".memRefresh")
-        .desc("Number of memory refreshes")
-        .flags(Stats::nozero)
-        ;
-
-    m_memInputQ
-        .name(m_description + ".memInputQ")
-        .desc("Delay in the input queue")
-        .flags(Stats::nozero)
-        ;
-
-    m_memBankQ
-        .name(m_description + ".memBankQ")
-        .desc("Delay behind the head of the bank queue")
-        .flags(Stats::nozero)
-        ;
-
-    m_memWaitCycles
-        .name(m_description + ".memWaitCycles")
-        .desc("Delay stalled at the head of the bank queue")
-        .flags(Stats::nozero)
-        ;
-
-    m_totalStalls
-        .name(m_description + ".totalStalls")
-        .desc("Total number of stall cycles")
-        .flags(Stats::nozero)
-        ;
-
-    m_totalStalls = m_memInputQ + m_memBankQ + m_memWaitCycles;
-
-    m_stallsPerReq
-        .name(m_description + ".stallsPerReq")
-        .desc("Expected number of stall cycles per request")
-        .flags(Stats::nozero)
-        ;
-
-    m_stallsPerReq = m_totalStalls / m_memReq;
-
-    // Note: The following "memory stalls" entries are a breakdown of
-    // the cycles which already showed up in m_memWaitCycles.  The
-    // order is significant; it is the priority of attributing the
-    // cycles.  For example, bank_busy is before arbitration because
-    // if the bank was busy, we didn't even check arbitration.
-    // Note: "not old enough" means that since we grouped waiting
-    // heads-of-queues into batches to avoid starvation, a request in
-    // a newer batch didn't try to arbitrate yet because there are
-    // older requests waiting.
-    m_memBankBusy
-        .name(m_description + ".memBankBusy")
-        .desc("memory stalls due to busy bank")
-        .flags(Stats::nozero)
-        ;
-
-    m_memRandBusy
-        .name(m_description + ".memRandBusy")
-        .desc("memory stalls due to busy random")
-        .flags(Stats::nozero)
-        ;
-
-    m_memNotOld
-        .name(m_description + ".memNotOld")
-        .desc("memory stalls due to anti starvation")
-        .flags(Stats::nozero)
-        ;
-
-    m_memArbWait
-        .name(m_description + ".memArbWait")
-        .desc("memory stalls due to arbitration")
-        .flags(Stats::nozero)
-        ;
-
-    m_memBusBusy
-        .name(m_description + ".memBusBusy")
-        .desc("memory stalls due to busy bus")
-        .flags(Stats::nozero)
-        ;
-
-    m_memTfawBusy
-        .name(m_description + ".memTfawBusy")
-        .desc("memory stalls for Tfaw")
-        .flags(Stats::nozero)
-        ;
-
-    m_memReadWriteBusy
-        .name(m_description + ".memReadWriteBusy")
-        .desc("memory stalls due to read write turnaround")
-        .flags(Stats::nozero)
-        ;
-
-    m_memDataBusBusy
-        .name(m_description + ".memDataBusBusy")
-        .desc("memory stalls due to read read turnaround")
-        .flags(Stats::nozero)
-        ;
-
-    int totalBanks = m_banks_per_rank * m_ranks_per_dimm * m_dimms_per_channel;
-    m_memBankCount
-        .init(totalBanks)
-        .name(m_description + ".memBankCount")
-        .desc("Number of accesses per bank")
-        .flags(Stats::pdf | Stats::total|Stats::oneline)
-        ;
-    for (int i = 0; i < totalBanks; i++) {
-        m_memBankCount.subname(i, "");
-    }
-}
-
diff --git a/src/mem/ruby/profiler/MemCntrlProfiler.hh b/src/mem/ruby/profiler/MemCntrlProfiler.hh
deleted file mode 100644
index 56e283f50..000000000
--- a/src/mem/ruby/profiler/MemCntrlProfiler.hh
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __MEM_RUBY_PROFILER_MEMCNTRLPROFILER_HH__
-#define __MEM_RUBY_PROFILER_MEMCNTRLPROFILER_HH__
-
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include "base/statistics.hh"
-#include "mem/ruby/common/TypeDefines.hh"
-
-class MemCntrlProfiler
-{
-  public:
-    MemCntrlProfiler(const std::string& description, int banks_per_rank,
-                     int ranks_per_dimm, int dimms_per_channel);
-    ~MemCntrlProfiler();
-
-    void regStats();
-
-    void profileMemReq(int bank);
-    void profileMemBankBusy();
-    void profileMemBusBusy();
-    void profileMemTfawBusy();
-    void profileMemReadWriteBusy();
-    void profileMemDataBusBusy();
-    void profileMemRefresh();
-    void profileMemRead();
-    void profileMemWrite();
-    void profileMemWaitCycles(int cycles);
-    void profileMemInputQ(int cycles);
-    void profileMemBankQ(int cycles);
-    void profileMemArbWait(int cycles);
-    void profileMemRandBusy();
-    void profileMemNotOld();
-
-    void print(std::ostream& out) const;
-
-private:
-    // Private copy constructor and assignment operator
-    MemCntrlProfiler(const MemCntrlProfiler& obj);
-    MemCntrlProfiler& operator=(const MemCntrlProfiler& obj);
-
-    std::string m_description;
-    Stats::Scalar m_memReq;
-    Stats::Scalar m_memRead;
-    Stats::Scalar m_memWrite;
-    Stats::Scalar m_memRefresh;
-
-    Stats::Scalar m_memWaitCycles;
-    Stats::Scalar m_memInputQ;
-    Stats::Scalar m_memBankQ;
-    Stats::Formula m_totalStalls;
-    Stats::Formula m_stallsPerReq;
-
-    Stats::Scalar m_memBankBusy;
-    Stats::Scalar m_memBusBusy;
-    Stats::Scalar m_memTfawBusy;
-    Stats::Scalar m_memReadWriteBusy;
-    Stats::Scalar m_memDataBusBusy;
-    Stats::Scalar m_memArbWait;
-    Stats::Scalar m_memRandBusy;
-    Stats::Scalar m_memNotOld;
-    Stats::Vector m_memBankCount;
-
-    int m_banks_per_rank;
-    int m_ranks_per_dimm;
-    int m_dimms_per_channel;
-};
-
-inline std::ostream&
-operator<<(std::ostream& out, const MemCntrlProfiler& obj)
-{
-    obj.print(out);
-    out << std::flush;
-    return out;
-}
-
-#endif // __MEM_RUBY_PROFILER_MEMCNTRLPROFILER_HH__
diff --git a/src/mem/ruby/profiler/SConscript b/src/mem/ruby/profiler/SConscript
index d1e9972e4..783dc78db 100644
--- a/src/mem/ruby/profiler/SConscript
+++ b/src/mem/ruby/profiler/SConscript
@@ -35,6 +35,5 @@ if env['PROTOCOL'] == 'None':
 
 Source('AccessTraceForAddress.cc')
 Source('AddressProfiler.cc')
-Source('MemCntrlProfiler.cc')
 Source('Profiler.cc')
 Source('StoreTrace.cc')