Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45829 )
Change subject: mem-ruby: Fix nonsensical check in MOESI_CMP_token-L1cache
......................................................................
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 <[email protected]>
Reviewed-by: Matt Sinclair <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
Maintainer: Matt Sinclair <[email protected]>
Tested-by: kokoro <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45829
Maintainer: Bobby R. Bruce <[email protected]>
---
M src/mem/ruby/protocol/MOESI_CMP_token-L1cache.sm
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matt Sinclair: Looks good to me, approved; Looks good to me, approved
Bobby R. Bruce: Looks good to me, approved
kokoro: Regressions pass
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));
}
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45829
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: minor-release-staging-v21-0-1
Gerrit-Change-Id: I299dc6fa8206d5e85d59ba8353bf16102b8e5e1b
Gerrit-Change-Number: 45829
Gerrit-PatchSet: 6
Gerrit-Owner: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matt Sinclair <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
