Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/51407 )
Change subject: mem-ruby: HTMSequencer stats initialized twice
......................................................................
mem-ruby: HTMSequencer stats initialized twice
HTMSequencer stats are already initialized in the constructor
This is a bug from:
[1]: https://gem5-review.googlesource.com/c/public/gem5/+/36478
Change-Id: Id7d9b11f45035a46af32584ed86470c65d2a80b6
Signed-off-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/51407
Reviewed-by: Hoa Nguyen <hoangu...@ucdavis.edu>
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/mem/ruby/system/HTMSequencer.cc
M src/mem/ruby/system/HTMSequencer.hh
2 files changed, 21 insertions(+), 35 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Hoa Nguyen: Looks good to me, but someone else must approve
kokoro: Regressions pass
diff --git a/src/mem/ruby/system/HTMSequencer.cc
b/src/mem/ruby/system/HTMSequencer.cc
index 5157842..98f6d35 100644
--- a/src/mem/ruby/system/HTMSequencer.cc
+++ b/src/mem/ruby/system/HTMSequencer.cc
@@ -210,40 +210,6 @@
}
void
-HTMSequencer::regStats()
-{
- // hardware transactional memory
- m_htm_transaction_cycles
- .init(10)
- .name(name() + ".htm_transaction_cycles")
- .desc("number of cycles spent in an outer transaction")
- .flags(statistics::pdf | statistics::dist | statistics::nozero |
- statistics::nonan)
- ;
- m_htm_transaction_instructions
- .init(10)
- .name(name() + ".htm_transaction_instructions")
- .desc("number of instructions spent in an outer transaction")
- .flags(statistics::pdf | statistics::dist | statistics::nozero |
- statistics::nonan)
- ;
- auto num_causes = static_cast<int>(HtmFailureFaultCause::NUM_CAUSES);
- m_htm_transaction_abort_cause
- .init(num_causes)
- .name(name() + ".htm_transaction_abort_cause")
- .desc("cause of htm transaction abort")
- .flags(statistics::total | statistics::pdf | statistics::dist |
- statistics::nozero)
- ;
-
- for (unsigned cause_idx = 0; cause_idx < num_causes; ++cause_idx) {
- m_htm_transaction_abort_cause.subname(
- cause_idx,
- htmFailureToStr(HtmFailureFaultCause(cause_idx)));
- }
-}
-
-void
HTMSequencer::rubyHtmCallback(PacketPtr pkt,
const HtmFailedInCacheReason htm_return_code)
{
diff --git a/src/mem/ruby/system/HTMSequencer.hh
b/src/mem/ruby/system/HTMSequencer.hh
index 2f19f39..3b39331 100644
--- a/src/mem/ruby/system/HTMSequencer.hh
+++ b/src/mem/ruby/system/HTMSequencer.hh
@@ -68,7 +68,6 @@
bool empty() const override;
void print(std::ostream& out) const override;
- void regStats() override;
void wakeup() override;
private:
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/51407
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: Id7d9b11f45035a46af32584ed86470c65d2a80b6
Gerrit-Change-Number: 51407
Gerrit-PatchSet: 2
Gerrit-Owner: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Hoa Nguyen <hoangu...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <ja...@lowepower.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.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
