Address PR comments

Author: quic-calvnguy

onnxruntime/core/providers/qnn/builder/qnn_backend_manager.cc

@@ -1596,20 +1596,18 @@ bool QnnBackendManager::GetPerThreadHtpPowerConfigMapping(const std::thread::id&
                                                           PerThreadHtpPowerConfigs_t& htp_power_configs) {
   std::lock_guard<std::mutex> lock(per_thread_power_configs_mutex_);
 
-  if (per_thread_power_configs_.find(thread_id) == per_thread_power_configs_.end()) {
+  auto it = per_thread_power_configs_.find(thread_id);
+  if (it == per_thread_power_configs_.end()) {
     return false;
   }
 
-  htp_power_configs = per_thread_power_configs_.at(thread_id);
+  htp_power_configs = it->second;
   return true;
 }
 
-void QnnBackendManager::RemovePerThreadHtpPowerConfigs(const std::thread::id& thread_id) {
+void QnnBackendManager::RemovePerThreadHtpPowerConfigMapping(const std::thread::id& thread_id) {
   std::lock_guard<std::mutex> lock(per_thread_power_configs_mutex_);
-  auto res = per_thread_power_configs_.find(thread_id);
-  if (res != per_thread_power_configs_.end()) {
-    per_thread_power_configs_.erase(thread_id);
-  }
+  per_thread_power_configs_.erase(thread_id);
 }
 
 Status QnnBackendManager::DestroyHTPPowerConfigID(uint32_t htp_power_config_id) {

onnxruntime/core/providers/qnn/builder/qnn_backend_manager.h

@@ -173,12 +173,12 @@ class QnnBackendManager : public std::enable_shared_from_this<QnnBackendManager>
                             uint32_t rpc_control_latency,
                             uint32_t rpc_polling_time);
 
-  Status SetPerThreadHtpPowerConfigs(const std::thread::id& theard_id, bool post_run);
+  Status SetPerThreadHtpPowerConfigs(const std::thread::id& thread_id, bool pre_run);
 
   Status AddPerThreadHtpPowerConfigMapping(const std::thread::id& thread_id,
                                            const PerThreadHtpPowerConfigs_t& htp_power_configs);
 
-  void RemovePerThreadHtpPowerConfigs(const std::thread::id& thread_id);
+  void RemovePerThreadHtpPowerConfigMapping(const std::thread::id& thread_id);
 
   const QNN_INTERFACE_VER_TYPE& GetQnnInterface() { return qnn_interface_; }
 

onnxruntime/core/providers/qnn/qnn_execution_provider.cc

@@ -653,7 +653,7 @@ QNNExecutionProvider::QNNExecutionProvider(const ProviderOptions& provider_optio
 QNNExecutionProvider::~QNNExecutionProvider() {
   if (qnn_backend_manager_) {
     auto thread_id = std::this_thread::get_id();
-    qnn_backend_manager_->RemovePerThreadHtpPowerConfigs(thread_id);
+    qnn_backend_manager_->RemovePerThreadHtpPowerConfigMapping(thread_id);
   }
 
   // Unregister the ETW callback
@@ -1455,7 +1455,7 @@ Status QNNExecutionProvider::OnRunEnd(bool /*sync_stream*/, const onnxruntime::R
 
   if (managed_htp_power_config_id_->IsValid()) {
     auto thread_id = std::this_thread::get_id();
-    qnn_backend_manager_->RemovePerThreadHtpPowerConfigs(thread_id);
+    qnn_backend_manager_->RemovePerThreadHtpPowerConfigMapping(thread_id);
   }
 
   return Status::OK();
@@ -1541,7 +1541,9 @@ QNNExecutionProvider::ManagedHtpPowerConfigId::ManagedHtpPowerConfigId(std::shar
 }
 
 QNNExecutionProvider::ManagedHtpPowerConfigId::~ManagedHtpPowerConfigId() {
-  ORT_IGNORE_RETURN_VALUE(qnn_backend_manager_->DestroyHTPPowerConfigID(htp_power_config_id_));
+  if (qnn_backend_manager_) {
+    ORT_IGNORE_RETURN_VALUE(qnn_backend_manager_->DestroyHTPPowerConfigID(htp_power_config_id_));
+  }
 }
 
 void QNNExecutionProvider::ManagedHtpPowerConfigId::CreateHtpPowerConfigId(uint32_t device_id,