AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

teflon: Support fused ReLU activation

Browse Source 
Enable support for fused ReLU activation on Conv2D and
DepthwiseConv2D operations.

Reviewed-by: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31981>
This commit is contained in:
Philipp Zabel
2024-09-18 12:59:01 +02:00
committed by Marge Bot
parent ad0ea175d5
commit 01dc82bc63
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/frontends/teflon/tfl_device.c
+12 -6
View File
@@ -115,7 +115,8 @@ fill_operation(struct teflon_delegate *delegate, TfLiteContext *tf_context, TfLi
if (node_registration->builtin_code == kTfLiteBuiltinConv2d) {
TfLiteConvParams* params = (TfLiteConvParams*)node->builtin_data;
assert(params->activation == kTfLiteActNone);
assert(params->activation == kTfLiteActNone ||
params->activation == kTfLiteActRelu);
if (node_registration->version >= 2) {
assert(params->dilation_width_factor == 1);
assert(params->dilation_height_factor == 1);
@@ -124,10 +125,12 @@ fill_operation(struct teflon_delegate *delegate, TfLiteContext *tf_context, TfLi
operation->conv.stride_y = params->stride_height;
operation->conv.padding_same = params->padding == kTfLitePaddingSame;
operation->conv.depthwise = false;
operation->conv.relu = params->activation == kTfLiteActRelu;
} else {
TfLiteDepthwiseConvParams* params = (TfLiteDepthwiseConvParams*)node->builtin_data;
assert(params->activation == kTfLiteActNone);
assert(params->activation == kTfLiteActNone ||
params->activation == kTfLiteActRelu);
if (node_registration->version >= 2) {
assert(params->dilation_width_factor == 1);
assert(params->dilation_height_factor == 1);
@@ -136,6 +139,7 @@ fill_operation(struct teflon_delegate *delegate, TfLiteContext *tf_context, TfLi
operation->conv.stride_y = params->stride_height;
operation->conv.padding_same = params->padding == kTfLitePaddingSame;
operation->conv.depthwise = true;
operation->conv.relu = params->activation == kTfLiteActRelu;
}
operation->conv.pointwise = operation->conv.weight_tensor->dims[1] == 1 && \
operation->conv.weight_tensor->dims[2] == 1;
@@ -390,8 +394,9 @@ PrepareDelegate(TfLiteContext *context, TfLiteDelegate *delegate)
case kTfLiteBuiltinConv2d: {
TfLiteConvParams* params = (TfLiteConvParams*)node->builtin_data;
// Fused activation and dilation not yet implemented
if (params->activation == kTfLiteActNone &&
// Dilation not yet implemented
if ((params->activation == kTfLiteActNone ||
params->activation == kTfLiteActRelu) &&
(registration->version < 2 ||
(params->dilation_width_factor == 1 &&
params->dilation_height_factor == 1))) {
@@ -402,8 +407,9 @@ PrepareDelegate(TfLiteContext *context, TfLiteDelegate *delegate)
case kTfLiteBuiltinDepthwiseConv2d: {
TfLiteDepthwiseConvParams* params = (TfLiteDepthwiseConvParams*)node->builtin_data;
// Fused activation and dilation not yet implemented
if (params->activation == kTfLiteActNone &&
// Dilation not yet implemented
if ((params->activation == kTfLiteActNone ||
params->activation == kTfLiteActRelu) &&
(registration->version < 2 ||
(params->dilation_width_factor == 1 &&
params->dilation_height_factor == 1))) {
src/gallium/include/pipe/p_state.h
+5
View File
@@ -1110,6 +1110,11 @@ struct pipe_ml_operation
* Whether this is a depthwise convolution.
*/
bool depthwise;
/**
* Whether this convolution has fused ReLU activation.
*/
bool relu;
} conv;
struct {
/**