Yu-hsin Wang has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/44526 )
Change subject: systemc: tlm bridge support atomic operations
......................................................................
systemc: tlm bridge support atomic operations
Change-Id: I9b0ca447f8457348e96debf3e67b4eee5b4cf076
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44526
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/systemc/tlm_bridge/gem5_to_tlm.cc
M src/systemc/tlm_bridge/tlm_to_gem5.cc
2 files changed, 35 insertions(+), 9 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/systemc/tlm_bridge/gem5_to_tlm.cc
b/src/systemc/tlm_bridge/gem5_to_tlm.cc
index c7d1b16..bde7537 100644
--- a/src/systemc/tlm_bridge/gem5_to_tlm.cc
+++ b/src/systemc/tlm_bridge/gem5_to_tlm.cc
@@ -155,6 +155,14 @@
auto *extension = new Gem5SystemC::Gem5Extension(packet);
trans->set_auto_extension(extension);
+ if (packet->isAtomicOp()) {
+ auto *atomic_ex = new Gem5SystemC::AtomicExtension(
+ std::shared_ptr<AtomicOpFunctor>(
+ packet->req->getAtomicOpFunctor()->clone()),
+ packet->req->isAtomicReturn());
+ trans->set_auto_extension(atomic_ex);
+ }
+
// Apply all conversion steps necessary in this specific setup.
for (auto &step : extraPacketToPayloadSteps) {
step(packet, *trans);
diff --git a/src/systemc/tlm_bridge/tlm_to_gem5.cc
b/src/systemc/tlm_bridge/tlm_to_gem5.cc
index 36809d3..0a8f94d 100644
--- a/src/systemc/tlm_bridge/tlm_to_gem5.cc
+++ b/src/systemc/tlm_bridge/tlm_to_gem5.cc
@@ -96,24 +96,42 @@
payload2packet(RequestorID _id, tlm::tlm_generic_payload &trans)
{
MemCmd cmd;
+ RequestPtr req;
- switch (trans.get_command()) {
- case tlm::TLM_READ_COMMAND:
+ Gem5SystemC::AtomicExtension *atomic_ex = nullptr;
+ trans.get_extension(atomic_ex);
+ if (atomic_ex) {
+ cmd = MemCmd::SwapReq;
+ Request::Flags flags = (atomic_ex->needReturn() ?
+ Request::ATOMIC_RETURN_OP :
+ Request::ATOMIC_NO_RETURN_OP);
+ AtomicOpFunctorPtr amo_op = AtomicOpFunctorPtr(
+ atomic_ex->getAtomicOpFunctor()->clone());
+ // FIXME: correct the context_id and pc state.
+ req = std::make_shared<Request>(
+ trans.get_address(), trans.get_data_length(), flags, _id,
+ 0, 0, std::move(amo_op));
+ req->setPaddr(trans.get_address());
+ } else {
+ switch (trans.get_command()) {
+ case tlm::TLM_READ_COMMAND:
cmd = MemCmd::ReadReq;
break;
- case tlm::TLM_WRITE_COMMAND:
+ case tlm::TLM_WRITE_COMMAND:
cmd = MemCmd::WriteReq;
break;
- case tlm::TLM_IGNORE_COMMAND:
+ case tlm::TLM_IGNORE_COMMAND:
return nullptr;
- default:
+ default:
SC_REPORT_FATAL("TlmToGem5Bridge",
- "received transaction with unsupported
command");
+ "received transaction with unsupported "
+ "command");
+ }
+ Request::Flags flags;
+ req = std::make_shared<Request>(
+ trans.get_address(), trans.get_data_length(), flags, _id);
}
- Request::Flags flags;
- auto req = std::make_shared<Request>(
- trans.get_address(), trans.get_data_length(), flags, _id);
/*
* Allocate a new Packet. The packet will be deleted when it returns
from
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/44526
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: I9b0ca447f8457348e96debf3e67b4eee5b4cf076
Gerrit-Change-Number: 44526
Gerrit-PatchSet: 6
Gerrit-Owner: Yu-hsin Wang <[email protected]>
Gerrit-Reviewer: Earl Ou <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Yu-hsin Wang <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-CC: Philip Metzler <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
