Skip to content

[ET-VK] Store unique ptr to StagingBuffer and SymInt in Value instead of inlined object, to reduce Value struct size from 80 to 32 bytes. #7248

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 1 commit into from
Dec 10, 2024
+21 −20
Merged

[ET-VK] Store unique ptr to StagingBuffer and SymInt in Value instead of inlined object, to reduce Value struct size from 80 to 32 bytes. #7248

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions backends/vulkan/runtime/graph/containers/Value.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ struct Value final {
} u;

std::unique_ptr<api::vTensor> as_tensor;
api::StagingBuffer as_staging;
std::unique_ptr<api::StagingBuffer> as_staging;
TensorRef as_tensorref;

std::vector<int64_t> as_int_list;
Expand All @@ -73,7 +73,7 @@ struct Value final {

std::string as_string;

SymInt as_symint;
std::unique_ptr<SymInt> as_symint;

Payload() : u() {}
// NOLINTNEXTLINE
Expand Down Expand Up @@ -117,9 +117,7 @@ struct Value final {
CASE_MOVE_TRIVIALLY_COPYABLE_TYPE(TypeTag::INT, as_int);
CASE_MOVE_TRIVIALLY_COPYABLE_TYPE(TypeTag::DOUBLE, as_double);
CASE_MOVE_TRIVIALLY_COPYABLE_TYPE(TypeTag::BOOL, as_bool);
// Tensor adjacent types
CASE_MOVE_MOVEABLE_TYPE(
TypeTag::STAGING, api::StagingBuffer, as_staging, StagingBuffer);
// Tensor adjacent type
CASE_MOVE_MOVEABLE_TYPE(
TypeTag::TENSORREF, TensorRef, as_tensorref, TensorRef);
// Scalar lists
Expand All @@ -134,9 +132,12 @@ struct Value final {
TypeTag::VALUELIST, std::vector<ValueRef>, as_value_list, vector);
CASE_MOVE_MOVEABLE_TYPE(
TypeTag::STRING, std::string, as_string, basic_string);
CASE_MOVE_MOVEABLE_TYPE(TypeTag::SYMINT, SymInt, as_symint, SymInt);
// Tensor type
CASE_MOVE_UNIQUE_PTR_TYPE(TypeTag::TENSOR, as_tensor);
// Small tensor adjacent types
CASE_MOVE_UNIQUE_PTR_TYPE(TypeTag::STAGING, as_staging);
// Large tensor adjacent types
CASE_MOVE_UNIQUE_PTR_TYPE(TypeTag::SYMINT, as_symint);

case TypeTag::NONE:
clearToNone();
Expand All @@ -163,9 +164,6 @@ struct Value final {

~Value() {
switch (tag) {
case TypeTag::STAGING:
payload.as_staging.~StagingBuffer();
break;
case TypeTag::TENSORREF:
payload.as_tensorref.~TensorRef();
break;
Expand All @@ -184,8 +182,11 @@ struct Value final {
case TypeTag::STRING:
payload.as_string.~basic_string();
break;
case TypeTag::STAGING:
payload.as_staging.reset();
break;
case TypeTag::SYMINT:
payload.as_symint.~SymInt();
payload.as_symint.reset();
break;
case TypeTag::TENSOR:
payload.as_tensor.reset();
Expand Down Expand Up @@ -258,12 +259,6 @@ struct Value final {
return payload.member_name; \
}

SUPPORT_TRIVIALLY_MOVEABLE_TYPE(
api::StagingBuffer,
Staging,
TypeTag::STAGING,
as_staging);

SUPPORT_TRIVIALLY_MOVEABLE_TYPE(
TensorRef,
TensorRef,
Expand Down Expand Up @@ -300,8 +295,6 @@ struct Value final {
TypeTag::STRING,
as_string);

SUPPORT_TRIVIALLY_MOVEABLE_TYPE(SymInt, SymInt, TypeTag::SYMINT, as_symint);

#undef SUPPORT_TRIVIALLY_MOVEABLE_TYPE

#define SUPPORT_UNIQUE_PTR_TYPE(type, type_name, type_tag, member_name) \
Expand Down Expand Up @@ -330,6 +323,14 @@ struct Value final {

SUPPORT_UNIQUE_PTR_TYPE(api::vTensor, Tensor, TypeTag::TENSOR, as_tensor);

SUPPORT_UNIQUE_PTR_TYPE(
api::StagingBuffer,
Staging,
TypeTag::STAGING,
as_staging);

SUPPORT_UNIQUE_PTR_TYPE(SymInt, SymInt, TypeTag::SYMINT, as_symint);

#undef SUPPORT_UNIQUE_PTR_TYPE

private:
Expand Down
4 changes: 2 additions & 2 deletions backends/vulkan/test/vulkan_compute_api_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1087,8 +1087,8 @@ TEST_F(VulkanComputeAPITest, print_object_sizes) {

// Current known size on 64 bit system: 1040 B
EXPECT_TRUE(sizeof(vTensor) < 1200);
// Current known size on 64 bit system: 120 B
EXPECT_TRUE(sizeof(Value) < 128);
// Current known size on 64 bit system: 48 B
EXPECT_TRUE(sizeof(Value) < 56);
// Current known size on 64 bit system: 120 B
EXPECT_TRUE(sizeof(StagingBuffer) < 500);
// Current known size on 64 bit system: 384 B
Expand Down
Loading