aboutsummaryrefslogtreecommitdiff
path: root/src/backends/neon/workloads
diff options
context:
space:
mode:
Diffstat (limited to 'src/backends/neon/workloads')
-rw-r--r--src/backends/neon/workloads/CMakeLists.txt2
-rw-r--r--src/backends/neon/workloads/NeonSliceWorkload.cpp57
-rw-r--r--src/backends/neon/workloads/NeonSliceWorkload.hpp31
-rw-r--r--src/backends/neon/workloads/NeonWorkloadUtils.hpp24
-rw-r--r--src/backends/neon/workloads/NeonWorkloads.hpp1
5 files changed, 115 insertions, 0 deletions
diff --git a/src/backends/neon/workloads/CMakeLists.txt b/src/backends/neon/workloads/CMakeLists.txt
index 46e4928882..19ac9c9d00 100644
--- a/src/backends/neon/workloads/CMakeLists.txt
+++ b/src/backends/neon/workloads/CMakeLists.txt
@@ -70,6 +70,8 @@ list(APPEND armnnNeonBackendWorkloads_sources
NeonResizeWorkload.hpp
NeonRsqrtWorkload.cpp
NeonRsqrtWorkload.hpp
+ NeonSliceWorkload.cpp
+ NeonSliceWorkload.hpp
NeonSoftmaxBaseWorkload.cpp
NeonSoftmaxBaseWorkload.hpp
NeonSoftmaxFloatWorkload.cpp
diff --git a/src/backends/neon/workloads/NeonSliceWorkload.cpp b/src/backends/neon/workloads/NeonSliceWorkload.cpp
new file mode 100644
index 0000000000..171edc6c59
--- /dev/null
+++ b/src/backends/neon/workloads/NeonSliceWorkload.cpp
@@ -0,0 +1,57 @@
+//
+// Copyright © 2019 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#include "NeonSliceWorkload.hpp"
+
+#include "NeonWorkloadUtils.hpp"
+
+#include <aclCommon/ArmComputeTensorUtils.hpp>
+
+#include <neon/NeonTensorHandle.hpp>
+
+#include <arm_compute/core/Error.h>
+
+namespace armnn
+{
+
+arm_compute::Status NeonSliceWorkloadValidate(const TensorInfo& input,
+ const TensorInfo& output,
+ const SliceDescriptor& descriptor)
+{
+ const arm_compute::TensorInfo aclInputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(input);
+ const arm_compute::TensorInfo aclOutputInfo = armcomputetensorutils::BuildArmComputeTensorInfo(output);
+
+ arm_compute::Coordinates starts;
+ arm_compute::Coordinates ends;
+
+ std::tie(starts, ends) = SetNeonSliceData(descriptor.m_Begin, descriptor.m_Size);
+
+ return arm_compute::NESlice::validate(&aclInputInfo, &aclOutputInfo, starts, ends);
+}
+
+NeonSliceWorkload::NeonSliceWorkload(const SliceQueueDescriptor& descriptor,
+ const WorkloadInfo& info)
+ : BaseWorkload<SliceQueueDescriptor>(descriptor, info)
+{
+ m_Data.ValidateInputsOutputs("NeonSliceWorkload", 1, 1);
+
+ arm_compute::ITensor& input = boost::polymorphic_downcast<IAclTensorHandle*>(m_Data.m_Inputs[0])->GetTensor();
+ arm_compute::ITensor& output = boost::polymorphic_downcast<IAclTensorHandle*>(m_Data.m_Outputs[0])->GetTensor();
+
+ arm_compute::Coordinates starts;
+ arm_compute::Coordinates ends;
+
+ std::tie(starts, ends) = SetNeonSliceData(m_Data.m_Parameters.m_Begin, m_Data.m_Parameters.m_Size);
+
+ m_SliceFunction.configure(&input, &output, starts, ends);
+}
+
+void NeonSliceWorkload::Execute() const
+{
+ ARMNN_SCOPED_PROFILING_EVENT_NEON("NeonSliceWorkload_Execute");
+ m_SliceFunction.run();
+}
+
+} // namespace armnn
diff --git a/src/backends/neon/workloads/NeonSliceWorkload.hpp b/src/backends/neon/workloads/NeonSliceWorkload.hpp
new file mode 100644
index 0000000000..d1f32a9d7e
--- /dev/null
+++ b/src/backends/neon/workloads/NeonSliceWorkload.hpp
@@ -0,0 +1,31 @@
+//
+// Copyright © 2019 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include <backendsCommon/Workload.hpp>
+
+#include <arm_compute/core/Error.h>
+#include <arm_compute/runtime/IFunction.h>
+#include <arm_compute/runtime/NEON/functions/NESlice.h>
+
+namespace armnn
+{
+
+arm_compute::Status NeonSliceWorkloadValidate(const TensorInfo& input,
+ const TensorInfo& output,
+ const SliceDescriptor& descriptor);
+
+class NeonSliceWorkload : public BaseWorkload<SliceQueueDescriptor>
+{
+public:
+ NeonSliceWorkload(const SliceQueueDescriptor& descriptor, const WorkloadInfo& info);
+ virtual void Execute() const override;
+
+private:
+ mutable arm_compute::NESlice m_SliceFunction;
+};
+
+} // namespace armnn \ No newline at end of file
diff --git a/src/backends/neon/workloads/NeonWorkloadUtils.hpp b/src/backends/neon/workloads/NeonWorkloadUtils.hpp
index 8cf97d3909..f63946ec07 100644
--- a/src/backends/neon/workloads/NeonWorkloadUtils.hpp
+++ b/src/backends/neon/workloads/NeonWorkloadUtils.hpp
@@ -76,4 +76,28 @@ inline auto SetNeonStridedSliceData(const std::vector<int>& m_begin,
return std::make_tuple(starts, ends, strides);
}
+inline auto SetNeonSliceData(const std::vector<unsigned int>& m_begin,
+ const std::vector<unsigned int>& m_size)
+{
+ // This function must translate the size vector given to an end vector
+ // expected by the ACL NESlice workload
+ arm_compute::Coordinates starts;
+ arm_compute::Coordinates ends;
+
+ unsigned int num_dims = static_cast<unsigned int>(m_begin.size());
+
+ // For strided slices, we have the relationship size = (end - begin) / stride
+ // For slice, we assume stride to be a vector of all ones, yielding the formula
+ // size = (end - begin) therefore we know end = size + begin
+ for (unsigned int i = 0; i < num_dims; i++)
+ {
+ unsigned int revertedIndex = num_dims - i - 1;
+
+ starts.set(i, static_cast<int>(m_begin[revertedIndex]));
+ ends.set(i, static_cast<int>(m_begin[revertedIndex] + m_size[revertedIndex]));
+ }
+
+ return std::make_tuple(starts, ends);
+}
+
} //namespace armnn
diff --git a/src/backends/neon/workloads/NeonWorkloads.hpp b/src/backends/neon/workloads/NeonWorkloads.hpp
index 7d99d260a6..77d819e3ab 100644
--- a/src/backends/neon/workloads/NeonWorkloads.hpp
+++ b/src/backends/neon/workloads/NeonWorkloads.hpp
@@ -37,6 +37,7 @@
#include "NeonReshapeWorkload.hpp"
#include "NeonResizeWorkload.hpp"
#include "NeonRsqrtWorkload.hpp"
+#include "NeonSliceWorkload.hpp"
#include "NeonSoftmaxFloatWorkload.hpp"
#include "NeonSoftmaxUint8Workload.hpp"
#include "NeonSpaceToDepthWorkload.hpp"