-
Notifications
You must be signed in to change notification settings - Fork 181
Moved management of shader module creation and lifetime to its own class. #444
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.
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
base: master
Are you sure you want to change the base?
Conversation
…e implementation Signed-off-by: softcookiepp <[email protected]>
Signed-off-by: softcookiepp <[email protected]>
Signed-off-by: softcookiepp <[email protected]>
axsaucedo
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have done an initial review, seems like still a way to go, there's a few inconsistencies that need to be addressed, as well as caveats on existing approach and coding style. There also doesn't seem to be a fully complete implementation as this suggests an optionally owned resource but currently the PR does not introduce the functionaly to make it optionally owned. We also need to ensure new functionality is tested, especially in contexts where these resources are owned, and particularly assessing the memory management / lifecycle aspect.
src/include/kompute/Cache.hpp
Outdated
| @@ -0,0 +1,27 @@ | |||
| #pragma once | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file is quite random, what is this here for - remove
src/include/kompute/Shader.hpp
Outdated
| /* | ||
| * getter for mShaderModule | ||
| */ | ||
| vk::ShaderModule& getShaderModule() { return mShaderModule; } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be const and should not return a mutable reference
| public: | ||
|
|
||
| /* | ||
| * Constructor accepting a device and a SPIR-V binary |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Comment conventions should align to rest of codebase - see manager.hpp
src/include/kompute/Shader.hpp
Outdated
| // the vulkan device; not owned by this object | ||
| std::weak_ptr<vk::Device> mDevice; | ||
|
|
||
| // the shader module handle |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Superfluous comment, see other classes for examples
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- needs clarity on ownerhsip as this is sometimes owned resource
src/include/kompute/Shader.hpp
Outdated
| * Wrapper for Vulkan's shader modules. | ||
| * The purpose of this is to manage the module lifetime, while | ||
| * building the groundwork for easily integrating things like | ||
| * SPIR-V reflection and multiple entry points in the future. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rewrite as description of class as of now not for future / groundwork
src/include/kompute/Shader.hpp
Outdated
| * building the groundwork for easily integrating things like | ||
| * SPIR-V reflection and multiple entry points in the future. | ||
| */ | ||
| class Module : public std::enable_shared_from_this<Module> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Naming convention here is not consistent, should be Shader as per file - module is a generic keyword
src/include/kompute/Algorithm.hpp
Outdated
| bool mFreeDescriptorSet = false; | ||
| std::shared_ptr<vk::ShaderModule> mShaderModule; | ||
| bool mFreeShaderModule = false; | ||
| std::shared_ptr<Module> mModule = nullptr; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is suggested as optionally owned resource but it's not handled as such, follow the same convention as per the rest of the optionally owned resources
src/Shader.cpp
Outdated
| spv.size()); | ||
| vk::ShaderModuleCreateInfo shaderModuleInfo(vk::ShaderModuleCreateFlags(), | ||
| sizeof(uint32_t) * spv.size(), spv.data()); | ||
| this->mDevice.lock()->createShaderModule( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently we don't use device.lock throughout the codebase, let's ensure consitency
src/include/kompute/Shader.hpp
Outdated
| class Module : public std::enable_shared_from_this<Module> | ||
| { | ||
| // the vulkan device; not owned by this object | ||
| std::weak_ptr<vk::Device> mDevice; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Device is not a weakptr as we need to ensure that this resource doesnt outlive the lifecylce by storing as strong reference and/or ensuring this is handled correctly
src/Shader.cpp
Outdated
| { | ||
| KP_LOG_DEBUG("Kompute Module destructor started"); | ||
| KP_LOG_DEBUG("Kompute Module Destroying shader module"); | ||
| if (!mDevice.expired() ) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ensure consistency with other classes, including coding style
|
Alright, that should cover everything. |
As the title says, the creation of vk::ShaderModule objects has been moved from kp::Algorithm kp::Module, a new class.
This will make it easier to implement caching of vk::ShaderModule objects, as well as add aditional features for shader module metadata handling in the future.