aboutsummaryrefslogtreecommitdiff
path: root/tests/validation/NEON
diff options
context:
space:
mode:
Diffstat (limited to 'tests/validation/NEON')
-rw-r--r--tests/validation/NEON/DepthwiseConvolutionLayer.cpp7
-rw-r--r--tests/validation/NEON/Permute.cpp2
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/validation/NEON/DepthwiseConvolutionLayer.cpp b/tests/validation/NEON/DepthwiseConvolutionLayer.cpp
index 47e8896fd6..0cdd4c0296 100644
--- a/tests/validation/NEON/DepthwiseConvolutionLayer.cpp
+++ b/tests/validation/NEON/DepthwiseConvolutionLayer.cpp
@@ -82,8 +82,11 @@ DATA_TEST_CASE(Configuration, framework::DatasetMode::ALL, combine(framework::da
validate(bias.info()->valid_region(), bias_valid_region);
// Validate padding
- const int step = 16 >> info.stride().first;
- const PaddingSize padding = PaddingCalculator(output_shape.x(), step).required_padding();
+ bool is_optimized_run = NEDepthwiseConvolutionLayer3x3Kernel::is_optimized_execution_possible(input_shape, info, data_type, DataLayout::NCHW);
+ const int step_non_opt_dwc = 16 >> info.stride().first;
+ const int step_bias_add = 16 / src.info()->element_size();
+ const int step = is_optimized_run ? step_bias_add : std::max(step_non_opt_dwc, step_bias_add);
+ const PaddingSize padding = PaddingCalculator(output_shape.x(), step).required_padding();
validate(dst.info()->padding(), padding);
}
diff --git a/tests/validation/NEON/Permute.cpp b/tests/validation/NEON/Permute.cpp
index 004aa8208d..7451d9e3f6 100644
--- a/tests/validation/NEON/Permute.cpp
+++ b/tests/validation/NEON/Permute.cpp
@@ -42,7 +42,7 @@ namespace validation
{
namespace
{
-const auto PermuteParametersSmall = combine(datasets::Small4DShapes(),
+const auto PermuteParametersSmall = combine(concat(concat(datasets::Small2DShapes(), datasets::Small3DShapes()), datasets::Small4DShapes()),
framework::dataset::make("PermutationVector", { PermutationVector(2U, 0U, 1U), PermutationVector(1U, 2U, 0U) }));
const auto PermuteParametersLarge = combine(datasets::Large4DShapes(),
framework::dataset::make("PermutationVector", { PermutationVector(2U, 0U, 1U), PermutationVector(1U, 2U, 0U) }));