From ecfbb1bb99430f6f057734c92d072f1eb5fefdbc Mon Sep 17 00:00:00 2001
From: Maik Riechert <marieche@microsoft.com>
Date: Thu, 31 Oct 2019 04:28:49 +0000
Subject: [PATCH] Add missing guards to profiling calls (#1374)

* guard remaining profiler calls

* enforce proper usage of profile class
---
 onnxruntime/core/common/profiler.cc           |  1 +
 onnxruntime/core/session/inference_session.cc | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/onnxruntime/core/common/profiler.cc b/onnxruntime/core/common/profiler.cc
index 6a99e6daf3..4ba358ab68 100644
--- a/onnxruntime/core/common/profiler.cc
+++ b/onnxruntime/core/common/profiler.cc
@@ -18,6 +18,7 @@ profiling::Profiler::~Profiler() {}
 #endif
 
 ::onnxruntime::TimePoint profiling::Profiler::StartTime() const {
+  ORT_ENFORCE(enabled_);
   return std::chrono::high_resolution_clock::now();
 }
 
diff --git a/onnxruntime/core/session/inference_session.cc b/onnxruntime/core/session/inference_session.cc
index 686f36358d..ac8810d835 100644
--- a/onnxruntime/core/session/inference_session.cc
+++ b/onnxruntime/core/session/inference_session.cc
@@ -215,7 +215,10 @@ common::Status InferenceSession::RegisterCustomRegistry(std::shared_ptr<CustomRe
 
 common::Status InferenceSession::Load(std::function<common::Status(std::shared_ptr<Model>&)> loader, const std::string& event_name) {
   Status status = Status::OK();
-  auto tp = session_profiler_.StartTime();
+  TimePoint tp;
+  if (session_profiler_.IsEnabled()) {
+    tp = session_profiler_.StartTime();
+  }
   try {
     std::lock_guard<onnxruntime::OrtMutex> l(session_mutex_);
     if (is_model_loaded_) {  // already loaded
@@ -539,7 +542,10 @@ common::Status InferenceSession::InitializeSubgraphSessions(Graph& graph, Sessio
 
 common::Status InferenceSession::Initialize() {
   Status status = Status::OK();
-  auto tp = session_profiler_.StartTime();
+  TimePoint tp;
+  if (session_profiler_.IsEnabled()) {
+    tp = session_profiler_.StartTime();
+  }
 
   try {
     LOGS(*session_logger_, INFO) << "Initializing session.";
@@ -775,7 +781,10 @@ common::Status InferenceSession::ValidateOutputs(const std::vector<std::string>&
 Status InferenceSession::Run(const RunOptions& run_options, const std::vector<std::string>& feed_names,
                              const std::vector<OrtValue>& feeds, const std::vector<std::string>& output_names,
                              std::vector<OrtValue>* p_fetches) {
-  auto tp = session_profiler_.StartTime();
+  TimePoint tp;
+  if (session_profiler_.IsEnabled()) {
+    tp = session_profiler_.StartTime();
+  }
   Status retval = Status::OK();
 
   try {