From e983ef9e8c6749c1cd0bf083a2092cb4683d0346 Mon Sep 17 00:00:00 2001 From: Brad Beckmann Date: Tue, 24 Aug 2010 12:07:22 -0700 Subject: testers: move testers to a new directory This patch moves the testers to a new subdirectory under src/cpu and includes the necessary fixes to work with latest m5 initialization patches. --HG-- rename : configs/example/determ_test.py => configs/example/ruby_direct_test.py rename : src/cpu/directedtest/DirectedGenerator.cc => src/cpu/testers/directedtest/DirectedGenerator.cc rename : src/cpu/directedtest/DirectedGenerator.hh => src/cpu/testers/directedtest/DirectedGenerator.hh rename : src/cpu/directedtest/InvalidateGenerator.cc => src/cpu/testers/directedtest/InvalidateGenerator.cc rename : src/cpu/directedtest/InvalidateGenerator.hh => src/cpu/testers/directedtest/InvalidateGenerator.hh rename : src/cpu/directedtest/RubyDirectedTester.cc => src/cpu/testers/directedtest/RubyDirectedTester.cc rename : src/cpu/directedtest/RubyDirectedTester.hh => src/cpu/testers/directedtest/RubyDirectedTester.hh rename : src/cpu/directedtest/RubyDirectedTester.py => src/cpu/testers/directedtest/RubyDirectedTester.py rename : src/cpu/directedtest/SConscript => src/cpu/testers/directedtest/SConscript rename : src/cpu/directedtest/SeriesRequestGenerator.cc => src/cpu/testers/directedtest/SeriesRequestGenerator.cc rename : src/cpu/directedtest/SeriesRequestGenerator.hh => src/cpu/testers/directedtest/SeriesRequestGenerator.hh rename : src/cpu/memtest/MemTest.py => src/cpu/testers/memtest/MemTest.py rename : src/cpu/memtest/SConscript => src/cpu/testers/memtest/SConscript rename : src/cpu/memtest/memtest.cc => src/cpu/testers/memtest/memtest.cc rename : src/cpu/memtest/memtest.hh => src/cpu/testers/memtest/memtest.hh rename : src/cpu/rubytest/Check.cc => src/cpu/testers/rubytest/Check.cc rename : src/cpu/rubytest/Check.hh => src/cpu/testers/rubytest/Check.hh rename : src/cpu/rubytest/CheckTable.cc => src/cpu/testers/rubytest/CheckTable.cc rename : src/cpu/rubytest/CheckTable.hh => src/cpu/testers/rubytest/CheckTable.hh rename : src/cpu/rubytest/RubyTester.cc => src/cpu/testers/rubytest/RubyTester.cc rename : src/cpu/rubytest/RubyTester.hh => src/cpu/testers/rubytest/RubyTester.hh rename : src/cpu/rubytest/RubyTester.py => src/cpu/testers/rubytest/RubyTester.py rename : src/cpu/rubytest/SConscript => src/cpu/testers/rubytest/SConscript --- src/cpu/directedtest/InvalidateGenerator.cc | 142 ---------------------------- 1 file changed, 142 deletions(-) delete mode 100644 src/cpu/directedtest/InvalidateGenerator.cc (limited to 'src/cpu/directedtest/InvalidateGenerator.cc') diff --git a/src/cpu/directedtest/InvalidateGenerator.cc b/src/cpu/directedtest/InvalidateGenerator.cc deleted file mode 100644 index 5a0a3cc6c..000000000 --- a/src/cpu/directedtest/InvalidateGenerator.cc +++ /dev/null @@ -1,142 +0,0 @@ -/* - * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood - * Copyright (c) 2009-2010 Advanced Micro Devices, Inc. - * 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 "cpu/directedtest/RubyDirectedTester.hh" -#include "cpu/directedtest/DirectedGenerator.hh" -#include "cpu/directedtest/InvalidateGenerator.hh" - -InvalidateGenerator::InvalidateGenerator(const Params *p) - : DirectedGenerator(p) -{ - // - // First, issue loads to bring the block into S state - // - m_status = InvalidateGeneratorStatus_Load_Waiting; - m_active_read_node = 0; - m_active_inv_node = 0; - m_address = 0x0; - m_addr_increment_size = p->addr_increment_size; -} - -InvalidateGenerator::~InvalidateGenerator() -{ -} - -bool -InvalidateGenerator::initiate() -{ - RubyDirectedTester::CpuPort* port; - Request::Flags flags; - PacketPtr pkt; - Packet::Command cmd; - - // For simplicity, requests are assumed to be 1 byte-sized - Request *req = new Request(m_address, 1, flags); - - // - // Based on the current state, issue a load or a store - // - if (m_status == InvalidateGeneratorStatus_Load_Waiting) { - DPRINTF(DirectedTest, "initiating read\n"); - cmd = MemCmd::ReadReq; - port = safe_cast(m_directed_tester-> - getCpuPort(m_active_read_node)); - pkt = new Packet(req, cmd, m_active_read_node); - } else if (m_status == InvalidateGeneratorStatus_Inv_Waiting) { - DPRINTF(DirectedTest, "initiating invalidating write\n"); - cmd = MemCmd::WriteReq; - port = safe_cast(m_directed_tester-> - getCpuPort(m_active_inv_node)); - pkt = new Packet(req, cmd, m_active_inv_node); - } else { - panic("initiate was unexpectedly called\n"); - } - uint8_t* dummyData = new uint8_t; - *dummyData = 0; - pkt->dataDynamic(dummyData); - - if (port->sendTiming(pkt)) { - DPRINTF(DirectedTest, "initiating request - successful\n"); - if (m_status == InvalidateGeneratorStatus_Load_Waiting) { - m_status = InvalidateGeneratorStatus_Load_Pending; - } else { - m_status = InvalidateGeneratorStatus_Inv_Pending; - } - return true; - } else { - // If the packet did not issue, must delete - // Note: No need to delete the data, the packet destructor - // will delete it - delete pkt->req; - delete pkt; - - DPRINTF(DirectedTest, "failed to issue request - sequencer not ready\n"); - return false; - } -} - -void -InvalidateGenerator::performCallback(uint proc, Addr address) -{ - assert(m_address == address); - - if (m_status == InvalidateGeneratorStatus_Load_Pending) { - assert(m_active_read_node == proc); - m_active_read_node++; - // - // Once all cpus have the block in S state, issue the invalidate - // - if (m_active_read_node == m_num_cpus) { - m_status = InvalidateGeneratorStatus_Inv_Waiting; - m_active_read_node = 0; - } else { - m_status = InvalidateGeneratorStatus_Load_Waiting; - } - } else if (m_status == InvalidateGeneratorStatus_Inv_Pending) { - assert(m_active_inv_node == proc); - m_active_inv_node++; - if (m_active_inv_node == m_num_cpus) { - m_address += m_addr_increment_size; - m_active_inv_node = 0; - } - // - // Invalidate completed, send that info to the tester and restart - // the cycle - // - m_directed_tester->incrementCycleCompletions(); - m_status = InvalidateGeneratorStatus_Load_Waiting; - } - -} - -InvalidateGenerator * -InvalidateGeneratorParams::create() -{ - return new InvalidateGenerator(this); -} -- cgit v1.2.3