From a121de3edee75180d335d8be42cdd6620a6063a5 Mon Sep 17 00:00:00 2001 From: nikraj01 Date: Wed, 29 May 2019 10:51:05 +0100 Subject: IVGCVSW-3168 Refactor reference softmax workload into a single workload Change-Id: Ie290efcbb9e3a6365cbd630cb2041e7b0f542505 Signed-off-by: nikraj01 --- src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp | 5 ++++- src/backends/backendsCommon/test/WorkloadDataValidation.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/backends/backendsCommon/test') diff --git a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp index 3248954e3b..4591def34f 100644 --- a/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp +++ b/src/backends/backendsCommon/test/JsonPrinterTestImpl.cpp @@ -244,6 +244,7 @@ void RunSoftmaxProfilerJsonPrinterTest(const std::vector& back std::string result = GetSoftmaxProfilerJson(backends); std::string backend = "Ref"; + std::string testName = "SoftmaxWorkload_Execute"; std::string changeLine31 = "\n},\n\"CopyMemGeneric_Execute\": {"; std::string changeLine39 = "us\""; std::string changeLine40; @@ -253,6 +254,7 @@ void RunSoftmaxProfilerJsonPrinterTest(const std::vector& back if (firstBackend == armnn::Compute::GpuAcc) { backend = "Cl"; + testName = "SoftmaxUintWorkload_Execute"; changeLine31 = ",\n\"OpenClKernelTimer/: softmax_layer_max_shift_exp_sum_quantized_serial GWS[,,]\": {"; changeLine39 = R"(us" }, @@ -278,6 +280,7 @@ void RunSoftmaxProfilerJsonPrinterTest(const std::vector& back else if (firstBackend == armnn::Compute::CpuAcc) { backend = "Neon"; + testName = "SoftmaxUintWorkload_Execute"; changeLine31 = ",\n\"NeonKernelTimer/: NEFillBorderKernel\": {"; changeLine39 = R"(us" }, @@ -332,7 +335,7 @@ void RunSoftmaxProfilerJsonPrinterTest(const std::vector& back ], "unit": "us" }, -")" + backend + R"(SoftmaxUintWorkload_Execute": { +")" + backend + testName + R"(": { "raw": [ , , diff --git a/src/backends/backendsCommon/test/WorkloadDataValidation.cpp b/src/backends/backendsCommon/test/WorkloadDataValidation.cpp index 94bef9b50a..795791fc5e 100644 --- a/src/backends/backendsCommon/test/WorkloadDataValidation.cpp +++ b/src/backends/backendsCommon/test/WorkloadDataValidation.cpp @@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE(SoftmaxQueueDescriptor_Validate_WrongInputHeight) AddOutputToWorkload(invalidData, invalidInfo, outputTensorInfo, nullptr); //Invalid argument exception is expected, because height != 1. - BOOST_CHECK_THROW(RefSoftmaxFloat32Workload(invalidData, invalidInfo), armnn::InvalidArgumentException); + BOOST_CHECK_THROW(RefSoftmaxWorkload(invalidData, invalidInfo), armnn::InvalidArgumentException); } BOOST_AUTO_TEST_CASE(FullyConnectedQueueDescriptor_Validate_RequiredDataMissing) -- cgit v1.2.1