Hsuan Hsu has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/28347 )
Change subject: cpu: Don't assert on branch target addresses
......................................................................
cpu: Don't assert on branch target addresses
We should assume a branch target can be any address.
JIRA: https://gem5.atlassian.net/browse/GEM5-483
Change-Id: I6f6da1f9260d6e8978536967dc7fcf1808965db2
Signed-off-by: Hsuan Hsu <hsuan....@mediatek.com>
Signed-off-by: Howard Wang <howard.w...@mediatek.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28347
Reviewed-by: Trivikram Reddy <tvre...@ucdavis.edu>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/cpu/pred/ltage.cc
M src/cpu/pred/multiperspective_perceptron.cc
M src/cpu/pred/multiperspective_perceptron_tage.cc
M src/cpu/pred/tage.cc
M src/cpu/pred/tage_sc_l.cc
5 files changed, 0 insertions(+), 9 deletions(-)
Approvals:
Trivikram Reddy: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/pred/ltage.cc b/src/cpu/pred/ltage.cc
index a2cc56a..68a6db7 100644
--- a/src/cpu/pred/ltage.cc
+++ b/src/cpu/pred/ltage.cc
@@ -95,8 +95,6 @@
LTageBranchInfo* bi = static_cast<LTageBranchInfo*>(bp_history);
- assert(corrTarget != MaxAddr);
-
if (squashed) {
if (tage->isSpeculativeUpdateEnabled()) {
// This restores the global history, then update it
diff --git a/src/cpu/pred/multiperspective_perceptron.cc
b/src/cpu/pred/multiperspective_perceptron.cc
index d081b49..6582197 100644
--- a/src/cpu/pred/multiperspective_perceptron.cc
+++ b/src/cpu/pred/multiperspective_perceptron.cc
@@ -613,7 +613,6 @@
{
assert(bp_history);
MPPBranchInfo *bi = static_cast<MPPBranchInfo*>(bp_history);
- assert(corrTarget != MaxAddr);
if (squashed) {
//delete bi;
return;
diff --git a/src/cpu/pred/multiperspective_perceptron_tage.cc
b/src/cpu/pred/multiperspective_perceptron_tage.cc
index 3ef5f4f..a54f37c 100644
--- a/src/cpu/pred/multiperspective_perceptron_tage.cc
+++ b/src/cpu/pred/multiperspective_perceptron_tage.cc
@@ -605,8 +605,6 @@
assert(bp_history);
MPPTAGEBranchInfo *bi = static_cast<MPPTAGEBranchInfo*>(bp_history);
- assert(corrTarget != MaxAddr);
-
if (squashed) {
if (tage->isSpeculativeUpdateEnabled()) {
// This restores the global history, then update it
diff --git a/src/cpu/pred/tage.cc b/src/cpu/pred/tage.cc
index 7906532..d7c50f0 100644
--- a/src/cpu/pred/tage.cc
+++ b/src/cpu/pred/tage.cc
@@ -58,8 +58,6 @@
TageBranchInfo *bi = static_cast<TageBranchInfo*>(bp_history);
TAGEBase::BranchInfo *tage_bi = bi->tageBranchInfo;
- assert(corrTarget != MaxAddr);
-
if (squashed) {
// This restores the global history, then update it
// and recomputes the folded histories.
diff --git a/src/cpu/pred/tage_sc_l.cc b/src/cpu/pred/tage_sc_l.cc
index de7c2f2..cbd9a45 100644
--- a/src/cpu/pred/tage_sc_l.cc
+++ b/src/cpu/pred/tage_sc_l.cc
@@ -419,8 +419,6 @@
TAGE_SC_L_TAGE::BranchInfo* tage_bi =
static_cast<TAGE_SC_L_TAGE::BranchInfo *>(bi->tageBranchInfo);
- assert(corrTarget != MaxAddr);
-
if (squashed) {
if (tage->isSpeculativeUpdateEnabled()) {
// This restores the global history, then update it
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/28347
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I6f6da1f9260d6e8978536967dc7fcf1808965db2
Gerrit-Change-Number: 28347
Gerrit-PatchSet: 5
Gerrit-Owner: Hsuan Hsu <kugwa2...@gmail.com>
Gerrit-Reviewer: Hsuan Hsu <kugwa2...@gmail.com>
Gerrit-Reviewer: Jairo Balart <jairo.bal...@metempsy.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Javier Bueno Hedo <javier.bu...@metempsy.com>
Gerrit-Reviewer: Pau Cabre <pau.ca...@metempsy.com>
Gerrit-Reviewer: Trivikram Reddy <tvre...@ucdavis.edu>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Ciro Santilli <ciro.santi...@arm.com>
Gerrit-CC: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-CC: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
