From a78e772929722364c809a0b9b07d7133629bf89c Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 11 Mar 2011 11:27:16 -0800 Subject: [PATCH] Ruby: Get rid of the dead ruby tester. None of the code in the ruby tester directory is compiled or referred to outside of that directory. This change eliminates it. If it's needed in the future, it can be revived from the history. In the mean time, this removes clutter and the only use of the GEMS_ROOT scons variable. --- src/mem/ruby/tester/DeterministicDriver.cc | 278 --------------- src/mem/ruby/tester/DeterministicDriver.hh | 150 -------- src/mem/ruby/tester/RaceyDriver.cc | 146 -------- src/mem/ruby/tester/RaceyDriver.hh | 130 ------- src/mem/ruby/tester/RaceyPseudoThread.cc | 351 ------------------- src/mem/ruby/tester/RaceyPseudoThread.hh | 152 --------- src/mem/ruby/tester/SConscript | 40 --- src/mem/ruby/tester/SpecifiedGenerator.cc | 44 --- src/mem/ruby/tester/SpecifiedGenerator.hh | 68 ---- src/mem/ruby/tester/Tester_Globals.hh | 39 --- src/mem/ruby/tester/main.cc | 45 --- src/mem/ruby/tester/main.hh | 43 --- src/mem/ruby/tester/test_framework.cc | 378 --------------------- src/mem/ruby/tester/test_framework.hh | 45 --- 14 files changed, 1909 deletions(-) delete mode 100644 src/mem/ruby/tester/DeterministicDriver.cc delete mode 100644 src/mem/ruby/tester/DeterministicDriver.hh delete mode 100644 src/mem/ruby/tester/RaceyDriver.cc delete mode 100644 src/mem/ruby/tester/RaceyDriver.hh delete mode 100644 src/mem/ruby/tester/RaceyPseudoThread.cc delete mode 100644 src/mem/ruby/tester/RaceyPseudoThread.hh delete mode 100644 src/mem/ruby/tester/SConscript delete mode 100644 src/mem/ruby/tester/SpecifiedGenerator.cc delete mode 100644 src/mem/ruby/tester/SpecifiedGenerator.hh delete mode 100644 src/mem/ruby/tester/Tester_Globals.hh delete mode 100644 src/mem/ruby/tester/main.cc delete mode 100644 src/mem/ruby/tester/main.hh delete mode 100644 src/mem/ruby/tester/test_framework.cc delete mode 100644 src/mem/ruby/tester/test_framework.hh diff --git a/src/mem/ruby/tester/DeterministicDriver.cc b/src/mem/ruby/tester/DeterministicDriver.cc deleted file mode 100644 index 9b0fe7967..000000000 --- a/src/mem/ruby/tester/DeterministicDriver.cc +++ /dev/null @@ -1,278 +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 - -#include "base/misc.hh" -#include "mem/ruby/common/Global.hh" -#include "mem/ruby/tester/Tester_Globals.hh" -#include "mem/ruby/tester/DeterministicDriver.hh" -#include "mem/ruby/eventqueue/RubyEventQueue.hh" -//#include "DMAGenerator.hh" -#include "mem/ruby/tester/DetermGETXGenerator.hh" - -using namespace std; - -#define DATA_BLOCK_BYTES 64 - -DeterministicDriver::DeterministicDriver(string generator_type, int num_completions, int num_procs, Time g_think_time, Time g_wait_time, int g_tester_length) -{ - eventQueue = new RubyEventQueue; - m_finish_time = 0; - m_last_issue = -11; - m_done_counter = 0; - m_loads_completed = 0; - m_stores_completed = 0; - - m_numCompletionsPerNode = num_completions; - m_num_procs = num_procs; - m_think_time = g_think_time; - m_wait_time = g_wait_time; - m_tester_length = g_tester_length; - - m_last_progress_vector.resize(num_procs); - for (int i=0; itriggerEvents(eventQueue->getTime() + 1); - } -} - - -DeterministicDriver::~DeterministicDriver() -{ - for (int i=0; iperformCallback(); -//} - -void DeterministicDriver::wakeup() { - assert(0); - // this shouldn't be called as we are not scheduling the driver ever -} - -void DeterministicDriver::hitCallback(int64_t request_id) -{ - assert(requests.find(request_id) != requests.end()); - int proc = requests[request_id].first; - Address address = requests[request_id].second; - - m_generator_vector[proc]->performCallback(proc, address); - - m_last_progress_vector[proc] = eventQueue->getTime(); - - requests.erase(request_id); -} - -bool DeterministicDriver::isStoreReady(NodeID node) -{ - return isAddrReady(node, m_store_vector); -} - -bool DeterministicDriver::isStoreReady(NodeID node, Address addr) -{ - return isAddrReady(node, m_store_vector, addr); -} - -bool DeterministicDriver::isLoadReady(NodeID node) -{ - return isAddrReady(node, m_load_vector); -} - -bool DeterministicDriver::isLoadReady(NodeID node, Address addr) -{ - return isAddrReady(node, m_load_vector, addr); -} - -// searches for any address in the addr_vector -bool DeterministicDriver::isAddrReady(NodeID node, vector addr_vector) -{ - for (int i=0; i= m_numCompletionsPerNode*node) && // is this node next - (eventQueue->getTime() >= m_last_issue + 10)) { // controll rate of requests - return true; - } - } - - return false; -} - -// test for a particular addr -bool DeterministicDriver::isAddrReady(NodeID node, vector addr_vector, Address addr) -{ - int addr_number = addr.getAddress()/DATA_BLOCK_BYTES; - - assert((addr_number >= 0) && (addr_number < addr_vector.size())); - - if (((addr_vector[addr_number]+1)%m_num_procs == node) && - (m_loads_completed+m_stores_completed >= m_numCompletionsPerNode*node) && // is this node next - (eventQueue->getTime() >= m_last_issue + 10)) { // controll rate of requests - return true; - } else { - return false; - } -} - -void DeterministicDriver::loadCompleted(NodeID node, Address addr) -{ - m_loads_completed++; - setNextAddr(node, addr, m_load_vector); -} - -void DeterministicDriver::storeCompleted(NodeID node, Address addr) -{ - m_stores_completed++; - setNextAddr(node, addr, m_store_vector); -} - -void DeterministicDriver::setNextAddr(NodeID node, Address addr, vector& addr_vector) -{ - // mark the addr vector that this proc was the last to use the particular address - int addr_number = addr.getAddress()/DATA_BLOCK_BYTES; - addr_vector[addr_number] = node; -} - -Address DeterministicDriver::getNextLoadAddr(NodeID node) -{ - return getNextAddr(node, m_load_vector); -} - -Address DeterministicDriver::getNextStoreAddr(NodeID node) -{ - return getNextAddr(node, m_store_vector); -} - -Address DeterministicDriver::getNextAddr(NodeID node, vector addr_vector) -{ - - // This method deterministically picks the next addr the node should acquirer - // The addrs cycle through according to NodeID 0->1->...->lastID->0... - - Address addr; - - // should only be called if we know a addr is ready for the node - assert(isAddrReady(node, addr_vector)); - - for (int addr_number=0; addr_numbergetTime(); - - return addr; -} - - -void DeterministicDriver::reportDone() -{ - m_done_counter++; - if ((m_done_counter == m_num_procs)) { - m_finish_time = eventQueue->getTime(); - //m_dma_generator->stop(); - } -} - -void DeterministicDriver::recordLoadLatency(Time time) -{ - m_load_latency.add(time); -} - -void DeterministicDriver::recordStoreLatency(Time time) -{ - m_store_latency.add(time); -} - -void DeterministicDriver::printStats(ostream& out) const -{ - out << endl; - out << "DeterministicDriver Stats" << endl; - out << "---------------------" << endl; - - out << "finish_time: " << m_finish_time << endl; - out << "load_latency: " << m_load_latency << endl; - out << "store_latency: " << m_store_latency << endl; -} - -void DeterministicDriver::print(ostream& out) const -{ -} diff --git a/src/mem/ruby/tester/DeterministicDriver.hh b/src/mem/ruby/tester/DeterministicDriver.hh deleted file mode 100644 index ddc7bc99b..000000000 --- a/src/mem/ruby/tester/DeterministicDriver.hh +++ /dev/null @@ -1,150 +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. - */ - -/* - * $Id$ - * - * Description: - * - */ - -#ifndef DETERMINISTICDRIVER_H -#define DETERMINISTICDRIVER_H - -#include -#include - -#include "mem/ruby/common/Global.hh" -#include "mem/ruby/tester/Tester_Globals.hh" -#include "mem/ruby/common/Histogram.hh" // includes global, but doesn't use anything, so it should be fine -#include "mem/protocol/CacheRequestType.hh" // includes global, but doesn't use anything, so it should be fine -#include "mem/ruby/common/Address.hh" // we redefined the address -#include "mem/ruby/tester/DetermGETXGenerator.hh" // this is our file -#include "mem/ruby/tester/DetermSeriesGETSGenerator.hh" // this is our file -#include "mem/ruby/tester/DetermInvGenerator.hh" // this is our file -#include "mem/ruby/libruby.hh" -#include "mem/ruby/common/Driver.hh" -#include "mem/ruby/common/Consumer.hh" -#include "mem/ruby/eventqueue/RubyEventQueue.hh" -#include "mem/protocol/SpecifiedGeneratorType.hh" - -//class DMAGenerator; - -class DeterministicDriver : public Driver, public Consumer { -public: - friend class DetermGETXGenerator; - friend class DetermSeriesGETSGenerator; - friend class DetermInvGenerator; - // Constructors - DeterministicDriver(string generator_type, int num_completions, int num_procs, Time g_think_time, Time g_wait_time, int g_tester_length); - - // Destructor - ~DeterministicDriver(); - - // Public Methods - void go(); - bool isStoreReady(NodeID node); - bool isLoadReady(NodeID node); - bool isStoreReady(NodeID node, Address addr); - bool isLoadReady(NodeID node, Address addr); - void loadCompleted(NodeID node, Address addr); - void storeCompleted(NodeID node, Address addr); - Address getNextLoadAddr(NodeID node); - Address getNextStoreAddr(NodeID node); - int getLoadsCompleted() { return m_loads_completed; } - int getStoresCompleted() { return m_stores_completed; } - - void reportDone(); - void recordLoadLatency(Time time); - void recordStoreLatency(Time time); - -// void dmaHitCallback(); - void hitCallback(int64_t request_id); - void wakeup(); - void printStats(ostream& out) const; - void clearStats() {} - void printConfig(ostream& out) const {} - - void print(ostream& out) const; - // Public copy constructor and assignment operator - DeterministicDriver(const DeterministicDriver& obj); - DeterministicDriver& operator=(const DeterministicDriver& obj); - -private: - // Private Methods - - Address getNextAddr(NodeID node, std::vector addr_vector); - bool isAddrReady(NodeID node, std::vector addr_vector); - bool isAddrReady(NodeID node, std::vector addr_vector, Address addr); - void setNextAddr(NodeID node, Address addr, std::vector& addr_vector); - - - // Data Members (m_ prefix) - std::vector