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

etnaviv/ml: Reorder dimensions in convolutions

Browse source 
The blob does this, and doesn't seem to just be for performance as I see
some tests being fixed by it.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34497>
This commit is contained in:
Tomeu Vizoso 2024-11-22 10:24:27 +01:00 • committed by Marge Bot
parent d55a69e769
commit d88f0b8f3c
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/etnaviv/etnaviv_ml_nn.c
View file

@ -770,11 +770,6 @@ create_nn_config(struct etna_ml_subgraph *subgraph, const struct etna_operation
&output_width, &output_height, &output_channels);
}
if (input_height > input_width) {
SWAP(input_width, input_height);
SWAP(output_width, output_height);
}
if (operation->fully_connected) {
unsigned original_input_width = input_width;
input_width = 15;
@ -787,6 +782,9 @@ create_nn_config(struct etna_ml_subgraph *subgraph, const struct etna_operation
input_channels = original_input_height / input_height;
weight_width = input_width;
weight_height = input_height;
} else {
SWAP(input_width, input_height);
SWAP(output_width, output_height);
}
etna_bo_cpu_prep(bo, DRM_ETNA_PREP_WRITE);

16
src/gallium/drivers/etnaviv/etnaviv_ml_tp.c
View file

@ -349,11 +349,13 @@ split_reshuffle(struct etna_ml_subgraph *subgraph, const struct etna_operation *
unsigned remaining_out_size, remaining_in_size;
unsigned dim_to_split = 0;
if (out_dims[1] >= out_dims[dim_to_split])
dim_to_split = 1;
if (operation->input_channels >= out_dims[dim_to_split]) {
if (out_dims[1] >= out_dims[dim_to_split])
dim_to_split = 1;
if (out_dims[2] >= out_dims[dim_to_split])
dim_to_split = 2;
if (out_dims[2] >= out_dims[dim_to_split])
dim_to_split = 2;
}
remaining_in_size = in_dims[dim_to_split];
remaining_out_size = out_dims[dim_to_split];
@ -429,10 +431,8 @@ create_reshuffle_config(struct etna_ml_subgraph *subgraph, const struct etna_ope
set_default_tp_config(map);
if (input_height > input_width) {
SWAP(input_width, input_height);
SWAP(output_width, output_height);
}
SWAP(input_width, input_height);
SWAP(output_width, output_height);
in_dims[0] = input_width;
in_dims[1] = input_height;