ruby: fix message buffer init order

Information
Submitter:	Tony Gutierrez
Repository:	gem5
Branch:	default
Bugs:
Depends On:
Reviewers
Groups:	Default
People:

Description

Changeset 11095:d1f176c26916
---------------------------
ruby: fix message buffer init order

The recent changes to make MessageBuffers SimObjects required them to be
initialized in a particular order, which could break some protocols. Fix this
by calling initNetQueues on the external nodes of each external link in the
constructor of Network.

This patch also refactors the duplicated code for checking network allocation
and setting net queues (which are called by initNetQueues) from the simple and
garnet networks to be in Network.

Testing Done

Issue Summary

Description	From	Last Updated	Status
These functions need not be virtual now.	Nilay Vaish	Sept. 14, 2015, 10:39 a.m.	Resolved
Why do we need virtual here?	Nilay Vaish	Sept. 14, 2015, 10:39 a.m.	Resolved

Tony, expand the review description and add the problem that you are facing.

Brad Beckmann Sept. 14, 2015, 5:18 p.m. (Sept. 14, 2015, 5:18 p.m.)

Nilay, I believe the particular problem we encountered was that the previous code required the controller init functions to be called before the Network init functions.  I think that order was happening for the public repo protocols, but our internal protocols did not follow that order.  In general, sim_object init and constructors should not be dependent on a particular order to work correctly.  So this patch fixes the problem.
The bugs fixed in this patch were a big reason it took two weeks for us to merge with Joel's MessageBuffer changes.

src/mem/ruby/network/Network.hh (Diff revision 1)

These functions need not be virtual now.

Show all issues

Tony Gutierrez Sept. 14, 2015, 10:39 a.m. (Sept. 14, 2015, 10:39 a.m.)
```
Yep. Will remove that.
```

src/mem/slicc/symbols/StateMachine.py (Diff revision 1)

Why do we need virtual here?

Show all issues

Tony Gutierrez Sept. 14, 2015, 10:39 a.m. (Sept. 14, 2015, 10:39 a.m.)
```
You're right. It's not needed. Will fix before pushing.
```

Description:

~		Changeset 11095:55e87e005a11
	~	Changeset 11095:d1f176c26916

		ruby: fix message buffer init order
	+
	+	The recent changes to make MessageBuffers SimObjects required them to be
	+	initialized in a particular order, which could break some protocols. Fix this
	+	by calling initNetQueues on the external nodes of each external link in the
	+	constructor of Network.
	+
	+	This patch also refactors the duplicated code for checking network allocation
	+	and setting net queues (which are called by initNetQueues) from the simple and
	+	garnet networks to be in Network.

Diff:

Revision 2 (+57 -111)

Show changes

	src/mem/ruby/network/Network.hh
	src/mem/ruby/network/Network.cc
	src/mem/ruby/network/garnet/BaseGarnetNetwork.hh
	src/mem/ruby/network/garnet/BaseGarnetNetwork.cc
	src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.hh
	src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
	src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.hh
	src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
	3 more

Ship It!

You have a pending review.

Review Board 2.0.15

This change has been marked as submitted.

Screenshots

Files

Issue Summary

Description:

Changeset 11095:55e87e005a11

Changeset 11095:d1f176c26916

Diff:

Status: Closed (submitted)