diff options
| author | Gabe Black <gabeblack@google.com> | 2019-08-16 23:21:56 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2019-08-27 22:18:28 +0000 |
| commit | 4d503eeffee054de0aab10962c345ca4bcb54140 (patch) | |
| tree | f85cff96b40616488a885019c902627b484f2695 /src/mem | |
| parent | f4f31b261cdda95fe6e5a5a71ce232ee479686ae (diff) | |
| download | gem5-4d503eeffee054de0aab10962c345ca4bcb54140.tar.xz | |
cpu, dev, mem: Use the new Port methods.
Use getPeer, takeOverFrom, and << to simplify the use of ports in some
areas.
Change-Id: Idfbda27411b5d6b742f5e4927894302ea6d6a53d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20235
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/mem')
| -rw-r--r-- | src/mem/coherent_xbar.cc | 3 | ||||
| -rw-r--r-- | src/mem/mport.cc | 2 | ||||
| -rw-r--r-- | src/mem/xbar.cc | 14 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/mem/coherent_xbar.cc b/src/mem/coherent_xbar.cc index 74c93be0f..a339500a8 100644 --- a/src/mem/coherent_xbar.cc +++ b/src/mem/coherent_xbar.cc @@ -125,8 +125,7 @@ CoherentXBar::init() for (const auto& p: slavePorts) { // check if the connected master port is snooping if (p->isSnooping()) { - DPRINTF(AddrRanges, "Adding snooping master %s\n", - p->getMasterPort().name()); + DPRINTF(AddrRanges, "Adding snooping master %s\n", p->getPeer()); snoopPorts.push_back(p); } } diff --git a/src/mem/mport.cc b/src/mem/mport.cc index 5678f87d7..6b5ae774b 100644 --- a/src/mem/mport.cc +++ b/src/mem/mport.cc @@ -49,6 +49,6 @@ MessageSlavePort::recvAtomic(PacketPtr pkt) return recvMessage(pkt); } else { panic("%s received unexpected atomic command %s from %s.\n", - name(), pkt->cmd.toString(), getMasterPort().name()); + name(), pkt->cmd.toString(), getPeer()); } } diff --git a/src/mem/xbar.cc b/src/mem/xbar.cc index de32c0b32..16f0e21dd 100644 --- a/src/mem/xbar.cc +++ b/src/mem/xbar.cc @@ -344,7 +344,7 @@ void BaseXBar::recvRangeChange(PortID master_port_id) { DPRINTF(AddrRanges, "Received range change from slave port %s\n", - masterPorts[master_port_id]->getSlavePort().name()); + masterPorts[master_port_id]->getPeer()); // remember that we got a range from this master port and thus the // connected slave module @@ -405,8 +405,8 @@ BaseXBar::recvRangeChange(PortID master_port_id) "%s:\n\t%s\n\t%s\n", name(), r.to_string(), - masterPorts[master_port_id]->getSlavePort().name(), - masterPorts[conflict_id]->getSlavePort().name()); + masterPorts[master_port_id]->getPeer(), + masterPorts[conflict_id]->getPeer()); } } } @@ -557,11 +557,11 @@ BaseXBar::regStats() // and snoop responses) and what came from the slave and was // forwarded to the master (responses and snoop requests) for (int i = 0; i < slavePorts.size(); i++) { - pktCount.subname(i, slavePorts[i]->getMasterPort().name()); - pktSize.subname(i, slavePorts[i]->getMasterPort().name()); + pktCount.subname(i, slavePorts[i]->getPeer().name()); + pktSize.subname(i, slavePorts[i]->getPeer().name()); for (int j = 0; j < masterPorts.size(); j++) { - pktCount.ysubname(j, masterPorts[j]->getSlavePort().name()); - pktSize.ysubname(j, masterPorts[j]->getSlavePort().name()); + pktCount.ysubname(j, masterPorts[j]->getPeer().name()); + pktSize.ysubname(j, masterPorts[j]->getPeer().name()); } } } |