sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ruby: mesi cmp directory: cosmetic changes

Browse source 
Updates copyright years, removes space at the end of lines, shortens
variable names.
This commit is contained in:
Nilay Vaish 2013-05-21 11:32:38 -05:00
parent bd3d1955da
commit 09d5bc7e6f
5 changed files with 88 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configs/ruby/MESI_CMP_directory.py
View file

@ -91,8 +91,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
l1_cntrl = L1Cache_Controller(version = i, l1_cntrl = L1Cache_Controller(version = i,
cntrl_id = cntrl_count, cntrl_id = cntrl_count,
L1IcacheMemory = l1i_cache, L1Icache = l1i_cache,
L1DcacheMemory = l1d_cache, L1Dcache = l1d_cache,
l2_select_num_bits = l2_bits, l2_select_num_bits = l2_bits,
send_evictions = ( send_evictions = (
options.cpu_type == "detailed"), options.cpu_type == "detailed"),
@ -132,7 +132,7 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
l2_cntrl = L2Cache_Controller(version = i, l2_cntrl = L2Cache_Controller(version = i,
cntrl_id = cntrl_count, cntrl_id = cntrl_count,
L2cacheMemory = l2_cache, L2cache = l2_cache,
ruby_system = ruby_system) ruby_system = ruby_system)
exec("ruby_system.l2_cntrl%d = l2_cntrl" % i) exec("ruby_system.l2_cntrl%d = l2_cntrl" % i)

78
src/mem/protocol/MESI_CMP_directory-L1cache.sm
View file

@ -1,6 +1,5 @@
/* /*
* Copyright (c) 1999-2005 Mark D. Hill and David A. Wood * Copyright (c) 1999-2013 Mark D. Hill and David A. Wood
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -29,8 +28,8 @@
machine(L1Cache, "MESI Directory L1 Cache CMP") machine(L1Cache, "MESI Directory L1 Cache CMP")
: Sequencer * sequencer, : Sequencer * sequencer,
CacheMemory * L1IcacheMemory, CacheMemory * L1Icache,
CacheMemory * L1DcacheMemory, CacheMemory * L1Dcache,
Prefetcher * prefetcher = 'NULL', Prefetcher * prefetcher = 'NULL',
int l2_select_num_bits, int l2_select_num_bits,
Cycles l1_request_latency = 2, Cycles l1_request_latency = 2,
@ -155,27 +154,27 @@ machine(L1Cache, "MESI Directory L1 Cache CMP")
// inclusive cache returns L1 entries only // inclusive cache returns L1 entries only
Entry getCacheEntry(Address addr), return_by_pointer="yes" { Entry getCacheEntry(Address addr), return_by_pointer="yes" {
Entry L1Dcache_entry := static_cast(Entry, "pointer", L1DcacheMemory[addr]); Entry L1Dcache_entry := static_cast(Entry, "pointer", L1Dcache[addr]);
if(is_valid(L1Dcache_entry)) { if(is_valid(L1Dcache_entry)) {
return L1Dcache_entry; return L1Dcache_entry;
} }
Entry L1Icache_entry := static_cast(Entry, "pointer", L1IcacheMemory[addr]); Entry L1Icache_entry := static_cast(Entry, "pointer", L1Icache[addr]);
return L1Icache_entry; return L1Icache_entry;
} }
Entry getL1DCacheEntry(Address addr), return_by_pointer="yes" { Entry getL1DCacheEntry(Address addr), return_by_pointer="yes" {
Entry L1Dcache_entry := static_cast(Entry, "pointer", L1DcacheMemory[addr]); Entry L1Dcache_entry := static_cast(Entry, "pointer", L1Dcache[addr]);
return L1Dcache_entry; return L1Dcache_entry;
} }
Entry getL1ICacheEntry(Address addr), return_by_pointer="yes" { Entry getL1ICacheEntry(Address addr), return_by_pointer="yes" {
Entry L1Icache_entry := static_cast(Entry, "pointer", L1IcacheMemory[addr]); Entry L1Icache_entry := static_cast(Entry, "pointer", L1Icache[addr]);
return L1Icache_entry; return L1Icache_entry;
} }
State getState(TBE tbe, Entry cache_entry, Address addr) { State getState(TBE tbe, Entry cache_entry, Address addr) {
assert((L1DcacheMemory.isTagPresent(addr) && L1IcacheMemory.isTagPresent(addr)) == false); assert((L1Dcache.isTagPresent(addr) && L1Icache.isTagPresent(addr)) == false);
if(is_valid(tbe)) { if(is_valid(tbe)) {
return tbe.TBEState; return tbe.TBEState;
@ -186,7 +185,7 @@ machine(L1Cache, "MESI Directory L1 Cache CMP")
} }
void setState(TBE tbe, Entry cache_entry, Address addr, State state) { void setState(TBE tbe, Entry cache_entry, Address addr, State state) {
assert((L1DcacheMemory.isTagPresent(addr) && L1IcacheMemory.isTagPresent(addr)) == false); assert((L1Dcache.isTagPresent(addr) && L1Icache.isTagPresent(addr)) == false);
// MUST CHANGE // MUST CHANGE
if(is_valid(tbe)) { if(is_valid(tbe)) {
@ -294,7 +293,7 @@ machine(L1Cache, "MESI Directory L1 Cache CMP")
L1Dcache_entry, L1_TBEs[in_msg.LineAddress]); L1Dcache_entry, L1_TBEs[in_msg.LineAddress]);
} }
if (L1IcacheMemory.cacheAvail(in_msg.LineAddress)) { if (L1Icache.cacheAvail(in_msg.LineAddress)) {
// L1 does't have the line, but we have space for it // L1 does't have the line, but we have space for it
// in the L1 so let's see if the L2 has it // in the L1 so let's see if the L2 has it
trigger(prefetch_request_type_to_event(in_msg.Type), trigger(prefetch_request_type_to_event(in_msg.Type),
@ -303,9 +302,9 @@ machine(L1Cache, "MESI Directory L1 Cache CMP")
} else { } else {
// No room in the L1, so we need to make room in the L1 // No room in the L1, so we need to make room in the L1
trigger(Event:L1_Replacement, trigger(Event:L1_Replacement,
L1IcacheMemory.cacheProbe(in_msg.LineAddress), L1Icache.cacheProbe(in_msg.LineAddress),
getL1ICacheEntry(L1IcacheMemory.cacheProbe(in_msg.LineAddress)), getL1ICacheEntry(L1Icache.cacheProbe(in_msg.LineAddress)),
L1_TBEs[L1IcacheMemory.cacheProbe(in_msg.LineAddress)]); L1_TBEs[L1Icache.cacheProbe(in_msg.LineAddress)]);
} }
} else { } else {
// Data prefetch // Data prefetch
@ -328,7 +327,7 @@ machine(L1Cache, "MESI Directory L1 Cache CMP")
L1Icache_entry, L1_TBEs[in_msg.LineAddress]); L1Icache_entry, L1_TBEs[in_msg.LineAddress]);
} }
if (L1DcacheMemory.cacheAvail(in_msg.LineAddress)) { if (L1Dcache.cacheAvail(in_msg.LineAddress)) {
// L1 does't have the line, but we have space for it in // L1 does't have the line, but we have space for it in
// the L1 let's see if the L2 has it // the L1 let's see if the L2 has it
trigger(prefetch_request_type_to_event(in_msg.Type), trigger(prefetch_request_type_to_event(in_msg.Type),
@ -337,9 +336,9 @@ machine(L1Cache, "MESI Directory L1 Cache CMP")
} else { } else {
// No room in the L1, so we need to make room in the L1 // No room in the L1, so we need to make room in the L1
trigger(Event:L1_Replacement, trigger(Event:L1_Replacement,
L1DcacheMemory.cacheProbe(in_msg.LineAddress), L1Dcache.cacheProbe(in_msg.LineAddress),
getL1DCacheEntry(L1DcacheMemory.cacheProbe(in_msg.LineAddress)), getL1DCacheEntry(L1Dcache.cacheProbe(in_msg.LineAddress)),
L1_TBEs[L1DcacheMemory.cacheProbe(in_msg.LineAddress)]); L1_TBEs[L1Dcache.cacheProbe(in_msg.LineAddress)]);
} }
} }
} }
@ -397,7 +396,8 @@ machine(L1Cache, "MESI Directory L1 Cache CMP")
if (in_msg.Type == CoherenceRequestType:INV) { if (in_msg.Type == CoherenceRequestType:INV) {
trigger(Event:Inv, in_msg.Address, cache_entry, tbe); trigger(Event:Inv, in_msg.Address, cache_entry, tbe);
} else if (in_msg.Type == CoherenceRequestType:GETX || in_msg.Type == CoherenceRequestType:UPGRADE) { } else if (in_msg.Type == CoherenceRequestType:GETX ||
in_msg.Type == CoherenceRequestType:UPGRADE) {
// upgrade transforms to GETX due to race // upgrade transforms to GETX due to race
trigger(Event:Fwd_GETX, in_msg.Address, cache_entry, tbe); trigger(Event:Fwd_GETX, in_msg.Address, cache_entry, tbe);
} else if (in_msg.Type == CoherenceRequestType:GETS) { } else if (in_msg.Type == CoherenceRequestType:GETS) {
@ -436,15 +436,16 @@ machine(L1Cache, "MESI Directory L1 Cache CMP")
L1Dcache_entry, L1_TBEs[in_msg.LineAddress]); L1Dcache_entry, L1_TBEs[in_msg.LineAddress]);
} }
if (L1IcacheMemory.cacheAvail(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 // 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, trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress,
L1Icache_entry, L1_TBEs[in_msg.LineAddress]); L1Icache_entry, L1_TBEs[in_msg.LineAddress]);
} else { } else {
// No room in the L1, so we need to make room in the L1 // No room in the L1, so we need to make room in the L1
trigger(Event:L1_Replacement, L1IcacheMemory.cacheProbe(in_msg.LineAddress), trigger(Event:L1_Replacement, L1Icache.cacheProbe(in_msg.LineAddress),
getL1ICacheEntry(L1IcacheMemory.cacheProbe(in_msg.LineAddress)), getL1ICacheEntry(L1Icache.cacheProbe(in_msg.LineAddress)),
L1_TBEs[L1IcacheMemory.cacheProbe(in_msg.LineAddress)]); L1_TBEs[L1Icache.cacheProbe(in_msg.LineAddress)]);
} }
} }
} else { } else {
@ -465,15 +466,16 @@ machine(L1Cache, "MESI Directory L1 Cache CMP")
L1Icache_entry, L1_TBEs[in_msg.LineAddress]); L1Icache_entry, L1_TBEs[in_msg.LineAddress]);
} }
if (L1DcacheMemory.cacheAvail(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 // 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, trigger(mandatory_request_type_to_event(in_msg.Type), in_msg.LineAddress,
L1Dcache_entry, L1_TBEs[in_msg.LineAddress]); L1Dcache_entry, L1_TBEs[in_msg.LineAddress]);
} else { } else {
// No room in the L1, so we need to make room in the L1 // No room in the L1, so we need to make room in the L1
trigger(Event:L1_Replacement, L1DcacheMemory.cacheProbe(in_msg.LineAddress), trigger(Event:L1_Replacement, L1Dcache.cacheProbe(in_msg.LineAddress),
getL1DCacheEntry(L1DcacheMemory.cacheProbe(in_msg.LineAddress)), getL1DCacheEntry(L1Dcache.cacheProbe(in_msg.LineAddress)),
L1_TBEs[L1DcacheMemory.cacheProbe(in_msg.LineAddress)]); L1_TBEs[L1Dcache.cacheProbe(in_msg.LineAddress)]);
} }
} }
} }
@ -846,23 +848,23 @@ machine(L1Cache, "MESI Directory L1 Cache CMP")
} }
action(ff_deallocateL1CacheBlock, "\f", desc="Deallocate L1 cache block. Sets the cache to not present, allowing a replacement in parallel with a fetch.") { action(ff_deallocateL1CacheBlock, "\f", desc="Deallocate L1 cache block. Sets the cache to not present, allowing a replacement in parallel with a fetch.") {
if (L1DcacheMemory.isTagPresent(address)) { if (L1Dcache.isTagPresent(address)) {
L1DcacheMemory.deallocate(address); L1Dcache.deallocate(address);
} else { } else {
L1IcacheMemory.deallocate(address); L1Icache.deallocate(address);
} }
unset_cache_entry(); unset_cache_entry();
} }
action(oo_allocateL1DCacheBlock, "\o", desc="Set L1 D-cache tag equal to tag of block B.") { action(oo_allocateL1DCacheBlock, "\o", desc="Set L1 D-cache tag equal to tag of block B.") {
if (is_invalid(cache_entry)) { if (is_invalid(cache_entry)) {
set_cache_entry(L1DcacheMemory.allocate(address, new Entry)); set_cache_entry(L1Dcache.allocate(address, new Entry));
} }
} }
action(pp_allocateL1ICacheBlock, "\p", desc="Set L1 I-cache tag equal to tag of block B.") { action(pp_allocateL1ICacheBlock, "\p", desc="Set L1 I-cache tag equal to tag of block B.") {
if (is_invalid(cache_entry)) { if (is_invalid(cache_entry)) {
set_cache_entry(L1IcacheMemory.allocate(address, new Entry)); set_cache_entry(L1Icache.allocate(address, new Entry));
} }
} }
@ -875,19 +877,19 @@ machine(L1Cache, "MESI Directory L1 Cache CMP")
} }
action(uu_profileInstMiss, "\uim", desc="Profile the demand miss") { action(uu_profileInstMiss, "\uim", desc="Profile the demand miss") {
++L1IcacheMemory.demand_misses; ++L1Icache.demand_misses;
} }
action(uu_profileInstHit, "\uih", desc="Profile the demand hit") { action(uu_profileInstHit, "\uih", desc="Profile the demand hit") {
++L1IcacheMemory.demand_hits; ++L1Icache.demand_hits;
} }
action(uu_profileDataMiss, "\udm", desc="Profile the demand miss") { action(uu_profileDataMiss, "\udm", desc="Profile the demand miss") {
++L1DcacheMemory.demand_misses; ++L1Dcache.demand_misses;
} }
action(uu_profileDataHit, "\udh", desc="Profile the demand hit") { action(uu_profileDataHit, "\udh", desc="Profile the demand hit") {
++L1DcacheMemory.demand_hits; ++L1Dcache.demand_hits;
} }
action(po_observeMiss, "\po", desc="Inform the prefetcher about the miss") { action(po_observeMiss, "\po", desc="Inform the prefetcher about the miss") {

29
src/mem/protocol/MESI_CMP_directory-L2cache.sm
View file

@ -1,6 +1,5 @@
/* /*
* Copyright (c) 1999-2005 Mark D. Hill and David A. Wood * Copyright (c) 1999-2013 Mark D. Hill and David A. Wood
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -33,7 +32,7 @@
*/ */
machine(L2Cache, "MESI Directory L2 Cache CMP") machine(L2Cache, "MESI Directory L2 Cache CMP")
: CacheMemory * L2cacheMemory, : CacheMemory * L2cache,
Cycles l2_request_latency = 2, Cycles l2_request_latency = 2,
Cycles l2_response_latency = 2, Cycles l2_response_latency = 2,
Cycles to_l1_latency = 1 Cycles to_l1_latency = 1
@ -160,7 +159,7 @@ machine(L2Cache, "MESI Directory L2 Cache CMP")
// inclusive cache, returns L2 entries only // inclusive cache, returns L2 entries only
Entry getCacheEntry(Address addr), return_by_pointer="yes" { Entry getCacheEntry(Address addr), return_by_pointer="yes" {
return static_cast(Entry, "pointer", L2cacheMemory[addr]); return static_cast(Entry, "pointer", L2cache[addr]);
} }
std::string getCoherenceRequestTypeStr(CoherenceRequestType type) { std::string getCoherenceRequestTypeStr(CoherenceRequestType type) {
@ -372,20 +371,20 @@ machine(L2Cache, "MESI Directory L2 Cache CMP")
in_msg.Requestor, cache_entry), in_msg.Requestor, cache_entry),
in_msg.Address, cache_entry, tbe); in_msg.Address, cache_entry, tbe);
} else { } else {
if (L2cacheMemory.cacheAvail(in_msg.Address)) { if (L2cache.cacheAvail(in_msg.Address)) {
// L2 does't have the line, but we have space for it in the L2 // L2 does't have the line, but we have space for it in the L2
trigger(L1Cache_request_type_to_event(in_msg.Type, in_msg.Address, trigger(L1Cache_request_type_to_event(in_msg.Type, in_msg.Address,
in_msg.Requestor, cache_entry), in_msg.Requestor, cache_entry),
in_msg.Address, cache_entry, tbe); in_msg.Address, cache_entry, tbe);
} else { } else {
// No room in the L2, so we need to make room before handling the request // No room in the L2, so we need to make room before handling the request
Entry L2cache_entry := getCacheEntry(L2cacheMemory.cacheProbe(in_msg.Address)); Entry L2cache_entry := getCacheEntry(L2cache.cacheProbe(in_msg.Address));
if (isDirty(L2cache_entry)) { if (isDirty(L2cache_entry)) {
trigger(Event:L2_Replacement, L2cacheMemory.cacheProbe(in_msg.Address), trigger(Event:L2_Replacement, L2cache.cacheProbe(in_msg.Address),
L2cache_entry, L2_TBEs[L2cacheMemory.cacheProbe(in_msg.Address)]); L2cache_entry, L2_TBEs[L2cache.cacheProbe(in_msg.Address)]);
} else { } else {
trigger(Event:L2_Replacement_clean, L2cacheMemory.cacheProbe(in_msg.Address), trigger(Event:L2_Replacement_clean, L2cache.cacheProbe(in_msg.Address),
L2cache_entry, L2_TBEs[L2cacheMemory.cacheProbe(in_msg.Address)]); L2cache_entry, L2_TBEs[L2cache.cacheProbe(in_msg.Address)]);
} }
} }
} }
@ -679,17 +678,17 @@ machine(L2Cache, "MESI Directory L2 Cache CMP")
} }
action(set_setMRU, "\set", desc="set the MRU entry") { action(set_setMRU, "\set", desc="set the MRU entry") {
L2cacheMemory.setMRU(address); L2cache.setMRU(address);
} }
action(qq_allocateL2CacheBlock, "\q", desc="Set L2 cache tag equal to tag of block B.") { action(qq_allocateL2CacheBlock, "\q", desc="Set L2 cache tag equal to tag of block B.") {
if (is_invalid(cache_entry)) { if (is_invalid(cache_entry)) {
set_cache_entry(L2cacheMemory.allocate(address, new Entry)); set_cache_entry(L2cache.allocate(address, new Entry));
} }
} }
action(rr_deallocateL2CacheBlock, "\r", desc="Deallocate L2 cache block. Sets the cache to not present, allowing a replacement in parallel with a fetch.") { action(rr_deallocateL2CacheBlock, "\r", desc="Deallocate L2 cache block. Sets the cache to not present, allowing a replacement in parallel with a fetch.") {
L2cacheMemory.deallocate(address); L2cache.deallocate(address);
unset_cache_entry(); unset_cache_entry();
} }
@ -721,11 +720,11 @@ machine(L2Cache, "MESI Directory L2 Cache CMP")
} }
action(uu_profileMiss, "\um", desc="Profile the demand miss") { action(uu_profileMiss, "\um", desc="Profile the demand miss") {
++L2cacheMemory.demand_misses; ++L2cache.demand_misses;
} }
action(uu_profileHit, "\uh", desc="Profile the demand hit") { action(uu_profileHit, "\uh", desc="Profile the demand hit") {
++L2cacheMemory.demand_hits; ++L2cache.demand_hits;
} }
action(ww_profileMissNoDir, "\w", desc="Profile this transition at the L2 because Dir won't see the request") { action(ww_profileMissNoDir, "\w", desc="Profile this transition at the L2 because Dir won't see the request") {

3
src/mem/protocol/MESI_CMP_directory-dir.sm
View file

@ -1,6 +1,5 @@
/* /*
* Copyright (c) 1999-2005 Mark D. Hill and David A. Wood * Copyright (c) 1999-2013 Mark D. Hill and David A. Wood
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without