diff options
author | Steve Reinhardt <steve.reinhardt@amd.com> | 2014-05-31 18:00:23 -0700 |
---|---|---|
committer | Steve Reinhardt <steve.reinhardt@amd.com> | 2014-05-31 18:00:23 -0700 |
commit | 0be64ffe2f4ff8824b3084362706ffbf456ea490 (patch) | |
tree | 795d803dcfaa3b92faa1155ce2c835daf2d76290 /src/mem/protocol | |
parent | 2a8088f5aec433b6a1a2330f4fbc29ae28b5ee73 (diff) | |
download | gem5-0be64ffe2f4ff8824b3084362706ffbf456ea490.tar.xz |
style: eliminate equality tests with true and false
Using '== true' in a boolean expression is totally redundant,
and using '== false' is pretty verbose (and arguably less
readable in most cases) compared to '!'.
It's somewhat of a pet peeve, perhaps, but I had some time
waiting for some tests to run and decided to clean these up.
Unfortunately, SLICC appears not to have the '!' operator,
so I had to leave the '== false' tests in the SLICC code.
Diffstat (limited to 'src/mem/protocol')
-rw-r--r-- | src/mem/protocol/MOESI_CMP_token-L1cache.sm | 6 | ||||
-rw-r--r-- | src/mem/protocol/MOESI_CMP_token-L2cache.sm | 8 | ||||
-rw-r--r-- | src/mem/protocol/MOESI_CMP_token-dir.sm | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/mem/protocol/MOESI_CMP_token-L1cache.sm b/src/mem/protocol/MOESI_CMP_token-L1cache.sm index 7400ba12e..2b15dc8bf 100644 --- a/src/mem/protocol/MOESI_CMP_token-L1cache.sm +++ b/src/mem/protocol/MOESI_CMP_token-L1cache.sm @@ -261,7 +261,7 @@ machine(L1Cache, "Token protocol") } else if (is_valid(cache_entry)) { return cache_entry.CacheState; } else { - if ((persistentTable.isLocked(addr) == true) && (persistentTable.findSmallest(addr) != machineID)) { + if (persistentTable.isLocked(addr) && (persistentTable.findSmallest(addr) != machineID)) { // Not in cache, in persistent table, but this processor isn't highest priority return State:I_L; } else { @@ -1401,7 +1401,7 @@ machine(L1Cache, "Token protocol") assert(is_valid(tbe)); if (tbe.WentPersistent) { - // assert(starving == true); + // assert(starving); outstandingRequests := outstandingRequests - 1; enqueue(persistentNetwork_out, PersistentMsg, l1_request_latency) { out_msg.Addr := address; @@ -1428,7 +1428,7 @@ machine(L1Cache, "Token protocol") // Update average latency if (tbe.IssueCount <= 1) { - if (tbe.ExternalResponse == true) { + if (tbe.ExternalResponse) { updateAverageLatencyEstimate(curCycle() - tbe.IssueTime); } } diff --git a/src/mem/protocol/MOESI_CMP_token-L2cache.sm b/src/mem/protocol/MOESI_CMP_token-L2cache.sm index b429a68aa..f0fa8227d 100644 --- a/src/mem/protocol/MOESI_CMP_token-L2cache.sm +++ b/src/mem/protocol/MOESI_CMP_token-L2cache.sm @@ -165,7 +165,7 @@ machine(L2Cache, "Token protocol") State getState(Entry cache_entry, Address addr) { if (is_valid(cache_entry)) { return cache_entry.CacheState; - } else if (persistentTable.isLocked(addr) == true) { + } else if (persistentTable.isLocked(addr)) { return State:I_L; } else { return State:NP; @@ -250,7 +250,7 @@ machine(L2Cache, "Token protocol") bool exclusiveExists(Address addr) { if (localDirectory.isTagPresent(addr)) { - if (localDirectory[addr].exclusive == true) { + if (localDirectory[addr].exclusive) { return true; } else { @@ -285,7 +285,7 @@ machine(L2Cache, "Token protocol") } void clearExclusiveBitIfExists(Address addr) { - if (localDirectory.isTagPresent(addr) == true) { + if (localDirectory.isTagPresent(addr)) { localDirectory[addr].exclusive := false; } } @@ -761,7 +761,7 @@ machine(L2Cache, "Token protocol") action(j_forwardTransientRequestToLocalSharers, "j", desc="Forward external transient request to local sharers") { peek(requestNetwork_in, RequestMsg) { - if (filtering_enabled == true && in_msg.RetryNum == 0 && sharersExist(in_msg.Addr) == false) { + if (filtering_enabled && in_msg.RetryNum == 0 && sharersExist(in_msg.Addr) == false) { //profile_filter_action(1); DPRINTF(RubySlicc, "filtered message, Retry Num: %d\n", in_msg.RetryNum); diff --git a/src/mem/protocol/MOESI_CMP_token-dir.sm b/src/mem/protocol/MOESI_CMP_token-dir.sm index f7d3f1fa2..4354d7c4c 100644 --- a/src/mem/protocol/MOESI_CMP_token-dir.sm +++ b/src/mem/protocol/MOESI_CMP_token-dir.sm @@ -708,7 +708,7 @@ machine(Directory, "Token protocol") action(s_deallocateTBE, "s", desc="Deallocate TBE") { if (tbe.WentPersistent) { - assert(starving == true); + assert(starving); enqueue(persistentNetwork_out, PersistentMsg, 1) { out_msg.Addr := address; |