| commit | dd57e9216ac723d0cff2c211cb323385c685c86c | [log] [tgz] |
|---|---|---|
| author | Bobby R. Bruce <bbruce@ucdavis.edu> | Thu May 20 10:32:42 2021 -0700 |
| committer | Bobby R. Bruce <bbruce@ucdavis.edu> | Tue Jun 22 18:18:04 2021 +0000 |
| tree | 495d62ec77005dd17ff6b66c77bd4969e442dbac | |
| parent | 09b71163be83d49f2d67915b0887e791e4336f94 [diff] |
mem-ruby: Fix nonsensical check in MOESI_CMP_token-L1cache This check always equated to False. It should be an 'or' not an 'and' comparison. The Clang 11 compiler threw an "overlapping comparisons always evaluate to false" error for the code generaed from this. Change-Id: I299dc6fa8206d5e85d59ba8353bf16102b8e5e1b Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45799 Reviewed-by: Jason Lowe-Power <power.jg@gmail.com> Reviewed-by: Matt Sinclair <mattdsinclair@gmail.com> Maintainer: Jason Lowe-Power <power.jg@gmail.com> Maintainer: Matt Sinclair <mattdsinclair@gmail.com> Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45829 Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
diff --git a/src/mem/ruby/protocol/MOESI_CMP_token-L1cache.sm b/src/mem/ruby/protocol/MOESI_CMP_token-L1cache.sm index 5c3d5f7..c9fe135 100644 --- a/src/mem/ruby/protocol/MOESI_CMP_token-L1cache.sm +++ b/src/mem/ruby/protocol/MOESI_CMP_token-L1cache.sm
@@ -358,7 +358,7 @@ } // You have at least half the token in O-like states - if (state == State:O && state == State:OM) { + if (state == State:O || state == State:OM) { assert(cache_entry.Tokens > (max_tokens() / 2)); }