diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MOESI_hammer-cache.sm --- a/src/mem/protocol/MOESI_hammer-cache.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MOESI_hammer-cache.sm Fri Jul 10 11:19:37 2015 -0500 @@ -212,7 +212,7 @@ if(is_valid(cache_entry)) { testAndRead(addr, cache_entry.DataBlk, pkt); } else { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -231,7 +231,7 @@ return num_functional_writes; } - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); return num_functional_writes; @@ -276,7 +276,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { return L1Cache_State_to_permission(tbe.TBEState); } @@ -339,7 +339,7 @@ peek(triggerQueue_in, TriggerMsg) { Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == TriggerType:L2_to_L1) { trigger(Event:Complete_L2_to_L1, in_msg.addr, cache_entry, tbe); @@ -362,7 +362,7 @@ peek(responseToCache_in, ResponseMsg, block_on="addr") { Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == CoherenceResponseType:ACK) { trigger(Event:Ack, in_msg.addr, cache_entry, tbe); @@ -387,7 +387,7 @@ peek(forwardToCache_in, RequestMsg, block_on="addr") { Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if ((in_msg.Type == CoherenceRequestType:GETX) || (in_msg.Type == CoherenceRequestType:GETF)) { @@ -431,7 +431,7 @@ peek(mandatoryQueue_in, RubyRequest, block_on="LineAddress") { // Check for data access to blocks in I-cache and ifetchs to blocks in D-cache - TBE tbe := TBEs[in_msg.LineAddress]; + TBE tbe := TBEs.lookup(in_msg.LineAddress); if (in_msg.Type == RubyRequestType:IFETCH) { // ** INSTRUCTION ACCESS *** @@ -454,7 +454,7 @@ trigger(Event:L2_Replacement, l2_victim_addr, getL2CacheEntry(l2_victim_addr), - TBEs[l2_victim_addr]); + TBEs.lookup(l2_victim_addr)); } } else { // L2 has it (maybe not with the right permissions) @@ -468,7 +468,7 @@ Addr l1i_victim_addr := L1Icache.cacheProbe(in_msg.LineAddress); trigger(Event:L1I_Replacement, l1i_victim_addr, getL1ICacheEntry(l1i_victim_addr), - TBEs[l1i_victim_addr]); + TBEs.lookup(l1i_victim_addr)); } } else { if (L1Icache.cacheAvail(in_msg.LineAddress)) { @@ -482,14 +482,14 @@ trigger(Event:L1_to_L2, l1i_victim_addr, getL1ICacheEntry(l1i_victim_addr), - TBEs[l1i_victim_addr]); + TBEs.lookup(l1i_victim_addr)); } else { Addr l2_victim_addr := L2cache.cacheProbe(l1i_victim_addr); // The L2 does not have room, so we replace a line from the L2 trigger(Event:L2_Replacement, l2_victim_addr, getL2CacheEntry(l2_victim_addr), - TBEs[l2_victim_addr]); + TBEs.lookup(l2_victim_addr)); } } } @@ -517,7 +517,7 @@ trigger(Event:L2_Replacement, l2_victim_addr, getL2CacheEntry(l2_victim_addr), - TBEs[l2_victim_addr]); + TBEs.lookup(l2_victim_addr)); } } else { Entry L2cache_entry := getL2CacheEntry(in_msg.LineAddress); @@ -531,7 +531,7 @@ Addr l1d_victim_addr := L1Dcache.cacheProbe(in_msg.LineAddress); trigger(Event:L1D_Replacement, l1d_victim_addr, getL1DCacheEntry(l1d_victim_addr), - TBEs[l1d_victim_addr]); + TBEs.lookup(l1d_victim_addr)); } } else { if (L1Dcache.cacheAvail(in_msg.LineAddress)) { @@ -545,14 +545,14 @@ trigger(Event:L1_to_L2, l1d_victim_addr, getL1DCacheEntry(l1d_victim_addr), - TBEs[l1d_victim_addr]); + TBEs.lookup(l1d_victim_addr)); } else { Addr l2_victim_addr := L2cache.cacheProbe(l1d_victim_addr); // The L2 does not have room, so we replace a line from the L2 trigger(Event:L2_Replacement, l2_victim_addr, getL2CacheEntry(l2_victim_addr), - TBEs[l2_victim_addr]); + TBEs.lookup(l2_victim_addr)); } } } @@ -939,7 +939,7 @@ check_allocate(TBEs); assert(is_valid(cache_entry)); TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.DataBlk := cache_entry.DataBlk; // Data only used for writebacks tbe.Dirty := cache_entry.Dirty; tbe.Sharers := false; @@ -948,7 +948,7 @@ action(it_allocateTBE, "it", desc="Allocate TBE") { check_allocate(TBEs); TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.Dirty := false; tbe.Sharers := false; } diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MOESI_CMP_token-L1cache.sm --- a/src/mem/protocol/MOESI_CMP_token-L1cache.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MOESI_CMP_token-L1cache.sm Fri Jul 10 11:19:37 2015 -0500 @@ -366,7 +366,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := L1_TBEs[addr]; + TBE tbe := L1_TBEs.lookup(addr); if(is_valid(tbe)) { return L1Cache_State_to_permission(tbe.TBEState); } @@ -459,7 +459,7 @@ // Use Timer in_port(useTimerTable_in, Addr, useTimerTable, rank=5) { if (useTimerTable_in.isReady()) { - TBE tbe := L1_TBEs[useTimerTable.readyAddress()]; + TBE tbe := L1_TBEs.lookup(useTimerTable.readyAddress()); if (persistentTable.isLocked(useTimerTable.readyAddress()) && (persistentTable.findSmallest(useTimerTable.readyAddress()) != machineID)) { @@ -487,7 +487,7 @@ if (reissueTimerTable_in.isReady()) { trigger(Event:Request_Timeout, reissueTimerTable.readyAddress(), getCacheEntry(reissueTimerTable.readyAddress()), - L1_TBEs[reissueTimerTable.readyAddress()]); + L1_TBEs.lookup(reissueTimerTable.readyAddress())); } } @@ -510,7 +510,7 @@ // React to the message based on the current state of the table Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := L1_TBEs[in_msg.addr]; + TBE tbe := L1_TBEs.lookup(in_msg.addr); if (persistentTable.isLocked(in_msg.addr)) { if (persistentTable.findSmallest(in_msg.addr) == machineID) { @@ -548,7 +548,7 @@ assert(in_msg.Destination.isElement(machineID)); Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := L1_TBEs[in_msg.addr]; + TBE tbe := L1_TBEs.lookup(in_msg.addr); // Mark TBE flag if response received off-chip. Use this to update average latency estimate if ( machineIDToMachineType(in_msg.Sender) == MachineType:L2Cache ) { @@ -559,7 +559,7 @@ // came from an off-chip L2 cache if (is_valid(tbe)) { - // L1_TBEs[in_msg.addr].ExternalResponse := true; + // L1_TBEs.lookup(in_msg.addr).ExternalResponse := true; // profile_offchipL2_response(in_msg.addr); } } @@ -619,7 +619,7 @@ assert(in_msg.Destination.isElement(machineID)); Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := L1_TBEs[in_msg.addr]; + TBE tbe := L1_TBEs.lookup(in_msg.addr); if (in_msg.Type == CoherenceRequestType:GETX) { if (in_msg.isLocal) { @@ -665,7 +665,7 @@ peek(mandatoryQueue_in, RubyRequest, block_on="LineAddress") { // Check for data access to blocks in I-cache and ifetchs to blocks in D-cache - TBE tbe := L1_TBEs[in_msg.LineAddress]; + TBE tbe := L1_TBEs.lookup(in_msg.LineAddress); if (in_msg.Type == RubyRequestType:IFETCH) { // ** INSTRUCTION ACCESS *** @@ -695,7 +695,7 @@ trigger(Event:L1_Replacement, L1Icache.cacheProbe(in_msg.LineAddress), getL1ICacheEntry(L1Icache.cacheProbe(in_msg.LineAddress)), - L1_TBEs[L1Icache.cacheProbe(in_msg.LineAddress)]); + L1_TBEs.lookup(L1Icache.cacheProbe(in_msg.LineAddress))); } } } else { @@ -726,7 +726,7 @@ trigger(Event:L1_Replacement, L1Dcache.cacheProbe(in_msg.LineAddress), getL1DCacheEntry(L1Dcache.cacheProbe(in_msg.LineAddress)), - L1_TBEs[L1Dcache.cacheProbe(in_msg.LineAddress)]); + L1_TBEs.lookup(L1Dcache.cacheProbe(in_msg.LineAddress))); } } } @@ -1332,7 +1332,7 @@ action(i_allocateTBE, "i", desc="Allocate TBE") { check_allocate(L1_TBEs); L1_TBEs.allocate(address); - set_tbe(L1_TBEs[address]); + set_tbe(L1_TBEs.lookup(address)); tbe.IssueCount := 0; peek(mandatoryQueue_in, RubyRequest) { tbe.PC := in_msg.ProgramCounter; diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MOESI_CMP_token-L2cache.sm --- a/src/mem/protocol/MOESI_CMP_token-L2cache.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MOESI_CMP_token-L2cache.sm Fri Jul 10 11:19:37 2015 -0500 @@ -241,8 +241,8 @@ void removeSharer(Addr addr, NodeID id) { if (localDirectory.isTagPresent(addr)) { - localDirectory[addr].Sharers.remove(id); - if (localDirectory[addr].Sharers.count() == 0) { + localDirectory.lookup(addr).Sharers.remove(id); + if (localDirectory.lookup(addr).Sharers.count() == 0) { localDirectory.deallocate(addr); } } @@ -250,7 +250,7 @@ bool sharersExist(Addr addr) { if (localDirectory.isTagPresent(addr)) { - if (localDirectory[addr].Sharers.count() > 0) { + if (localDirectory.lookup(addr).Sharers.count() > 0) { return true; } else { @@ -264,7 +264,7 @@ bool exclusiveExists(Addr addr) { if (localDirectory.isTagPresent(addr)) { - if (localDirectory[addr].exclusive) { + if (localDirectory.lookup(addr).exclusive) { return true; } else { @@ -278,29 +278,29 @@ // assumes that caller will check to make sure tag is present Set getSharers(Addr addr) { - return localDirectory[addr].Sharers; + return localDirectory.lookup(addr).Sharers; } void setNewWriter(Addr addr, NodeID id) { if (localDirectory.isTagPresent(addr) == false) { localDirectory.allocate(addr); } - localDirectory[addr].Sharers.clear(); - localDirectory[addr].Sharers.add(id); - localDirectory[addr].exclusive := true; + localDirectory.lookup(addr).Sharers.clear(); + localDirectory.lookup(addr).Sharers.add(id); + localDirectory.lookup(addr).exclusive := true; } void addNewSharer(Addr addr, NodeID id) { if (localDirectory.isTagPresent(addr) == false) { localDirectory.allocate(addr); } - localDirectory[addr].Sharers.add(id); - // localDirectory[addr].exclusive := false; + localDirectory.lookup(addr).Sharers.add(id); + // localDirectory.lookup(addr).exclusive := false; } void clearExclusiveBitIfExists(Addr addr) { if (localDirectory.isTagPresent(addr)) { - localDirectory[addr].exclusive := false; + localDirectory.lookup(addr).exclusive := false; } } diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MOESI_CMP_token-dir.sm --- a/src/mem/protocol/MOESI_CMP_token-dir.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MOESI_CMP_token-dir.sm Fri Jul 10 11:19:37 2015 -0500 @@ -175,7 +175,7 @@ void unset_tbe(); Entry getDirectoryEntry(Addr addr), return_by_pointer="yes" { - Entry dir_entry := static_cast(Entry, "pointer", directory[addr]); + Entry dir_entry := static_cast(Entry, "pointer", directory.lookup(addr)); if (is_valid(dir_entry)) { return dir_entry; @@ -218,7 +218,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { return Directory_State_to_permission(tbe.TBEState); } @@ -245,7 +245,7 @@ } void functionalRead(Addr addr, Packet *pkt) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -256,7 +256,7 @@ int functionalWrite(Addr addr, Packet *pkt) { int num_functional_writes := 0; - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); @@ -278,9 +278,9 @@ if (memQueue_in.isReady()) { peek(memQueue_in, MemoryMsg) { if (in_msg.Type == MemoryRequestType:MEMORY_READ) { - trigger(Event:Memory_Data, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Memory_Data, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == MemoryRequestType:MEMORY_WB) { - trigger(Event:Memory_Ack, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Memory_Ack, in_msg.addr, TBEs.lookup(in_msg.addr)); } else { DPRINTF(RubySlicc, "%s\n", in_msg.Type); error("Invalid message"); @@ -293,7 +293,7 @@ in_port(reissueTimerTable_in, Addr, reissueTimerTable) { if (reissueTimerTable_in.isReady()) { trigger(Event:Request_Timeout, reissueTimerTable.readyAddress(), - TBEs[reissueTimerTable.readyAddress()]); + TBEs.lookup(reissueTimerTable.readyAddress())); } } @@ -305,13 +305,13 @@ if ((in_msg.Type == CoherenceResponseType:DATA_OWNER) || (in_msg.Type == CoherenceResponseType:DATA_SHARED)) { trigger(Event:Data_All_Tokens, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:ACK_OWNER) { trigger(Event:Ack_Owner_All_Tokens, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:ACK) { trigger(Event:Ack_All_Tokens, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else { DPRINTF(RubySlicc, "%s\n", in_msg.Type); error("Invalid message"); @@ -319,14 +319,14 @@ } else { if (in_msg.Type == CoherenceResponseType:DATA_OWNER) { trigger(Event:Data_Owner, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else if ((in_msg.Type == CoherenceResponseType:ACK) || (in_msg.Type == CoherenceResponseType:DATA_SHARED)) { trigger(Event:Tokens, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:ACK_OWNER) { trigger(Event:Ack_Owner, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else { DPRINTF(RubySlicc, "%s\n", in_msg.Type); error("Invalid message"); @@ -358,38 +358,38 @@ if (persistentTable.findSmallest(in_msg.addr) == machineID) { if (getDirectoryEntry(in_msg.addr).Tokens > 0) { trigger(Event:Own_Lock_or_Unlock_Tokens, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else { trigger(Event:Own_Lock_or_Unlock, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } } else { // locked - trigger(Event:Lockdown, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Lockdown, in_msg.addr, TBEs.lookup(in_msg.addr)); } } else { // unlocked - trigger(Event:Unlockdown, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Unlockdown, in_msg.addr, TBEs.lookup(in_msg.addr)); } } else { if (persistentTable.findSmallest(in_msg.addr) == machineID) { if (getDirectoryEntry(in_msg.addr).Tokens > 0) { trigger(Event:Own_Lock_or_Unlock_Tokens, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else { trigger(Event:Own_Lock_or_Unlock, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } } else if (in_msg.Type == PersistentRequestType:GETX_PERSISTENT) { // locked - trigger(Event:Lockdown, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Lockdown, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == PersistentRequestType:GETS_PERSISTENT) { // locked - trigger(Event:Lockdown, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Lockdown, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == PersistentRequestType:DEACTIVATE_PERSISTENT) { // unlocked - trigger(Event:Unlockdown, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Unlockdown, in_msg.addr, TBEs.lookup(in_msg.addr)); } else { error("Invalid message"); } @@ -403,9 +403,9 @@ peek(requestNetwork_in, RequestMsg) { assert(in_msg.Destination.isElement(machineID)); if (in_msg.Type == CoherenceRequestType:GETS) { - trigger(Event:GETS, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:GETS, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:GETX) { - trigger(Event:GETX, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:GETX, in_msg.addr, TBEs.lookup(in_msg.addr)); } else { error("Invalid message"); } @@ -417,14 +417,14 @@ if (dmaRequestQueue_in.isReady()) { peek(dmaRequestQueue_in, DMARequestMsg) { if (in_msg.Type == DMARequestType:READ) { - trigger(Event:DMA_READ, in_msg.LineAddress, TBEs[in_msg.LineAddress]); + trigger(Event:DMA_READ, in_msg.LineAddress, TBEs.lookup(in_msg.LineAddress)); } else if (in_msg.Type == DMARequestType:WRITE) { if (getDirectoryEntry(in_msg.LineAddress).Tokens == max_tokens()) { trigger(Event:DMA_WRITE_All_Tokens, in_msg.LineAddress, - TBEs[in_msg.LineAddress]); + TBEs.lookup(in_msg.LineAddress)); } else { trigger(Event:DMA_WRITE, in_msg.LineAddress, - TBEs[in_msg.LineAddress]); + TBEs.lookup(in_msg.LineAddress)); } } else { error("Invalid message"); @@ -689,7 +689,7 @@ action(vd_allocateDmaRequestInTBE, "vd", desc="Record Data in TBE") { peek(dmaRequestQueue_in, DMARequestMsg) { TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.DataBlk := in_msg.DataBlk; tbe.PhysicalAddress := in_msg.PhysicalAddress; tbe.Len := in_msg.Len; diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MESI_Three_Level-L0cache.sm --- a/src/mem/protocol/MESI_Three_Level-L0cache.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MESI_Three_Level-L0cache.sm Fri Jul 10 11:19:37 2015 -0500 @@ -145,22 +145,22 @@ // inclusive cache returns L0 entries only Entry getCacheEntry(Addr addr), return_by_pointer="yes" { - Entry Dcache_entry := static_cast(Entry, "pointer", Dcache[addr]); + Entry Dcache_entry := static_cast(Entry, "pointer", Dcache.lookup(addr)); if(is_valid(Dcache_entry)) { return Dcache_entry; } - Entry Icache_entry := static_cast(Entry, "pointer", Icache[addr]); + Entry Icache_entry := static_cast(Entry, "pointer", Icache.lookup(addr)); return Icache_entry; } Entry getDCacheEntry(Addr addr), return_by_pointer="yes" { - Entry Dcache_entry := static_cast(Entry, "pointer", Dcache[addr]); + Entry Dcache_entry := static_cast(Entry, "pointer", Dcache.lookup(addr)); return Dcache_entry; } Entry getICacheEntry(Addr addr), return_by_pointer="yes" { - Entry Icache_entry := static_cast(Entry, "pointer", Icache[addr]); + Entry Icache_entry := static_cast(Entry, "pointer", Icache.lookup(addr)); return Icache_entry; } @@ -189,7 +189,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { DPRINTF(RubySlicc, "%s\n", L0Cache_State_to_permission(tbe.TBEState)); return L0Cache_State_to_permission(tbe.TBEState); @@ -206,7 +206,7 @@ } void functionalRead(Addr addr, Packet *pkt) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -217,7 +217,7 @@ int functionalWrite(Addr addr, Packet *pkt) { int num_functional_writes := 0; - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); @@ -260,7 +260,7 @@ assert(in_msg.Dest == machineID); Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if(in_msg.Class == CoherenceClass:DATA_EXCLUSIVE) { trigger(Event:Data_Exclusive, in_msg.addr, cache_entry, tbe); @@ -303,7 +303,7 @@ if (is_valid(Icache_entry)) { // The tag matches for the L0, so the L0 asks the L2 for it. trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, - Icache_entry, TBEs[in_msg.LineAddress]); + Icache_entry, TBEs.lookup(in_msg.LineAddress)); } else { // Check to see if it is in the OTHER L0 @@ -311,19 +311,19 @@ if (is_valid(Dcache_entry)) { // The block is in the wrong L0, put the request on the queue to the shared L2 trigger(Event:L0_Replacement, in_msg.LineAddress, - Dcache_entry, TBEs[in_msg.LineAddress]); + Dcache_entry, TBEs.lookup(in_msg.LineAddress)); } if (Icache.cacheAvail(in_msg.LineAddress)) { // L0 does't have the line, but we have space for it // in the L0 so let's see if the L2 has it trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, - Icache_entry, TBEs[in_msg.LineAddress]); + Icache_entry, TBEs.lookup(in_msg.LineAddress)); } else { // No room in the L0, so we need to make room in the L0 trigger(Event:L0_Replacement, Icache.cacheProbe(in_msg.LineAddress), getICacheEntry(Icache.cacheProbe(in_msg.LineAddress)), - TBEs[Icache.cacheProbe(in_msg.LineAddress)]); + TBEs.lookup(Icache.cacheProbe(in_msg.LineAddress))); } } } else { @@ -333,7 +333,7 @@ if (is_valid(Dcache_entry)) { // The tag matches for the L0, so the L0 ask the L1 for it trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, - Dcache_entry, TBEs[in_msg.LineAddress]); + Dcache_entry, TBEs.lookup(in_msg.LineAddress)); } else { // Check to see if it is in the OTHER L0 @@ -341,19 +341,19 @@ if (is_valid(Icache_entry)) { // The block is in the wrong L0, put the request on the queue to the private L1 trigger(Event:L0_Replacement, in_msg.LineAddress, - Icache_entry, TBEs[in_msg.LineAddress]); + Icache_entry, TBEs.lookup(in_msg.LineAddress)); } if (Dcache.cacheAvail(in_msg.LineAddress)) { // L1 does't have the line, but we have space for it // in the L0 let's see if the L1 has it trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, - Dcache_entry, TBEs[in_msg.LineAddress]); + Dcache_entry, TBEs.lookup(in_msg.LineAddress)); } else { // No room in the L1, so we need to make room in the L0 trigger(Event:L0_Replacement, Dcache.cacheProbe(in_msg.LineAddress), getDCacheEntry(Dcache.cacheProbe(in_msg.LineAddress)), - TBEs[Dcache.cacheProbe(in_msg.LineAddress)]); + TBEs.lookup(Dcache.cacheProbe(in_msg.LineAddress))); } } } @@ -477,7 +477,7 @@ check_allocate(TBEs); assert(is_valid(cache_entry)); TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.Dirty := cache_entry.Dirty; tbe.DataBlk := cache_entry.DataBlk; } diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MESI_Three_Level-L1cache.sm --- a/src/mem/protocol/MESI_Three_Level-L1cache.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MESI_Three_Level-L1cache.sm Fri Jul 10 11:19:37 2015 -0500 @@ -164,7 +164,7 @@ // inclusive cache returns L1 entries only Entry getCacheEntry(Addr addr), return_by_pointer="yes" { - Entry cache_entry := static_cast(Entry, "pointer", cache[addr]); + Entry cache_entry := static_cast(Entry, "pointer", cache.lookup(addr)); return cache_entry; } @@ -189,7 +189,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { DPRINTF(RubySlicc, "%s\n", L1Cache_State_to_permission(tbe.TBEState)); return L1Cache_State_to_permission(tbe.TBEState); @@ -206,7 +206,7 @@ } void functionalRead(Addr addr, Packet *pkt) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -217,7 +217,7 @@ int functionalWrite(Addr addr, Packet *pkt) { int num_functional_writes := 0; - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); @@ -274,7 +274,7 @@ assert(in_msg.Destination.isElement(machineID)); Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if(in_msg.Type == CoherenceResponseType:DATA_EXCLUSIVE) { trigger(Event:Data_Exclusive, in_msg.addr, cache_entry, tbe); @@ -311,7 +311,7 @@ peek(requestNetwork_in, RequestMsg) { assert(in_msg.Destination.isElement(machineID)); Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == CoherenceRequestType:INV) { if (is_valid(cache_entry) && inL0Cache(cache_entry.CacheState)) { @@ -347,7 +347,7 @@ if (messageBufferFromL0_in.isReady()) { peek(messageBufferFromL0_in, CoherenceMsg) { Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if(in_msg.Class == CoherenceClass:INV_DATA) { trigger(Event:L0_DataAck, in_msg.addr, cache_entry, tbe); @@ -367,7 +367,7 @@ // No room in the L1, so we need to make room in the L1 Entry victim_entry := getCacheEntry(cache.cacheProbe(in_msg.addr)); - TBE victim_tbe := TBEs[cache.cacheProbe(in_msg.addr)]; + TBE victim_tbe := TBEs.lookup(cache.cacheProbe(in_msg.addr)); if (is_valid(victim_entry) && inL0Cache(victim_entry.CacheState)) { trigger(Event:L0_Invalidate_Own, @@ -647,7 +647,7 @@ check_allocate(TBEs); assert(is_valid(cache_entry)); TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.Dirty := cache_entry.Dirty; tbe.DataBlk := cache_entry.DataBlk; } diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MESI_Two_Level-L1cache.sm --- a/src/mem/protocol/MESI_Two_Level-L1cache.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MESI_Two_Level-L1cache.sm Fri Jul 10 11:19:37 2015 -0500 @@ -164,22 +164,22 @@ // inclusive cache returns L1 entries only Entry getCacheEntry(Addr addr), return_by_pointer="yes" { - Entry L1Dcache_entry := static_cast(Entry, "pointer", L1Dcache[addr]); + Entry L1Dcache_entry := static_cast(Entry, "pointer", L1Dcache.lookup(addr)); if(is_valid(L1Dcache_entry)) { return L1Dcache_entry; } - Entry L1Icache_entry := static_cast(Entry, "pointer", L1Icache[addr]); + Entry L1Icache_entry := static_cast(Entry, "pointer", L1Icache.lookup(addr)); return L1Icache_entry; } Entry getL1DCacheEntry(Addr addr), return_by_pointer="yes" { - Entry L1Dcache_entry := static_cast(Entry, "pointer", L1Dcache[addr]); + Entry L1Dcache_entry := static_cast(Entry, "pointer", L1Dcache.lookup(addr)); return L1Dcache_entry; } Entry getL1ICacheEntry(Addr addr), return_by_pointer="yes" { - Entry L1Icache_entry := static_cast(Entry, "pointer", L1Icache[addr]); + Entry L1Icache_entry := static_cast(Entry, "pointer", L1Icache.lookup(addr)); return L1Icache_entry; } @@ -208,7 +208,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { DPRINTF(RubySlicc, "%s\n", L1Cache_State_to_permission(tbe.TBEState)); return L1Cache_State_to_permission(tbe.TBEState); @@ -225,7 +225,7 @@ } void functionalRead(Addr addr, Packet *pkt) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -236,7 +236,7 @@ int functionalWrite(Addr addr, Packet *pkt) { int num_functional_writes := 0; - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); @@ -305,7 +305,7 @@ // cache. We should drop this request. trigger(prefetch_request_type_to_event(in_msg.Type), in_msg.LineAddress, - L1Icache_entry, TBEs[in_msg.LineAddress]); + L1Icache_entry, TBEs.lookup(in_msg.LineAddress)); } // Check to see if it is in the OTHER L1 @@ -315,7 +315,7 @@ // this request. trigger(prefetch_request_type_to_event(in_msg.Type), in_msg.LineAddress, - L1Dcache_entry, TBEs[in_msg.LineAddress]); + L1Dcache_entry, TBEs.lookup(in_msg.LineAddress)); } if (L1Icache.cacheAvail(in_msg.LineAddress)) { @@ -323,13 +323,13 @@ // in the L1 so let's see if the L2 has it trigger(prefetch_request_type_to_event(in_msg.Type), in_msg.LineAddress, - L1Icache_entry, TBEs[in_msg.LineAddress]); + L1Icache_entry, TBEs.lookup(in_msg.LineAddress)); } else { // No room in the L1, so we need to make room in the L1 trigger(Event:L1_Replacement, L1Icache.cacheProbe(in_msg.LineAddress), getL1ICacheEntry(L1Icache.cacheProbe(in_msg.LineAddress)), - TBEs[L1Icache.cacheProbe(in_msg.LineAddress)]); + TBEs.lookup(L1Icache.cacheProbe(in_msg.LineAddress))); } } else { // Data prefetch @@ -339,7 +339,7 @@ // cache. We should drop this request. trigger(prefetch_request_type_to_event(in_msg.Type), in_msg.LineAddress, - L1Dcache_entry, TBEs[in_msg.LineAddress]); + L1Dcache_entry, TBEs.lookup(in_msg.LineAddress)); } // Check to see if it is in the OTHER L1 @@ -349,7 +349,7 @@ // request. trigger(prefetch_request_type_to_event(in_msg.Type), in_msg.LineAddress, - L1Icache_entry, TBEs[in_msg.LineAddress]); + L1Icache_entry, TBEs.lookup(in_msg.LineAddress)); } if (L1Dcache.cacheAvail(in_msg.LineAddress)) { @@ -357,13 +357,13 @@ // the L1 let's see if the L2 has it trigger(prefetch_request_type_to_event(in_msg.Type), in_msg.LineAddress, - L1Dcache_entry, TBEs[in_msg.LineAddress]); + L1Dcache_entry, TBEs.lookup(in_msg.LineAddress)); } else { // No room in the L1, so we need to make room in the L1 trigger(Event:L1_Replacement, L1Dcache.cacheProbe(in_msg.LineAddress), getL1DCacheEntry(L1Dcache.cacheProbe(in_msg.LineAddress)), - TBEs[L1Dcache.cacheProbe(in_msg.LineAddress)]); + TBEs.lookup(L1Dcache.cacheProbe(in_msg.LineAddress))); } } } @@ -377,7 +377,7 @@ assert(in_msg.Destination.isElement(machineID)); Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if(in_msg.Type == CoherenceResponseType:DATA_EXCLUSIVE) { trigger(Event:Data_Exclusive, in_msg.addr, cache_entry, tbe); @@ -417,7 +417,7 @@ assert(in_msg.Destination.isElement(machineID)); Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == CoherenceRequestType:INV) { trigger(Event:Inv, in_msg.addr, cache_entry, tbe); @@ -450,7 +450,7 @@ if (is_valid(L1Icache_entry)) { // The tag matches for the L1, so the L1 asks the L2 for it. trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, - L1Icache_entry, TBEs[in_msg.LineAddress]); + L1Icache_entry, TBEs.lookup(in_msg.LineAddress)); } else { // Check to see if it is in the OTHER L1 @@ -458,19 +458,19 @@ if (is_valid(L1Dcache_entry)) { // The block is in the wrong L1, put the request on the queue to the shared L2 trigger(Event:L1_Replacement, in_msg.LineAddress, - L1Dcache_entry, TBEs[in_msg.LineAddress]); + L1Dcache_entry, TBEs.lookup(in_msg.LineAddress)); } if (L1Icache.cacheAvail(in_msg.LineAddress)) { // L1 does't have the line, but we have space for it // in the L1 so let's see if the L2 has it. trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, - L1Icache_entry, TBEs[in_msg.LineAddress]); + L1Icache_entry, TBEs.lookup(in_msg.LineAddress)); } else { // No room in the L1, so we need to make room in the L1 trigger(Event:L1_Replacement, L1Icache.cacheProbe(in_msg.LineAddress), getL1ICacheEntry(L1Icache.cacheProbe(in_msg.LineAddress)), - TBEs[L1Icache.cacheProbe(in_msg.LineAddress)]); + TBEs.lookup(L1Icache.cacheProbe(in_msg.LineAddress))); } } } else { @@ -480,7 +480,7 @@ if (is_valid(L1Dcache_entry)) { // The tag matches for the L1, so the L1 ask the L2 for it trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, - L1Dcache_entry, TBEs[in_msg.LineAddress]); + L1Dcache_entry, TBEs.lookup(in_msg.LineAddress)); } else { // Check to see if it is in the OTHER L1 @@ -488,19 +488,19 @@ if (is_valid(L1Icache_entry)) { // The block is in the wrong L1, put the request on the queue to the shared L2 trigger(Event:L1_Replacement, in_msg.LineAddress, - L1Icache_entry, TBEs[in_msg.LineAddress]); + L1Icache_entry, TBEs.lookup(in_msg.LineAddress)); } if (L1Dcache.cacheAvail(in_msg.LineAddress)) { // L1 does't have the line, but we have space for it // in the L1 let's see if the L2 has it. trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, - L1Dcache_entry, TBEs[in_msg.LineAddress]); + L1Dcache_entry, TBEs.lookup(in_msg.LineAddress)); } else { // No room in the L1, so we need to make room in the L1 trigger(Event:L1_Replacement, L1Dcache.cacheProbe(in_msg.LineAddress), getL1DCacheEntry(L1Dcache.cacheProbe(in_msg.LineAddress)), - TBEs[L1Dcache.cacheProbe(in_msg.LineAddress)]); + TBEs.lookup(L1Dcache.cacheProbe(in_msg.LineAddress))); } } } @@ -847,7 +847,7 @@ check_allocate(TBEs); assert(is_valid(cache_entry)); TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.isPrefetch := false; tbe.Dirty := cache_entry.Dirty; tbe.DataBlk := cache_entry.DataBlk; diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MESI_Two_Level-L2cache.sm --- a/src/mem/protocol/MESI_Two_Level-L2cache.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MESI_Two_Level-L2cache.sm Fri Jul 10 11:19:37 2015 -0500 @@ -157,7 +157,7 @@ // inclusive cache, returns L2 entries only Entry getCacheEntry(Addr addr), return_by_pointer="yes" { - return static_cast(Entry, "pointer", L2cache[addr]); + return static_cast(Entry, "pointer", L2cache.lookup(addr)); } bool isSharer(Addr addr, MachineID requestor, Entry cache_entry) { @@ -196,7 +196,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { DPRINTF(RubySlicc, "%s\n", L2Cache_State_to_permission(tbe.TBEState)); return L2Cache_State_to_permission(tbe.TBEState); @@ -213,7 +213,7 @@ } void functionalRead(Addr addr, Packet *pkt) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -224,7 +224,7 @@ int functionalWrite(Addr addr, Packet *pkt) { int num_functional_writes := 0; - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); @@ -288,7 +288,7 @@ if(L1unblockNetwork_in.isReady()) { peek(L1unblockNetwork_in, ResponseMsg) { Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); DPRINTF(RubySlicc, "Addr: %s State: %s Sender: %s Type: %s Dest: %s\n", in_msg.addr, getState(tbe, cache_entry, in_msg.addr), in_msg.Sender, in_msg.Type, in_msg.Destination); @@ -312,7 +312,7 @@ // test wether it's from a local L1 or an off chip source assert(in_msg.Destination.isElement(machineID)); Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if(machineIDToMachineType(in_msg.Sender) == MachineType:L1Cache) { if(in_msg.Type == CoherenceResponseType:DATA) { @@ -351,7 +351,7 @@ if(L1RequestL2Network_in.isReady()) { peek(L1RequestL2Network_in, RequestMsg) { Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); DPRINTF(RubySlicc, "Addr: %s State: %s Req: %s Type: %s Dest: %s\n", in_msg.addr, getState(tbe, cache_entry, in_msg.addr), @@ -376,10 +376,10 @@ Entry L2cache_entry := getCacheEntry(L2cache.cacheProbe(in_msg.addr)); if (isDirty(L2cache_entry)) { trigger(Event:L2_Replacement, L2cache.cacheProbe(in_msg.addr), - L2cache_entry, TBEs[L2cache.cacheProbe(in_msg.addr)]); + L2cache_entry, TBEs.lookup(L2cache.cacheProbe(in_msg.addr))); } else { trigger(Event:L2_Replacement_clean, L2cache.cacheProbe(in_msg.addr), - L2cache_entry, TBEs[L2cache.cacheProbe(in_msg.addr)]); + L2cache_entry, TBEs.lookup(L2cache.cacheProbe(in_msg.addr))); } } } @@ -591,7 +591,7 @@ check_allocate(TBEs); assert(is_valid(cache_entry)); TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.L1_GetS_IDs.clear(); tbe.DataBlk := cache_entry.DataBlk; tbe.Dirty := cache_entry.Dirty; diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MESI_Two_Level-dir.sm --- a/src/mem/protocol/MESI_Two_Level-dir.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MESI_Two_Level-dir.sm Fri Jul 10 11:19:37 2015 -0500 @@ -101,7 +101,7 @@ void wakeUpBuffers(Addr a); Entry getDirectoryEntry(Addr addr), return_by_pointer="yes" { - Entry dir_entry := static_cast(Entry, "pointer", directory[addr]); + Entry dir_entry := static_cast(Entry, "pointer", directory.lookup(addr)); if (is_valid(dir_entry)) { return dir_entry; @@ -133,7 +133,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { DPRINTF(RubySlicc, "%s\n", Directory_State_to_permission(tbe.TBEState)); return Directory_State_to_permission(tbe.TBEState); @@ -149,7 +149,7 @@ } void functionalRead(Addr addr, Packet *pkt) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -160,7 +160,7 @@ int functionalWrite(Addr addr, Packet *pkt) { int num_functional_writes := 0; - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); @@ -193,13 +193,13 @@ peek(requestNetwork_in, RequestMsg) { assert(in_msg.Destination.isElement(machineID)); if (isGETRequest(in_msg.Type)) { - trigger(Event:Fetch, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Fetch, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:DMA_READ) { trigger(Event:DMA_READ, makeLineAddress(in_msg.addr), - TBEs[makeLineAddress(in_msg.addr)]); + TBEs.lookup(makeLineAddress(in_msg.addr))); } else if (in_msg.Type == CoherenceRequestType:DMA_WRITE) { trigger(Event:DMA_WRITE, makeLineAddress(in_msg.addr), - TBEs[makeLineAddress(in_msg.addr)]); + TBEs.lookup(makeLineAddress(in_msg.addr))); } else { DPRINTF(RubySlicc, "%s\n", in_msg); error("Invalid message"); @@ -213,9 +213,9 @@ peek(responseNetwork_in, ResponseMsg) { assert(in_msg.Destination.isElement(machineID)); if (in_msg.Type == CoherenceResponseType:MEMORY_DATA) { - trigger(Event:Data, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Data, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:ACK) { - trigger(Event:CleanReplacement, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:CleanReplacement, in_msg.addr, TBEs.lookup(in_msg.addr)); } else { DPRINTF(RubySlicc, "%s\n", in_msg.Type); error("Invalid message"); @@ -229,9 +229,9 @@ if (memQueue_in.isReady()) { peek(memQueue_in, MemoryMsg) { if (in_msg.Type == MemoryRequestType:MEMORY_READ) { - trigger(Event:Memory_Data, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Memory_Data, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == MemoryRequestType:MEMORY_WB) { - trigger(Event:Memory_Ack, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Memory_Ack, in_msg.addr, TBEs.lookup(in_msg.addr)); } else { DPRINTF(RubySlicc, "%s\n", in_msg.Type); error("Invalid message"); @@ -389,7 +389,7 @@ action(v_allocateTBE, "v", desc="Allocate TBE") { peek(requestNetwork_in, RequestMsg) { TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.DataBlk := in_msg.DataBlk; tbe.PhysicalAddress := in_msg.addr; tbe.Len := in_msg.Len; diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MI_example-cache.sm --- a/src/mem/protocol/MI_example-cache.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MI_example-cache.sm Fri Jul 10 11:19:37 2015 -0500 @@ -152,7 +152,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { return L1Cache_State_to_permission(tbe.TBEState); } @@ -172,7 +172,7 @@ } void functionalRead(Addr addr, Packet *pkt) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -183,7 +183,7 @@ int functionalWrite(Addr addr, Packet *pkt) { int num_functional_writes := 0; - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); @@ -205,7 +205,7 @@ peek(forwardRequestNetwork_in, RequestMsg, block_on="addr") { Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == CoherenceRequestType:GETX) { trigger(Event:Fwd_GETX, in_msg.addr, cache_entry, tbe); @@ -231,7 +231,7 @@ peek(responseNetwork_in, ResponseMsg, block_on="addr") { Entry cache_entry := getCacheEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == CoherenceResponseType:DATA) { trigger(Event:Data, in_msg.addr, cache_entry, tbe); @@ -254,11 +254,11 @@ // make room for the block trigger(Event:Replacement, cacheMemory.cacheProbe(in_msg.LineAddress), getCacheEntry(cacheMemory.cacheProbe(in_msg.LineAddress)), - TBEs[cacheMemory.cacheProbe(in_msg.LineAddress)]); + TBEs.lookup(cacheMemory.cacheProbe(in_msg.LineAddress))); } else { trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, - cache_entry, TBEs[in_msg.LineAddress]); + cache_entry, TBEs.lookup(in_msg.LineAddress)); } } } @@ -396,7 +396,7 @@ action(v_allocateTBE, "v", desc="Allocate TBE") { TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); } action(w_deallocateTBE, "w", desc="Deallocate TBE") { diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MI_example-dir.sm --- a/src/mem/protocol/MI_example-dir.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MI_example-dir.sm Fri Jul 10 11:19:37 2015 -0500 @@ -111,7 +111,7 @@ void unset_tbe(); Entry getDirectoryEntry(Addr addr), return_by_pointer="yes" { - Entry dir_entry := static_cast(Entry, "pointer", directory[addr]); + Entry dir_entry := static_cast(Entry, "pointer", directory.lookup(addr)); if (is_valid(dir_entry)) { return dir_entry; @@ -155,7 +155,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { return Directory_State_to_permission(tbe.TBEState); } @@ -174,7 +174,7 @@ } void functionalRead(Addr addr, Packet *pkt) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -185,7 +185,7 @@ int functionalWrite(Addr addr, Packet *pkt) { int num_functional_writes := 0; - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); @@ -205,7 +205,7 @@ in_port(dmaRequestQueue_in, DMARequestMsg, dmaRequestToDir) { if (dmaRequestQueue_in.isReady()) { peek(dmaRequestQueue_in, DMARequestMsg) { - TBE tbe := TBEs[in_msg.LineAddress]; + TBE tbe := TBEs.lookup(in_msg.LineAddress); if (in_msg.Type == DMARequestType:READ) { trigger(Event:DMA_READ, in_msg.LineAddress, tbe); } else if (in_msg.Type == DMARequestType:WRITE) { @@ -220,7 +220,7 @@ in_port(requestQueue_in, RequestMsg, requestToDir) { if (requestQueue_in.isReady()) { peek(requestQueue_in, RequestMsg) { - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == CoherenceRequestType:GETS) { trigger(Event:GETS, in_msg.addr, tbe); } else if (in_msg.Type == CoherenceRequestType:GETX) { @@ -243,7 +243,7 @@ in_port(memQueue_in, MemoryMsg, responseFromMemory) { if (memQueue_in.isReady()) { peek(memQueue_in, MemoryMsg) { - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == MemoryRequestType:MEMORY_READ) { trigger(Event:Memory_Data, in_msg.addr, tbe); } else if (in_msg.Type == MemoryRequestType:MEMORY_WB) { @@ -401,7 +401,7 @@ action(v_allocateTBE, "v", desc="Allocate TBE") { peek(dmaRequestQueue_in, DMARequestMsg) { TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.DataBlk := in_msg.DataBlk; tbe.PhysicalAddress := in_msg.PhysicalAddress; tbe.Len := in_msg.Len; @@ -412,7 +412,7 @@ action(r_allocateTbeForDmaRead, "\r", desc="Allocate TBE for DMA Read") { peek(dmaRequestQueue_in, DMARequestMsg) { TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.DmaRequestor := in_msg.Requestor; } } @@ -420,7 +420,7 @@ action(v_allocateTBEFromRequestNet, "\v", desc="Allocate TBE") { peek(requestQueue_in, RequestMsg) { TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.DataBlk := in_msg.DataBlk; } } diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MOESI_CMP_directory-L1cache.sm --- a/src/mem/protocol/MOESI_CMP_directory-L1cache.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MOESI_CMP_directory-L1cache.sm Fri Jul 10 11:19:37 2015 -0500 @@ -190,7 +190,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { DPRINTF(RubySlicc, "%s\n", L1Cache_State_to_permission(tbe.TBEState)); return L1Cache_State_to_permission(tbe.TBEState); @@ -217,7 +217,7 @@ if(is_valid(cache_entry)) { testAndRead(addr, cache_entry.DataBlk, pkt); } else { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -236,7 +236,7 @@ return num_functional_writes; } - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); return num_functional_writes; @@ -269,7 +269,7 @@ if (useTimerTable_in.isReady()) { trigger(Event:Use_Timeout, useTimerTable.readyAddress(), getCacheEntry(useTimerTable.readyAddress()), - TBEs[useTimerTable.readyAddress()]); + TBEs.lookup(useTimerTable.readyAddress())); } } @@ -279,7 +279,7 @@ peek(triggerQueue_in, TriggerMsg) { if (in_msg.Type == TriggerType:ALL_ACKS) { trigger(Event:All_acks, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else { error("Unexpected message"); } @@ -299,29 +299,29 @@ if (in_msg.Type == CoherenceRequestType:GETX || in_msg.Type == CoherenceRequestType:DMA_WRITE) { if (in_msg.Requestor == machineID && in_msg.RequestorMachine == MachineType:L1Cache) { trigger(Event:Own_GETX, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else { trigger(Event:Fwd_GETX, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } } else if (in_msg.Type == CoherenceRequestType:GETS) { trigger(Event:Fwd_GETS, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:DMA_READ) { trigger(Event:Fwd_DMA, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:WB_ACK) { trigger(Event:Writeback_Ack, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:WB_ACK_DATA) { trigger(Event:Writeback_Ack_Data, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:WB_NACK) { trigger(Event:Writeback_Nack, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:INV) { trigger(Event:Inv, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else { error("Unexpected message"); } @@ -335,13 +335,13 @@ peek(responseToL1Cache_in, ResponseMsg, block_on="addr") { if (in_msg.Type == CoherenceResponseType:ACK) { trigger(Event:Ack, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:DATA) { trigger(Event:Data, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:DATA_EXCLUSIVE) { trigger(Event:Exclusive_Data, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else { error("Unexpected message"); } @@ -365,7 +365,7 @@ // The tag matches for the L1, so the L1 asks the L2 for it. trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, L1Icache_entry, - TBEs[in_msg.LineAddress]); + TBEs.lookup(in_msg.LineAddress)); } else { Entry L1Dcache_entry := getL1DCacheEntry(in_msg.LineAddress); @@ -373,19 +373,19 @@ if (is_valid(L1Dcache_entry)) { // The block is in the wrong L1, put the request on the queue to the shared L2 trigger(Event:L1_Replacement, in_msg.LineAddress, L1Dcache_entry, - TBEs[in_msg.LineAddress]); + TBEs.lookup(in_msg.LineAddress)); } if (L1Icache.cacheAvail(in_msg.LineAddress)) { // L1 does't have the line, but we have space for it in the L1 so let's see if the L2 has it trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, L1Icache_entry, - TBEs[in_msg.LineAddress]); + TBEs.lookup(in_msg.LineAddress)); } else { // No room in the L1, so we need to make room in the L1 trigger(Event:L1_Replacement, L1Icache.cacheProbe(in_msg.LineAddress), getL1ICacheEntry(L1Icache.cacheProbe(in_msg.LineAddress)), - TBEs[L1Icache.cacheProbe(in_msg.LineAddress)]); + TBEs.lookup(L1Icache.cacheProbe(in_msg.LineAddress))); } } } else { @@ -396,7 +396,7 @@ // The tag matches for the L1, so the L1 ask the L2 for it trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, L1Dcache_entry, - TBEs[in_msg.LineAddress]); + TBEs.lookup(in_msg.LineAddress)); } else { Entry L1Icache_entry := getL1ICacheEntry(in_msg.LineAddress); @@ -404,19 +404,19 @@ if (is_valid(L1Icache_entry)) { // The block is in the wrong L1, put the request on the queue to the shared L2 trigger(Event:L1_Replacement, in_msg.LineAddress, - L1Icache_entry, TBEs[in_msg.LineAddress]); + L1Icache_entry, TBEs.lookup(in_msg.LineAddress)); } if (L1Dcache.cacheAvail(in_msg.LineAddress)) { // L1 does't have the line, but we have space for it in the L1 let's see if the L2 has it trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress, L1Dcache_entry, - TBEs[in_msg.LineAddress]); + TBEs.lookup(in_msg.LineAddress)); } else { // No room in the L1, so we need to make room in the L1 trigger(Event:L1_Replacement, L1Dcache.cacheProbe(in_msg.LineAddress), getL1DCacheEntry(L1Dcache.cacheProbe(in_msg.LineAddress)), - TBEs[L1Dcache.cacheProbe(in_msg.LineAddress)]); + TBEs.lookup(L1Dcache.cacheProbe(in_msg.LineAddress))); } } } @@ -664,7 +664,7 @@ action(i_allocateTBE, "i", desc="Allocate TBE") { check_allocate(TBEs); TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); assert(is_valid(cache_entry)); tbe.DataBlk := cache_entry.DataBlk; // Data only used for writebacks tbe.Dirty := cache_entry.Dirty; diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MOESI_CMP_directory-L2cache.sm --- a/src/mem/protocol/MOESI_CMP_directory-L2cache.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MOESI_CMP_directory-L2cache.sm Fri Jul 10 11:19:37 2015 -0500 @@ -232,7 +232,7 @@ void unset_tbe(); Entry getCacheEntry(Addr address), return_by_pointer="yes" { - return static_cast(Entry, "pointer", L2cache[address]); + return static_cast(Entry, "pointer", L2cache.lookup(address)); } bool isDirTagPresent(Addr addr) { @@ -259,11 +259,11 @@ } } else if (localDirectory.isTagPresent(addr)){ - if (localDirectory[addr].Sharers.count() > 1) { + if (localDirectory.lookup(addr).Sharers.count() > 1) { return false; } - else if (localDirectory[addr].Sharers.count() == 1) { - if (localDirectory[addr].Sharers.isElement(shar_id)) { + else if (localDirectory.lookup(addr).Sharers.count() == 1) { + if (localDirectory.lookup(addr).Sharers.isElement(shar_id)) { return true; } else { @@ -284,18 +284,18 @@ assert(localDirectory.isTagPresent(addr) == false); assert(is_valid(cache_entry)); localDirectory.allocate(addr); - localDirectory[addr].DirState := cache_entry.CacheState; - localDirectory[addr].Sharers := cache_entry.Sharers; - localDirectory[addr].Owner := cache_entry.Owner; - localDirectory[addr].OwnerValid := cache_entry.OwnerValid; + localDirectory.lookup(addr).DirState := cache_entry.CacheState; + localDirectory.lookup(addr).Sharers := cache_entry.Sharers; + localDirectory.lookup(addr).Owner := cache_entry.Owner; + localDirectory.lookup(addr).OwnerValid := cache_entry.OwnerValid; } void copyDirToCache(Entry cache_entry, Addr addr) { assert(is_valid(cache_entry)); - cache_entry.Sharers := localDirectory[addr].Sharers; - cache_entry.Owner := localDirectory[addr].Owner; - cache_entry.OwnerValid := localDirectory[addr].OwnerValid; + cache_entry.Sharers := localDirectory.lookup(addr).Sharers; + cache_entry.Owner := localDirectory.lookup(addr).Owner; + cache_entry.OwnerValid := localDirectory.lookup(addr).OwnerValid; } @@ -307,10 +307,10 @@ else { if (localDirectory.isTagPresent(addr) == false) { localDirectory.allocate(addr); - localDirectory[addr].Sharers.clear(); - localDirectory[addr].OwnerValid := false; + localDirectory.lookup(addr).Sharers.clear(); + localDirectory.lookup(addr).OwnerValid := false; } - localDirectory[addr].Sharers.add(shar_id); + localDirectory.lookup(addr).Sharers.add(shar_id); } } @@ -326,9 +326,9 @@ if (localDirectory.isTagPresent(addr) == false) { localDirectory.allocate(addr); } - localDirectory[addr].Sharers.clear(); - localDirectory[addr].OwnerValid := true; - localDirectory[addr].Owner := exc_id; + localDirectory.lookup(addr).Sharers.clear(); + localDirectory.lookup(addr).OwnerValid := true; + localDirectory.lookup(addr).Owner := exc_id; } } @@ -339,8 +339,8 @@ cache_entry.OwnerValid := false; } else { - localDirectory[addr].Sharers.clear(); - localDirectory[addr].OwnerValid := false; + localDirectory.lookup(addr).Sharers.clear(); + localDirectory.lookup(addr).OwnerValid := false; } } @@ -350,7 +350,7 @@ cache_entry.Sharers.remove(sender); } else { - localDirectory[addr].Sharers.remove(sender); + localDirectory.lookup(addr).Sharers.remove(sender); } } @@ -360,7 +360,7 @@ cache_entry.OwnerValid := false; } else { - localDirectory[addr].OwnerValid := false; + localDirectory.lookup(addr).OwnerValid := false; } } @@ -370,7 +370,7 @@ return cache_entry.Sharers.isElement(shar_id); } else { - return localDirectory[addr].Sharers.isElement(shar_id); + return localDirectory.lookup(addr).Sharers.isElement(shar_id); } } @@ -380,7 +380,7 @@ return cache_entry.Sharers; } else { - return localDirectory[addr].Sharers; + return localDirectory.lookup(addr).Sharers; } } @@ -390,7 +390,7 @@ return cache_entry.Owner; } else { - return localDirectory[addr].Owner; + return localDirectory.lookup(addr).Owner; } } @@ -400,7 +400,7 @@ return cache_entry.Sharers.count(); } else { - return localDirectory[addr].Sharers.count(); + return localDirectory.lookup(addr).Sharers.count(); } } @@ -410,7 +410,7 @@ return cache_entry.OwnerValid; } else { - return localDirectory[addr].OwnerValid; + return localDirectory.lookup(addr).OwnerValid; } } @@ -425,11 +425,11 @@ } } else { - if (localDirectory[addr].Sharers.isElement(requestor)) { - return ( localDirectory[addr].Sharers.count() - 1 ); + if (localDirectory.lookup(addr).Sharers.isElement(requestor)) { + return ( localDirectory.lookup(addr).Sharers.count() - 1 ); } else { - return localDirectory[addr].Sharers.count(); + return localDirectory.lookup(addr).Sharers.count(); } } } @@ -441,7 +441,7 @@ } else if (is_valid(cache_entry)) { return cache_entry.CacheState; } else if (isDirTagPresent(addr)) { - return localDirectory[addr].DirState; + return localDirectory.lookup(addr).DirState; } else { return State:NP; } @@ -493,12 +493,12 @@ } } else if (localDirectory.isTagPresent(addr)) { - localDirectory[addr].DirState := state; + localDirectory.lookup(addr).DirState := state; } } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { DPRINTF(RubySlicc, "%s\n", L2Cache_State_to_permission(tbe.TBEState)); return L2Cache_State_to_permission(tbe.TBEState); @@ -521,7 +521,7 @@ } void functionalRead(Addr addr, Packet *pkt) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -532,7 +532,7 @@ int functionalWrite(Addr addr, Packet *pkt) { int num_functional_writes := 0; - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); @@ -561,7 +561,7 @@ peek(triggerQueue_in, TriggerMsg) { if (in_msg.Type == TriggerType:ALL_ACKS) { trigger(Event:All_Acks, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else { error("Unexpected message"); } @@ -577,26 +577,26 @@ if (in_msg.Type == CoherenceRequestType:GETX || in_msg.Type == CoherenceRequestType:DMA_WRITE) { if (in_msg.Requestor == machineID) { trigger(Event:Own_GETX, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else { trigger(Event:Fwd_GETX, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } } else if (in_msg.Type == CoherenceRequestType:GETS) { trigger(Event:Fwd_GETS, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if(in_msg.Type == CoherenceRequestType:DMA_READ) { trigger(Event:Fwd_DMA, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:INV) { trigger(Event:Inv, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:WB_ACK) { trigger(Event:Writeback_Ack, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:WB_NACK) { trigger(Event:Writeback_Nack, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else { error("Unexpected message"); } @@ -610,25 +610,25 @@ assert(in_msg.Destination.isElement(machineID)); if (in_msg.Type == CoherenceRequestType:GETX) { trigger(Event:L1_GETX, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:GETS) { trigger(Event:L1_GETS, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:PUTO) { trigger(Event:L1_PUTO, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:PUTX) { trigger(Event:L1_PUTX, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:PUTS) { Entry cache_entry := getCacheEntry(in_msg.addr); if (isOnlySharer(cache_entry, in_msg.addr, in_msg.Requestor)) { trigger(Event:L1_PUTS_only, in_msg.addr, - cache_entry, TBEs[in_msg.addr]); + cache_entry, TBEs.lookup(in_msg.addr)); } else { trigger(Event:L1_PUTS, in_msg.addr, - cache_entry, TBEs[in_msg.addr]); + cache_entry, TBEs.lookup(in_msg.addr)); } } else { error("Unexpected message"); @@ -646,35 +646,35 @@ if (in_msg.Type == CoherenceResponseType:ACK) { if (in_msg.SenderMachine == MachineType:L2Cache) { trigger(Event:ExtAck, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else { trigger(Event:IntAck, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } } else if (in_msg.Type == CoherenceResponseType:DATA) { trigger(Event:Data, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:DATA_EXCLUSIVE) { trigger(Event:Data_Exclusive, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:UNBLOCK) { trigger(Event:Unblock, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:UNBLOCK_EXCLUSIVE) { trigger(Event:Exclusive_Unblock, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:WRITEBACK_DIRTY_DATA) { Entry cache_entry := getCacheEntry(in_msg.addr); if (is_invalid(cache_entry) && L2cache.cacheAvail(in_msg.addr) == false) { trigger(Event:L2_Replacement, L2cache.cacheProbe(in_msg.addr), getCacheEntry(L2cache.cacheProbe(in_msg.addr)), - TBEs[L2cache.cacheProbe(in_msg.addr)]); + TBEs.lookup(L2cache.cacheProbe(in_msg.addr))); } else { trigger(Event:L1_WBDIRTYDATA, in_msg.addr, - cache_entry, TBEs[in_msg.addr]); + cache_entry, TBEs.lookup(in_msg.addr)); } } else if (in_msg.Type == CoherenceResponseType:WRITEBACK_CLEAN_DATA) { Entry cache_entry := getCacheEntry(in_msg.addr); @@ -682,15 +682,15 @@ L2cache.cacheAvail(in_msg.addr) == false) { trigger(Event:L2_Replacement, L2cache.cacheProbe(in_msg.addr), getCacheEntry(L2cache.cacheProbe(in_msg.addr)), - TBEs[L2cache.cacheProbe(in_msg.addr)]); + TBEs.lookup(L2cache.cacheProbe(in_msg.addr))); } else { trigger(Event:L1_WBCLEANDATA, in_msg.addr, - cache_entry, TBEs[in_msg.addr]); + cache_entry, TBEs.lookup(in_msg.addr)); } } else if (in_msg.Type == CoherenceResponseType:DMA_ACK) { trigger(Event:DmaAck, in_msg.addr, - getCacheEntry(in_msg.addr), TBEs[in_msg.addr]); + getCacheEntry(in_msg.addr), TBEs.lookup(in_msg.addr)); } else { error("Unexpected message"); } @@ -1202,7 +1202,7 @@ action(i_allocateTBE, "i", desc="Allocate TBE for internal/external request(isPrefetch=0, number of invalidates=0)") { check_allocate(TBEs); TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); if(is_valid(cache_entry)) { tbe.DataBlk := cache_entry.DataBlk; tbe.Dirty := cache_entry.Dirty; @@ -1254,7 +1254,7 @@ out_msg.Requestor := in_msg.Requestor; out_msg.RequestorMachine := MachineType:L1Cache; // should randomize this so one node doesn't get abused more than others - out_msg.Destination.add(localDirectory[in_msg.addr].Sharers.smallestElement(MachineType:L1Cache)); + out_msg.Destination.add(localDirectory.lookup(in_msg.addr).Sharers.smallestElement(MachineType:L1Cache)); out_msg.MessageSize := MessageSizeType:Forwarded_Control; } } @@ -1267,7 +1267,7 @@ out_msg.Type := CoherenceRequestType:GETX; out_msg.Requestor := tbe.L1_GetX_ID; out_msg.RequestorMachine := MachineType:L1Cache; - out_msg.Destination.add(localDirectory[address].Owner); + out_msg.Destination.add(localDirectory.lookup(address).Owner); out_msg.MessageSize := MessageSizeType:Forwarded_Control; out_msg.Acks := 1 + tbe.Local_GETX_IntAcks; } diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MOESI_CMP_directory-dir.sm --- a/src/mem/protocol/MOESI_CMP_directory-dir.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MOESI_CMP_directory-dir.sm Fri Jul 10 11:19:37 2015 -0500 @@ -122,7 +122,7 @@ void unset_tbe(); Entry getDirectoryEntry(Addr addr), return_by_pointer="yes" { - Entry dir_entry := static_cast(Entry, "pointer", directory[addr]); + Entry dir_entry := static_cast(Entry, "pointer", directory.lookup(addr)); if (is_valid(dir_entry)) { return dir_entry; @@ -233,26 +233,26 @@ if (in_msg.Type == CoherenceResponseType:UNBLOCK) { if (getDirectoryEntry(in_msg.addr).WaitingUnblocks == 1) { trigger(Event:Last_Unblock, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else { trigger(Event:Unblock, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } } else if (in_msg.Type == CoherenceResponseType:UNBLOCK_EXCLUSIVE) { trigger(Event:Exclusive_Unblock, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:WRITEBACK_DIRTY_DATA) { trigger(Event:Dirty_Writeback, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:WRITEBACK_CLEAN_ACK) { trigger(Event:Clean_Writeback, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:DATA_EXCLUSIVE) { trigger(Event:Data, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceResponseType:DMA_ACK) { trigger(Event:DMA_ACK, in_msg.addr, - TBEs[in_msg.addr]); + TBEs.lookup(in_msg.addr)); } else { error("Invalid message"); } @@ -264,21 +264,21 @@ if (requestQueue_in.isReady()) { peek(requestQueue_in, RequestMsg) { if (in_msg.Type == CoherenceRequestType:GETS) { - trigger(Event:GETS, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:GETS, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:GETX) { - trigger(Event:GETX, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:GETX, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:PUTX) { - trigger(Event:PUTX, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:PUTX, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:PUTO) { - trigger(Event:PUTO, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:PUTO, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:PUTO_SHARERS) { - trigger(Event:PUTO_SHARERS, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:PUTO_SHARERS, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == CoherenceRequestType:DMA_READ) { trigger(Event:DMA_READ, makeLineAddress(in_msg.addr), - TBEs[makeLineAddress(in_msg.addr)]); + TBEs.lookup(makeLineAddress(in_msg.addr))); } else if (in_msg.Type == CoherenceRequestType:DMA_WRITE) { trigger(Event:DMA_WRITE, makeLineAddress(in_msg.addr), - TBEs[makeLineAddress(in_msg.addr)]); + TBEs.lookup(makeLineAddress(in_msg.addr))); } else { error("Invalid message"); } @@ -291,9 +291,9 @@ if (memQueue_in.isReady()) { peek(memQueue_in, MemoryMsg) { if (in_msg.Type == MemoryRequestType:MEMORY_READ) { - trigger(Event:Memory_Data, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Memory_Data, in_msg.addr, TBEs.lookup(in_msg.addr)); } else if (in_msg.Type == MemoryRequestType:MEMORY_WB) { - trigger(Event:Memory_Ack, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:Memory_Ack, in_msg.addr, TBEs.lookup(in_msg.addr)); } else { DPRINTF(RubySlicc, "%s\n", in_msg.Type); error("Invalid message"); @@ -539,7 +539,7 @@ action(v_allocateTBE, "v", desc="Allocate TBE entry") { peek (requestQueue_in, RequestMsg) { TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.PhysicalAddress := in_msg.addr; tbe.Len := in_msg.Len; tbe.DataBlk := in_msg.DataBlk; diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MOESI_CMP_directory-dma.sm --- a/src/mem/protocol/MOESI_CMP_directory-dma.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MOESI_CMP_directory-dma.sm Fri Jul 10 11:19:37 2015 -0500 @@ -108,10 +108,10 @@ peek(dmaRequestQueue_in, SequencerMsg) { if (in_msg.Type == SequencerRequestType:LD ) { trigger(Event:ReadRequest, in_msg.LineAddress, - TBEs[in_msg.LineAddress]); + TBEs.lookup(in_msg.LineAddress)); } else if (in_msg.Type == SequencerRequestType:ST) { trigger(Event:WriteRequest, in_msg.LineAddress, - TBEs[in_msg.LineAddress]); + TBEs.lookup(in_msg.LineAddress)); } else { error("Invalid request type"); } @@ -124,14 +124,14 @@ peek( dmaResponseQueue_in, ResponseMsg) { if (in_msg.Type == CoherenceResponseType:DMA_ACK) { trigger(Event:DMA_Ack, makeLineAddress(in_msg.addr), - TBEs[makeLineAddress(in_msg.addr)]); + TBEs.lookup(makeLineAddress(in_msg.addr))); } else if (in_msg.Type == CoherenceResponseType:DATA_EXCLUSIVE || in_msg.Type == CoherenceResponseType:DATA) { trigger(Event:Data, makeLineAddress(in_msg.addr), - TBEs[makeLineAddress(in_msg.addr)]); + TBEs.lookup(makeLineAddress(in_msg.addr))); } else if (in_msg.Type == CoherenceResponseType:ACK) { trigger(Event:Inv_Ack, makeLineAddress(in_msg.addr), - TBEs[makeLineAddress(in_msg.addr)]); + TBEs.lookup(makeLineAddress(in_msg.addr))); } else { error("Invalid response type"); } @@ -144,7 +144,7 @@ if (triggerQueue_in.isReady()) { peek(triggerQueue_in, TriggerMsg) { if (in_msg.Type == TriggerType:ALL_ACKS) { - trigger(Event:All_Acks, in_msg.addr, TBEs[in_msg.addr]); + trigger(Event:All_Acks, in_msg.addr, TBEs.lookup(in_msg.addr)); } else { error("Unexpected message"); } @@ -240,7 +240,7 @@ action(v_allocateTBE, "v", desc="Allocate TBE entry") { TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); } action(w_deallocateTBE, "w", desc="Deallocate TBE entry") { diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/protocol/MOESI_hammer-dir.sm --- a/src/mem/protocol/MOESI_hammer-dir.sm Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/protocol/MOESI_hammer-dir.sm Fri Jul 10 11:19:37 2015 -0500 @@ -195,7 +195,7 @@ TBETable TBEs, template="", constructor="m_number_of_TBEs"; Entry getDirectoryEntry(Addr addr), return_by_pointer="yes" { - Entry dir_entry := static_cast(Entry, "pointer", directory[addr]); + Entry dir_entry := static_cast(Entry, "pointer", directory.lookup(addr)); if (is_valid(dir_entry)) { return dir_entry; @@ -250,7 +250,7 @@ } AccessPermission getAccessPermission(Addr addr) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { return Directory_State_to_permission(tbe.TBEState); } @@ -267,7 +267,7 @@ } void functionalRead(Addr addr, Packet *pkt) { - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { testAndRead(addr, tbe.DataBlk, pkt); } else { @@ -278,7 +278,7 @@ int functionalWrite(Addr addr, Packet *pkt) { int num_functional_writes := 0; - TBE tbe := TBEs[addr]; + TBE tbe := TBEs.lookup(addr); if(is_valid(tbe)) { num_functional_writes := num_functional_writes + testAndWrite(addr, tbe.DataBlk, pkt); @@ -316,7 +316,7 @@ if (triggerQueue_in.isReady()) { peek(triggerQueue_in, TriggerMsg) { PfEntry pf_entry := getProbeFilterEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == TriggerType:ALL_ACKS) { trigger(Event:All_acks_and_owner_data, in_msg.addr, pf_entry, tbe); @@ -340,7 +340,7 @@ if (unblockNetwork_in.isReady()) { peek(unblockNetwork_in, ResponseMsg) { PfEntry pf_entry := getProbeFilterEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == CoherenceResponseType:UNBLOCK) { trigger(Event:Unblock, in_msg.addr, pf_entry, tbe); } else if (in_msg.Type == CoherenceResponseType:UNBLOCKS) { @@ -369,7 +369,7 @@ if (responseToDir_in.isReady()) { peek(responseToDir_in, ResponseMsg) { PfEntry pf_entry := getProbeFilterEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == CoherenceResponseType:ACK) { trigger(Event:Ack, in_msg.addr, pf_entry, tbe); } else if (in_msg.Type == CoherenceResponseType:ACK_SHARED) { @@ -392,7 +392,7 @@ if (memQueue_in.isReady()) { peek(memQueue_in, MemoryMsg) { PfEntry pf_entry := getProbeFilterEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == MemoryRequestType:MEMORY_READ) { trigger(Event:Memory_Data, in_msg.addr, pf_entry, tbe); } else if (in_msg.Type == MemoryRequestType:MEMORY_WB) { @@ -409,7 +409,7 @@ if (requestQueue_in.isReady()) { peek(requestQueue_in, RequestMsg) { PfEntry pf_entry := getProbeFilterEntry(in_msg.addr); - TBE tbe := TBEs[in_msg.addr]; + TBE tbe := TBEs.lookup(in_msg.addr); if (in_msg.Type == CoherenceRequestType:PUT) { trigger(Event:PUT, in_msg.addr, pf_entry, tbe); } else if (in_msg.Type == CoherenceRequestType:PUTF) { @@ -427,7 +427,7 @@ trigger(Event:Pf_Replacement, probeFilter.cacheProbe(in_msg.addr), getProbeFilterEntry(probeFilter.cacheProbe(in_msg.addr)), - TBEs[probeFilter.cacheProbe(in_msg.addr)]); + TBEs.lookup(probeFilter.cacheProbe(in_msg.addr))); } } } else { @@ -443,7 +443,7 @@ if (dmaRequestQueue_in.isReady()) { peek(dmaRequestQueue_in, DMARequestMsg) { PfEntry pf_entry := getProbeFilterEntry(in_msg.LineAddress); - TBE tbe := TBEs[in_msg.LineAddress]; + TBE tbe := TBEs.lookup(in_msg.LineAddress); if (in_msg.Type == DMARequestType:READ) { trigger(Event:DMA_READ, in_msg.LineAddress, pf_entry, tbe); } else if (in_msg.Type == DMARequestType:WRITE) { @@ -566,7 +566,7 @@ check_allocate(TBEs); peek(requestQueue_in, RequestMsg) { TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.PhysicalAddress := address; tbe.ResponseType := CoherenceResponseType:NULL; } @@ -576,7 +576,7 @@ check_allocate(TBEs); peek(dmaRequestQueue_in, DMARequestMsg) { TBEs.allocate(address); - set_tbe(TBEs[address]); + set_tbe(TBEs.lookup(address)); tbe.DmaDataBlk := in_msg.DataBlk; tbe.PhysicalAddress := in_msg.PhysicalAddress; tbe.Len := in_msg.Len; diff -r 77f97a10aa4e -r 8ddd1d80b590 src/mem/slicc/parser.py --- a/src/mem/slicc/parser.py Fri Jul 10 11:19:28 2015 -0500 +++ b/src/mem/slicc/parser.py Fri Jul 10 11:19:37 2015 -0500 @@ -661,10 +661,6 @@ "aexpr : aexpr DOT ident '(' exprs ')'" p[0] = ast.MemberMethodCallExprAST(self, p[1], p[3], p[5]) - def p_expr__member_method_call_lookup(self, p): - "aexpr : aexpr '[' exprs ']'" - p[0] = ast.MemberMethodCallExprAST(self, p[1], "lookup", p[3]) - def p_expr__class_method_call(self, p): "aexpr : type DOUBLE_COLON ident '(' exprs ')'" p[0] = ast.ClassMethodCallExprAST(self, p[1], p[3], p[5])