Yu-hsin Wang has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/66053?usp=email )
Change subject: systemc: fix extension not found TlmToGem5 bridge response
path
......................................................................
systemc: fix extension not found TlmToGem5 bridge response path
The gem5 packet has two ways to associate to the TLM payload. If the
request is initiated from gem5, they would be associated by TLM
extension. If the request is initiated from systemc, they would be
associated by SenderState. So current implementation apparently only
took care the request initiated from gem5 only. We need to update the
logic to take care both.
This change moves the response sync out of beginSendResp and sync it
before calling the function.
Change-Id: If415fbe33249b75e549086d9ca36eda3c20f7ec2
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/66053
Reviewed-by: Earl Ou <shunhsin...@google.com>
Maintainer: Bobby Bruce <bbr...@ucdavis.edu>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/systemc/tlm_bridge/tlm_to_gem5.cc
1 file changed, 27 insertions(+), 10 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved
Earl Ou: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/systemc/tlm_bridge/tlm_to_gem5.cc
b/src/systemc/tlm_bridge/tlm_to_gem5.cc
index 468ea83..47a2fba 100644
--- a/src/systemc/tlm_bridge/tlm_to_gem5.cc
+++ b/src/systemc/tlm_bridge/tlm_to_gem5.cc
@@ -207,14 +207,6 @@
TlmToGem5Bridge<BITWIDTH>::sendBeginResp(tlm::tlm_generic_payload &trans,
sc_core::sc_time &delay)
{
- Gem5SystemC::Gem5Extension *extension = nullptr;
- trans.get_extension(extension);
- panic_if(extension == nullptr,
- "Missing gem5 extension when sending BEGIN_RESP");
- auto pkt = extension->getPacket();
-
- setPayloadResponse(trans, pkt);
-
tlm::tlm_phase phase = tlm::BEGIN_RESP;
auto status = socket->nb_transport_bw(trans, phase, delay);
@@ -252,6 +244,7 @@
sendEndReq(trans);
if (!needsResponse) {
auto delay = sc_core::SC_ZERO_TIME;
+ setPayloadResponse(trans, pkt);
sendBeginResp(trans, delay);
}
trans.release();
@@ -481,6 +474,8 @@
sc_assert(tlmSenderState != nullptr);
auto &trans = tlmSenderState->trans;
+ setPayloadResponse(trans, pkt);
+ sendBeginResp(trans, delay);
Gem5SystemC::Gem5Extension *extension = nullptr;
trans.get_extension(extension);
@@ -493,7 +488,6 @@
if (extension == nullptr)
destroyPacket(pkt);
- sendBeginResp(trans, delay);
trans.release();
return true;
@@ -512,12 +506,12 @@
bool needsResponse = pendingPacket->needsResponse();
if (bmp.sendTimingReq(pendingPacket)) {
waitForRetry = false;
- pendingPacket = nullptr;
auto &trans = *pendingRequest;
sendEndReq(trans);
if (!needsResponse) {
auto delay = sc_core::SC_ZERO_TIME;
+ setPayloadResponse(trans, pendingPacket);
sendBeginResp(trans, delay);
}
trans.release();
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/66053?usp=email
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: If415fbe33249b75e549086d9ca36eda3c20f7ec2
Gerrit-Change-Number: 66053
Gerrit-PatchSet: 2
Gerrit-Owner: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Earl Ou <shunhsin...@google.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Yu-hsin Wang <yuhsi...@google.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
