diff options
Diffstat (limited to 'src/backends/tosaReference')
4 files changed, 101 insertions, 4 deletions
diff --git a/src/backends/tosaReference/TosaRefBackend.cpp b/src/backends/tosaReference/TosaRefBackend.cpp index 688cf93b49..e3a516a5f9 100644 --- a/src/backends/tosaReference/TosaRefBackend.cpp +++ b/src/backends/tosaReference/TosaRefBackend.cpp @@ -85,6 +85,9 @@ OptimizationViews TosaRefBackend::OptimizeSubgraphView(const SubgraphView& subgr OptimizationViews optimizationViews(modelOptions); auto handler = std::make_unique<TosaSerializationHandler>(); + // A main block should only be added once. + bool isMain = true; + auto it = subgraph.endIConnectable(); while (it != subgraph.beginIConnectable()) { @@ -97,8 +100,13 @@ OptimizationViews TosaRefBackend::OptimizeSubgraphView(const SubgraphView& subgr continue; } - tosa::TosaSerializationBasicBlock* mappings = GetTosaMappingFromLayer(&base); + tosa::TosaSerializationBasicBlock* mappings = GetTosaMappingFromLayer(&base, isMain); handler.get()->GetBlocks().push_back(mappings); + + if(isMain) + { + isMain = false; + } } auto compiledBlob = diff --git a/src/backends/tosaReference/TosaRefLayerSupport.cpp b/src/backends/tosaReference/TosaRefLayerSupport.cpp index f5f34a814b..c2b0b1b0b9 100644 --- a/src/backends/tosaReference/TosaRefLayerSupport.cpp +++ b/src/backends/tosaReference/TosaRefLayerSupport.cpp @@ -113,7 +113,7 @@ bool TosaRefLayerSupport::IsLayerSupported(const LayerType& type, break; } - auto mappings = GetTosaMapping(type, inputInfos, outputInfos, descriptor); + auto mappings = GetTosaMapping(type, inputInfos, outputInfos, descriptor, false); if (mappings->GetName() == "") { // There currently isn't a TOSA mapping for this layer, as the default was returned. diff --git a/src/backends/tosaReference/workloads/TosaRefPreCompiledWorkload.cpp b/src/backends/tosaReference/workloads/TosaRefPreCompiledWorkload.cpp index c4af4d40b1..18d2900eff 100644 --- a/src/backends/tosaReference/workloads/TosaRefPreCompiledWorkload.cpp +++ b/src/backends/tosaReference/workloads/TosaRefPreCompiledWorkload.cpp @@ -11,13 +11,91 @@ namespace armnn TosaRefPreCompiledWorkload::TosaRefPreCompiledWorkload(const PreCompiledQueueDescriptor& descriptor, const WorkloadInfo& info) : BaseWorkload<PreCompiledQueueDescriptor>(descriptor, info) + , m_workloadInfo(info) { - // Do nothing for now + // Check that the workload is holding a pointer to a valid pre-compiled object + if (m_Data.m_PreCompiledObject == nullptr) + { + throw InvalidArgumentException( + "TosaRefPreCompiledWorkload requires a valid pre-compiled object (TosaSerializationHandler)."); + } } void TosaRefPreCompiledWorkload::Execute() const { - // Do nothing for now + uint32_t numInputBuffers = static_cast<uint32_t>(m_Data.m_Inputs.size()); + uint32_t numOutputBuffers = static_cast<uint32_t>(m_Data.m_Outputs.size()); + + tosa::TosaSerializationHandler* handler = static_cast<tosa::TosaSerializationHandler*>(m_Data.m_PreCompiledObject); + + std::vector<std::string> input_names = handler->GetInputs(); + std::vector<std::string> output_names = handler->GetOutputs(); + + TosaReference::IModelRunner runner; + GraphStatus status; + + // Initialise the model runner with the TosaSerializationHandler + status = runner.initialize(*handler); + if(status != GraphStatus::TOSA_VALID) + { + throw armnn::Exception("An error has occurred while initialising the TOSA Reference Model."); + } + + // Set the inputs + for (uint32_t inputSlotIdx = 0; inputSlotIdx < numInputBuffers; ++inputSlotIdx) + { + DataType dataType = m_workloadInfo.m_InputTensorInfos[inputSlotIdx].GetDataType(); + switch (dataType) + { + case DataType::Float32: + SetInput<float>(runner, input_names[inputSlotIdx], inputSlotIdx); + break; + default: + throw armnn::Exception("Input data type is unsupported in TOSA Reference Backend."); + } + } + + // Run the TOSA Reference Model + status = runner.run(); + if(status != GraphStatus::TOSA_VALID) + { + throw armnn::Exception("An error has occurred while running the TOSA Reference Model."); + } + + // Gets the outputs + for (uint32_t outputSlotIdx = 0; outputSlotIdx < numOutputBuffers; ++outputSlotIdx) + { + DataType dataType = m_workloadInfo.m_OutputTensorInfos[outputSlotIdx].GetDataType(); + switch (dataType) + { + case DataType::Float32: + GetOutput<float>(runner, output_names[outputSlotIdx], outputSlotIdx); + break; + default: + throw armnn::Exception("Output data type is unsupported in TOSA Reference Backend."); + } + } +} + +template <typename T> +void TosaRefPreCompiledWorkload::SetInput(TosaReference::IModelRunner& runner, + std::string inputName, + uint32_t inputIndex) const +{ + std::vector<T> inputData(m_Data.m_Inputs[inputIndex]->GetShape().GetNumElements()); + m_Data.m_Inputs[inputIndex]->CopyOutTo(inputData.data()); + + runner.setInput<T>(inputName, inputData); +} + +template <typename T> +void TosaRefPreCompiledWorkload::GetOutput(TosaReference::IModelRunner& runner, + std::string outputName, + uint32_t outputIndex) const +{ + std::vector<T> actualOutputs = runner.getOutput<T>(outputName); + + m_Data.m_Outputs[outputIndex]->CopyInFrom(actualOutputs.data()); } bool TosaRefPreCompiledWorkloadValidate(std::string*) diff --git a/src/backends/tosaReference/workloads/TosaRefPreCompiledWorkload.hpp b/src/backends/tosaReference/workloads/TosaRefPreCompiledWorkload.hpp index 30972693de..2b3a314888 100644 --- a/src/backends/tosaReference/workloads/TosaRefPreCompiledWorkload.hpp +++ b/src/backends/tosaReference/workloads/TosaRefPreCompiledWorkload.hpp @@ -7,6 +7,9 @@ #include "armnn/backends/Workload.hpp" +#include <graph_status.h> +#include <model_runner.h> + #include <memory> #include <string> #include <vector> @@ -38,6 +41,14 @@ private: { this->m_Data.m_Outputs[slot] = tensorHandle; } + + template <typename T> + void SetInput(TosaReference::IModelRunner& runner, std::string inputName, uint32_t inputIndex) const; + + template <typename T> + void GetOutput(TosaReference::IModelRunner& runner, std::string outputName, uint32_t outputIndex) const; + + WorkloadInfo m_workloadInfo; }; } //namespace armnn |