diff options
author | Gian Marco <gianmarco.iodice@arm.com> | 2017-11-29 10:41:38 +0000 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:41:36 +0000 |
commit | 5420b28d54c5238ed4c4aa2ccf02a7c3855c6760 (patch) | |
tree | 44d201142f71622eaf9d711e2d38d4e1360586df /tests/validation/NEON/FixedPoint | |
parent | a5e6d67ddad4c88cec87b23063e8493768bb2c61 (diff) | |
download | ComputeLibrary-5420b28d54c5238ed4c4aa2ccf02a7c3855c6760.tar.gz |
COMPMID-710 - Fix CLTranspose and NETranspose when the input shape is a
vector
Fixed replacing AccessWindowTranspose with AccessWindowStatic due to the
wrong padding calculation in the X direction within AccessWindowTranspose.
AccessWindowTranspose should be fixed with COMPMID-708
Change-Id: I665e130b897a213ae2bf9da4bf092dd491fa00c6
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/111057
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>
Reviewed-by: Michel Iwaniec <michel.iwaniec@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'tests/validation/NEON/FixedPoint')
-rw-r--r-- | tests/validation/NEON/FixedPoint/FixedPoint.cpp | 14 | ||||
-rw-r--r-- | tests/validation/NEON/FixedPoint/FixedPointTarget.h | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/tests/validation/NEON/FixedPoint/FixedPoint.cpp b/tests/validation/NEON/FixedPoint/FixedPoint.cpp index 3b25b0524b..871143bc19 100644 --- a/tests/validation/NEON/FixedPoint/FixedPoint.cpp +++ b/tests/validation/NEON/FixedPoint/FixedPoint.cpp @@ -61,7 +61,7 @@ using NEFixedPointFixture = FixedPointValidationFixture<Tensor, Accessor, T>; TEST_SUITE(QS8) TEST_SUITE(Exp) -FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", DataType::QS8)), framework::dataset::make("FixedPointOp", FixedPointOp::EXP)), framework::dataset::make("FractionalBits", 1, 7))) @@ -72,7 +72,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::Dataset TEST_SUITE_END() TEST_SUITE(Invsqrt) -FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", DataType::QS8)), framework::dataset::make("FixedPointOp", FixedPointOp::INV_SQRT)), framework::dataset::make("FractionalBits", 1, 6))) @@ -83,7 +83,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::Dataset TEST_SUITE_END() TEST_SUITE(Log) -FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", DataType::QS8)), framework::dataset::make("FixedPointOp", FixedPointOp::LOG)), framework::dataset::make("FractionalBits", 3, 6))) @@ -94,7 +94,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::Dataset TEST_SUITE_END() TEST_SUITE(Reciprocal) -FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int8_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", DataType::QS8)), framework::dataset::make("FixedPointOp", FixedPointOp::RECIPROCAL)), framework::dataset::make("FractionalBits", 1, 6))) @@ -107,7 +107,7 @@ TEST_SUITE_END() TEST_SUITE(QS16) TEST_SUITE(Exp) -FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", DataType::QS16)), framework::dataset::make("FixedPointOp", FixedPointOp::EXP)), framework::dataset::make("FractionalBits", 1, 15))) @@ -130,7 +130,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::Datase TEST_SUITE_END() TEST_SUITE(Log) -FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", DataType::QS16)), framework::dataset::make("FixedPointOp", FixedPointOp::LOG)), framework::dataset::make("FractionalBits", 4, 14))) @@ -141,7 +141,7 @@ FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::Datase TEST_SUITE_END() TEST_SUITE(Reciprocal) -FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShape(), framework::dataset::make("DataType", +FIXTURE_DATA_TEST_CASE(RunSmall, NEFixedPointFixture<int16_t>, framework::DatasetMode::ALL, combine(combine(combine(datasets::Small1DShapes(), framework::dataset::make("DataType", DataType::QS16)), framework::dataset::make("FixedPointOp", FixedPointOp::RECIPROCAL)), framework::dataset::make("FractionalBits", 1, 14))) diff --git a/tests/validation/NEON/FixedPoint/FixedPointTarget.h b/tests/validation/NEON/FixedPoint/FixedPointTarget.h index fa1d97f152..31ccc0817e 100644 --- a/tests/validation/NEON/FixedPoint/FixedPointTarget.h +++ b/tests/validation/NEON/FixedPoint/FixedPointTarget.h @@ -50,6 +50,7 @@ void compute_target_impl(const TensorShape &shape, DataType dt, FixedPointOp op, window = calculate_max_window(*src.info(), Steps(num_elems_processed_per_iteration)); AccessWindowHorizontal input_access(src.info(), 0, num_elems_processed_per_iteration); AccessWindowHorizontal output_access(dst.info(), 0, num_elems_processed_per_iteration); + update_window_and_padding(window, input_access, output_access); break; } case DataType::QS16: @@ -58,6 +59,7 @@ void compute_target_impl(const TensorShape &shape, DataType dt, FixedPointOp op, window = calculate_max_window(*src.info(), Steps(num_elems_processed_per_iteration)); AccessWindowHorizontal input_access(src.info(), 0, num_elems_processed_per_iteration); AccessWindowHorizontal output_access(dst.info(), 0, num_elems_processed_per_iteration); + update_window_and_padding(window, input_access, output_access); break; } default: |