diff options
| author | Viet-Hoa Do <viet-hoa.do@arm.com> | 2022-10-20 11:18:17 +0100 |
|---|---|---|
| committer | Viet-Hoa Do <viet-hoa.do@arm.com> | 2022-10-20 14:34:47 +0000 |
| commit | 9fc0b5c484e0f6cfe52009719ebccc179ada1112 (patch) | |
| tree | 60216895d51bd161f28f1bd1f49d5c2e9d1c6715 /tests/validation/NEON/ArithmeticAddition.cpp | |
| parent | 6782452c16a286a6dd4a071cfc70bbbcbabb20be (diff) | |
| download | ComputeLibrary-9fc0b5c484e0f6cfe52009719ebccc179ada1112.tar.gz | |
Update reinterpret tensor as 1D for CPU add
* Use the same implementation as other layers.
Resolves: COMPMID-5108
Signed-off-by: Viet-Hoa Do <viet-hoa.do@arm.com>
Change-Id: I5a50259b398b71ca1f61b5ee8daa539bf8263fac
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8501
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/validation/NEON/ArithmeticAddition.cpp')
| -rw-r--r-- | tests/validation/NEON/ArithmeticAddition.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/tests/validation/NEON/ArithmeticAddition.cpp b/tests/validation/NEON/ArithmeticAddition.cpp index 322cd7bea5..e18d61e415 100644 --- a/tests/validation/NEON/ArithmeticAddition.cpp +++ b/tests/validation/NEON/ArithmeticAddition.cpp @@ -89,7 +89,7 @@ DATA_TEST_CASE(Validate, framework::DatasetMode::ALL, zip(zip(zip( } DATA_TEST_CASE(KernelSelection, framework::DatasetMode::ALL, concat(concat( - combine(combine(combine(framework::dataset::make("CpuExt", std::string("NEON")), + combine(combine(framework::dataset::make("CpuExt", std::string("NEON")), framework::dataset::make("DataType", { DataType::F32, DataType::F16, DataType::U8, @@ -99,25 +99,22 @@ DATA_TEST_CASE(KernelSelection, framework::DatasetMode::ALL, concat(concat( DataType::QASYMM8_SIGNED, DataType::QSYMM16 })), - framework::dataset::make("CanInterpretAs1D", {true, false})), framework::dataset::make("CanUseFixedpoint", {true, false})), - combine(combine(combine(framework::dataset::make("CpuExt", std::string("SVE")), + combine(combine(framework::dataset::make("CpuExt", std::string("SVE")), framework::dataset::make("DataType", { DataType::F32, DataType::F16, DataType::U8, DataType::S16, DataType::S32 })), - framework::dataset::make("CanInterpretAs1D", {true, false})), framework::dataset::make("CanUseFixedpoint", {true, false}))), - combine(combine(combine(framework::dataset::make("CpuExt", std::string("SVE2")), + combine(combine(framework::dataset::make("CpuExt", std::string("SVE2")), framework::dataset::make("DataType", { DataType::QASYMM8, DataType::QASYMM8_SIGNED, DataType::QSYMM16 })), - framework::dataset::make("CanInterpretAs1D", {false})), framework::dataset::make("CanUseFixedpoint", {true, false}))), - cpu_ext, data_type, can_interpret_inputs_as_1d_array, can_use_fixedpoint) + cpu_ext, data_type, can_use_fixedpoint) { using namespace cpu::kernels; @@ -127,20 +124,14 @@ DATA_TEST_CASE(KernelSelection, framework::DatasetMode::ALL, concat(concat( cpu_isa.sve2 = (cpu_ext == "SVE2"); cpu_isa.fp16 = (data_type == DataType::F16); - const auto *selected_impl = CpuAddKernel::get_implementation(CpuAddKernelDataTypeISASelectorData{data_type, cpu_isa, can_interpret_inputs_as_1d_array, can_use_fixedpoint}, cpu::KernelSelectionType::Preferred); + const auto *selected_impl = CpuAddKernel::get_implementation(CpuAddKernelDataTypeISASelectorData{data_type, cpu_isa, can_use_fixedpoint}, cpu::KernelSelectionType::Preferred); ARM_COMPUTE_ERROR_ON_NULLPTR(selected_impl); - bool float_or_integer = (data_type == DataType::F32 || data_type == DataType::F16 || data_type == DataType::U8 || - data_type == DataType::S16 || data_type == DataType::S32); bool qasymm8_any = (data_type == DataType::QASYMM8 || data_type == DataType::QASYMM8_SIGNED); std::string expected; - if(can_interpret_inputs_as_1d_array && float_or_integer) - { - expected = "neon_" + cpu_impl_dt(data_type) + "_add_as_1d_array"; - } - else if(qasymm8_any && can_use_fixedpoint) + if(qasymm8_any && can_use_fixedpoint) { expected = "neon_" + cpu_impl_dt(data_type) + "_add_fixedpoint"; } |