From 82d136285dac52a97384961a814d5a0dda4a6482 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Mon, 1 Sep 2014 16:55:40 -0500 Subject: ruby: move files from ruby/system to ruby/structures The directory ruby/system is crowded and unorganized. Hence, the files the hold actual physical structures, are being moved to the directory ruby/structures. This includes Cache Memory, Directory Memory, Memory Controller, Wire Buffer, TBE Table, Perfect Cache Memory, Timer Table, Bank Array. The directory ruby/systems has the glue code that holds these structures together. --HG-- rename : src/mem/ruby/system/MachineID.hh => src/mem/ruby/common/MachineID.hh rename : src/mem/ruby/buffers/MessageBuffer.cc => src/mem/ruby/network/MessageBuffer.cc rename : src/mem/ruby/buffers/MessageBuffer.hh => src/mem/ruby/network/MessageBuffer.hh rename : src/mem/ruby/buffers/MessageBufferNode.cc => src/mem/ruby/network/MessageBufferNode.cc rename : src/mem/ruby/buffers/MessageBufferNode.hh => src/mem/ruby/network/MessageBufferNode.hh rename : src/mem/ruby/system/AbstractReplacementPolicy.hh => src/mem/ruby/structures/AbstractReplacementPolicy.hh rename : src/mem/ruby/system/BankedArray.cc => src/mem/ruby/structures/BankedArray.cc rename : src/mem/ruby/system/BankedArray.hh => src/mem/ruby/structures/BankedArray.hh rename : src/mem/ruby/system/Cache.py => src/mem/ruby/structures/Cache.py rename : src/mem/ruby/system/CacheMemory.cc => src/mem/ruby/structures/CacheMemory.cc rename : src/mem/ruby/system/CacheMemory.hh => src/mem/ruby/structures/CacheMemory.hh rename : src/mem/ruby/system/DirectoryMemory.cc => src/mem/ruby/structures/DirectoryMemory.cc rename : src/mem/ruby/system/DirectoryMemory.hh => src/mem/ruby/structures/DirectoryMemory.hh rename : src/mem/ruby/system/DirectoryMemory.py => src/mem/ruby/structures/DirectoryMemory.py rename : src/mem/ruby/system/LRUPolicy.hh => src/mem/ruby/structures/LRUPolicy.hh rename : src/mem/ruby/system/MemoryControl.cc => src/mem/ruby/structures/MemoryControl.cc rename : src/mem/ruby/system/MemoryControl.hh => src/mem/ruby/structures/MemoryControl.hh rename : src/mem/ruby/system/MemoryControl.py => src/mem/ruby/structures/MemoryControl.py rename : src/mem/ruby/system/MemoryNode.cc => src/mem/ruby/structures/MemoryNode.cc rename : src/mem/ruby/system/MemoryNode.hh => src/mem/ruby/structures/MemoryNode.hh rename : src/mem/ruby/system/MemoryVector.hh => src/mem/ruby/structures/MemoryVector.hh rename : src/mem/ruby/system/PerfectCacheMemory.hh => src/mem/ruby/structures/PerfectCacheMemory.hh rename : src/mem/ruby/system/PersistentTable.cc => src/mem/ruby/structures/PersistentTable.cc rename : src/mem/ruby/system/PersistentTable.hh => src/mem/ruby/structures/PersistentTable.hh rename : src/mem/ruby/system/PseudoLRUPolicy.hh => src/mem/ruby/structures/PseudoLRUPolicy.hh rename : src/mem/ruby/system/RubyMemoryControl.cc => src/mem/ruby/structures/RubyMemoryControl.cc rename : src/mem/ruby/system/RubyMemoryControl.hh => src/mem/ruby/structures/RubyMemoryControl.hh rename : src/mem/ruby/system/RubyMemoryControl.py => src/mem/ruby/structures/RubyMemoryControl.py rename : src/mem/ruby/system/SparseMemory.cc => src/mem/ruby/structures/SparseMemory.cc rename : src/mem/ruby/system/SparseMemory.hh => src/mem/ruby/structures/SparseMemory.hh rename : src/mem/ruby/system/TBETable.hh => src/mem/ruby/structures/TBETable.hh rename : src/mem/ruby/system/TimerTable.cc => src/mem/ruby/structures/TimerTable.cc rename : src/mem/ruby/system/TimerTable.hh => src/mem/ruby/structures/TimerTable.hh rename : src/mem/ruby/system/WireBuffer.cc => src/mem/ruby/structures/WireBuffer.cc rename : src/mem/ruby/system/WireBuffer.hh => src/mem/ruby/structures/WireBuffer.hh rename : src/mem/ruby/system/WireBuffer.py => src/mem/ruby/structures/WireBuffer.py rename : src/mem/ruby/recorder/CacheRecorder.cc => src/mem/ruby/system/CacheRecorder.cc rename : src/mem/ruby/recorder/CacheRecorder.hh => src/mem/ruby/system/CacheRecorder.hh --- src/mem/ruby/system/PersistentTable.cc | 219 --------------------------------- 1 file changed, 219 deletions(-) delete mode 100644 src/mem/ruby/system/PersistentTable.cc (limited to 'src/mem/ruby/system/PersistentTable.cc') diff --git a/src/mem/ruby/system/PersistentTable.cc b/src/mem/ruby/system/PersistentTable.cc deleted file mode 100644 index c60d39b8a..000000000 --- a/src/mem/ruby/system/PersistentTable.cc +++ /dev/null @@ -1,219 +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/system/PersistentTable.hh" - -using namespace std; - -// randomize so that handoffs are not locality-aware -#if 0 -int persistent_randomize[] = {0, 4, 8, 12, 1, 5, 9, 13, 2, 6, - 10, 14, 3, 7, 11, 15}; -int persistent_randomize[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15}; -#endif - -PersistentTable::PersistentTable() -{ -} - -PersistentTable::~PersistentTable() -{ -} - -void -PersistentTable::persistentRequestLock(const Address& address, - MachineID locker, - AccessType type) -{ -#if 0 - if (locker == m_chip_ptr->getID()) - cout << "Chip " << m_chip_ptr->getID() << ": " << llocker - << " requesting lock for " << address << endl; - - MachineID locker = (MachineID) persistent_randomize[llocker]; -#endif - - assert(address == line_address(address)); - - static const PersistentTableEntry dflt; - pair r = - m_map.insert(AddressMap::value_type(address, dflt)); - bool present = !r.second; - AddressMap::iterator i = r.first; - PersistentTableEntry &entry = i->second; - - if (present) { - // Make sure we're not already in the locked set - assert(!(entry.m_starving.isElement(locker))); - } - - entry.m_starving.add(locker); - if (type == AccessType_Write) - entry.m_request_to_write.add(locker); - - if (present) - assert(entry.m_marked.isSubset(entry.m_starving)); -} - -void -PersistentTable::persistentRequestUnlock(const Address& address, - MachineID unlocker) -{ -#if 0 - if (unlocker == m_chip_ptr->getID()) - cout << "Chip " << m_chip_ptr->getID() << ": " << uunlocker - << " requesting unlock for " << address << endl; - - MachineID unlocker = (MachineID) persistent_randomize[uunlocker]; -#endif - - assert(address == line_address(address)); - assert(m_map.count(address)); - PersistentTableEntry& entry = m_map[address]; - - // - // Make sure we're in the locked set - // - assert(entry.m_starving.isElement(unlocker)); - assert(entry.m_marked.isSubset(entry.m_starving)); - entry.m_starving.remove(unlocker); - entry.m_marked.remove(unlocker); - entry.m_request_to_write.remove(unlocker); - assert(entry.m_marked.isSubset(entry.m_starving)); - - // Deallocate if empty - if (entry.m_starving.isEmpty()) { - assert(entry.m_marked.isEmpty()); - m_map.erase(address); - } -} - -bool -PersistentTable::okToIssueStarving(const Address& address, - MachineID machId) const -{ - assert(address == line_address(address)); - - AddressMap::const_iterator i = m_map.find(address); - if (i == m_map.end()) { - // No entry present - return true; - } - - const PersistentTableEntry &entry = i->second; - - if (entry.m_starving.isElement(machId)) { - // We can't issue another lockdown until are previous unlock - // has occurred - return false; - } - - return entry.m_marked.isEmpty(); -} - -MachineID -PersistentTable::findSmallest(const Address& address) const -{ - assert(address == line_address(address)); - AddressMap::const_iterator i = m_map.find(address); - assert(i != m_map.end()); - const PersistentTableEntry& entry = i->second; - return entry.m_starving.smallestElement(); -} - -AccessType -PersistentTable::typeOfSmallest(const Address& address) const -{ - assert(address == line_address(address)); - AddressMap::const_iterator i = m_map.find(address); - assert(i != m_map.end()); - const PersistentTableEntry& entry = i->second; - if (entry.m_request_to_write. - isElement(entry.m_starving.smallestElement())) { - return AccessType_Write; - } else { - return AccessType_Read; - } -} - -void -PersistentTable::markEntries(const Address& address) -{ - assert(address == line_address(address)); - AddressMap::iterator i = m_map.find(address); - if (i == m_map.end()) - return; - - PersistentTableEntry& entry = i->second; - - // None should be marked - assert(entry.m_marked.isEmpty()); - - // Mark all the nodes currently in the table - entry.m_marked = entry.m_starving; -} - -bool -PersistentTable::isLocked(const Address& address) const -{ - assert(address == line_address(address)); - - // If an entry is present, it must be locked - return m_map.count(address) > 0; -} - -int -PersistentTable::countStarvingForAddress(const Address& address) const -{ - assert(address == line_address(address)); - AddressMap::const_iterator i = m_map.find(address); - if (i == m_map.end()) - return 0; - - const PersistentTableEntry& entry = i->second; - return entry.m_starving.count(); -} - -int -PersistentTable::countReadStarvingForAddress(const Address& address) const -{ - assert(address == line_address(address)); - AddressMap::const_iterator i = m_map.find(address); - if (i == m_map.end()) - return 0; - - const PersistentTableEntry& entry = i->second; - return entry.m_starving.count() - entry.m_request_to_write.count(); -} - -void -PersistentTable::print(ostream& out) const -{ -} - -- cgit v1.2.3