derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

systemc: associate tlm payload and gem5 packet in blocking interfaces

Browse Source 
TlmToGem5Bridge only associates the tlm payload and gem5 packet in
nb_transport case. We should also do the samething in blocking
interfaces. Otherwise, the downstream Gem5ToTlmBridge cannot get the
correct payload.

Change-Id: I85b213402d58d68641615a6cea04961f4a15f1ba
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63772
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Yu-hsin Wang
2022-09-22 11:56:39 +08:00
parent 5d35e22518
commit 344e2ae823
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/systemc/tlm_bridge/tlm_to_gem5.cc
View File

@@ -219,8 +219,7 @@ TlmToGem5Bridge<BITWIDTH>::handleBeginReq(tlm::tlm_generic_payload &trans)
trans.acquire();
auto [pkt, pkt_created] = payload2packet(_id, trans);
auto *tlmSenderState = new Gem5SystemC::TlmSenderState(trans);
pkt->pushSenderState(tlmSenderState);
pkt->pushSenderState(new Gem5SystemC::TlmSenderState(trans));
// If the packet doesn't need a response, we should send BEGIN_RESP by
// ourselves.
@@ -331,6 +330,7 @@ TlmToGem5Bridge<BITWIDTH>::b_transport(tlm::tlm_generic_payload &trans,
sc_core::sc_time &t)
{
auto [pkt, pkt_created] = payload2packet(_id, trans);
pkt->pushSenderState(new Gem5SystemC::TlmSenderState(trans));
MemBackdoorPtr backdoor = nullptr;
Tick ticks = bmp.sendAtomicBackdoor(pkt, backdoor);
@@ -348,6 +348,13 @@ TlmToGem5Bridge<BITWIDTH>::b_transport(tlm::tlm_generic_payload &trans,
// update time
t += delay;
gem5::Packet::SenderState *senderState = pkt->popSenderState();
sc_assert(
nullptr != dynamic_cast<Gem5SystemC::TlmSenderState*>(senderState));
// clean up
delete senderState;
if (pkt_created)
destroyPacket(pkt);
@@ -360,8 +367,17 @@ TlmToGem5Bridge<BITWIDTH>::transport_dbg(tlm::tlm_generic_payload &trans)
{
auto [pkt, pkt_created] = payload2packet(_id, trans);
if (pkt != nullptr) {
pkt->pushSenderState(new Gem5SystemC::TlmSenderState(trans));
bmp.sendFunctional(pkt);
gem5::Packet::SenderState *senderState = pkt->popSenderState();
sc_assert(
nullptr != dynamic_cast<Gem5SystemC::TlmSenderState*>(senderState));
// clean up
delete senderState;
if (pkt_created)
destroyPacket(pkt);
}
@@ -375,6 +391,7 @@ TlmToGem5Bridge<BITWIDTH>::get_direct_mem_ptr(tlm::tlm_generic_payload &trans,
tlm::tlm_dmi &dmi_data)
{
auto [pkt, pkt_created] = payload2packet(_id, trans);
pkt->pushSenderState(new Gem5SystemC::TlmSenderState(trans));
MemBackdoorPtr backdoor = nullptr;
bmp.sendAtomicBackdoor(pkt, backdoor);
@@ -400,6 +417,13 @@ TlmToGem5Bridge<BITWIDTH>::get_direct_mem_ptr(tlm::tlm_generic_payload &trans,
);
}
gem5::Packet::SenderState *senderState = pkt->popSenderState();
sc_assert(
nullptr != dynamic_cast<Gem5SystemC::TlmSenderState*>(senderState));
// clean up
delete senderState;
if (!pkt_created)
destroyPacket(pkt);