[gem5-dev] Change in gem5/gem5[develop]: mem-garnet,mem-ruby: Properly reset garnet2.0 statistics.

2020-05-19 Thread Polydoros Petrakis (Gerrit) via gem5-dev 
Polydoros Petrakis has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/29253 )



Change subject: mem-garnet,mem-ruby: Properly reset garnet2.0 statistics.
..

mem-garnet,mem-ruby: Properly reset garnet2.0 statistics.

Statistics for crossbar activity, and link related statistics were not  
getting reset when using m5_reset_stats.


Change-Id: Ib84c55200e4a86c6f9190de28498112bd43dde9d
---
M src/mem/ruby/network/garnet2.0/GarnetNetwork.cc
M src/mem/ruby/network/garnet2.0/GarnetNetwork.hh
M src/mem/ruby/system/RubySystem.cc
3 files changed, 13 insertions(+), 0 deletions(-)



diff --git a/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc  
b/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc

index 1eff921..83ec4a1 100644
--- a/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc
@@ -415,6 +415,17 @@
 }

 void
+GarnetNetwork::resetStats()
+{
+for (int i = 0; i < m_routers.size(); i++) {
+m_routers[i]->resetStats();
+}
+for (int i = 0; i < m_networklinks.size(); i++) {
+m_networklinks[i]->resetStats();
+}
+}
+
+void
 GarnetNetwork::print(ostream& out) const
 {
 out << "[GarnetNetwork]";
diff --git a/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh  
b/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh

index 9acbeef..3821dd8 100644
--- a/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh
@@ -101,6 +101,7 @@
 // Stats
 void collateStats();
 void regStats();
+void resetStats();
 void print(std::ostream& out) const;

 // increment counters
diff --git a/src/mem/ruby/system/RubySystem.cc  
b/src/mem/ruby/system/RubySystem.cc

index 57d4966..2aeff8c 100644
--- a/src/mem/ruby/system/RubySystem.cc
+++ b/src/mem/ruby/system/RubySystem.cc
@@ -407,6 +407,7 @@
 RubySystem::resetStats()
 {
 m_start_cycle = curCycle();
+m_network->resetStats();
 }

 bool

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/29253
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: Ib84c55200e4a86c6f9190de28498112bd43dde9d
Gerrit-Change-Number: 29253
Gerrit-PatchSet: 1
Gerrit-Owner: Polydoros Petrakis 
Gerrit-MessageType: newchange
___
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

[gem5-dev] Change in gem5/gem5[develop]: mem-garnet: Remove extraneous loop in Router resetStats.

2020-05-19 Thread Polydoros Petrakis (Gerrit) via gem5-dev 
Polydoros Petrakis has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/29254 )



Change subject: mem-garnet: Remove extraneous loop in Router resetStats.
..

mem-garnet: Remove extraneous loop in Router resetStats.

This outer loop makes no sense.

Change-Id: Ibe4b8b50c5843fba2119906f59ea1cb6c1d8c762
---
M src/mem/ruby/network/garnet2.0/Router.cc
1 file changed, 1 insertion(+), 3 deletions(-)



diff --git a/src/mem/ruby/network/garnet2.0/Router.cc  
b/src/mem/ruby/network/garnet2.0/Router.cc

index 14c0e84..73b7dce 100644
--- a/src/mem/ruby/network/garnet2.0/Router.cc
+++ b/src/mem/ruby/network/garnet2.0/Router.cc
@@ -215,10 +215,8 @@
 void
 Router::resetStats()
 {
-for (int j = 0; j < m_virtual_networks; j++) {
-for (int i = 0; i < m_input_unit.size(); i++) {
+for (int i = 0; i < m_input_unit.size(); i++) {
 m_input_unit[i]->resetStats();
-}
 }

 crossbarSwitch.resetStats();

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/29254
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: Ibe4b8b50c5843fba2119906f59ea1cb6c1d8c762
Gerrit-Change-Number: 29254
Gerrit-PatchSet: 1
Gerrit-Owner: Polydoros Petrakis 
Gerrit-MessageType: newchange
___
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

[gem5-dev] Change in gem5/gem5[develop]: Merge branch 'develop' of https://gem5.googlesource.com/public/gem5 i...

2020-05-20 Thread Polydoros Petrakis (Gerrit) via gem5-dev 
Polydoros Petrakis has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/29255 )



Change subject: Merge branch 'develop' of  
https://gem5.googlesource.com/public/gem5 into develop

..

Merge branch 'develop' of https://gem5.googlesource.com/public/gem5 into  
develop


Change-Id: I49a0acde1af5c5dc7bc6bc7869bf9809d9d9c9a3
---
M src/mem/ruby/network/garnet2.0/GarnetNetwork.cc
2 files changed, 4 insertions(+), 0 deletions(-)



diff --git a/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc  
b/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc

index 83ec4a1..5f4b54f 100644
--- a/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc
@@ -423,6 +423,10 @@
 for (int i = 0; i < m_networklinks.size(); i++) {
 m_networklinks[i]->resetStats();
 }
+for (int i = 0; i < m_creditlinks.size(); i++) {
+m_creditlinks[i]->resetStats();
+}
+}
 }

 void

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/29255
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: I49a0acde1af5c5dc7bc6bc7869bf9809d9d9c9a3
Gerrit-Change-Number: 29255
Gerrit-PatchSet: 1
Gerrit-Owner: Polydoros Petrakis 
Gerrit-MessageType: newchange
___
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

[gem5-dev] Change in gem5/gem5[develop]: mem-garnet,mem-ruby: Properly reset garnet2.0 statistics.

2020-05-21 Thread Polydoros Petrakis (Gerrit) via gem5-dev 
Polydoros Petrakis has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/29253 )


Change subject: mem-garnet,mem-ruby: Properly reset garnet2.0 statistics.
..

mem-garnet,mem-ruby: Properly reset garnet2.0 statistics.

Statistics for crossbar activity, and link related statistics were not  
getting reset when using m5_reset_stats.


Change-Id: Ib84c55200e4a86c6f9190de28498112bd43dde9d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29253
Reviewed-by: Jason Lowe-Power 
Reviewed-by: Srikant Bharadwaj 
Maintainer: Jason Lowe-Power 
Tested-by: kokoro 
---
M src/mem/ruby/network/garnet2.0/GarnetNetwork.cc
M src/mem/ruby/network/garnet2.0/GarnetNetwork.hh
M src/mem/ruby/system/RubySystem.cc
3 files changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Jason Lowe-Power: Looks good to me, but someone else must approve; Looks  
good to me, approved

  Srikant Bharadwaj: Looks good to me, approved
  kokoro: Regressions pass



diff --git a/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc  
b/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc

index 1eff921..8f226b1 100644
--- a/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet2.0/GarnetNetwork.cc
@@ -415,6 +415,20 @@
 }

 void
+GarnetNetwork::resetStats()
+{
+for (int i = 0; i < m_routers.size(); i++) {
+m_routers[i]->resetStats();
+}
+for (int i = 0; i < m_networklinks.size(); i++) {
+m_networklinks[i]->resetStats();
+}
+for (int i = 0; i < m_creditlinks.size(); i++) {
+m_creditlinks[i]->resetStats();
+}
+}
+
+void
 GarnetNetwork::print(ostream& out) const
 {
 out << "[GarnetNetwork]";
diff --git a/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh  
b/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh

index 9acbeef..3821dd8 100644
--- a/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet2.0/GarnetNetwork.hh
@@ -101,6 +101,7 @@
 // Stats
 void collateStats();
 void regStats();
+void resetStats();
 void print(std::ostream& out) const;

 // increment counters
diff --git a/src/mem/ruby/system/RubySystem.cc  
b/src/mem/ruby/system/RubySystem.cc

index 57d4966..2aeff8c 100644
--- a/src/mem/ruby/system/RubySystem.cc
+++ b/src/mem/ruby/system/RubySystem.cc
@@ -407,6 +407,7 @@
 RubySystem::resetStats()
 {
 m_start_cycle = curCycle();
+m_network->resetStats();
 }

 bool

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/29253
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: Ib84c55200e4a86c6f9190de28498112bd43dde9d
Gerrit-Change-Number: 29253
Gerrit-PatchSet: 3
Gerrit-Owner: Polydoros Petrakis 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: Polydoros Petrakis 
Gerrit-Reviewer: Srikant Bharadwaj 
Gerrit-Reviewer: kokoro 
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

[gem5-dev] Change in gem5/gem5[develop]: mem-garnet: Remove extraneous loop in Router resetStats.

2020-05-21 Thread Polydoros Petrakis (Gerrit) via gem5-dev 
Polydoros Petrakis has submitted this change. (  
https://gem5-review.googlesource.com/c/public/gem5/+/29254 )


Change subject: mem-garnet: Remove extraneous loop in Router resetStats.
..

mem-garnet: Remove extraneous loop in Router resetStats.

This outer loop makes no sense.

Change-Id: Ibe4b8b50c5843fba2119906f59ea1cb6c1d8c762
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29254
Reviewed-by: Srikant Bharadwaj 
Reviewed-by: Jason Lowe-Power 
Maintainer: Jason Lowe-Power 
Tested-by: kokoro 
---
M src/mem/ruby/network/garnet2.0/Router.cc
1 file changed, 1 insertion(+), 3 deletions(-)

Approvals:
  Jason Lowe-Power: Looks good to me, but someone else must approve; Looks  
good to me, approved

  Srikant Bharadwaj: Looks good to me, approved
  kokoro: Regressions pass



diff --git a/src/mem/ruby/network/garnet2.0/Router.cc  
b/src/mem/ruby/network/garnet2.0/Router.cc

index 14c0e84..73b7dce 100644
--- a/src/mem/ruby/network/garnet2.0/Router.cc
+++ b/src/mem/ruby/network/garnet2.0/Router.cc
@@ -215,10 +215,8 @@
 void
 Router::resetStats()
 {
-for (int j = 0; j < m_virtual_networks; j++) {
-for (int i = 0; i < m_input_unit.size(); i++) {
+for (int i = 0; i < m_input_unit.size(); i++) {
 m_input_unit[i]->resetStats();
-}
 }

 crossbarSwitch.resetStats();

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/29254
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: Ibe4b8b50c5843fba2119906f59ea1cb6c1d8c762
Gerrit-Change-Number: 29254
Gerrit-PatchSet: 3
Gerrit-Owner: Polydoros Petrakis 
Gerrit-Reviewer: Jason Lowe-Power 
Gerrit-Reviewer: Polydoros Petrakis 
Gerrit-Reviewer: Srikant Bharadwaj 
Gerrit-Reviewer: kokoro 
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