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

Tidy up mappings when buffer map commands fail to execute #552

Merged
merged 1 commit into from
Jun 21, 2023
Merged

Tidy up mappings when buffer map commands fail to execute #552

Show file tree
Hide file tree
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
8 changes: 8 additions & 0 deletions src/memory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,14 @@ struct cvk_buffer : public cvk_mem {
return mapping;
}

void cleanup_mapping(cvk_buffer_mapping& mapping) {
std::lock_guard<std::mutex> lock(m_mappings_lock);
if (m_mappings.count(mapping.ptr)) {
m_mappings.erase(mapping.ptr);
}
mapping.buffer->unmap();
}

uint64_t device_address() const {
VkBufferDeviceAddressInfo info{};
info.buffer = vulkan_buffer();
Expand Down
5 changes: 5 additions & 0 deletions src/queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,6 +1289,7 @@ cl_int cvk_command_map_buffer::build(void** map_ptr) {
return CL_OUT_OF_RESOURCES;
}

m_mapping_needs_releasing_on_destruction = true;
*map_ptr = m_mapping.buffer->map_ptr(m_offset);

return CL_SUCCESS;
Expand All @@ -1307,6 +1308,10 @@ cl_int cvk_command_map_buffer::do_action() {
success = m_buffer->copy_to(dst, m_offset, m_size);
}

if (success) {
m_mapping_needs_releasing_on_destruction = false;
}

return success ? CL_COMPLETE : CL_OUT_OF_RESOURCES;
}

Expand Down
8 changes: 7 additions & 1 deletion src/queue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,7 +846,12 @@ struct cvk_command_map_buffer final : public cvk_command_buffer_base_region {
size_t offset, size_t size, cl_map_flags flags)
: cvk_command_buffer_base_region(queue, CL_COMMAND_MAP_BUFFER, buffer,
offset, size),
m_flags(flags) {}
m_flags(flags), m_mapping_needs_releasing_on_destruction(false) {}
~cvk_command_map_buffer() {
if (m_mapping_needs_releasing_on_destruction) {
m_buffer->cleanup_mapping(m_mapping);
}
}
CHECK_RETURN cl_int build(void** map_ptr);
CHECK_RETURN cl_int do_action() override final;

Expand All @@ -857,6 +862,7 @@ struct cvk_command_map_buffer final : public cvk_command_buffer_base_region {
private:
cl_map_flags m_flags;
cvk_buffer_mapping m_mapping;
bool m_mapping_needs_releasing_on_destruction;
};

struct cvk_command_unmap_buffer final : public cvk_command_buffer_base {
Expand Down