Skip to content

[ET-VK] Use shared pointer for vTensorStorage #11400

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

Merged
merged 4 commits into from
Jun 9, 2025
+44 −238
Merged

[ET-VK] Use shared pointer for vTensorStorage #11400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
012f7a3
[ET-VK] Use shared pointer for vTensorStorage
SS-JIA Jun 5, 2025
3540421
Update on "[ET-VK] Use shared pointer for vTensorStorage"
SS-JIA Jun 6, 2025
921f76f
Update on "[ET-VK] Use shared pointer for vTensorStorage"
SS-JIA Jun 6, 2025
508c033
Update on "[ET-VK] Use shared pointer for vTensorStorage"
SS-JIA Jun 9, 2025
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
116 changes: 33 additions & 83 deletions backends/vulkan/runtime/api/containers/Tensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,7 @@ vTensorStorage::vTensorStorage(
storage_type_,
dtype,
allocate_memory)),
last_access_{},
has_copies_{false} {}
last_access_{} {}

vTensorStorage::vTensorStorage(
Context* const context,
Expand All @@ -361,21 +360,6 @@ vTensorStorage::vTensorStorage(
buffer_(vkapi::VulkanBuffer()),
last_access_{} {}

vTensorStorage::vTensorStorage(
vTensorStorage& other,
const int64_t buffer_offset)
: context_(other.context_),
storage_type_{other.storage_type_},
image_extents_(other.image_extents_),
buffer_length_{other.buffer_length_},
buffer_offset_{buffer_offset},
image_(other.image_),
buffer_(other.buffer_, buffer_offset),
last_access_{other.last_access_},
has_copies_{false} {
other.has_copies_ = true;
}

vTensorStorage::~vTensorStorage() {
flush();
}
Expand All @@ -397,21 +381,6 @@ void vTensorStorage::transition(
vkapi::PipelineStageFlags prev_stage = last_access_.stage;
vkapi::MemoryAccessFlags prev_access = last_access_.access;

// If the underlying resource is a copy of another tensor's resource the
// last_access may not be accurate, since the original storage may have been
// written to as part of the original tensor. Likewise, if the underlying
// resource has copies, then the resource may have been updated as part of the
// view tensors.
//
// If the resource is a copy, or has copies of it, then cowardly assume that
// it has previously been written to as part of a compute shader before the
// current access event so that the appropriate memory barriers may be
// inserted.
if (is_copy() || has_copies_) {
prev_stage = vkapi::PipelineStage::COMPUTE;
prev_access = vkapi::kWrite;
}

const bool prev_written = (prev_access & vkapi::MemoryAccessType::WRITE) != 0;

VkImageLayout cur_layout = VK_IMAGE_LAYOUT_UNDEFINED;
Expand Down Expand Up @@ -458,20 +427,6 @@ void vTensorStorage::transition(
last_access_.access = cur_access;
}

bool vTensorStorage::is_copy() const {
if (storage_type_ == utils::kBuffer) {
return buffer_.is_copy();
}
return image_.is_copy();
}

bool vTensorStorage::is_copy_of(const vTensorStorage& other) const {
if (storage_type_ == utils::kBuffer) {
return buffer_.is_copy_of(other.buffer_);
}
return image_.is_copy_of(other.image_);
}

//
// vTensor
//
Expand Down Expand Up @@ -503,14 +458,14 @@ vTensor::vTensor(
numel_uniform_offset_(kUniformOffsetUnset),
logical_limits_uniform_offset_(kUniformOffsetUnset),
// Construct Tensor storage
storage_(
storage_(std::make_shared<vTensorStorage>(
context,
storage_type,
axis_map_,
packed_dim_,
padded_sizes_,
dtype_,
allocate_memory) {
allocate_memory)) {
uniform_data_ = std::make_shared<UniformData>(UniformData{
sizes_,
unsqueezed_strides_,
Expand All @@ -519,7 +474,7 @@ vTensor::vTensor(
VK_CHECK_COND(
dim_order_is_valid(dim_order_), "computed dim order is invalid");

set_logical_limits(storage_.image_extents_);
set_logical_limits(storage_->image_extents_);
}

// NOLINTNEXTLINE
Expand All @@ -546,13 +501,13 @@ vTensor::vTensor(
numel_uniform_offset_(kUniformOffsetUnset),
logical_limits_uniform_offset_(kUniformOffsetUnset),
// Construct Tensor storage
storage_(context, image) {
storage_(std::make_shared<vTensorStorage>(context, image)) {
uniform_data_ = std::make_shared<UniformData>(UniformData{
sizes_,
{0, 0, 0, 0},
{{0, 0, 0}},
static_cast<size_t>(utils::multiply_integers(sizes_))});
set_logical_limits(storage_.image_extents_);
set_logical_limits(storage_->image_extents_);
}

vTensor::vTensor(vTensor& other)
Expand Down Expand Up @@ -583,8 +538,7 @@ vTensor::vTensor(vTensor& other)
vTensor::vTensor(
vTensor& other,
const std::vector<int64_t>& sizes,
const std::vector<int64_t>& dim_order,
const int64_t offset_numel)
const std::vector<int64_t>& dim_order)
: dtype_(other.dtype_),
// Copy tensor size metadata
sizes_(sizes.begin(), sizes.end()),
Expand All @@ -604,7 +558,7 @@ vTensor::vTensor(
numel_uniform_offset_(kUniformOffsetUnset),
logical_limits_uniform_offset_(kUniformOffsetUnset),
// Copy Tensor storage
storage_(other.storage_, vkapi::element_size(dtype_) * offset_numel) {
storage_(other.storage_) {
uniform_data_ = std::make_shared<UniformData>(UniformData{
sizes_,
unsqueezed_strides_,
Expand All @@ -613,10 +567,6 @@ vTensor::vTensor(

VK_CHECK_COND(
dim_order_is_valid(dim_order_), "new dim order provided is invalid");
VK_CHECK_COND(
offset_numel + numel() <= other.numel(),
"Tensor alias cannot access more elements than available in the original"
"tensor");
}

uint32_t vTensor::UniformData::write_attribute(
Expand Down Expand Up @@ -647,31 +597,31 @@ uint32_t vTensor::UniformData::write_attribute(
vkapi::VulkanImage& vTensor::image(
vkapi::PipelineBarrier& pipeline_barrier,
const vkapi::PipelineStageFlags stage) & {
storage_.transition(pipeline_barrier, stage, vkapi::MemoryAccessType::READ);
return storage_.image_;
storage_->transition(pipeline_barrier, stage, vkapi::MemoryAccessType::READ);
return storage_->image_;
}

vkapi::VulkanImage& vTensor::image(
vkapi::PipelineBarrier& pipeline_barrier,
const vkapi::PipelineStageFlags stage,
const vkapi::MemoryAccessFlags access) & {
storage_.transition(pipeline_barrier, stage, access);
return storage_.image_;
storage_->transition(pipeline_barrier, stage, access);
return storage_->image_;
}

vkapi::VulkanBuffer& vTensor::buffer(
vkapi::PipelineBarrier& pipeline_barrier,
const vkapi::PipelineStageFlags stage) & {
storage_.transition(pipeline_barrier, stage, vkapi::MemoryAccessType::READ);
return storage_.buffer_;
storage_->transition(pipeline_barrier, stage, vkapi::MemoryAccessType::READ);
return storage_->buffer_;
}

vkapi::VulkanBuffer& vTensor::buffer(
vkapi::PipelineBarrier& pipeline_barrier,
const vkapi::PipelineStageFlags stage,
const vkapi::MemoryAccessFlags access) & {
storage_.transition(pipeline_barrier, stage, access);
return storage_.buffer_;
storage_->transition(pipeline_barrier, stage, access);
return storage_->buffer_;
}

void vTensor::set_logical_limits(const utils::uvec3& image_extents) {
Expand All @@ -695,10 +645,10 @@ utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {

const vkapi::BufferBindInfo vTensor::sizes_ubo() {
const size_t size_per_ubo =
storage_.context_->adapter_ptr()->min_ubo_alignment();
storage_->context_->adapter_ptr()->min_ubo_alignment();
const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
uniforms_ = ParamsBuffer(storage_->context_, max_ubo_size, true);
}
if (sizes_uniform_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
Expand All @@ -714,10 +664,10 @@ const vkapi::BufferBindInfo vTensor::sizes_ubo() {

const vkapi::BufferBindInfo vTensor::strides_ubo() {
const size_t size_per_ubo =
storage_.context_->adapter_ptr()->min_ubo_alignment();
storage_->context_->adapter_ptr()->min_ubo_alignment();
const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
uniforms_ = ParamsBuffer(storage_->context_, max_ubo_size, true);
}
if (unsqueezed_strides_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
Expand All @@ -735,10 +685,10 @@ const vkapi::BufferBindInfo vTensor::strides_ubo() {

const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {
const size_t size_per_ubo =
storage_.context_->adapter_ptr()->min_ubo_alignment();
storage_->context_->adapter_ptr()->min_ubo_alignment();
const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
uniforms_ = ParamsBuffer(storage_->context_, max_ubo_size, true);
}
if (logical_limits_uniform_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
Expand All @@ -754,10 +704,10 @@ const vkapi::BufferBindInfo vTensor::logical_limits_ubo() {

const vkapi::BufferBindInfo vTensor::numel_ubo() {
const size_t size_per_ubo =
storage_.context_->adapter_ptr()->min_ubo_alignment();
storage_->context_->adapter_ptr()->min_ubo_alignment();
const size_t max_ubo_size = kMaxMetadataFieldCount * size_per_ubo;
if (!uniforms_.buffer()) {
uniforms_ = ParamsBuffer(storage_.context_, max_ubo_size, true);
uniforms_ = ParamsBuffer(storage_->context_, max_ubo_size, true);
}
if (numel_uniform_offset_ == kUniformOffsetUnset) {
VK_CHECK_COND(
Expand All @@ -774,7 +724,7 @@ const vkapi::BufferBindInfo vTensor::numel_ubo() {
size_t vTensor::staging_buffer_numel() const {
const bool is_int8 = dtype_ == vkapi::kChar;
const bool int8_supported =
storage_.context_->adapter_ptr()->has_full_int8_buffers_support();
storage_->context_->adapter_ptr()->has_full_int8_buffers_support();
if (is_int8 && !int8_supported) {
return utils::align_up_4(numel());
}
Expand All @@ -787,22 +737,22 @@ size_t vTensor::staging_buffer_numel() const {
VkMemoryRequirements vTensor::get_memory_requirements() const {
switch (storage_type()) {
case utils::kBuffer:
return storage_.buffer_.get_memory_requirements();
return storage_->buffer_.get_memory_requirements();
case utils::kTexture2D:
case utils::kTexture3D:
return storage_.image_.get_memory_requirements();
return storage_->image_.get_memory_requirements();
}
return {};
}

void vTensor::bind_allocation(const vkapi::Allocation& allocation) {
switch (storage_type()) {
case utils::kBuffer:
storage_.buffer_.bind_allocation(allocation);
storage_->buffer_.bind_allocation(allocation);
break;
case utils::kTexture2D:
case utils::kTexture3D:
storage_.image_.bind_allocation(allocation);
storage_->image_.bind_allocation(allocation);
break;
}
}
Expand Down Expand Up @@ -845,11 +795,11 @@ void vTensor::check_sizes(const std::vector<int64_t>& sizes) const {
utils::uvec3 virtual_extents =
calculate_image_extents(padded_sizes_, axis_map_, packed_dim_);

bool valid_resize = virtual_extents[0] <= storage_.image_extents_[0];
bool valid_resize = virtual_extents[0] <= storage_->image_extents_[0];
valid_resize =
valid_resize && virtual_extents[1] <= storage_.image_extents_[1];
valid_resize && virtual_extents[1] <= storage_->image_extents_[1];
valid_resize =
valid_resize && virtual_extents[2] <= storage_.image_extents_[2];
valid_resize && virtual_extents[2] <= storage_->image_extents_[2];

VK_CHECK_COND(
valid_resize,
Expand All @@ -859,7 +809,7 @@ void vTensor::check_sizes(const std::vector<int64_t>& sizes) const {
// new sizes of the tensor.
int64_t numel = utils::multiply_integers(sizes);
bool valid_resize =
numel + storage_.buffer_offset_ <= storage_.buffer_length_;
numel + storage_->buffer_offset_ <= storage_->buffer_length_;
VK_CHECK_COND(
valid_resize,
"tensor sizes requires a larger buffer than the current one.");
Expand Down
Loading
Loading