Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed scratch size calculation for conv for HiFi targets for scenarios when input, filter and output heights are 1. #3004

Merged
merged 3 commits into from
Dec 13, 2024
Merged

Fixed scratch size calculation for conv for HiFi targets for scenarios when input, filter and output heights are 1. #3004

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b14dd1
Fixed scratch size calculation for conv for HiFi targets for scenario…
cad-audio Dec 10, 2024
0d35313
Corrected formatting.
cad-audio Dec 13, 2024
ff7f40a
Merge branch 'main' into conv_hifi_fix1
suleshahid Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 38 additions & 6 deletions tensorflow/lite/micro/kernels/xtensa/conv_hifi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,28 +77,60 @@ TfLiteStatus ConvPrepareHifi(TfLiteContext* context, TfLiteNode* node) {
}

const int input_height = input_shape.Dims(1);
const int input_width = input_shape.Dims(2);
const int input_depth = MatchingDim(input_shape, 3, filter_shape, 3);
const int filter_height = filter_shape.Dims(1);
const int filter_width = filter_shape.Dims(2);
const int output_height = output_shape.Dims(1);
const int output_width = output_shape.Dims(2);
const int output_channels = output_shape.Dims(3);
const int stride_height = params->stride_height;
const int stride_width = params->stride_width;
const int pad_height = data->reference_op_data.padding.height;
const int pad_width = data->reference_op_data.padding.width;

int required_scratch = 0;
// TODO(b/277112516): Dilation is currently not supported on HiFi 4 NN Library
if ((params->dilation_width_factor == 1) &&
(params->dilation_height_factor == 1)) {
if (input->type == kTfLiteInt8) {
required_scratch = xa_nn_conv2d_std_getsize(
input_height, input_depth, filter_height, filter_width, stride_height,
pad_height, output_height, output_channels, PREC_ASYM8S);
if (input_height == 1 && filter_height == 1 && output_height == 1) {
int inp_h, filt_h, filt_w, str_h, pad_h, out_h;
inp_h = input_width;
filt_h = filter_width;
filt_w = filter_height;
str_h = stride_width;
pad_h = pad_width;
out_h = output_width;
required_scratch = xa_nn_conv2d_std_getsize(
inp_h, input_depth, filt_h, filt_w, str_h, pad_h, out_h,
output_channels, PREC_ASYM8S);
} else {
required_scratch = xa_nn_conv2d_std_getsize(
input_height, input_depth, filter_height, filter_width,
stride_height, pad_height, output_height, output_channels,
PREC_ASYM8S);
}
TF_LITE_ENSURE(context, required_scratch > 0);
}
if (input->type == kTfLiteInt16) {
required_scratch = xa_nn_conv2d_std_getsize(
input_height, input_depth, filter_height, filter_width, stride_height,
pad_height, output_height, output_channels, PREC_SYM16S);
if (input_height == 1 && filter_height == 1 && output_height == 1) {
int inp_h, filt_h, filt_w, str_h, pad_h, out_h;
inp_h = input_width;
filt_h = filter_width;
filt_w = filter_height;
str_h = stride_width;
pad_h = pad_width;
out_h = output_width;
required_scratch = xa_nn_conv2d_std_getsize(
inp_h, input_depth, filt_h, filt_w, str_h, pad_h, out_h,
output_channels, PREC_SYM16S);
} else {
required_scratch = xa_nn_conv2d_std_getsize(
input_height, input_depth, filter_height, filter_width,
stride_height, pad_height, output_height, output_channels,
PREC_SYM16S);
}
TF_LITE_ENSURE(context, required_scratch > 0);
}
}
Expand Down
Loading