diff options
Diffstat (limited to 'src/mem/ruby/system/PersistentTable.cc')
| -rw-r--r-- | src/mem/ruby/system/PersistentTable.cc | 264 |
1 files changed, 136 insertions, 128 deletions
diff --git a/src/mem/ruby/system/PersistentTable.cc b/src/mem/ruby/system/PersistentTable.cc index 58b67ea60..1d971ae21 100644 --- a/src/mem/ruby/system/PersistentTable.cc +++ b/src/mem/ruby/system/PersistentTable.cc @@ -1,4 +1,3 @@ - /* * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood * All rights reserved. @@ -27,178 +26,187 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "mem/ruby/system/PersistentTable.hh" #include "mem/gems_common/util.hh" +#include "mem/ruby/system/PersistentTable.hh" // randomize so that handoffs are not locality-aware -// 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}; - +#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() { - m_map_ptr = new Map<Address, PersistentTableEntry>; + m_map_ptr = new Map<Address, PersistentTableEntry>; } PersistentTable::~PersistentTable() { - delete m_map_ptr; - m_map_ptr = NULL; + delete m_map_ptr; + m_map_ptr = NULL; } -void PersistentTable::persistentRequestLock(const Address& address, - MachineID locker, - AccessType type) +void +PersistentTable::persistentRequestLock(const Address& address, + MachineID locker, + AccessType type) { - - // if (locker == m_chip_ptr->getID() ) - // cout << "Chip " << m_chip_ptr->getID() << ": " << llocker - // << " requesting lock for " << address << endl; - - // MachineID locker = (MachineID) persistent_randomize[llocker]; - - assert(address == line_address(address)); - if (!m_map_ptr->exist(address)) { - // Allocate if not present - PersistentTableEntry entry; - entry.m_starving.add(locker); - if (type == AccessType_Write) { - entry.m_request_to_write.add(locker); +#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)); + if (!m_map_ptr->exist(address)) { + // Allocate if not present + PersistentTableEntry entry; + entry.m_starving.add(locker); + if (type == AccessType_Write) { + entry.m_request_to_write.add(locker); + } + m_map_ptr->add(address, entry); + } else { + PersistentTableEntry& entry = m_map_ptr->lookup(address); + + // + // 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); + } + assert(entry.m_marked.isSubset(entry.m_starving)); } - m_map_ptr->add(address, entry); - } else { +} + +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_ptr->exist(address)); PersistentTableEntry& entry = m_map_ptr->lookup(address); // - // Make sure we're not already in the locked set + // Make sure we're 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); - } + 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)); - } -} -void PersistentTable::persistentRequestUnlock(const Address& address, - MachineID unlocker) -{ - // if (unlocker == m_chip_ptr->getID() ) - // cout << "Chip " << m_chip_ptr->getID() << ": " << uunlocker - // << " requesting unlock for " << address << endl; - - // MachineID unlocker = (MachineID) persistent_randomize[uunlocker]; - - assert(address == line_address(address)); - assert(m_map_ptr->exist(address)); - PersistentTableEntry& entry = m_map_ptr->lookup(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_ptr->erase(address); - } + // Deallocate if empty + if (entry.m_starving.isEmpty()) { + assert(entry.m_marked.isEmpty()); + m_map_ptr->erase(address); + } } -bool PersistentTable::okToIssueStarving(const Address& address, - MachineID machId) const +bool +PersistentTable::okToIssueStarving(const Address& address, + MachineID machId) const { - assert(address == line_address(address)); - if (!m_map_ptr->exist(address)) { - // - // No entry present - // - return true; - } else if (m_map_ptr->lookup(address).m_starving.isElement(machId)) { - // - // We can't issue another lockdown until are previous unlock has occurred - // - return false; - } else { - return (m_map_ptr->lookup(address).m_marked.isEmpty()); - } + assert(address == line_address(address)); + if (!m_map_ptr->exist(address)) { + // No entry present + return true; + } else if (m_map_ptr->lookup(address).m_starving.isElement(machId)) { + // We can't issue another lockdown until are previous unlock + // has occurred + return false; + } else { + return m_map_ptr->lookup(address).m_marked.isEmpty(); + } } -MachineID PersistentTable::findSmallest(const Address& address) const +MachineID +PersistentTable::findSmallest(const Address& address) const { - assert(address == line_address(address)); - assert(m_map_ptr->exist(address)); - const PersistentTableEntry& entry = m_map_ptr->lookup(address); - return entry.m_starving.smallestElement(); + assert(address == line_address(address)); + assert(m_map_ptr->exist(address)); + const PersistentTableEntry& entry = m_map_ptr->lookup(address); + return entry.m_starving.smallestElement(); } -AccessType PersistentTable::typeOfSmallest(const Address& address) const +AccessType +PersistentTable::typeOfSmallest(const Address& address) const { - assert(address == line_address(address)); - assert(m_map_ptr->exist(address)); - const PersistentTableEntry& entry = m_map_ptr->lookup(address); - if (entry.m_request_to_write.isElement(entry.m_starving.smallestElement())) { - return AccessType_Write; - } else { - return AccessType_Read; - } + assert(address == line_address(address)); + assert(m_map_ptr->exist(address)); + const PersistentTableEntry& entry = m_map_ptr->lookup(address); + if (entry.m_request_to_write. + isElement(entry.m_starving.smallestElement())) { + return AccessType_Write; + } else { + return AccessType_Read; + } } -void PersistentTable::markEntries(const Address& address) +void +PersistentTable::markEntries(const Address& address) { - assert(address == line_address(address)); - if (m_map_ptr->exist(address)) { - PersistentTableEntry& entry = m_map_ptr->lookup(address); + assert(address == line_address(address)); + if (m_map_ptr->exist(address)) { + PersistentTableEntry& entry = m_map_ptr->lookup(address); - // - // None should be marked - // - assert(entry.m_marked.isEmpty()); + // None should be marked + assert(entry.m_marked.isEmpty()); - // - // Mark all the nodes currently in the table - // - entry.m_marked = entry.m_starving; - } + // Mark all the nodes currently in the table + entry.m_marked = entry.m_starving; + } } -bool PersistentTable::isLocked(const Address& address) const +bool +PersistentTable::isLocked(const Address& address) const { - assert(address == line_address(address)); - // If an entry is present, it must be locked - return (m_map_ptr->exist(address)); + assert(address == line_address(address)); + + // If an entry is present, it must be locked + return m_map_ptr->exist(address); } -int PersistentTable::countStarvingForAddress(const Address& address) const +int +PersistentTable::countStarvingForAddress(const Address& address) const { - if (m_map_ptr->exist(address)) { - PersistentTableEntry& entry = m_map_ptr->lookup(address); - return (entry.m_starving.count()); - } - else { - return 0; - } + if (m_map_ptr->exist(address)) { + PersistentTableEntry& entry = m_map_ptr->lookup(address); + return (entry.m_starving.count()); + } else { + return 0; + } } -int PersistentTable::countReadStarvingForAddress(const Address& address) const +int +PersistentTable::countReadStarvingForAddress(const Address& address) const { - if (m_map_ptr->exist(address)) { - PersistentTableEntry& entry = m_map_ptr->lookup(address); - return (entry.m_starving.count() - entry.m_request_to_write.count()); - } - else { - return 0; - } + if (m_map_ptr->exist(address)) { + PersistentTableEntry& entry = m_map_ptr->lookup(address); + return (entry.m_starving.count() - entry.m_request_to_write.count()); + } else { + return 0; + } } -void PersistentTable::print(ostream& out) const +void +PersistentTable::print(ostream& out) const { } |