fixed issues from reviews

Author: jethroqti

backends/qualcomm/runtime/QnnExecuTorchBackend.cpp

@@ -275,6 +275,7 @@ executorch::runtime::Error QnnExecuTorchBackend::get_option(
     executorch::runtime::BackendOptionContext& context,
     executorch::runtime::Span<executorch::runtime::BackendOption>&
         backend_options) {
+  std::lock_guard<std::mutex> guard(runtime_option_mutex_);
   size_t matches = backend_options.size();
   for (size_t i = 0; i < backend_options.size(); ++i) {
     // Set the value to what was stored by set_option

backends/qualcomm/runtime/backends/QnnContextCommon.h

@@ -39,14 +39,13 @@ class QnnContext {
         device_(device),
         cache_(cache),
         qnn_dlc_manager_(qnn_dlc_manager),
-        profile_level_(profile_level),
         is_htp_backend_(
             implementation->GetQnnInterface().GetBackendId() ==
             QNN_BACKEND_ID_HTP),
         need_to_profile_(
             profile_level != QnnExecuTorchProfileLevel::kProfileOff) {
     qnn_profiler_ =
-        std::make_unique<QnnProfile>(implementation_, backend_, profile_level_);
+        std::make_unique<QnnProfile>(implementation_, backend_, profile_level);
   }
 
   virtual ~QnnContext();
@@ -95,7 +94,6 @@ class QnnContext {
   QnnContextCustomProtocol qnn_context_custom_protocol_;
   QnnDlcManager* qnn_dlc_manager_;
 
-  QnnExecuTorchProfileLevel profile_level_;
   std::unique_ptr<QnnProfile> qnn_profiler_;
   bool is_htp_backend_;
   bool need_to_profile_;

backends/qualcomm/runtime/backends/QnnProfiler.cpp

@@ -195,7 +195,7 @@ Qnn_ErrorHandle_t QnnProfile::ProfileData(
 }
 
 Qnn_ErrorHandle_t QnnProfile::ProfileDataToFile(
-    const std::string profile_filename) {
+    const std::string& profile_filename) {
   if (handle_ == nullptr) {
     QNN_EXECUTORCH_LOG_WARN(
         "Profile handle is null, skipping ProfileDataToFile");

backends/qualcomm/runtime/backends/QnnProfiler.h

@@ -27,7 +27,7 @@ class QnnProfile {
       const QnnExecuTorchProfileLevel& profile_level);
   ~QnnProfile();
   Qnn_ErrorHandle_t ProfileData(executorch::runtime::EventTracer* event_tracer);
-  Qnn_ErrorHandle_t ProfileDataToFile(const std::string profile_filename);
+  Qnn_ErrorHandle_t ProfileDataToFile(const std::string& profile_filename);
 
   Qnn_ProfileHandle_t GetHandle() {
     return handle_;

examples/qualcomm/executor_runner/qnn_executor_runner.cpp

@@ -142,6 +142,13 @@ DEFINE_int32(
     "This is a runtime option and will override the profile level set during AOT. "
     "Refer to QnnExecuTorchProfileLevel under qc_compiler_spec.fbs for more info.");
 
+DEFINE_string(
+    heap_profiling_path,
+    "",
+    "Output path for QNN heap-profiling dump. "
+    "Empty disables heap profiling. "
+    "This is a runtime option and will override the path set during AOT.");
+
 using executorch::aten::Tensor;
 using executorch::aten::TensorImpl;
 using executorch::etdump::ETDumpGen;
@@ -212,7 +219,7 @@ int main(int argc, char** argv) {
   }
 
   // Set runtime options
-  executorch::runtime::BackendOptions<8> backend_options;
+  executorch::runtime::BackendOptions<9> backend_options;
   if (!gflags::GetCommandLineFlagInfoOrDie("log_level").is_default) {
     ET_LOG(Info, "Setting runtime log level: %d", FLAGS_log_level);
     ET_CHECK_MSG(
@@ -290,6 +297,18 @@ int main(int argc, char** argv) {
         "Failed to set backend options: %s",
         QNN_RUNTIME_LPAI_CORE_SELECTION);
   }
+  if (!gflags::GetCommandLineFlagInfoOrDie("heap_profiling_path").is_default) {
+    ET_LOG(
+        Info,
+        "Setting runtime heap_profiling_path: %s",
+        FLAGS_heap_profiling_path.c_str());
+    ET_CHECK_MSG(
+        backend_options.set_option(
+            QNN_RUNTIME_HEAP_PROFILING_PATH,
+            FLAGS_heap_profiling_path.c_str()) == Error::Ok,
+        "Failed to set backend options: %s",
+        QNN_RUNTIME_HEAP_PROFILING_PATH);
+  }
   ET_CHECK_MSG(
       set_option(QNN_BACKEND, backend_options.view()) == Error::Ok,
       "Failed to set runtime options.");