From 840a2fd35c03004daca32f72d56491e64b140c66 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EA=B9=80=EC=88=98=EC=A7=84/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Engineer/=EC=82=BC=EC=84=B1=EC=A0=84?= =?utf8?q?=EC=9E=90?= Date: Wed, 28 Nov 2018 07:11:51 +0900 Subject: [PATCH] [neurun] Introduce CLTensor/CLSubTensor (#3723) Related : #3273 Part of : #3700 This commit introduces `neurun::backend::acl_cl::operand::CLTensor`/`neurun::backend::acl_cl::operand::CLSubTensor`. Those are inherited to internal `ICLTensor`, and have handles of `ACL` `arm_compute::CLTensor` and `arm_compute::CLSubTensor`. Signed-off-by: sjsujinkim --- .../src/backend/acl_cl/operand/CLSubTensor.cc | 61 ++++++++++++++++++++ .../src/backend/acl_cl/operand/CLSubTensor.h | 63 ++++++++++++++++++++ .../neurun/src/backend/acl_cl/operand/CLTensor.cc | 55 ++++++++++++++++++ .../neurun/src/backend/acl_cl/operand/CLTensor.h | 67 ++++++++++++++++++++++ 4 files changed, 246 insertions(+) create mode 100644 runtimes/neurun/src/backend/acl_cl/operand/CLSubTensor.cc create mode 100644 runtimes/neurun/src/backend/acl_cl/operand/CLSubTensor.h create mode 100644 runtimes/neurun/src/backend/acl_cl/operand/CLTensor.cc create mode 100644 runtimes/neurun/src/backend/acl_cl/operand/CLTensor.h diff --git a/runtimes/neurun/src/backend/acl_cl/operand/CLSubTensor.cc b/runtimes/neurun/src/backend/acl_cl/operand/CLSubTensor.cc new file mode 100644 index 0000000..f64b521 --- /dev/null +++ b/runtimes/neurun/src/backend/acl_cl/operand/CLSubTensor.cc @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "CLSubTensor.h" + +namespace neurun +{ +namespace backend +{ +namespace acl_cl +{ +namespace operand +{ + +CLSubTensor::CLSubTensor(ICLTensor *parent, const arm_compute::TensorShape &tensor_shape, + const arm_compute::Coordinates &coords, bool extend_parent) + : _cl_sub_tensor(std::make_shared(parent->handle(), tensor_shape, + coords, extend_parent)) +{ + // DO NOTHING +} + +arm_compute::CLSubTensor *CLSubTensor::handle() const { return _cl_sub_tensor.get(); } + +arm_compute::CLSubTensor *CLSubTensor::handle() { return _cl_sub_tensor.get(); } + +void CLSubTensor::map(bool blocking) { _cl_sub_tensor->map(blocking); } + +void CLSubTensor::unmap() { _cl_sub_tensor->unmap(); } + +uint8_t *CLSubTensor::doMap(cl::CommandQueue &q, bool blocking) +{ + assert(cl_buffer().get() == nullptr); + return static_cast(q.enqueueMapBuffer(cl_buffer(), blocking ? CL_TRUE : CL_FALSE, + CL_MAP_READ | CL_MAP_WRITE, 0, + info()->total_size())); +} + +void CLSubTensor::doUnmap(cl::CommandQueue &q) +{ + assert(cl_buffer().get() == nullptr); + q.enqueueUnmapMemObject(cl_buffer(), buffer()); +} + +} // namespace operand +} // namespace acl_cl +} // namespace backend +} // namespace neurun diff --git a/runtimes/neurun/src/backend/acl_cl/operand/CLSubTensor.h b/runtimes/neurun/src/backend/acl_cl/operand/CLSubTensor.h new file mode 100644 index 0000000..cef78c1 --- /dev/null +++ b/runtimes/neurun/src/backend/acl_cl/operand/CLSubTensor.h @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __NEURUN_BACKEND_ACL_CL_OPERAND_CL_SUB_TENSOR_H__ +#define __NEURUN_BACKEND_ACL_CL_OPERAND_CL_SUB_TENSOR_H__ + +#include +#include "ICLTensor.h" +#include "compiler/SubTensorInfo.h" + +namespace neurun +{ +namespace backend +{ +namespace acl_cl +{ +namespace operand +{ + +class CLSubTensor : public ICLTensor +{ +public: + CLSubTensor() = delete; + +public: + CLSubTensor(ICLTensor *parent, const arm_compute::TensorShape &tensor_shape, + const arm_compute::Coordinates &coords, bool extend_parent = false); + +public: + arm_compute::CLSubTensor *handle() const override; + arm_compute::CLSubTensor *handle() override; + +public: + void map(bool blocking = true); + void unmap(); + +protected: + uint8_t *doMap(cl::CommandQueue &q, bool blocking) override; + virtual void doUnmap(cl::CommandQueue &q) override; + +private: + std::shared_ptr _cl_sub_tensor; +}; + +} // namespace operand +} // namespace acl_cl +} // namespace backend +} // namespace neurun + +#endif // __NEURUN_BACKEND_ACL_CL_OPERAND_CL_SUB_TENSOR_H__ diff --git a/runtimes/neurun/src/backend/acl_cl/operand/CLTensor.cc b/runtimes/neurun/src/backend/acl_cl/operand/CLTensor.cc new file mode 100644 index 0000000..7889882 --- /dev/null +++ b/runtimes/neurun/src/backend/acl_cl/operand/CLTensor.cc @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "CLTensor.h" + +namespace neurun +{ +namespace backend +{ +namespace acl_cl +{ +namespace operand +{ + +CLTensor::CLTensor(const compiler::TensorInfo &info) + : _cl_tensor(std::make_shared()) +{ + auto acl_cl_info = ::internal::asTensorInfo(info.shape(), info.typeInfo()); + allocator()->init(acl_cl_info); +} + +arm_compute::CLTensor *CLTensor::handle() const { return _cl_tensor.get(); } + +arm_compute::CLTensor *CLTensor::handle() { return _cl_tensor.get(); } + +arm_compute::CLTensorAllocator *CLTensor::allocator() { return _cl_tensor->allocator(); } + +void CLTensor::map(bool blocking) { _cl_tensor->map(blocking); } + +void CLTensor::unmap() { _cl_tensor->unmap(); } + +uint8_t *CLTensor::doMap(cl::CommandQueue &q, bool blocking) +{ + return allocator()->map(q, blocking); +} + +void CLTensor::doUnmap(cl::CommandQueue &q) { allocator()->unmap(q, buffer()); } + +} // namespace operand +} // namespace acl_cl +} // namespace backend +} // namespace neurun diff --git a/runtimes/neurun/src/backend/acl_cl/operand/CLTensor.h b/runtimes/neurun/src/backend/acl_cl/operand/CLTensor.h new file mode 100644 index 0000000..7b329a8 --- /dev/null +++ b/runtimes/neurun/src/backend/acl_cl/operand/CLTensor.h @@ -0,0 +1,67 @@ +/* + * Copyright (c) 2018 Samsung Electronics Co., Ltd. All Rights Reserved + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __NEURUN_BACKEND_ACL_CL_OPERAND_CL_TENSOR_H__ +#define __NEURUN_BACKEND_ACL_CL_OPERAND_CL_TENSOR_H__ + +#include +#include +#include +#include "arm_compute/runtime/CL/CLTensorAllocator.h" +#include "ICLTensor.h" +#include "internal/Convert.h" +#include "compiler/TensorInfo.h" + +namespace neurun +{ +namespace backend +{ +namespace acl_cl +{ +namespace operand +{ + +class CLTensor : public ICLTensor +{ +public: + CLTensor() = delete; + +public: + CLTensor(const compiler::TensorInfo &info); + +public: + arm_compute::CLTensor *handle() const override; + arm_compute::CLTensor *handle() override; + +public: + arm_compute::CLTensorAllocator *allocator(); + void map(bool blocking = true); + void unmap(); + +protected: + uint8_t *doMap(cl::CommandQueue &q, bool blocking) override; + void doUnmap(cl::CommandQueue &q) override; + +private: + std::shared_ptr _cl_tensor; +}; + +} // namespace operand +} // namespace acl_cl +} // namespace backend +} // namespace neurun + +#endif // __NEURUN_BACKEND_ACL_CL_OPERAND_CL_TENSOR_H__ -- 2.7.4