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 <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2418
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
diff --git a/arm_compute/graph/IGraphMutator.h b/arm_compute/graph/IGraphMutator.h
index b80d37d..94a28f6 100644
--- a/arm_compute/graph/IGraphMutator.h
+++ b/arm_compute/graph/IGraphMutator.h
@@ -35,6 +35,14 @@
class IGraphMutator
{
public:
+ /** Mutation type */
+ enum class MutationType
+ {
+ IR, /** IR specific mutation */
+ Backend /** Backend specific mutation */
+ };
+
+public:
/** Virtual Destructor */
virtual ~IGraphMutator() = default;
/** Walk the graph and perform a specific mutation
@@ -42,6 +50,11 @@
* @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 c2b2319..c8920ba 100644
--- a/arm_compute/graph/PassManager.h
+++ b/arm_compute/graph/PassManager.h
@@ -78,12 +78,18 @@
* @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<std::unique_ptr<IGraphMutator>> _passes; /**< Vector of graph passes */
diff --git a/arm_compute/graph/Types.h b/arm_compute/graph/Types.h
index c337126..cd4da69 100644
--- a/arm_compute/graph/Types.h
+++ b/arm_compute/graph/Types.h
@@ -81,6 +81,7 @@
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 1760bc6..57a6f14 100644
--- a/arm_compute/graph/Utils.h
+++ b/arm_compute/graph/Utils.h
@@ -85,10 +85,11 @@
/** 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 11fc82f..14a427b 100644
--- a/arm_compute/graph/mutators/DepthConcatSubTensorMutator.h
+++ b/arm_compute/graph/mutators/DepthConcatSubTensorMutator.h
@@ -39,6 +39,7 @@
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 f6e390e..6ae0699 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 b6dac71..01c9d0e 100644
--- a/arm_compute/graph/mutators/GroupedConvolutionMutator.h
+++ b/arm_compute/graph/mutators/GroupedConvolutionMutator.h
@@ -39,6 +39,7 @@
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 43e8838..7932b62 100644
--- a/arm_compute/graph/mutators/InPlaceOperationMutator.h
+++ b/arm_compute/graph/mutators/InPlaceOperationMutator.h
@@ -36,6 +36,7 @@
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 59df818..3de9406 100644
--- a/arm_compute/graph/mutators/NodeExecutionMethodMutator.h
+++ b/arm_compute/graph/mutators/NodeExecutionMethodMutator.h
@@ -41,6 +41,7 @@
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 a4dd5c9..b99ee79 100644
--- a/arm_compute/graph/mutators/NodeFusionMutator.h
+++ b/arm_compute/graph/mutators/NodeFusionMutator.h
@@ -37,6 +37,7 @@
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 29d061f..c9747fd 100644
--- a/arm_compute/graph/mutators/SplitLayerSubTensorMutator.h
+++ b/arm_compute/graph/mutators/SplitLayerSubTensorMutator.h
@@ -39,6 +39,7 @@
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 0000000..74f4b56
--- /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 c6990b1..cbcd06a 100644
--- a/arm_compute/graph/nodes/SoftmaxLayerNode.h
+++ b/arm_compute/graph/nodes/SoftmaxLayerNode.h
@@ -51,6 +51,9 @@
TensorDescriptor configure_output(size_t idx) const override;
void accept(INodeVisitor &v) override;
+public:
+ static constexpr NodeType node_type = NodeType::SoftmaxLayer;
+
private:
float _beta;
};