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

systemc: tlm bridge support atomic operations

Browse Source 
Change-Id: I9b0ca447f8457348e96debf3e67b4eee5b4cf076
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/44526
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
2021-03-30 15:10:07 +08:00
parent aa33b5746b
commit ce6fdc5a84
2 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/systemc/tlm_bridge/gem5_to_tlm.cc
View File

@@ -155,6 +155,14 @@ packet2payload(PacketPtr packet)
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);

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

@@ -96,24 +96,42 @@ PacketPtr
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