Skip to content

Commit f7664d3

Browse files
authored
[ET-VK] Replace kPackedInt8_4H with kPackedInt8_4C1W (pytorch#16858)
Replace the unused `kPackedInt8_4H` (height-packed int8) layout with `kPackedInt8_4C1W`, a block-transposed layout where channels are packed with width as the outer packed dimension. This layout uses the new `block_transposed` flag in `PackedDimInfo` to indicate that the stride ordering of packed_dim and outer_packed_dim should be swapped. The new layout has: - packed_dim = 2 (channels) - outer_packed_dim = 0 (width) - packed_dim_block_size = 4 - outer_packed_dim_block_size = 4 - block_transposed = true Updated `estimate_memory_layout()` to use `block_transposed` flag to distinguish between `kPackedInt8_4C` and `kPackedInt8_4C1W`. Differential Revision: [D91281382](https://our.internmc.facebook.com/intern/diff/D91281382/)
1 parent 2b1b987 commit f7664d3

4 files changed

Lines changed: 86 additions & 46 deletions

File tree

‎backends/vulkan/runtime/api/containers/Tensor.cpp‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,34 +1022,32 @@ vkapi::VulkanBuffer& vTensor::buffer(
10221022
utils::GPUMemoryLayout vTensor::estimate_memory_layout() const {
10231023
// Check for block-packed layouts (two-level packing) - only applicable for
10241024
// kInt8x4
1025-
if (dtype_ == vkapi::kInt8x4 &&
1026-
packed_dim_info_.outer_packed_dim_block_size > 1) {
1027-
// For 4W4C: packed_dim = Channels, outer_packed_dim = Width
1028-
if (packed_dim_info_.packed_dim == WHCN::kChannelsDim &&
1029-
packed_dim_info_.outer_packed_dim == WHCN::kWidthDim) {
1030-
return utils::kPackedInt8_4W4C;
1031-
}
1032-
// For 4H4W: packed_dim = Width, outer_packed_dim = Height
1033-
if (packed_dim_info_.packed_dim == WHCN::kWidthDim &&
1034-
packed_dim_info_.outer_packed_dim == WHCN::kHeightDim) {
1035-
return utils::kPackedInt8_4H4W;
1036-
}
1037-
VK_THROW("Invalid block-packed layout configuration for kInt8x4 dtype");
1038-
}
1039-
1040-
// Single-level packing layouts
10411025
if (dtype_ == vkapi::kInt8x4) {
1042-
switch (packed_dim_info_.packed_dim) {
1043-
case WHCN::kChannelsDim:
1044-
return utils::kPackedInt8_4C;
1045-
case WHCN::kWidthDim:
1046-
return utils::kPackedInt8_4W;
1047-
case WHCN::kHeightDim:
1048-
return utils::kPackedInt8_4H;
1049-
default:
1050-
VK_THROW("Invalid packed dim for Tensor with kInt8x4 type");
1026+
if (packed_dim_info_.outer_packed_dim_block_size > 1) {
1027+
// For 4W4C: packed_dim = Channels, outer_packed_dim = Width
1028+
if (packed_dim_info_.packed_dim == WHCN::kChannelsDim &&
1029+
packed_dim_info_.outer_packed_dim == WHCN::kWidthDim) {
1030+
return utils::kPackedInt8_4W4C;
1031+
}
1032+
// For 4H4W: packed_dim = Width, outer_packed_dim = Height
1033+
if (packed_dim_info_.packed_dim == WHCN::kWidthDim &&
1034+
packed_dim_info_.outer_packed_dim == WHCN::kHeightDim) {
1035+
return utils::kPackedInt8_4H4W;
1036+
}
1037+
VK_THROW("Invalid block-packed layout configuration for kInt8x4 dtype");
1038+
} else {
1039+
switch (packed_dim_info_.packed_dim) {
1040+
case WHCN::kChannelsDim:
1041+
return packed_dim_info_.block_transposed ? utils::kPackedInt8_4C1W
1042+
: utils::kPackedInt8_4C;
1043+
case WHCN::kWidthDim:
1044+
return utils::kPackedInt8_4W;
1045+
default:
1046+
VK_THROW("Invalid packed dim for Tensor with kInt8x4 type");
1047+
}
10511048
}
10521049
}
1050+
10531051
switch (packed_dim_info_.packed_dim) {
10541052
case WHCN::kWidthDim:
10551053
return utils::kWidthPacked;

‎backends/vulkan/runtime/utils/StorageUtils.cpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,22 @@ bool is_packed_int8_layout(const GPUMemoryLayout layout) {
1515
switch (layout) {
1616
case kPackedInt8_4W:
1717
case kPackedInt8_4C:
18-
case kPackedInt8_4H:
1918
case kPackedInt8_4W4C:
2019
case kPackedInt8_4H4W:
20+
case kPackedInt8_4C1W:
2121
return true;
2222
default:
2323
return false;
2424
}
2525
}
2626

2727
bool is_block_transposed_layout(const GPUMemoryLayout layout) {
28-
return false;
28+
switch (layout) {
29+
case kPackedInt8_4C1W:
30+
return true;
31+
default:
32+
return false;
33+
}
2934
}
3035

3136
} // namespace utils

‎backends/vulkan/runtime/utils/StorageUtils.h‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,18 @@ enum class GPUMemoryLayout : uint8_t {
101101
* 16 element block is loaded, rather than 4 elements along one dimension.
102102
*/
103103

104+
// Block packed layouts - two levels of packing (4x4 block composed of
105+
// elements from two packed dims per ivec4)
106+
TENSOR_PACKED_INT8_4W4C = 3u,
107+
TENSOR_PACKED_INT8_4H4W = 4u,
108+
104109
// "vector" packed layouts - single level of packing (4 elements along packed
105110
// dim per int32)
106111
TENSOR_PACKED_INT8_4W = 5u,
107112
TENSOR_PACKED_INT8_4C = 6u,
108-
TENSOR_PACKED_INT8_4H = 7u,
109113

110-
// Block packed layouts - two levels of packing (4x4 block composed of
111-
// elements from two packed dims per ivec4)
112-
TENSOR_PACKED_INT8_4W4C = 3u,
113-
TENSOR_PACKED_INT8_4H4W = 4u,
114+
// Block transposed layouts
115+
TENSOR_PACKED_INT8_4C1W = 8u,
114116
};
115117

116118
static constexpr GPUMemoryLayout kWidthPacked =
@@ -128,15 +130,15 @@ static constexpr GPUMemoryLayout kPackedInt8_4W =
128130
static constexpr GPUMemoryLayout kPackedInt8_4C =
129131
GPUMemoryLayout::TENSOR_PACKED_INT8_4C;
130132

131-
static constexpr GPUMemoryLayout kPackedInt8_4H =
132-
GPUMemoryLayout::TENSOR_PACKED_INT8_4H;
133-
134133
static constexpr GPUMemoryLayout kPackedInt8_4W4C =
135134
GPUMemoryLayout::TENSOR_PACKED_INT8_4W4C;
136135

137136
static constexpr GPUMemoryLayout kPackedInt8_4H4W =
138137
GPUMemoryLayout::TENSOR_PACKED_INT8_4H4W;
139138

139+
static constexpr GPUMemoryLayout kPackedInt8_4C1W =
140+
GPUMemoryLayout::TENSOR_PACKED_INT8_4C1W;
141+
140142
template <typename T>
141143
T to_packed_dim(const GPUMemoryLayout layout) {
142144
switch (layout) {
@@ -150,12 +152,12 @@ T to_packed_dim(const GPUMemoryLayout layout) {
150152
return 0;
151153
case kPackedInt8_4C:
152154
return 2;
153-
case kPackedInt8_4H:
154-
return 1;
155155
case kPackedInt8_4W4C:
156156
return 2;
157157
case kPackedInt8_4H4W:
158158
return 0;
159+
case kPackedInt8_4C1W:
160+
return 2;
159161
};
160162
// Should be unreachable
161163
return 0;
@@ -174,12 +176,12 @@ T to_outer_packed_dim(const GPUMemoryLayout layout) {
174176
return 1;
175177
case kPackedInt8_4C:
176178
return 0;
177-
case kPackedInt8_4H:
178-
return 0;
179179
case kPackedInt8_4W4C:
180180
return 0;
181181
case kPackedInt8_4H4W:
182182
return 1;
183+
case kPackedInt8_4C1W:
184+
return 0;
183185
};
184186
// Should be unreachable
185187
return 1;
@@ -200,12 +202,12 @@ T to_packed_dim_block_size(
200202
return storage == kBuffer ? 4 : 16;
201203
case kPackedInt8_4C:
202204
return storage == kBuffer ? 4 : 16;
203-
case kPackedInt8_4H:
204-
return storage == kBuffer ? 4 : 16;
205205
case kPackedInt8_4W4C:
206206
return 4;
207207
case kPackedInt8_4H4W:
208208
return 4;
209+
case kPackedInt8_4C1W:
210+
return storage == kBuffer ? 4 : 16;
209211
};
210212
// Should be unreachable
211213
return 1;
@@ -224,12 +226,12 @@ T to_outer_packed_dim_block_size(const GPUMemoryLayout layout) {
224226
return 1;
225227
case kPackedInt8_4C:
226228
return 1;
227-
case kPackedInt8_4H:
228-
return 1;
229229
case kPackedInt8_4W4C:
230230
return 4;
231231
case kPackedInt8_4H4W:
232232
return 4;
233+
case kPackedInt8_4C1W:
234+
return 1;
233235
};
234236
// Should be unreachable
235237
return 1;
@@ -275,15 +277,15 @@ inline std::ostream& operator<<(
275277
case kPackedInt8_4C:
276278
os << "TENSOR_PACKED_INT8_4C";
277279
break;
278-
case kPackedInt8_4H:
279-
os << "TENSOR_PACKED_INT8_4H";
280-
break;
281280
case kPackedInt8_4W4C:
282281
os << "TENSOR_PACKED_INT8_4W4C";
283282
break;
284283
case kPackedInt8_4H4W:
285284
os << "TENSOR_PACKED_INT8_4H4W";
286285
break;
286+
case kPackedInt8_4C1W:
287+
os << "TENSOR_PACKED_INT8_4C1W";
288+
break;
287289
}
288290
return os;
289291
}

‎backends/vulkan/test/vulkan_compute_api_test.cpp‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,12 @@ TEST_F(VulkanComputeAPITest, tensor_layout_metadata_test) {
480480
WHCN::kHeightDim,
481481
true,
482482
false},
483+
{utils::kPackedInt8_4C1W,
484+
vkapi::kChar,
485+
WHCN::kChannelsDim,
486+
WHCN::kWidthDim,
487+
false,
488+
true},
483489
};
484490

485491
std::vector<utils::StorageType> storage_types = {
@@ -788,6 +794,35 @@ TEST_F(VulkanComputeAPITest, tensor_layout_metadata_test_against_golden) {
788794
/* expected_physical_numel_buffer */ 720,
789795
/* expected_physical_numel_texture */ 720,
790796
/* expected_image_extents */ {5, 4, 9}},
797+
798+
// 3D tensor [9, 13, 17] with packed int8 4C1W block-transposed layout
799+
// packed_dim = channels (2), outer_packed_dim = width (0)
800+
// block_transposed = true, so dim_order swaps: [1, 0, 2] instead of
801+
// [1, 2, 0] Channels padded to 12 (multiple of 4), width padded to 20
802+
// (multiple of 4)
803+
{/* sizes */ {9, 13, 17},
804+
/* dtype */ vkapi::kChar,
805+
/* layout */ utils::kPackedInt8_4C1W,
806+
/* expected_dim_order */ {1, 0, 2},
807+
/* expected_padded_sizes_buffer */ {1, 12, 13, 17},
808+
/* expected_padded_sizes_texture */ {1, 16, 13, 17},
809+
/* expected_strides_buffer */ {},
810+
/* expected_physical_numel_buffer */ 663,
811+
/* expected_physical_numel_texture */ 884,
812+
/* expected_image_extents */ {17, 13, 1}},
813+
814+
// 4D tensor [2, 8, 12, 16] with packed int8 4C1W block-transposed layout
815+
// Tests 4D case with block_transposed = true
816+
{/* sizes */ {2, 8, 12, 16},
817+
/* dtype */ vkapi::kChar,
818+
/* layout */ utils::kPackedInt8_4C1W,
819+
/* expected_dim_order */ {0, 2, 1, 3},
820+
/* expected_padded_sizes_buffer */ {2, 8, 12, 16},
821+
/* expected_padded_sizes_texture */ {2, 16, 12, 16},
822+
/* expected_strides_buffer */ {},
823+
/* expected_physical_numel_buffer */ 768,
824+
/* expected_physical_numel_texture */ 1536,
825+
/* expected_image_extents */ {16, 12, 2}},
791826
};
792827

793828
for (size_t i = 0; i < test_cases.size(); ++i) {

0 commit comments

Comments
 (0)