From 7b607dc5058d2f6a398cfac4d2eab65d415c3733 Mon Sep 17 00:00:00 2001
From: Anthony Barbier <anthony.barbier@arm.com>
Date: Fri, 13 Jul 2018 15:55:24 +0100
Subject: COMPMID-1400: Add command line option to specify the tuner's config
 file

Change-Id: Ib597e0dff4c8c01f7e6bd46d03824beef4bc1e9a
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/139923
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
---
 utils/CommonGraphOptions.cpp | 6 +++++-
 utils/CommonGraphOptions.h   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'utils')

diff --git a/utils/CommonGraphOptions.cpp b/utils/CommonGraphOptions.cpp
index bf882f5164..7ac7bbce2b 100644
--- a/utils/CommonGraphOptions.cpp
+++ b/utils/CommonGraphOptions.cpp
@@ -83,6 +83,7 @@ namespace utils
     os << "Data type : " << common_params.data_type << std::endl;
     os << "Data layout : " << common_params.data_layout << std::endl;
     os << "Tuner enabled? : " << (common_params.enable_tuner ? true_str : false_str) << std::endl;
+    os << "Tuner file : " << common_params.tuner_file << std::endl;
     os << "Fast math enabled? : " << (common_params.fast_math_hint == FastMathHint::ENABLED ? true_str : false_str) << std::endl;
     if(!common_params.data_path.empty())
     {
@@ -122,7 +123,8 @@ CommonGraphOptions::CommonGraphOptions(CommandLineParser &parser)
       labels(parser.add_option<SimpleOption<std::string>>("labels")),
       validation_file(parser.add_option<SimpleOption<std::string>>("validation-file")),
       validation_path(parser.add_option<SimpleOption<std::string>>("validation-path")),
-      validation_range(parser.add_option<SimpleOption<std::string>>("validation-range"))
+      validation_range(parser.add_option<SimpleOption<std::string>>("validation-range")),
+      tuner_file(parser.add_option<SimpleOption<std::string>>("tuner-file"))
 {
     std::set<arm_compute::graph::Target> supported_targets
     {
@@ -161,6 +163,7 @@ CommonGraphOptions::CommonGraphOptions(CommandLineParser &parser)
     validation_file->set_help("File used to validate the graph");
     validation_path->set_help("Path to the validation data");
     validation_range->set_help("Range of the images to validate for (Format : start,end)");
+    tuner_file->set_help("File to load/save CLTuner values");
 }
 
 CommonGraphParams consume_common_graph_parameters(CommonGraphOptions &options)
@@ -183,6 +186,7 @@ CommonGraphParams consume_common_graph_parameters(CommonGraphOptions &options)
     common_params.validation_path        = options.validation_path->value();
     common_params.validation_range_start = validation_range.first;
     common_params.validation_range_end   = validation_range.second;
+    common_params.tuner_file             = options.tuner_file->value();
 
     return common_params;
 }
diff --git a/utils/CommonGraphOptions.h b/utils/CommonGraphOptions.h
index b429a18069..24c8dbb67c 100644
--- a/utils/CommonGraphOptions.h
+++ b/utils/CommonGraphOptions.h
@@ -49,6 +49,7 @@ struct CommonGraphParams
     std::string                      labels{};
     std::string                      validation_file{};
     std::string                      validation_path{};
+    std::string                      tuner_file{};
     unsigned int                     validation_range_start{ 0 };
     unsigned int                     validation_range_end{ std::numeric_limits<unsigned int>::max() };
 };
@@ -103,6 +104,7 @@ public:
     SimpleOption<std::string>              *validation_file;  /**< Validation file */
     SimpleOption<std::string>              *validation_path;  /**< Validation data path */
     SimpleOption<std::string>              *validation_range; /**< Validation range */
+    SimpleOption<std::string>              *tuner_file;       /**< File to load/store the tuner's values from */
 };
 
 /** Consumes the common graph options and creates a structure containing any information
-- 
cgit v1.2.1