From 75078fa44920519a23f4f7bd2150a06406e89021 Mon Sep 17 00:00:00 2001 From: CodemodService Bot Date: Sat, 26 Jul 2025 12:56:32 -0700 Subject: [PATCH] fbcode//executorch/backends/qualcomm/runtime:runtime Reviewed By: dtolnay Differential Revision: D79042066 --- backends/qualcomm/runtime/QnnExecuTorchBackend.cpp | 2 +- backends/qualcomm/runtime/SharedBuffer.cpp | 4 ++-- .../qualcomm/runtime/backends/QnnGraphCommon.cpp | 4 ++-- .../runtime/backends/QnnImplementation.cpp | 14 +++++++------- .../runtime/backends/QnnOpPackageManager.cpp | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backends/qualcomm/runtime/QnnExecuTorchBackend.cpp b/backends/qualcomm/runtime/QnnExecuTorchBackend.cpp index 01bf13603d6..67047185b2c 100644 --- a/backends/qualcomm/runtime/QnnExecuTorchBackend.cpp +++ b/backends/qualcomm/runtime/QnnExecuTorchBackend.cpp @@ -116,7 +116,7 @@ Error QnnExecuTorchBackend::execute( DelegateHandle* handle, EValue** args) const { ET_CHECK_OR_RETURN_ERROR( - delegate_map_rev_.count(handle) != 0, + delegate_map_rev_.contains(handle), Internal, "DelegateHandle has been deleted"); QnnManager* qnn_manager = static_cast(handle); diff --git a/backends/qualcomm/runtime/SharedBuffer.cpp b/backends/qualcomm/runtime/SharedBuffer.cpp index 99dee7c9a7b..8792c7e5901 100644 --- a/backends/qualcomm/runtime/SharedBuffer.cpp +++ b/backends/qualcomm/runtime/SharedBuffer.cpp @@ -147,7 +147,7 @@ int32_t SharedBuffer::MemToFd(void* buf) { void SharedBuffer::FreeMem(void* buf) { if (!initialize_) { QNN_EXECUTORCH_LOG_ERROR("Shared memory not initialized."); - } else if (restore_map_.count(buf) == 0) { + } else if (!restore_map_.contains(buf)) { QNN_EXECUTORCH_LOG_WARN("Don't free an unallocated tensor."); } else { rpc_mem_free_(restore_map_[buf]); @@ -156,7 +156,7 @@ void SharedBuffer::FreeMem(void* buf) { } bool SharedBuffer::IsAllocated(void* buf) { - return restore_map_.count(buf) != 0U; + return restore_map_.contains(buf); } Error SharedBuffer::Load() { diff --git a/backends/qualcomm/runtime/backends/QnnGraphCommon.cpp b/backends/qualcomm/runtime/backends/QnnGraphCommon.cpp index 9fe81f4cf54..078e118718d 100644 --- a/backends/qualcomm/runtime/backends/QnnGraphCommon.cpp +++ b/backends/qualcomm/runtime/backends/QnnGraphCommon.cpp @@ -22,7 +22,7 @@ Error QnnGraph::Configure(const std::string& graph_name) { Internal, "Fail to make graph config."); - if (handle_.count(graph_name)) { + if (handle_.contains(graph_name)) { QNN_EXECUTORCH_LOG_ERROR( "Graph '%s' has been configured.", graph_name.c_str()); return Error::Ok; @@ -75,7 +75,7 @@ Qnn_ErrorHandle_t QnnGraph::GraphExecute( const std::string& graph_name, const std::vector& input_tensor_structs, std::vector& output_tensor_structs) { - if (!handle_.count(graph_name)) { + if (!handle_.contains(graph_name)) { QNN_EXECUTORCH_LOG_ERROR( "graph name: %s does not exist.", graph_name.c_str()); return QNN_COMMON_ERROR_GENERAL; diff --git a/backends/qualcomm/runtime/backends/QnnImplementation.cpp b/backends/qualcomm/runtime/backends/QnnImplementation.cpp index a9136a83c9c..945b8c79920 100644 --- a/backends/qualcomm/runtime/backends/QnnImplementation.cpp +++ b/backends/qualcomm/runtime/backends/QnnImplementation.cpp @@ -113,7 +113,7 @@ Error QnnImplementation::StartBackend( // library_path=libQnnHtp_2.so // for different QnnBackend instances. // So we warning out here. - if (loaded_backend_.count(backend_id) > 0) { + if (loaded_backend_.contains(backend_id)) { QNN_EXECUTORCH_LOG_WARN( "lib_path %s is loaded, but backend %d " "already exists. Overwriting previous loaded backend...", @@ -122,7 +122,7 @@ Error QnnImplementation::StartBackend( } loaded_backend_[backend_id] = provider_list[0]; - if (loaded_lib_handle_.count(backend_id) > 0) { + if (loaded_lib_handle_.contains(backend_id)) { QNN_EXECUTORCH_LOG_WARN("closing %pK...", loaded_lib_handle_[backend_id]); int dlclose_error = dlclose(loaded_lib_handle_[backend_id]); @@ -183,7 +183,7 @@ Error QnnImplementation::Load(const QnnSaver_Config_t** saver_config) { { const std::lock_guard lock(be_init_mutex_); - if (lib_path_to_backend_id_.count(lib_path_) == 0) { + if (!lib_path_to_backend_id_.contains(lib_path_)) { Error st = StartBackend(lib_path_, saver_config); ET_CHECK_OR_RETURN_ERROR( st == Error::Ok, Internal, "Fail to start backend"); @@ -193,15 +193,15 @@ Error QnnImplementation::Load(const QnnSaver_Config_t** saver_config) { backend_id = lib_path_to_backend_id_[lib_path_]; // really don't expect. - if (loaded_backend_.count(backend_id) == 0 || - loaded_lib_handle_.count(backend_id) == 0) { + if (!loaded_backend_.contains(backend_id) || + !loaded_lib_handle_.contains(backend_id)) { QNN_EXECUTORCH_LOG_ERROR( "library %s is loaded but " "loaded backend count=%zu, " "loaded lib_handle count=%zu", lib_path_.c_str(), - loaded_backend_.count(backend_id), - loaded_lib_handle_.count(backend_id)); + loaded_backend_.contains(backend_id), + loaded_lib_handle_.contains(backend_id)); return Error::Internal; } } // be_init_mutex_ release. diff --git a/backends/qualcomm/runtime/backends/QnnOpPackageManager.cpp b/backends/qualcomm/runtime/backends/QnnOpPackageManager.cpp index f0fe7ab34de..7200910c1c3 100644 --- a/backends/qualcomm/runtime/backends/QnnOpPackageManager.cpp +++ b/backends/qualcomm/runtime/backends/QnnOpPackageManager.cpp @@ -19,7 +19,7 @@ bool QnnOpPackageManager::Add(std::string qnn_op_name) { bool QnnOpPackageManager::Has(std::string qnn_op_name) { const std::lock_guard lock(table_mutex_); - return qnn_op_package_path_set_.count(qnn_op_name) > 0; + return qnn_op_package_path_set_.contains(qnn_op_name); } bool QnnOpPackageManager::Erase(std::string qnn_op_name) {