From f4261adf78bdb9f8b2d6f2970636125096c173cb Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Mon, 2 Dec 2019 11:58:19 +0000 Subject: COMPMID-2779: Add support for generating synthetic int8 graphs. Adds SyntheticDataTypeMutator, which is responsible for mutating graphs to int8 and thus enable performance analysis on a wider range of models. Change-Id: I9a00f0ae59421ab11952660f5115b5dcd9314aaf Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/2418 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio --- arm_compute/graph/IGraphMutator.h | 13 +++++++ arm_compute/graph/PassManager.h | 8 +++- arm_compute/graph/Types.h | 1 + arm_compute/graph/Utils.h | 3 +- .../graph/mutators/DepthConcatSubTensorMutator.h | 1 + arm_compute/graph/mutators/GraphMutators.h | 1 + .../graph/mutators/GroupedConvolutionMutator.h | 1 + .../graph/mutators/InPlaceOperationMutator.h | 1 + .../graph/mutators/NodeExecutionMethodMutator.h | 1 + arm_compute/graph/mutators/NodeFusionMutator.h | 1 + .../graph/mutators/SplitLayerSubTensorMutator.h | 1 + .../graph/mutators/SyntheticDataTypeMutator.h | 45 ++++++++++++++++++++++ arm_compute/graph/nodes/SoftmaxLayerNode.h | 3 ++ 13 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 arm_compute/graph/mutators/SyntheticDataTypeMutator.h (limited to 'arm_compute') diff --git a/arm_compute/graph/IGraphMutator.h b/arm_compute/graph/IGraphMutator.h index b80d37d274..94a28f63b1 100644 --- a/arm_compute/graph/IGraphMutator.h +++ b/arm_compute/graph/IGraphMutator.h @@ -34,6 +34,14 @@ class Graph; /** Graph mutator interface */ class IGraphMutator { +public: + /** Mutation type */ + enum class MutationType + { + IR, /** IR specific mutation */ + Backend /** Backend specific mutation */ + }; + public: /** Virtual Destructor */ virtual ~IGraphMutator() = default; @@ -42,6 +50,11 @@ public: * @param[in, out] g Graph to walk and mutate */ virtual void mutate(Graph &g) = 0; + /** Returns mutation type + * + * @return Mutation type enumeration + */ + virtual MutationType type() const = 0; /** Returns mutator name * * @return Mutator name diff --git a/arm_compute/graph/PassManager.h b/arm_compute/graph/PassManager.h index c2b2319bcb..c8920ba296 100644 --- a/arm_compute/graph/PassManager.h +++ b/arm_compute/graph/PassManager.h @@ -78,12 +78,18 @@ public: * @param[in, out] g Graph to run the mutations on */ void run_all(Graph &g); + /** Runs a mutation passes of a specific type on a given graph + * + * @param[in, out] g Graph to run the mutation on + * @param[in] type Type of the mutations to execute + */ + void run_type(Graph &g, IGraphMutator::MutationType type); /** Runs a specific mutation pass on a given graph * * @param[in, out] g Graph to run the mutation on * @param[in] index Index of the mutation to execute */ - void run(Graph &g, size_t index); + void run_index(Graph &g, size_t index); private: std::vector> _passes; /**< Vector of graph passes */ diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h index c337126c8d..cd4da694d2 100644 --- a/arm_compute/graph/Types.h +++ b/arm_compute/graph/Types.h @@ -81,6 +81,7 @@ struct GraphConfig bool use_function_weights_manager{ true }; /**< Use a weights manager to manage transformed weights */ bool use_transition_memory_manager{ true }; /**< Use a memory manager to manager transition buffer memory */ bool use_tuner{ false }; /**< Use a tuner in tunable backends */ + bool convert_to_uint8{ false }; /**< Convert graph to a synthetic uint8 graph */ CLTunerMode tuner_mode{ CLTunerMode::EXHAUSTIVE }; /**< Tuner mode to be used by the CL tuner */ int num_threads{ -1 }; /**< Number of threads to use (thread capable backends), if 0 the backend will auto-initialize, if -1 the backend will stay as it is. */ std::string tuner_file{ "acl_tuner.csv" }; /**< File to load/store tuning values from */ diff --git a/arm_compute/graph/Utils.h b/arm_compute/graph/Utils.h index 1760bc6dee..57a6f14bae 100644 --- a/arm_compute/graph/Utils.h +++ b/arm_compute/graph/Utils.h @@ -85,10 +85,11 @@ void force_target_to_graph(Graph &g, Target target); /** Creates a default @ref PassManager * * @param[in] target Target to create the pass manager for + * @param[in] cfg Graph configuration meta-data * * @return A PassManager with default mutating passes */ -PassManager create_default_pass_manager(Target target); +PassManager create_default_pass_manager(Target target, const GraphConfig &cfg); /** Setups requested backend context if it exists, is supported and hasn't been initialized already. * * @param[in,out] ctx Graph Context. diff --git a/arm_compute/graph/mutators/DepthConcatSubTensorMutator.h b/arm_compute/graph/mutators/DepthConcatSubTensorMutator.h index 11fc82ffa1..14a427ba7c 100644 --- a/arm_compute/graph/mutators/DepthConcatSubTensorMutator.h +++ b/arm_compute/graph/mutators/DepthConcatSubTensorMutator.h @@ -39,6 +39,7 @@ class DepthConcatSubTensorMutator final : public IGraphMutator public: // Inherited methods overridden virtual void mutate(Graph &g) override; + MutationType type() const override; const char *name() override; }; } // namespace graph diff --git a/arm_compute/graph/mutators/GraphMutators.h b/arm_compute/graph/mutators/GraphMutators.h index f6e390eaff..6ae06990a4 100644 --- a/arm_compute/graph/mutators/GraphMutators.h +++ b/arm_compute/graph/mutators/GraphMutators.h @@ -30,5 +30,6 @@ #include "arm_compute/graph/mutators/NodeExecutionMethodMutator.h" #include "arm_compute/graph/mutators/NodeFusionMutator.h" #include "arm_compute/graph/mutators/SplitLayerSubTensorMutator.h" +#include "arm_compute/graph/mutators/SyntheticDataTypeMutator.h" #endif /* ARM_COMPUTE_GRAPH_GRAPH_MUTATORS_H */ diff --git a/arm_compute/graph/mutators/GroupedConvolutionMutator.h b/arm_compute/graph/mutators/GroupedConvolutionMutator.h index b6dac71182..01c9d0ee2c 100644 --- a/arm_compute/graph/mutators/GroupedConvolutionMutator.h +++ b/arm_compute/graph/mutators/GroupedConvolutionMutator.h @@ -39,6 +39,7 @@ class GroupedConvolutionMutator final : public IGraphMutator public: // Inherited methods overridden virtual void mutate(Graph &g) override; + MutationType type() const override; const char *name() override; }; } // namespace graph diff --git a/arm_compute/graph/mutators/InPlaceOperationMutator.h b/arm_compute/graph/mutators/InPlaceOperationMutator.h index 43e88383b9..7932b6245c 100644 --- a/arm_compute/graph/mutators/InPlaceOperationMutator.h +++ b/arm_compute/graph/mutators/InPlaceOperationMutator.h @@ -36,6 +36,7 @@ class InPlaceOperationMutator final : public IGraphMutator public: // Inherited methods overridden virtual void mutate(Graph &g) override; + MutationType type() const override; const char *name() override; }; } // namespace graph diff --git a/arm_compute/graph/mutators/NodeExecutionMethodMutator.h b/arm_compute/graph/mutators/NodeExecutionMethodMutator.h index 59df8181c5..3de940654b 100644 --- a/arm_compute/graph/mutators/NodeExecutionMethodMutator.h +++ b/arm_compute/graph/mutators/NodeExecutionMethodMutator.h @@ -41,6 +41,7 @@ class NodeExecutionMethodMutator final : public IGraphMutator public: // Inherited methods overridden virtual void mutate(Graph &g) override; + MutationType type() const override; const char *name() override; }; } // namespace graph diff --git a/arm_compute/graph/mutators/NodeFusionMutator.h b/arm_compute/graph/mutators/NodeFusionMutator.h index a4dd5c925d..b99ee79f94 100644 --- a/arm_compute/graph/mutators/NodeFusionMutator.h +++ b/arm_compute/graph/mutators/NodeFusionMutator.h @@ -37,6 +37,7 @@ class NodeFusionMutator final : public IGraphMutator public: // Inherited methods overridden virtual void mutate(Graph &g) override; + MutationType type() const override; const char *name() override; }; } // namespace graph diff --git a/arm_compute/graph/mutators/SplitLayerSubTensorMutator.h b/arm_compute/graph/mutators/SplitLayerSubTensorMutator.h index 29d061febb..c9747fd889 100644 --- a/arm_compute/graph/mutators/SplitLayerSubTensorMutator.h +++ b/arm_compute/graph/mutators/SplitLayerSubTensorMutator.h @@ -39,6 +39,7 @@ class SplitLayerSubTensorMutator final : public IGraphMutator public: // Inherited methods overridden virtual void mutate(Graph &g) override; + MutationType type() const override; const char *name() override; }; } // namespace graph diff --git a/arm_compute/graph/mutators/SyntheticDataTypeMutator.h b/arm_compute/graph/mutators/SyntheticDataTypeMutator.h new file mode 100644 index 0000000000..74f4b56acd --- /dev/null +++ b/arm_compute/graph/mutators/SyntheticDataTypeMutator.h @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2019 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef ARM_COMPUTE_GRAPH_SYNTHETIC_DATA_TYPE_MUTATOR_H +#define ARM_COMPUTE_GRAPH_SYNTHETIC_DATA_TYPE_MUTATOR_H + +#include "arm_compute/graph/Graph.h" +#include "arm_compute/graph/IGraphMutator.h" + +namespace arm_compute +{ +namespace graph +{ +/** Mutation pass to create synthetic graphs of a given data type */ +class SyntheticDataTypeMutator final : public IGraphMutator +{ +public: + // Inherited methods overridden + virtual void mutate(Graph &g) override; + MutationType type() const override; + const char *name() override; +}; +} // namespace graph +} // namespace arm_compute +#endif /* ARM_COMPUTE_GRAPH_SYNTHETIC_DATA_TYPE_MUTATOR_H */ diff --git a/arm_compute/graph/nodes/SoftmaxLayerNode.h b/arm_compute/graph/nodes/SoftmaxLayerNode.h index c6990b161d..cbcd06a477 100644 --- a/arm_compute/graph/nodes/SoftmaxLayerNode.h +++ b/arm_compute/graph/nodes/SoftmaxLayerNode.h @@ -51,6 +51,9 @@ public: TensorDescriptor configure_output(size_t idx) const override; void accept(INodeVisitor &v) override; +public: + static constexpr NodeType node_type = NodeType::SoftmaxLayer; + private: float _beta; }; -- cgit v1.2.1