Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with dealing with duplicate memory blocks #20

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Fix issue with dealing with duplicate memory blocks #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 26 additions & 20 deletions dive_core/capture_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,25 +131,27 @@ void MemoryManager::Finalize(bool same_submit_copy_only, bool duplicate_ib_captu
m_same_submit_only = same_submit_copy_only;

// Sorting required for GetMaxContiguousSize(), GetMemoryOfUnknownSizeViaCallback(), and others
std::sort(m_memory_blocks.begin(),
m_memory_blocks.end(),
[&](const MemoryBlock &lhs, const MemoryBlock &rhs) -> bool {
// Only if m_same_submit_only does the submit affect the sort order
// When this flag is not enabled, then the memory is "flattened" and memory can be
// captured from any submit (ie: memory tracker not reset between submits)
if (m_same_submit_only)
{
// Sort by submit, then by address
if (lhs.m_submit_index == rhs.m_submit_index)
return (lhs.m_va_addr < rhs.m_va_addr);
return lhs.m_submit_index < rhs.m_submit_index;
}
return (lhs.m_va_addr < rhs.m_va_addr);
});

// For some reason, freedreno's ioctl calls sometimes have allocation of same buffer twice
// It's possible system ioctl just ignores the second allocation. We should ignore them too
// This pass eliminates any duplicates
// Important: Preserve order of equivalent blocks using stable_sort (later blocks have more
// updated view of memory)
std::stable_sort(m_memory_blocks.begin(),
m_memory_blocks.end(),
[&](const MemoryBlock &lhs, const MemoryBlock &rhs) -> bool {
// Only if m_same_submit_only does the submit affect the sort order
// When this flag is not enabled, then the memory is "flattened" and memory
// can be captured from any submit (ie: memory tracker not reset between
// submits)
if (m_same_submit_only)
{
// Sort by submit, then by address
if (lhs.m_submit_index == rhs.m_submit_index)
return (lhs.m_va_addr < rhs.m_va_addr);
return lhs.m_submit_index < rhs.m_submit_index;
}
return (lhs.m_va_addr < rhs.m_va_addr);
});

// In libwrap, sometimes we re-capture buffers that have been suballocated from. This means the
// *later* buffers have a more up-to-date view of memory
if (m_same_submit_only)
{
std::vector<MemoryBlock> temp_memory_blocks;
Expand All @@ -170,7 +172,11 @@ void MemoryManager::Finalize(bool same_submit_copy_only, bool duplicate_ib_captu
if (memory_block.m_va_addr != prev_addr || memory_block.m_data_size != prev_size)
temp_memory_blocks.push_back(memory_block);
else
delete[] m_memory_blocks[i].m_data_ptr;
{
// Replace previous memory block with the more updated current version
delete[] temp_memory_blocks.back().m_data_ptr;
temp_memory_blocks.back() = m_memory_blocks[i];
}
}
prev_addr = memory_block.m_va_addr;
prev_size = memory_block.m_data_size;
Expand Down