[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

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

Closed
junpi3 wants to merge 3 commits into from
Closed

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb3461
[ET-VK][EZ] Split `Resource.h` into multiple files within `resource/`
May 8, 2024
48a5ed4
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 8, 2024
323b450
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 9, 2024
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
6 changes: 4 additions & 2 deletions backends/vulkan/runtime/api/Adapter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Allocator.h>

#include <array>
#include <mutex>
#include <ostream>
Expand DownExpand Up@@ -136,7 +138,7 @@ class Adapter final {
ComputePipelineCache compute_pipeline_cache_;
// Memory Management
SamplerCache sampler_cache_;
MemoryAllocator vma_;
Allocator vma_;

public:
// Physical Device metadata
Expand DownExpand Up@@ -194,7 +196,7 @@ class Adapter final {
return sampler_cache_;
}

inline MemoryAllocator& vma() {
inline Allocator& vma() {
return vma_;
}

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Command.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@

#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Context.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,15 @@
#include <executorch/backends/vulkan/runtime/api/Adapter.h>
#include <executorch/backends/vulkan/runtime/api/Command.h>
#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Fence.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/QueryPool.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Runtime.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Descriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <unordered_map>

namespace vkcompute {
Expand Down
7 changes: 4 additions & 3 deletions backends/vulkan/runtime/api/Exception.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,15 @@
#pragma once
// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>

#include <exception>
#include <ostream>
#include <string>
#include <vector>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>
#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#define VK_CHECK(function) \
do { \
const VkResult result = (function); \
Expand Down
76 changes: 76 additions & 0 deletions backends/vulkan/runtime/api/Fence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#include <executorch/backends/vulkan/runtime/api/Fence.h>

namespace vkcompute {
namespace api {

VulkanFence::VulkanFence()
: device_(VK_NULL_HANDLE), handle_(VK_NULL_HANDLE), waiting_(false) {}

VulkanFence::VulkanFence(VkDevice device)
: device_(device), handle_(VK_NULL_HANDLE), waiting_(VK_NULL_HANDLE) {
const VkFenceCreateInfo fence_create_info{
VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType
nullptr, // pNext
0u, // flags
};

VK_CHECK(vkCreateFence(device_, &fence_create_info, nullptr, &handle_));
}

VulkanFence::VulkanFence(VulkanFence&& other) noexcept
: device_(other.device_), handle_(other.handle_), waiting_(other.waiting_) {
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;
}

VulkanFence& VulkanFence::operator=(VulkanFence&& other) noexcept {
device_ = other.device_;
handle_ = other.handle_;
waiting_ = other.waiting_;

other.device_ = VK_NULL_HANDLE;
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;

return *this;
}

VulkanFence::~VulkanFence() {
if (VK_NULL_HANDLE == handle_) {
return;
}
vkDestroyFence(device_, handle_, nullptr);
}

void VulkanFence::wait() {
// if get_submit_handle() has not been called, then this will no-op
if (waiting_) {
VkResult fence_status = VK_NOT_READY;
// Run the wait in a loop to keep the CPU hot. A single call to
// vkWaitForFences with no timeout may cause the calling thread to be
// scheduled out.
do {
// The timeout (last) arg is in units of ns
fence_status = vkWaitForFences(device_, 1u, &handle_, VK_TRUE, 100000);

VK_CHECK_COND(
fence_status != VK_ERROR_DEVICE_LOST,
"Vulkan Fence: Device lost while waiting for fence!");
} while (fence_status != VK_SUCCESS);

VK_CHECK(vkResetFences(device_, 1u, &handle_));

waiting_ = false;
}
}

} // namespace api
} // namespace vkcompute
98 changes: 98 additions & 0 deletions backends/vulkan/runtime/api/Fence.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Exception.h>

#include <stack>

namespace vkcompute {
namespace api {

class VulkanFence final {
public:
// TODO: This is required for the lazy allocation pattern in api/Tensor.
// It will be disabled pending future refactors.
explicit VulkanFence();

explicit VulkanFence(VkDevice);

VulkanFence(const VulkanFence&) = delete;
VulkanFence& operator=(const VulkanFence&) = delete;

VulkanFence(VulkanFence&&) noexcept;
VulkanFence& operator=(VulkanFence&&) noexcept;

~VulkanFence();

private:
VkDevice device_;
VkFence handle_;
bool waiting_;

public:
// Used to get the handle for a queue submission.
VkFence get_submit_handle() {
if (handle_ != VK_NULL_HANDLE) {
// Indicate we are now waiting for this fence to be signaled
waiting_ = true;
}
return handle_;
}

VkFence handle() {
return handle_;
}

// Trigger a synchronous wait for the fence to be signaled
void wait();

bool waiting() const {
return waiting_;
}

operator bool() const {
return (VK_NULL_HANDLE != handle_);
}
};

// A pool to track created Fences and reuse ones that are available.
// Only intended to be modified by one thread at a time.
struct FencePool final {
VkDevice device_;

std::stack<VulkanFence> pool_;

explicit FencePool(VkDevice device) : device_(device), pool_{} {}

// Returns an rvalue reference to a fence, so that it can be moved
inline VulkanFence get_fence() {
if (pool_.empty()) {
VulkanFence new_fence = VulkanFence(device_);
return new_fence;
}

VulkanFence top_fence = std::move(pool_.top());
pool_.pop();

return top_fence;
}

// Marks the fence as available
inline void return_fence(VulkanFence& fence) {
pool_.push(std::move(fence));
}
};

} // namespace api
} // namespace vkcompute
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Pipeline.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <mutex>
#include <unordered_map>

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

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

Closed
junpi3 wants to merge 3 commits into from
Closed

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb3461
[ET-VK][EZ] Split `Resource.h` into multiple files within `resource/`
May 8, 2024
48a5ed4
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 8, 2024
323b450
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 9, 2024
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
6 changes: 4 additions & 2 deletions backends/vulkan/runtime/api/Adapter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Allocator.h>

#include <array>
#include <mutex>
#include <ostream>
Expand DownExpand Up@@ -136,7 +138,7 @@ class Adapter final {
ComputePipelineCache compute_pipeline_cache_;
// Memory Management
SamplerCache sampler_cache_;
MemoryAllocator vma_;
Allocator vma_;

public:
// Physical Device metadata
Expand DownExpand Up@@ -194,7 +196,7 @@ class Adapter final {
return sampler_cache_;
}

inline MemoryAllocator& vma() {
inline Allocator& vma() {
return vma_;
}

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Command.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@

#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Context.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,15 @@
#include <executorch/backends/vulkan/runtime/api/Adapter.h>
#include <executorch/backends/vulkan/runtime/api/Command.h>
#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Fence.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/QueryPool.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Runtime.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Descriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <unordered_map>

namespace vkcompute {
Expand Down
7 changes: 4 additions & 3 deletions backends/vulkan/runtime/api/Exception.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,15 @@
#pragma once
// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>

#include <exception>
#include <ostream>
#include <string>
#include <vector>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>
#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#define VK_CHECK(function) \
do { \
const VkResult result = (function); \
Expand Down
76 changes: 76 additions & 0 deletions backends/vulkan/runtime/api/Fence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#include <executorch/backends/vulkan/runtime/api/Fence.h>

namespace vkcompute {
namespace api {

VulkanFence::VulkanFence()
: device_(VK_NULL_HANDLE), handle_(VK_NULL_HANDLE), waiting_(false) {}

VulkanFence::VulkanFence(VkDevice device)
: device_(device), handle_(VK_NULL_HANDLE), waiting_(VK_NULL_HANDLE) {
const VkFenceCreateInfo fence_create_info{
VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType
nullptr, // pNext
0u, // flags
};

VK_CHECK(vkCreateFence(device_, &fence_create_info, nullptr, &handle_));
}

VulkanFence::VulkanFence(VulkanFence&& other) noexcept
: device_(other.device_), handle_(other.handle_), waiting_(other.waiting_) {
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;
}

VulkanFence& VulkanFence::operator=(VulkanFence&& other) noexcept {
device_ = other.device_;
handle_ = other.handle_;
waiting_ = other.waiting_;

other.device_ = VK_NULL_HANDLE;
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;

return *this;
}

VulkanFence::~VulkanFence() {
if (VK_NULL_HANDLE == handle_) {
return;
}
vkDestroyFence(device_, handle_, nullptr);
}

void VulkanFence::wait() {
// if get_submit_handle() has not been called, then this will no-op
if (waiting_) {
VkResult fence_status = VK_NOT_READY;
// Run the wait in a loop to keep the CPU hot. A single call to
// vkWaitForFences with no timeout may cause the calling thread to be
// scheduled out.
do {
// The timeout (last) arg is in units of ns
fence_status = vkWaitForFences(device_, 1u, &handle_, VK_TRUE, 100000);

VK_CHECK_COND(
fence_status != VK_ERROR_DEVICE_LOST,
"Vulkan Fence: Device lost while waiting for fence!");
} while (fence_status != VK_SUCCESS);

VK_CHECK(vkResetFences(device_, 1u, &handle_));

waiting_ = false;
}
}

} // namespace api
} // namespace vkcompute
98 changes: 98 additions & 0 deletions backends/vulkan/runtime/api/Fence.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Exception.h>

#include <stack>

namespace vkcompute {
namespace api {

class VulkanFence final {
public:
// TODO: This is required for the lazy allocation pattern in api/Tensor.
// It will be disabled pending future refactors.
explicit VulkanFence();

explicit VulkanFence(VkDevice);

VulkanFence(const VulkanFence&) = delete;
VulkanFence& operator=(const VulkanFence&) = delete;

VulkanFence(VulkanFence&&) noexcept;
VulkanFence& operator=(VulkanFence&&) noexcept;

~VulkanFence();

private:
VkDevice device_;
VkFence handle_;
bool waiting_;

public:
// Used to get the handle for a queue submission.
VkFence get_submit_handle() {
if (handle_ != VK_NULL_HANDLE) {
// Indicate we are now waiting for this fence to be signaled
waiting_ = true;
}
return handle_;
}

VkFence handle() {
return handle_;
}

// Trigger a synchronous wait for the fence to be signaled
void wait();

bool waiting() const {
return waiting_;
}

operator bool() const {
return (VK_NULL_HANDLE != handle_);
}
};

// A pool to track created Fences and reuse ones that are available.
// Only intended to be modified by one thread at a time.
struct FencePool final {
VkDevice device_;

std::stack<VulkanFence> pool_;

explicit FencePool(VkDevice device) : device_(device), pool_{} {}

// Returns an rvalue reference to a fence, so that it can be moved
inline VulkanFence get_fence() {
if (pool_.empty()) {
VulkanFence new_fence = VulkanFence(device_);
return new_fence;
}

VulkanFence top_fence = std::move(pool_.top());
pool_.pop();

return top_fence;
}

// Marks the fence as available
inline void return_fence(VulkanFence& fence) {
pool_.push(std::move(fence));
}
};

} // namespace api
} // namespace vkcompute
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Pipeline.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <mutex>
#include <unordered_map>

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

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

Closed
junpi3 wants to merge 3 commits into from
Closed

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb3461
[ET-VK][EZ] Split `Resource.h` into multiple files within `resource/`
May 8, 2024
48a5ed4
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 8, 2024
323b450
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 9, 2024
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
6 changes: 4 additions & 2 deletions backends/vulkan/runtime/api/Adapter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Allocator.h>

#include <array>
#include <mutex>
#include <ostream>
Expand DownExpand Up@@ -136,7 +138,7 @@ class Adapter final {
ComputePipelineCache compute_pipeline_cache_;
// Memory Management
SamplerCache sampler_cache_;
MemoryAllocator vma_;
Allocator vma_;

public:
// Physical Device metadata
Expand DownExpand Up@@ -194,7 +196,7 @@ class Adapter final {
return sampler_cache_;
}

inline MemoryAllocator& vma() {
inline Allocator& vma() {
return vma_;
}

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Command.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@

#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Context.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,15 @@
#include <executorch/backends/vulkan/runtime/api/Adapter.h>
#include <executorch/backends/vulkan/runtime/api/Command.h>
#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Fence.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/QueryPool.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Runtime.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Descriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <unordered_map>

namespace vkcompute {
Expand Down
7 changes: 4 additions & 3 deletions backends/vulkan/runtime/api/Exception.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,15 @@
#pragma once
// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>

#include <exception>
#include <ostream>
#include <string>
#include <vector>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>
#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#define VK_CHECK(function) \
do { \
const VkResult result = (function); \
Expand Down
76 changes: 76 additions & 0 deletions backends/vulkan/runtime/api/Fence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#include <executorch/backends/vulkan/runtime/api/Fence.h>

namespace vkcompute {
namespace api {

VulkanFence::VulkanFence()
: device_(VK_NULL_HANDLE), handle_(VK_NULL_HANDLE), waiting_(false) {}

VulkanFence::VulkanFence(VkDevice device)
: device_(device), handle_(VK_NULL_HANDLE), waiting_(VK_NULL_HANDLE) {
const VkFenceCreateInfo fence_create_info{
VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType
nullptr, // pNext
0u, // flags
};

VK_CHECK(vkCreateFence(device_, &fence_create_info, nullptr, &handle_));
}

VulkanFence::VulkanFence(VulkanFence&& other) noexcept
: device_(other.device_), handle_(other.handle_), waiting_(other.waiting_) {
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;
}

VulkanFence& VulkanFence::operator=(VulkanFence&& other) noexcept {
device_ = other.device_;
handle_ = other.handle_;
waiting_ = other.waiting_;

other.device_ = VK_NULL_HANDLE;
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;

return *this;
}

VulkanFence::~VulkanFence() {
if (VK_NULL_HANDLE == handle_) {
return;
}
vkDestroyFence(device_, handle_, nullptr);
}

void VulkanFence::wait() {
// if get_submit_handle() has not been called, then this will no-op
if (waiting_) {
VkResult fence_status = VK_NOT_READY;
// Run the wait in a loop to keep the CPU hot. A single call to
// vkWaitForFences with no timeout may cause the calling thread to be
// scheduled out.
do {
// The timeout (last) arg is in units of ns
fence_status = vkWaitForFences(device_, 1u, &handle_, VK_TRUE, 100000);

VK_CHECK_COND(
fence_status != VK_ERROR_DEVICE_LOST,
"Vulkan Fence: Device lost while waiting for fence!");
} while (fence_status != VK_SUCCESS);

VK_CHECK(vkResetFences(device_, 1u, &handle_));

waiting_ = false;
}
}

} // namespace api
} // namespace vkcompute
98 changes: 98 additions & 0 deletions backends/vulkan/runtime/api/Fence.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Exception.h>

#include <stack>

namespace vkcompute {
namespace api {

class VulkanFence final {
public:
// TODO: This is required for the lazy allocation pattern in api/Tensor.
// It will be disabled pending future refactors.
explicit VulkanFence();

explicit VulkanFence(VkDevice);

VulkanFence(const VulkanFence&) = delete;
VulkanFence& operator=(const VulkanFence&) = delete;

VulkanFence(VulkanFence&&) noexcept;
VulkanFence& operator=(VulkanFence&&) noexcept;

~VulkanFence();

private:
VkDevice device_;
VkFence handle_;
bool waiting_;

public:
// Used to get the handle for a queue submission.
VkFence get_submit_handle() {
if (handle_ != VK_NULL_HANDLE) {
// Indicate we are now waiting for this fence to be signaled
waiting_ = true;
}
return handle_;
}

VkFence handle() {
return handle_;
}

// Trigger a synchronous wait for the fence to be signaled
void wait();

bool waiting() const {
return waiting_;
}

operator bool() const {
return (VK_NULL_HANDLE != handle_);
}
};

// A pool to track created Fences and reuse ones that are available.
// Only intended to be modified by one thread at a time.
struct FencePool final {
VkDevice device_;

std::stack<VulkanFence> pool_;

explicit FencePool(VkDevice device) : device_(device), pool_{} {}

// Returns an rvalue reference to a fence, so that it can be moved
inline VulkanFence get_fence() {
if (pool_.empty()) {
VulkanFence new_fence = VulkanFence(device_);
return new_fence;
}

VulkanFence top_fence = std::move(pool_.top());
pool_.pop();

return top_fence;
}

// Marks the fence as available
inline void return_fence(VulkanFence& fence) {
pool_.push(std::move(fence));
}
};

} // namespace api
} // namespace vkcompute
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Pipeline.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <mutex>
#include <unordered_map>

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

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

Closed
junpi3 wants to merge 3 commits into from
Closed

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb3461
[ET-VK][EZ] Split `Resource.h` into multiple files within `resource/`
May 8, 2024
48a5ed4
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 8, 2024
323b450
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 9, 2024
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
6 changes: 4 additions & 2 deletions backends/vulkan/runtime/api/Adapter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Allocator.h>

#include <array>
#include <mutex>
#include <ostream>
Expand DownExpand Up@@ -136,7 +138,7 @@ class Adapter final {
ComputePipelineCache compute_pipeline_cache_;
// Memory Management
SamplerCache sampler_cache_;
MemoryAllocator vma_;
Allocator vma_;

public:
// Physical Device metadata
Expand DownExpand Up@@ -194,7 +196,7 @@ class Adapter final {
return sampler_cache_;
}

inline MemoryAllocator& vma() {
inline Allocator& vma() {
return vma_;
}

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Command.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@

#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Context.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,15 @@
#include <executorch/backends/vulkan/runtime/api/Adapter.h>
#include <executorch/backends/vulkan/runtime/api/Command.h>
#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Fence.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/QueryPool.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Runtime.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Descriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <unordered_map>

namespace vkcompute {
Expand Down
7 changes: 4 additions & 3 deletions backends/vulkan/runtime/api/Exception.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,15 @@
#pragma once
// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>

#include <exception>
#include <ostream>
#include <string>
#include <vector>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>
#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#define VK_CHECK(function) \
do { \
const VkResult result = (function); \
Expand Down
76 changes: 76 additions & 0 deletions backends/vulkan/runtime/api/Fence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#include <executorch/backends/vulkan/runtime/api/Fence.h>

namespace vkcompute {
namespace api {

VulkanFence::VulkanFence()
: device_(VK_NULL_HANDLE), handle_(VK_NULL_HANDLE), waiting_(false) {}

VulkanFence::VulkanFence(VkDevice device)
: device_(device), handle_(VK_NULL_HANDLE), waiting_(VK_NULL_HANDLE) {
const VkFenceCreateInfo fence_create_info{
VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType
nullptr, // pNext
0u, // flags
};

VK_CHECK(vkCreateFence(device_, &fence_create_info, nullptr, &handle_));
}

VulkanFence::VulkanFence(VulkanFence&& other) noexcept
: device_(other.device_), handle_(other.handle_), waiting_(other.waiting_) {
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;
}

VulkanFence& VulkanFence::operator=(VulkanFence&& other) noexcept {
device_ = other.device_;
handle_ = other.handle_;
waiting_ = other.waiting_;

other.device_ = VK_NULL_HANDLE;
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;

return *this;
}

VulkanFence::~VulkanFence() {
if (VK_NULL_HANDLE == handle_) {
return;
}
vkDestroyFence(device_, handle_, nullptr);
}

void VulkanFence::wait() {
// if get_submit_handle() has not been called, then this will no-op
if (waiting_) {
VkResult fence_status = VK_NOT_READY;
// Run the wait in a loop to keep the CPU hot. A single call to
// vkWaitForFences with no timeout may cause the calling thread to be
// scheduled out.
do {
// The timeout (last) arg is in units of ns
fence_status = vkWaitForFences(device_, 1u, &handle_, VK_TRUE, 100000);

VK_CHECK_COND(
fence_status != VK_ERROR_DEVICE_LOST,
"Vulkan Fence: Device lost while waiting for fence!");
} while (fence_status != VK_SUCCESS);

VK_CHECK(vkResetFences(device_, 1u, &handle_));

waiting_ = false;
}
}

} // namespace api
} // namespace vkcompute
98 changes: 98 additions & 0 deletions backends/vulkan/runtime/api/Fence.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Exception.h>

#include <stack>

namespace vkcompute {
namespace api {

class VulkanFence final {
public:
// TODO: This is required for the lazy allocation pattern in api/Tensor.
// It will be disabled pending future refactors.
explicit VulkanFence();

explicit VulkanFence(VkDevice);

VulkanFence(const VulkanFence&) = delete;
VulkanFence& operator=(const VulkanFence&) = delete;

VulkanFence(VulkanFence&&) noexcept;
VulkanFence& operator=(VulkanFence&&) noexcept;

~VulkanFence();

private:
VkDevice device_;
VkFence handle_;
bool waiting_;

public:
// Used to get the handle for a queue submission.
VkFence get_submit_handle() {
if (handle_ != VK_NULL_HANDLE) {
// Indicate we are now waiting for this fence to be signaled
waiting_ = true;
}
return handle_;
}

VkFence handle() {
return handle_;
}

// Trigger a synchronous wait for the fence to be signaled
void wait();

bool waiting() const {
return waiting_;
}

operator bool() const {
return (VK_NULL_HANDLE != handle_);
}
};

// A pool to track created Fences and reuse ones that are available.
// Only intended to be modified by one thread at a time.
struct FencePool final {
VkDevice device_;

std::stack<VulkanFence> pool_;

explicit FencePool(VkDevice device) : device_(device), pool_{} {}

// Returns an rvalue reference to a fence, so that it can be moved
inline VulkanFence get_fence() {
if (pool_.empty()) {
VulkanFence new_fence = VulkanFence(device_);
return new_fence;
}

VulkanFence top_fence = std::move(pool_.top());
pool_.pop();

return top_fence;
}

// Marks the fence as available
inline void return_fence(VulkanFence& fence) {
pool_.push(std::move(fence));
}
};

} // namespace api
} // namespace vkcompute
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Pipeline.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <mutex>
#include <unordered_map>

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

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

Closed
junpi3 wants to merge 3 commits into from
Closed

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb3461
[ET-VK][EZ] Split `Resource.h` into multiple files within `resource/`
May 8, 2024
48a5ed4
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 8, 2024
323b450
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 9, 2024
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
6 changes: 4 additions & 2 deletions backends/vulkan/runtime/api/Adapter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Allocator.h>

#include <array>
#include <mutex>
#include <ostream>
Expand DownExpand Up@@ -136,7 +138,7 @@ class Adapter final {
ComputePipelineCache compute_pipeline_cache_;
// Memory Management
SamplerCache sampler_cache_;
MemoryAllocator vma_;
Allocator vma_;

public:
// Physical Device metadata
Expand DownExpand Up@@ -194,7 +196,7 @@ class Adapter final {
return sampler_cache_;
}

inline MemoryAllocator& vma() {
inline Allocator& vma() {
return vma_;
}

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Command.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@

#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Context.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,15 @@
#include <executorch/backends/vulkan/runtime/api/Adapter.h>
#include <executorch/backends/vulkan/runtime/api/Command.h>
#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Fence.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/QueryPool.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Runtime.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Descriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <unordered_map>

namespace vkcompute {
Expand Down
7 changes: 4 additions & 3 deletions backends/vulkan/runtime/api/Exception.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,15 @@
#pragma once
// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>

#include <exception>
#include <ostream>
#include <string>
#include <vector>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>
#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#define VK_CHECK(function) \
do { \
const VkResult result = (function); \
Expand Down
76 changes: 76 additions & 0 deletions backends/vulkan/runtime/api/Fence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#include <executorch/backends/vulkan/runtime/api/Fence.h>

namespace vkcompute {
namespace api {

VulkanFence::VulkanFence()
: device_(VK_NULL_HANDLE), handle_(VK_NULL_HANDLE), waiting_(false) {}

VulkanFence::VulkanFence(VkDevice device)
: device_(device), handle_(VK_NULL_HANDLE), waiting_(VK_NULL_HANDLE) {
const VkFenceCreateInfo fence_create_info{
VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType
nullptr, // pNext
0u, // flags
};

VK_CHECK(vkCreateFence(device_, &fence_create_info, nullptr, &handle_));
}

VulkanFence::VulkanFence(VulkanFence&& other) noexcept
: device_(other.device_), handle_(other.handle_), waiting_(other.waiting_) {
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;
}

VulkanFence& VulkanFence::operator=(VulkanFence&& other) noexcept {
device_ = other.device_;
handle_ = other.handle_;
waiting_ = other.waiting_;

other.device_ = VK_NULL_HANDLE;
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;

return *this;
}

VulkanFence::~VulkanFence() {
if (VK_NULL_HANDLE == handle_) {
return;
}
vkDestroyFence(device_, handle_, nullptr);
}

void VulkanFence::wait() {
// if get_submit_handle() has not been called, then this will no-op
if (waiting_) {
VkResult fence_status = VK_NOT_READY;
// Run the wait in a loop to keep the CPU hot. A single call to
// vkWaitForFences with no timeout may cause the calling thread to be
// scheduled out.
do {
// The timeout (last) arg is in units of ns
fence_status = vkWaitForFences(device_, 1u, &handle_, VK_TRUE, 100000);

VK_CHECK_COND(
fence_status != VK_ERROR_DEVICE_LOST,
"Vulkan Fence: Device lost while waiting for fence!");
} while (fence_status != VK_SUCCESS);

VK_CHECK(vkResetFences(device_, 1u, &handle_));

waiting_ = false;
}
}

} // namespace api
} // namespace vkcompute
98 changes: 98 additions & 0 deletions backends/vulkan/runtime/api/Fence.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Exception.h>

#include <stack>

namespace vkcompute {
namespace api {

class VulkanFence final {
public:
// TODO: This is required for the lazy allocation pattern in api/Tensor.
// It will be disabled pending future refactors.
explicit VulkanFence();

explicit VulkanFence(VkDevice);

VulkanFence(const VulkanFence&) = delete;
VulkanFence& operator=(const VulkanFence&) = delete;

VulkanFence(VulkanFence&&) noexcept;
VulkanFence& operator=(VulkanFence&&) noexcept;

~VulkanFence();

private:
VkDevice device_;
VkFence handle_;
bool waiting_;

public:
// Used to get the handle for a queue submission.
VkFence get_submit_handle() {
if (handle_ != VK_NULL_HANDLE) {
// Indicate we are now waiting for this fence to be signaled
waiting_ = true;
}
return handle_;
}

VkFence handle() {
return handle_;
}

// Trigger a synchronous wait for the fence to be signaled
void wait();

bool waiting() const {
return waiting_;
}

operator bool() const {
return (VK_NULL_HANDLE != handle_);
}
};

// A pool to track created Fences and reuse ones that are available.
// Only intended to be modified by one thread at a time.
struct FencePool final {
VkDevice device_;

std::stack<VulkanFence> pool_;

explicit FencePool(VkDevice device) : device_(device), pool_{} {}

// Returns an rvalue reference to a fence, so that it can be moved
inline VulkanFence get_fence() {
if (pool_.empty()) {
VulkanFence new_fence = VulkanFence(device_);
return new_fence;
}

VulkanFence top_fence = std::move(pool_.top());
pool_.pop();

return top_fence;
}

// Marks the fence as available
inline void return_fence(VulkanFence& fence) {
pool_.push(std::move(fence));
}
};

} // namespace api
} // namespace vkcompute
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Pipeline.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <mutex>
#include <unordered_map>

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

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

Closed
junpi3 wants to merge 3 commits into from
Closed

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb3461
[ET-VK][EZ] Split `Resource.h` into multiple files within `resource/`
May 8, 2024
48a5ed4
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 8, 2024
323b450
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 9, 2024
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
6 changes: 4 additions & 2 deletions backends/vulkan/runtime/api/Adapter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Allocator.h>

#include <array>
#include <mutex>
#include <ostream>
Expand DownExpand Up@@ -136,7 +138,7 @@ class Adapter final {
ComputePipelineCache compute_pipeline_cache_;
// Memory Management
SamplerCache sampler_cache_;
MemoryAllocator vma_;
Allocator vma_;

public:
// Physical Device metadata
Expand DownExpand Up@@ -194,7 +196,7 @@ class Adapter final {
return sampler_cache_;
}

inline MemoryAllocator& vma() {
inline Allocator& vma() {
return vma_;
}

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Command.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@

#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Context.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,15 @@
#include <executorch/backends/vulkan/runtime/api/Adapter.h>
#include <executorch/backends/vulkan/runtime/api/Command.h>
#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Fence.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/QueryPool.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Runtime.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Descriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <unordered_map>

namespace vkcompute {
Expand Down
7 changes: 4 additions & 3 deletions backends/vulkan/runtime/api/Exception.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,15 @@
#pragma once
// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>

#include <exception>
#include <ostream>
#include <string>
#include <vector>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>
#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#define VK_CHECK(function) \
do { \
const VkResult result = (function); \
Expand Down
76 changes: 76 additions & 0 deletions backends/vulkan/runtime/api/Fence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#include <executorch/backends/vulkan/runtime/api/Fence.h>

namespace vkcompute {
namespace api {

VulkanFence::VulkanFence()
: device_(VK_NULL_HANDLE), handle_(VK_NULL_HANDLE), waiting_(false) {}

VulkanFence::VulkanFence(VkDevice device)
: device_(device), handle_(VK_NULL_HANDLE), waiting_(VK_NULL_HANDLE) {
const VkFenceCreateInfo fence_create_info{
VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType
nullptr, // pNext
0u, // flags
};

VK_CHECK(vkCreateFence(device_, &fence_create_info, nullptr, &handle_));
}

VulkanFence::VulkanFence(VulkanFence&& other) noexcept
: device_(other.device_), handle_(other.handle_), waiting_(other.waiting_) {
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;
}

VulkanFence& VulkanFence::operator=(VulkanFence&& other) noexcept {
device_ = other.device_;
handle_ = other.handle_;
waiting_ = other.waiting_;

other.device_ = VK_NULL_HANDLE;
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;

return *this;
}

VulkanFence::~VulkanFence() {
if (VK_NULL_HANDLE == handle_) {
return;
}
vkDestroyFence(device_, handle_, nullptr);
}

void VulkanFence::wait() {
// if get_submit_handle() has not been called, then this will no-op
if (waiting_) {
VkResult fence_status = VK_NOT_READY;
// Run the wait in a loop to keep the CPU hot. A single call to
// vkWaitForFences with no timeout may cause the calling thread to be
// scheduled out.
do {
// The timeout (last) arg is in units of ns
fence_status = vkWaitForFences(device_, 1u, &handle_, VK_TRUE, 100000);

VK_CHECK_COND(
fence_status != VK_ERROR_DEVICE_LOST,
"Vulkan Fence: Device lost while waiting for fence!");
} while (fence_status != VK_SUCCESS);

VK_CHECK(vkResetFences(device_, 1u, &handle_));

waiting_ = false;
}
}

} // namespace api
} // namespace vkcompute
98 changes: 98 additions & 0 deletions backends/vulkan/runtime/api/Fence.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Exception.h>

#include <stack>

namespace vkcompute {
namespace api {

class VulkanFence final {
public:
// TODO: This is required for the lazy allocation pattern in api/Tensor.
// It will be disabled pending future refactors.
explicit VulkanFence();

explicit VulkanFence(VkDevice);

VulkanFence(const VulkanFence&) = delete;
VulkanFence& operator=(const VulkanFence&) = delete;

VulkanFence(VulkanFence&&) noexcept;
VulkanFence& operator=(VulkanFence&&) noexcept;

~VulkanFence();

private:
VkDevice device_;
VkFence handle_;
bool waiting_;

public:
// Used to get the handle for a queue submission.
VkFence get_submit_handle() {
if (handle_ != VK_NULL_HANDLE) {
// Indicate we are now waiting for this fence to be signaled
waiting_ = true;
}
return handle_;
}

VkFence handle() {
return handle_;
}

// Trigger a synchronous wait for the fence to be signaled
void wait();

bool waiting() const {
return waiting_;
}

operator bool() const {
return (VK_NULL_HANDLE != handle_);
}
};

// A pool to track created Fences and reuse ones that are available.
// Only intended to be modified by one thread at a time.
struct FencePool final {
VkDevice device_;

std::stack<VulkanFence> pool_;

explicit FencePool(VkDevice device) : device_(device), pool_{} {}

// Returns an rvalue reference to a fence, so that it can be moved
inline VulkanFence get_fence() {
if (pool_.empty()) {
VulkanFence new_fence = VulkanFence(device_);
return new_fence;
}

VulkanFence top_fence = std::move(pool_.top());
pool_.pop();

return top_fence;
}

// Marks the fence as available
inline void return_fence(VulkanFence& fence) {
pool_.push(std::move(fence));
}
};

} // namespace api
} // namespace vkcompute
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Pipeline.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <mutex>
#include <unordered_map>

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

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

Closed
junpi3 wants to merge 3 commits into from
Closed

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb3461
[ET-VK][EZ] Split `Resource.h` into multiple files within `resource/`
May 8, 2024
48a5ed4
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 8, 2024
323b450
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 9, 2024
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
6 changes: 4 additions & 2 deletions backends/vulkan/runtime/api/Adapter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Allocator.h>

#include <array>
#include <mutex>
#include <ostream>
Expand DownExpand Up@@ -136,7 +138,7 @@ class Adapter final {
ComputePipelineCache compute_pipeline_cache_;
// Memory Management
SamplerCache sampler_cache_;
MemoryAllocator vma_;
Allocator vma_;

public:
// Physical Device metadata
Expand DownExpand Up@@ -194,7 +196,7 @@ class Adapter final {
return sampler_cache_;
}

inline MemoryAllocator& vma() {
inline Allocator& vma() {
return vma_;
}

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Command.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@

#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Context.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,15 @@
#include <executorch/backends/vulkan/runtime/api/Adapter.h>
#include <executorch/backends/vulkan/runtime/api/Command.h>
#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Fence.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/QueryPool.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Runtime.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Descriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <unordered_map>

namespace vkcompute {
Expand Down
7 changes: 4 additions & 3 deletions backends/vulkan/runtime/api/Exception.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,15 @@
#pragma once
// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>

#include <exception>
#include <ostream>
#include <string>
#include <vector>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>
#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#define VK_CHECK(function) \
do { \
const VkResult result = (function); \
Expand Down
76 changes: 76 additions & 0 deletions backends/vulkan/runtime/api/Fence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#include <executorch/backends/vulkan/runtime/api/Fence.h>

namespace vkcompute {
namespace api {

VulkanFence::VulkanFence()
: device_(VK_NULL_HANDLE), handle_(VK_NULL_HANDLE), waiting_(false) {}

VulkanFence::VulkanFence(VkDevice device)
: device_(device), handle_(VK_NULL_HANDLE), waiting_(VK_NULL_HANDLE) {
const VkFenceCreateInfo fence_create_info{
VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType
nullptr, // pNext
0u, // flags
};

VK_CHECK(vkCreateFence(device_, &fence_create_info, nullptr, &handle_));
}

VulkanFence::VulkanFence(VulkanFence&& other) noexcept
: device_(other.device_), handle_(other.handle_), waiting_(other.waiting_) {
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;
}

VulkanFence& VulkanFence::operator=(VulkanFence&& other) noexcept {
device_ = other.device_;
handle_ = other.handle_;
waiting_ = other.waiting_;

other.device_ = VK_NULL_HANDLE;
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;

return *this;
}

VulkanFence::~VulkanFence() {
if (VK_NULL_HANDLE == handle_) {
return;
}
vkDestroyFence(device_, handle_, nullptr);
}

void VulkanFence::wait() {
// if get_submit_handle() has not been called, then this will no-op
if (waiting_) {
VkResult fence_status = VK_NOT_READY;
// Run the wait in a loop to keep the CPU hot. A single call to
// vkWaitForFences with no timeout may cause the calling thread to be
// scheduled out.
do {
// The timeout (last) arg is in units of ns
fence_status = vkWaitForFences(device_, 1u, &handle_, VK_TRUE, 100000);

VK_CHECK_COND(
fence_status != VK_ERROR_DEVICE_LOST,
"Vulkan Fence: Device lost while waiting for fence!");
} while (fence_status != VK_SUCCESS);

VK_CHECK(vkResetFences(device_, 1u, &handle_));

waiting_ = false;
}
}

} // namespace api
} // namespace vkcompute
98 changes: 98 additions & 0 deletions backends/vulkan/runtime/api/Fence.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Exception.h>

#include <stack>

namespace vkcompute {
namespace api {

class VulkanFence final {
public:
// TODO: This is required for the lazy allocation pattern in api/Tensor.
// It will be disabled pending future refactors.
explicit VulkanFence();

explicit VulkanFence(VkDevice);

VulkanFence(const VulkanFence&) = delete;
VulkanFence& operator=(const VulkanFence&) = delete;

VulkanFence(VulkanFence&&) noexcept;
VulkanFence& operator=(VulkanFence&&) noexcept;

~VulkanFence();

private:
VkDevice device_;
VkFence handle_;
bool waiting_;

public:
// Used to get the handle for a queue submission.
VkFence get_submit_handle() {
if (handle_ != VK_NULL_HANDLE) {
// Indicate we are now waiting for this fence to be signaled
waiting_ = true;
}
return handle_;
}

VkFence handle() {
return handle_;
}

// Trigger a synchronous wait for the fence to be signaled
void wait();

bool waiting() const {
return waiting_;
}

operator bool() const {
return (VK_NULL_HANDLE != handle_);
}
};

// A pool to track created Fences and reuse ones that are available.
// Only intended to be modified by one thread at a time.
struct FencePool final {
VkDevice device_;

std::stack<VulkanFence> pool_;

explicit FencePool(VkDevice device) : device_(device), pool_{} {}

// Returns an rvalue reference to a fence, so that it can be moved
inline VulkanFence get_fence() {
if (pool_.empty()) {
VulkanFence new_fence = VulkanFence(device_);
return new_fence;
}

VulkanFence top_fence = std::move(pool_.top());
pool_.pop();

return top_fence;
}

// Marks the fence as available
inline void return_fence(VulkanFence& fence) {
pool_.push(std::move(fence));
}
};

} // namespace api
} // namespace vkcompute
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Pipeline.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <mutex>
#include <unordered_map>

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

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

Closed
junpi3 wants to merge 3 commits into from
Closed

[ET-VK][EZ] Split Resource.h into multiple files within resource/#3553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eeb3461
[ET-VK][EZ] Split `Resource.h` into multiple files within `resource/`
May 8, 2024
48a5ed4
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 8, 2024
323b450
Update on "[ET-VK][EZ] Split `Resource.h` into multiple files within …
May 9, 2024
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
6 changes: 4 additions & 2 deletions backends/vulkan/runtime/api/Adapter.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,8 @@
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Allocator.h>

#include <array>
#include <mutex>
#include <ostream>
Expand DownExpand Up@@ -136,7 +138,7 @@ class Adapter final {
ComputePipelineCache compute_pipeline_cache_;
// Memory Management
SamplerCache sampler_cache_;
MemoryAllocator vma_;
Allocator vma_;

public:
// Physical Device metadata
Expand DownExpand Up@@ -194,7 +196,7 @@ class Adapter final {
return sampler_cache_;
}

inline MemoryAllocator& vma() {
inline Allocator& vma() {
return vma_;
}

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Command.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,10 +14,12 @@

#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Context.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,15 @@
#include <executorch/backends/vulkan/runtime/api/Adapter.h>
#include <executorch/backends/vulkan/runtime/api/Command.h>
#include <executorch/backends/vulkan/runtime/api/Descriptor.h>
#include <executorch/backends/vulkan/runtime/api/Fence.h>
#include <executorch/backends/vulkan/runtime/api/Pipeline.h>
#include <executorch/backends/vulkan/runtime/api/QueryPool.h>
#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Runtime.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>
#include <executorch/backends/vulkan/runtime/api/Utils.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>

namespace vkcompute {
namespace api {

Expand Down
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Descriptor.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <unordered_map>

namespace vkcompute {
Expand Down
7 changes: 4 additions & 3 deletions backends/vulkan/runtime/api/Exception.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,15 @@
#pragma once
// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>

#include <exception>
#include <ostream>
#include <string>
#include <vector>

#include <executorch/backends/vulkan/runtime/api/StringUtil.h>
#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#define VK_CHECK(function) \
do { \
const VkResult result = (function); \
Expand Down
76 changes: 76 additions & 0 deletions backends/vulkan/runtime/api/Fence.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#include <executorch/backends/vulkan/runtime/api/Fence.h>

namespace vkcompute {
namespace api {

VulkanFence::VulkanFence()
: device_(VK_NULL_HANDLE), handle_(VK_NULL_HANDLE), waiting_(false) {}

VulkanFence::VulkanFence(VkDevice device)
: device_(device), handle_(VK_NULL_HANDLE), waiting_(VK_NULL_HANDLE) {
const VkFenceCreateInfo fence_create_info{
VK_STRUCTURE_TYPE_FENCE_CREATE_INFO, // sType
nullptr, // pNext
0u, // flags
};

VK_CHECK(vkCreateFence(device_, &fence_create_info, nullptr, &handle_));
}

VulkanFence::VulkanFence(VulkanFence&& other) noexcept
: device_(other.device_), handle_(other.handle_), waiting_(other.waiting_) {
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;
}

VulkanFence& VulkanFence::operator=(VulkanFence&& other) noexcept {
device_ = other.device_;
handle_ = other.handle_;
waiting_ = other.waiting_;

other.device_ = VK_NULL_HANDLE;
other.handle_ = VK_NULL_HANDLE;
other.waiting_ = false;

return *this;
}

VulkanFence::~VulkanFence() {
if (VK_NULL_HANDLE == handle_) {
return;
}
vkDestroyFence(device_, handle_, nullptr);
}

void VulkanFence::wait() {
// if get_submit_handle() has not been called, then this will no-op
if (waiting_) {
VkResult fence_status = VK_NOT_READY;
// Run the wait in a loop to keep the CPU hot. A single call to
// vkWaitForFences with no timeout may cause the calling thread to be
// scheduled out.
do {
// The timeout (last) arg is in units of ns
fence_status = vkWaitForFences(device_, 1u, &handle_, VK_TRUE, 100000);

VK_CHECK_COND(
fence_status != VK_ERROR_DEVICE_LOST,
"Vulkan Fence: Device lost while waiting for fence!");
} while (fence_status != VK_SUCCESS);

VK_CHECK(vkResetFences(device_, 1u, &handle_));

waiting_ = false;
}
}

} // namespace api
} // namespace vkcompute
98 changes: 98 additions & 0 deletions backends/vulkan/runtime/api/Fence.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
/*
* Copyright (c) Meta Platforms, Inc. and affiliates.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree.
*/

#pragma once

// @lint-ignore-every CLANGTIDY facebook-hte-BadMemberName

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Exception.h>

#include <stack>

namespace vkcompute {
namespace api {

class VulkanFence final {
public:
// TODO: This is required for the lazy allocation pattern in api/Tensor.
// It will be disabled pending future refactors.
explicit VulkanFence();

explicit VulkanFence(VkDevice);

VulkanFence(const VulkanFence&) = delete;
VulkanFence& operator=(const VulkanFence&) = delete;

VulkanFence(VulkanFence&&) noexcept;
VulkanFence& operator=(VulkanFence&&) noexcept;

~VulkanFence();

private:
VkDevice device_;
VkFence handle_;
bool waiting_;

public:
// Used to get the handle for a queue submission.
VkFence get_submit_handle() {
if (handle_ != VK_NULL_HANDLE) {
// Indicate we are now waiting for this fence to be signaled
waiting_ = true;
}
return handle_;
}

VkFence handle() {
return handle_;
}

// Trigger a synchronous wait for the fence to be signaled
void wait();

bool waiting() const {
return waiting_;
}

operator bool() const {
return (VK_NULL_HANDLE != handle_);
}
};

// A pool to track created Fences and reuse ones that are available.
// Only intended to be modified by one thread at a time.
struct FencePool final {
VkDevice device_;

std::stack<VulkanFence> pool_;

explicit FencePool(VkDevice device) : device_(device), pool_{} {}

// Returns an rvalue reference to a fence, so that it can be moved
inline VulkanFence get_fence() {
if (pool_.empty()) {
VulkanFence new_fence = VulkanFence(device_);
return new_fence;
}

VulkanFence top_fence = std::move(pool_.top());
pool_.pop();

return top_fence;
}

// Marks the fence as available
inline void return_fence(VulkanFence& fence) {
pool_.push(std::move(fence));
}
};

} // namespace api
} // namespace vkcompute
4 changes: 3 additions & 1 deletion backends/vulkan/runtime/api/Pipeline.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,9 +12,11 @@

#include <executorch/backends/vulkan/runtime/api/vk_api.h>

#include <executorch/backends/vulkan/runtime/api/Resource.h>
#include <executorch/backends/vulkan/runtime/api/Shader.h>

#include <executorch/backends/vulkan/runtime/api/memory/Buffer.h>
#include <executorch/backends/vulkan/runtime/api/memory/Image.h>

#include <mutex>
#include <unordered_map>

Expand Down
Loading