fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-23 19:10:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

etnaviv/ml: Add support for no-op Reshape operations

Browse source 
This operation could be implemented in the TP cores, but this operation
tends to be added by convertors that export to TFLite from frameworks
with different channel order, and end up being no-ops.

Once we move to NIR for tensor operations, we can support this operation
and then remove it when we have an explicit transpose operation that is
negated by a consequent transpose operation.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34629>
This commit is contained in:
Tomeu Vizoso 2025-04-10 18:33:59 +02:00 • committed by Marge Bot
parent dae0af20ab
commit ff3162b074
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/gallium/drivers/etnaviv/etnaviv_ml.c
View file

@ -5,6 +5,7 @@
#include <stdio.h>
#include <unistd.h>
#include "pipe/p_state.h"
#include <sys/time.h>
#include "util/u_inlines.h"
@ -272,6 +273,10 @@ dump_graph(struct list_head *etna_operations)
ML_DBG("%3d %-4s %3d %3d out2: %3d",
i, "SPLIT", operation->input_tensors[0], operation->output_tensors[0], operation->output_tensors[1]);
break;
case ETNA_JOB_TYPE_BYPASS:
ML_DBG("%3d %-4s %3d %3d",
i, "BYPASS", operation->input_tensors[0], operation->output_tensors[0]);
break;
}
ML_DBG("\n");
i++;
@ -279,6 +284,25 @@ dump_graph(struct list_head *etna_operations)
ML_DBG("\n");
}
static void
add_bypass(const struct pipe_ml_operation *poperation, unsigned input_tensor,
struct etna_operation *operation, struct list_head *etna_operations)
{
operation->type = ETNA_JOB_TYPE_BYPASS;
operation->input_count = 1;
operation->input_tensors[0] = input_tensor;
operation->input_tensor_sizes[0] = poperation->input_tensors[0]->dims[1] *
poperation->input_tensors[0]->dims[2] *
poperation->input_tensors[0]->dims[3];
operation->output_count = 1;
operation->output_tensors[0] = poperation->output_tensors[0]->index;
operation->output_tensor_sizes[0] = poperation->output_tensors[0]->dims[1] *
poperation->output_tensors[0]->dims[2] *
poperation->output_tensors[0]->dims[3];
list_addtail(&operation->link, etna_operations);
}
static bool
is_3d(struct pipe_tensor *tensor)
{
@ -438,6 +462,10 @@ lower_operations(struct etna_ml_subgraph *subgraph,
list_addtail(&operation->link, etna_operations);
break;
}
case PIPE_ML_OPERATION_TYPE_RESHAPE: {
add_bypass(poperation, input_tensors[0], operation, etna_operations);
break;
}
default:
unreachable("Unsupported ML operation type");
}
@ -498,6 +526,13 @@ lower_operations(struct etna_ml_subgraph *subgraph,
operation->input_tensors[1],
operation->input_tensor_sizes[0],
operation->input_tensor_sizes[1]);
} else if (operation->type == ETNA_JOB_TYPE_BYPASS) {
etna_ml_create_tensor(subgraph, operation->input_tensors[0], operation->input_tensor_sizes[0]);
reference_tensor_with_offset(subgraph,
operation->input_tensors[0],
operation->output_tensors[0],
0,
operation->output_tensor_sizes[0]);
} else {
for (int i = 0; i < operation->input_count; i++)
etna_ml_create_tensor(subgraph, operation->input_tensors[i], operation->input_tensor_sizes[i]);
@ -548,6 +583,7 @@ count_tensors(const struct pipe_ml_operation *poperations,
case PIPE_ML_OPERATION_TYPE_ADD:
case PIPE_ML_OPERATION_TYPE_CONCATENATION:
case PIPE_ML_OPERATION_TYPE_SPLIT:
case PIPE_ML_OPERATION_TYPE_RESHAPE:
break;
default:
unreachable("Unsupported ML operation type");
@ -632,6 +668,9 @@ etna_ml_operation_supported(struct pipe_context *pcontext,
supported = operation->input_tensors[0]->dims[3] < 1280;
break;
}
case PIPE_ML_OPERATION_TYPE_RESHAPE:
supported = true;
break;
default:
return false;
}
@ -682,6 +721,7 @@ etna_ml_subgraph_create(struct pipe_context *pcontext,
break;
case ETNA_JOB_TYPE_CONCAT:
case ETNA_JOB_TYPE_SPLIT:
case ETNA_JOB_TYPE_BYPASS:
continue;
}

1
src/gallium/drivers/etnaviv/etnaviv_ml.h
View file

@ -18,6 +18,7 @@ enum etna_job_type {
ETNA_JOB_TYPE_TP,
ETNA_JOB_TYPE_CONCAT, /* Fake operation, won't execute on HW. Hack will go away after the move to NIR. */
ETNA_JOB_TYPE_SPLIT, /* Fake operation, won't execute on HW. Hack will go away after the move to NIR. */
ETNA_JOB_TYPE_BYPASS, /* Fake operation, won't execute on HW. Hack will go away after the move to NIR. */
};
enum etna_ml_tp_type {