diff options
Diffstat (limited to 'src/backends/tosaCommon/operatorMappings')
8 files changed, 121 insertions, 21 deletions
diff --git a/src/backends/tosaCommon/operatorMappings/AdditionOperator.cpp b/src/backends/tosaCommon/operatorMappings/AdditionOperator.cpp index 66ca869ac4..f1fb34c5e2 100644 --- a/src/backends/tosaCommon/operatorMappings/AdditionOperator.cpp +++ b/src/backends/tosaCommon/operatorMappings/AdditionOperator.cpp @@ -50,7 +50,7 @@ TosaSerializationBasicBlock* ConvertAdditionToTosaOperator(const Layer* layer, auto* outputTensor0 = new TosaSerializationTensor(outputName, outputShape0, outputDType0, {}); // operatorInputNames/operatorOutputNames ends up being the same as - // blockInputNames/blockOutputNames for one-to-one ArmNN to Tosa mappings + // blockInputNames/blockOutputNames for one-to-one ArmNN to TOSA mappings return new TosaSerializationBasicBlock(blockName, // name {op}, // operators {inputTensor0, inputTensor1, outputTensor0}, // tensors diff --git a/src/backends/tosaCommon/operatorMappings/AvgPool2DIgnoreValueOperator.cpp b/src/backends/tosaCommon/operatorMappings/AvgPool2DIgnoreValueOperator.cpp index 2601a6243d..7e7631dcef 100644 --- a/src/backends/tosaCommon/operatorMappings/AvgPool2DIgnoreValueOperator.cpp +++ b/src/backends/tosaCommon/operatorMappings/AvgPool2DIgnoreValueOperator.cpp @@ -101,7 +101,7 @@ TosaSerializationBasicBlock* ConvertAvgPool2DIgnoreValueToTosaOperator(const Lay auto* outputTensor = new TosaSerializationTensor(poolOutputName, outputShape, outputDType, {}); // operatorInputNames/operatorOutputNames ends up being the same as - // blockInputNames/blockOutputNames for one-to-one ArmNN to Tosa mappings + // blockInputNames/blockOutputNames for one-to-one ArmNN to TOSA mappings return new TosaSerializationBasicBlock(blockName, // name {opPad, opPool}, // operators {inputTensor, intermediateTensor, outputTensor}, // tensors diff --git a/src/backends/tosaCommon/operatorMappings/CMakeLists.txt b/src/backends/tosaCommon/operatorMappings/CMakeLists.txt index b256eddda1..7733d01abb 100644 --- a/src/backends/tosaCommon/operatorMappings/CMakeLists.txt +++ b/src/backends/tosaCommon/operatorMappings/CMakeLists.txt @@ -14,6 +14,8 @@ list(APPEND armnnTosaBackendOperators_sources Conv2dOperator.cpp Pooling2DOperator.hpp Pooling2DOperator.cpp + ReshapeOperator.hpp + ReshapeOperator.cpp TosaOperatorUtils.hpp ) diff --git a/src/backends/tosaCommon/operatorMappings/Pooling2DOperator.cpp b/src/backends/tosaCommon/operatorMappings/Pooling2DOperator.cpp index eaeb8a4cde..265901e1ae 100644 --- a/src/backends/tosaCommon/operatorMappings/Pooling2DOperator.cpp +++ b/src/backends/tosaCommon/operatorMappings/Pooling2DOperator.cpp @@ -56,7 +56,7 @@ TosaSerializationBasicBlock* ConvertPooling2DToTosaOperator(const Layer* layer, auto* outputTensor0 = new TosaSerializationTensor(outputName, outputShape0, outputDType0, {}); // operatorInputNames/operatorOutputNames ends up being the same as - // blockInputNames/blockOutputNames for one-to-one ArmNN to Tosa mappings + // blockInputNames/blockOutputNames for one-to-one ArmNN to TOSA mappings return new TosaSerializationBasicBlock(blockName, // name {op}, // operators {inputTensor0, outputTensor0}, // tensors diff --git a/src/backends/tosaCommon/operatorMappings/ReshapeOperator.cpp b/src/backends/tosaCommon/operatorMappings/ReshapeOperator.cpp new file mode 100644 index 0000000000..b88a6ef894 --- /dev/null +++ b/src/backends/tosaCommon/operatorMappings/ReshapeOperator.cpp @@ -0,0 +1,54 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#include "ReshapeOperator.hpp" + +TosaSerializationBasicBlock* ConvertReshapeToTosaOperator(const Layer* layer, + const std::vector<const TensorInfo*>& inputs, + const std::vector<const TensorInfo*>& outputs, + const ReshapeDescriptor* reshapeDescriptor) +{ + std::string inputName = std::string("input0_"); + std::string outputName = std::string("output0_"); + std::string blockName = std::string("Op_RESHAPE_block_") + GetUniqueTosaMappingID(); + + // If a layer is present then the block will be used for execution, so input and output names need to be determined + // using the previous and following layers so the graph is connected correctly. For validation this doesn't matter. + if(layer != nullptr) + { + // Get the layers connected to the input slots and determine unique layer names. + Layer& connectedLayer = layer->GetInputSlot(0).GetConnectedOutputSlot()->GetOwningLayer(); + inputName = GenerateUniqueName(connectedLayer, 0); + + // Get the layer connected to the output slot and determine unique layer name. + Layer& connectedOutputLayer = layer->GetOutputSlot().GetConnection(0)->GetOwningLayer(); + outputName = GenerateUniqueName(connectedOutputLayer, 0); + } + + TosaReshapeAttribute attribute(GetTosaTensorShape(reshapeDescriptor->m_TargetShape)); + + auto* op = new TosaSerializationOperator(Op_RESHAPE, + Attribute_ReshapeAttribute, + &attribute, + {inputName}, + {outputName}); + + std::vector<int32_t> inputShape = GetTosaTensorShape(inputs[0]->GetShape()); + DType inputDType = ArmNNToDType(inputs[0]->GetDataType()); + + std::vector<int32_t> outputShape = GetTosaTensorShape(outputs[0]->GetShape()); + DType outputDType = ArmNNToDType(outputs[0]->GetDataType()); + + auto* inputTensor = new TosaSerializationTensor(inputName, inputShape, inputDType, {}); + auto* outputTensor = new TosaSerializationTensor(outputName, outputShape, outputDType, {}); + + // operatorInputNames/operatorOutputNames ends up being the same as + // blockInputNames/blockOutputNames for one-to-one ArmNN to TOSA mappings + return new TosaSerializationBasicBlock(blockName, // name + {op}, // operators + {inputTensor, outputTensor}, // tensors + {inputName}, // inputs + {outputName}); // outputs +}
\ No newline at end of file diff --git a/src/backends/tosaCommon/operatorMappings/ReshapeOperator.hpp b/src/backends/tosaCommon/operatorMappings/ReshapeOperator.hpp new file mode 100644 index 0000000000..4f363df052 --- /dev/null +++ b/src/backends/tosaCommon/operatorMappings/ReshapeOperator.hpp @@ -0,0 +1,20 @@ +// +// Copyright © 2022 Arm Ltd and Contributors. All rights reserved. +// SPDX-License-Identifier: MIT +// + +#pragma once + +#include "TosaOperatorUtils.hpp" + +#include <Layer.hpp> + +#include <tosa_serialization_handler.h> + +using namespace armnn; +using namespace tosa; + +TosaSerializationBasicBlock* ConvertReshapeToTosaOperator(const Layer* layer, + const std::vector<const TensorInfo*>& inputs, + const std::vector<const TensorInfo*>& outputs, + const ReshapeDescriptor* reshapeDescriptor); diff --git a/src/backends/tosaCommon/operatorMappings/TosaCommonOperators.hpp b/src/backends/tosaCommon/operatorMappings/TosaCommonOperators.hpp index 513db0c039..0711095a25 100644 --- a/src/backends/tosaCommon/operatorMappings/TosaCommonOperators.hpp +++ b/src/backends/tosaCommon/operatorMappings/TosaCommonOperators.hpp @@ -9,4 +9,5 @@ #include "ConstantOperator.hpp" #include "Conv2dOperator.hpp" #include "AvgPool2DIgnoreValueOperator.hpp" -#include "Pooling2DOperator.hpp"
\ No newline at end of file +#include "Pooling2DOperator.hpp" +#include "ReshapeOperator.hpp"
\ No newline at end of file diff --git a/src/backends/tosaCommon/operatorMappings/TosaOperatorUtils.hpp b/src/backends/tosaCommon/operatorMappings/TosaOperatorUtils.hpp index 176e4e1cfb..288966badd 100644 --- a/src/backends/tosaCommon/operatorMappings/TosaOperatorUtils.hpp +++ b/src/backends/tosaCommon/operatorMappings/TosaOperatorUtils.hpp @@ -59,28 +59,20 @@ inline std::vector<int32_t> GetTosaTensorShape(const TensorShape& shape) // Function that generates unique name using the layer type, input slot and layer guid. inline std::string GenerateUniqueName(const Layer& layer, uint32_t layerSlot) { - std::string name; std::string guid = std::to_string(layer.GetGuid()); std::string slotAndGuid = std::to_string(layerSlot) + "_" + guid; - LayerType layerType = layer.GetType(); - if (layerType == LayerType::Input) + switch (layer.GetType()) { - name = "input" + slotAndGuid; - } - else if (layerType == LayerType::Output) - { - name = "output" + slotAndGuid; - } - else if (layerType == LayerType::Constant) - { - name = "constant_" + guid; - } - else - { - name = "intermediate" + slotAndGuid; + case LayerType::Input: + return "input" + slotAndGuid; + case LayerType::Output: + return "output" + slotAndGuid; + case LayerType::Constant: + return "constant_" + guid; + default: + return "intermediate" + slotAndGuid; } - return name; } // Function to return unique int as a string to ensure uniqueness between all input, output and block names. @@ -90,6 +82,37 @@ inline std::string GetUniqueTosaMappingID() return std::to_string(++uniqueTosaMappingID); } +// Function to return Tosa DType as string. +inline std::string TosaDTypeToString(DType tosaDType) +{ + switch (tosaDType) + { + case DType_UNKNOWN: + return "DType_UNKNOWN"; + case DType_BOOL: + return "DType_BOOL"; + case DType_UINT8: + return "DType_UINT8"; + case DType_INT4: + return "DType_INT4"; + case DType_INT8: + return "DType_INT8"; + case DType_INT16: + return "DType_INT16"; + case DType_INT32: + return "DType_INT32"; + case DType_INT48: + return "DType_INT48"; + case DType_FP32: + return "DType_FP32"; + case DType_UINT16: + return "DType_UINT16"; + case DType_FP16: + return "DType_FP16"; + } + return ""; +} + // Function to return Tosa Op as string. inline std::string TosaOpToString(Op tosaOp) { |