mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
use new getter for graph
This commit is contained in:
parent
1af96b20e4
commit
bb8a711f02
6 changed files with 11 additions and 6 deletions
|
@ -454,7 +454,7 @@ bool Gpu::init()
|
|||
{
|
||||
auto& mm = MemoryManager::get();
|
||||
|
||||
const auto gpuPciEAddrSpaceName = mm.getMasterAddrSpaceName(getName(), "PCIe");
|
||||
const auto gpuPciEAddrSpaceName = mm.getMasterAddrSpaceName(getName(), "pcie");
|
||||
masterPciEAddrSpaceId = mm.getOrCreateAddressSpace(gpuPciEAddrSpaceName);
|
||||
|
||||
allocator = std::make_unique<GpuAllocator>(*this);
|
||||
|
|
|
@ -118,6 +118,10 @@ public:
|
|||
virtual const StreamVertex&
|
||||
getDefaultMasterPort() const;
|
||||
|
||||
const StreamGraph&
|
||||
getGraph() const
|
||||
{ return streamGraph; }
|
||||
|
||||
|
||||
bool loopbackPossible() const;
|
||||
bool connectLoopback();
|
||||
|
|
|
@ -119,7 +119,7 @@ PCIeCardFactory::create()
|
|||
|
||||
PCIeCard::~PCIeCard()
|
||||
{
|
||||
auto& mm = MemoryManager::get();
|
||||
auto& mg = MemoryManager::get().getGraph();
|
||||
|
||||
// unmap all memory blocks
|
||||
for (auto& mappedMemoryBlock : memoryBlocksMapped) {
|
||||
|
|
|
@ -175,7 +175,7 @@ int main(int argc, char* argv[])
|
|||
dma->makeAccesibleFromVA(block);
|
||||
|
||||
auto &mm = MemoryManager::get();
|
||||
mm.getMemoryGraph().dump("graph.dot");
|
||||
mm.getGraph().dump("graph.dot");
|
||||
|
||||
while (true) {
|
||||
dma->read(block, block.getSize());
|
||||
|
|
|
@ -100,7 +100,8 @@ Test(fpga, dma, .description = "DMA")
|
|||
logger->info(CLR_GRN("Passed"));
|
||||
}
|
||||
|
||||
MemoryManager::get().dump();
|
||||
cr_assert(count > 0, "No DMA found");
|
||||
|
||||
cr_assert(count > 0, "No Dma found");
|
||||
MemoryManager::getGraph().dump();
|
||||
IpNode::getGraph().dump();
|
||||
}
|
||||
|
|
|
@ -142,7 +142,7 @@ Test(fpga, gpu_dma, .description = "GPU DMA tests")
|
|||
CLR_RED("Failed"));
|
||||
}
|
||||
|
||||
villas::MemoryManager::get().dump();
|
||||
MemoryManager::getGraph().dump();
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue