fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ethosu: Move stride calculation to lowering

Browse source 
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39975>
This commit is contained in:
Rob Herring (Arm) 2026-03-03 17:24:24 -06:00 • committed by Marge Bot
parent ed2c19a411
commit d772f36741
3 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gallium/drivers/ethosu/ethosu_cmd.c
View file

@ -137,23 +137,9 @@ emit_strides(
struct ethosu_feature_map *feature_map,
uint32_t cmd_stride_c, uint32_t cmd_stride_y, uint32_t cmd_stride_x)
{
unsigned elem_size = 1;
unsigned tensor_x, tensor_y, tensor_c;
struct ethosu_tensor *tensor = feature_map->tensor;
if (tensor->layout == ETHOSU_LAYOUT_NHCWB16) {
tensor_x = 16 * elem_size;
tensor_c = tensor_x * tensor->shape.width;
tensor_y = elem_size * tensor->shape.width * align(tensor->shape.depth, 16);
} else {
tensor_c = elem_size;
tensor_x = tensor->shape.depth * tensor_c;
tensor_y = tensor->shape.width * tensor_x;
}
EMIT1(cmd_stride_y, 0x0, tensor_y);
EMIT1(cmd_stride_x, 0x0, tensor_x);
EMIT1(cmd_stride_c, 0x0, tensor_c);
EMIT1(cmd_stride_y, 0x0, feature_map->stride.y);
EMIT1(cmd_stride_x, 0x0, feature_map->stride.x);
EMIT1(cmd_stride_c, 0x0, feature_map->stride.c);
}
static void

18
src/gallium/drivers/ethosu/ethosu_lower.c
View file

@ -30,6 +30,22 @@ needed_total_padding(int input_size, int stride, int filter_size)
return MAX2(filter_size - (input_size % stride), 0);
}
static void
set_feature_map_strides(struct ethosu_feature_map *fm, bool is_nhcwb16)
{
unsigned elem_size = 1;
if (is_nhcwb16) {
fm->stride.x = 16 * elem_size;
fm->stride.c = fm->stride.x * fm->shape.width;
fm->stride.y = elem_size * fm->shape.width * align(fm->shape.depth, 16);
} else {
fm->stride.c = elem_size;
fm->stride.x = fm->shape.depth * fm->stride.c;
fm->stride.y = fm->shape.width * fm->stride.x;
}
}
static void
set_feature_map(struct ethosu_subgraph *subgraph,
struct pipe_tensor *tensor,
@ -43,6 +59,8 @@ set_feature_map(struct ethosu_subgraph *subgraph,
fm->scale = tensor->scale;
fm->is_signed = tensor->is_signed;
fm->precision = log2(tensor->type_size);
set_feature_map_strides(fm, fm->tensor->layout == ETHOSU_LAYOUT_NHCWB16);
}
static void

7
src/gallium/drivers/ethosu/ethosu_ml.h
View file

@ -66,11 +66,18 @@ enum ethosu_upscale_mode {
ETHOSU_UPSCALE_ZEROS = 2,
};
struct ethosu_stride {
unsigned x;
unsigned y;
unsigned c;
};
struct ethosu_tensor;
struct ethosu_feature_map {
struct ethosu_tensor *tensor;
struct ethosu_block shape;
struct ethosu_stride stride;
bool is_signed;
uint8_t precision;
struct ethosu_tile_box tiles;