From 6a4f99899b080b1afd68b0aaff24d2c2867b6c77 Mon Sep 17 00:00:00 2001 From: Brad Beckmann Date: Fri, 20 Aug 2010 11:46:13 -0700 Subject: ruby: Resurrected Ruby's deterministic tests Added the request series and invalidate deterministic tests as new cpu models and removed the no longer needed ruby tests --HG-- rename : configs/example/rubytest.py => configs/example/determ_test.py rename : src/mem/ruby/tester/DetermGETXGenerator.cc => src/cpu/directedtest/DirectedGenerator.cc rename : src/mem/ruby/tester/DetermGETXGenerator.hh => src/cpu/directedtest/DirectedGenerator.hh rename : src/mem/ruby/tester/DetermGETXGenerator.cc => src/cpu/directedtest/InvalidateGenerator.cc rename : src/mem/ruby/tester/DetermGETXGenerator.hh => src/cpu/directedtest/InvalidateGenerator.hh rename : src/cpu/rubytest/RubyTester.cc => src/cpu/directedtest/RubyDirectedTester.cc rename : src/cpu/rubytest/RubyTester.hh => src/cpu/directedtest/RubyDirectedTester.hh rename : src/mem/ruby/tester/DetermGETXGenerator.cc => src/cpu/directedtest/SeriesRequestGenerator.cc rename : src/mem/ruby/tester/DetermGETXGenerator.hh => src/cpu/directedtest/SeriesRequestGenerator.hh --- src/mem/ruby/tester/DetermGETXGenerator.hh | 105 ----------------------------- 1 file changed, 105 deletions(-) delete mode 100644 src/mem/ruby/tester/DetermGETXGenerator.hh (limited to 'src/mem/ruby/tester/DetermGETXGenerator.hh') diff --git a/src/mem/ruby/tester/DetermGETXGenerator.hh b/src/mem/ruby/tester/DetermGETXGenerator.hh deleted file mode 100644 index 567177c6d..000000000 --- a/src/mem/ruby/tester/DetermGETXGenerator.hh +++ /dev/null @@ -1,105 +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: - * - */ - -// This Deterministic Generator generates GETX requests for all nodes in the system -// The GETX requests are generated one at a time in round-robin fashion 0...1...2...etc. - -#ifndef DETERMGETXGENERATOR_H -#define DETERMGETXGENERATOR_H - -#include "mem/ruby/tester/Tester_Globals.hh" -#include "mem/ruby/common/Consumer.hh" -#include "mem/protocol/DetermGETXGeneratorStatus.hh" -#include "mem/ruby/tester/SpecifiedGenerator.hh" -#include "mem/ruby/common/Global.hh" -#include "mem/ruby/common/Address.hh" - -class DeterministicDriver; -class DMAController; - -class DetermGETXGenerator : public SpecifiedGenerator { -public: - // Constructors - DetermGETXGenerator(NodeID node, DeterministicDriver * driver); - - // Destructor - ~DetermGETXGenerator(); - - // Public Methods - void wakeup(); - void performCallback(NodeID proc, Address address); - - void print(ostream& out) const; -private: - // Private Methods - int thinkTime() const; - int waitTime() const; - void initiateStore(); - void initiateDMA(); - void pickAddress(); - - DMAController* dma() const; - - // copy constructor and assignment operator - DetermGETXGenerator(const DetermGETXGenerator& obj); - DetermGETXGenerator& operator=(const DetermGETXGenerator& obj); - - DeterministicDriver * parent_driver; - // Data Members (m_ prefix) - DetermGETXGeneratorStatus m_status; - int m_counter; - bool issued_load; - Address m_address; - NodeID m_node; - long int counter; - Time m_last_transition; -}; - -// Output operator declaration -ostream& operator<<(ostream& out, const DetermGETXGenerator& obj); - -// ******************* Definitions ******************* - -// Output operator definition -extern inline -ostream& operator<<(ostream& out, const DetermGETXGenerator& obj) -{ - obj.print(out); - out << flush; - return out; -} - -#endif //DETERMGETXGENERATOR_H - -- cgit v1.2.3