vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactoring: remove unused get_rpcmem_from_memhandle func

Browse source
This commit is contained in:
hongruichen 2024-07-27 11:22:29 +08:00
parent 2c73791d62
commit ccfec70106
1 changed files with 14 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

39
ggml/src/ggml-qnn/qnn-lib.hpp
View file

@ -591,8 +591,6 @@ public:
size_t get_rpcmem_capacity() { return _rpcmem_capacity; } size_t get_rpcmem_capacity() { return _rpcmem_capacity; }
bool is_rpcmem_registered(Qnn_MemHandle_t handle) { return _qnn_mem_set.count(handle) != 0U; }
void *alloc_rpcmem(size_t bytes, size_t alignment) { void *alloc_rpcmem(size_t bytes, size_t alignment) {
if (!_rpcmem_initialized) { if (!_rpcmem_initialized) {
QNN_LOG_WARN("rpc memory not initialized\n"); QNN_LOG_WARN("rpc memory not initialized\n");
@ -619,7 +617,7 @@ public:
void free_rpcmem(void *buf) { void free_rpcmem(void *buf) {
if (!_rpcmem_initialized) { if (!_rpcmem_initialized) {
QNN_LOG_WARN("rpc memory not initialized\n"); QNN_LOG_WARN("rpc memory not initialized\n");
} else if (0 == _rpcmem_store_map.count(buf)) { } else if (_rpcmem_store_map.count(buf) == 0) {
QNN_LOG_WARN("no allocated tensor\n"); QNN_LOG_WARN("no allocated tensor\n");
} else { } else {
_pfn_rpc_mem_free(_rpcmem_store_map[buf]); _pfn_rpc_mem_free(_rpcmem_store_map[buf]);
@ -638,18 +636,6 @@ public:
return mem_fd; return mem_fd;
} }
void *get_rpcmem_from_memhandle(Qnn_MemHandle_t mem_handle) {
for (std::unordered_map<void *, Qnn_MemHandle_t>::iterator it = _qnn_mem_set.begin(); it != _qnn_mem_set.end();
it++) {
Qnn_MemHandle_t mem_handle = it->second;
if (it->second == mem_handle) {
return it->first;
}
}
QNN_LOG_WARN("can't find rpcmem from qnn mem handle %p", mem_handle);
return nullptr;
}
Qnn_MemHandle_t register_rpcmem(void *p_data, uint32_t rank, uint32_t *dimensions, Qnn_DataType_t data_type) { Qnn_MemHandle_t register_rpcmem(void *p_data, uint32_t rank, uint32_t *dimensions, Qnn_DataType_t data_type) {
if (!p_data) { if (!p_data) {
QNN_LOG_WARN("invalid param\n"); QNN_LOG_WARN("invalid param\n");
@ -661,9 +647,9 @@ public:
return nullptr; return nullptr;
} }
if (is_rpcmem_allocated(p_data)) { if (is_rpcmem_registered(p_data)) {
QNN_LOG_WARN("rpc memory already allocated\n"); QNN_LOG_WARN("rpc memory already registered\n");
return nullptr; return _qnn_rpc_buffer_to_handles[p_data];
} }
auto mem_fd = rpcmem_to_fd(p_data); auto mem_fd = rpcmem_to_fd(p_data);
@ -683,8 +669,7 @@ public:
return nullptr; return nullptr;
} }
_qnn_mem_set.insert((std::pair<void *, Qnn_MemHandle_t>(p_data, handle))); _qnn_rpc_buffer_to_handles.insert({ p_data, handle });
QNN_LOG_INFO("successfully register shared memory handler: %p\n", handle); QNN_LOG_INFO("successfully register shared memory handler: %p\n", handle);
return handle; return handle;
} }
@ -695,14 +680,18 @@ public:
QNN_LOG_WARN("failed to unregister shared memory, error %d\n", QNN_GET_ERROR_CODE(error)); QNN_LOG_WARN("failed to unregister shared memory, error %d\n", QNN_GET_ERROR_CODE(error));
} }
auto it = std::find_if(_qnn_mem_set.begin(), _qnn_mem_set.end(), auto it = std::find_if(_qnn_rpc_buffer_to_handles.begin(), _qnn_rpc_buffer_to_handles.end(),
[mem_handle](const auto &kv) { return kv.second == mem_handle; }); [mem_handle](const auto &kv) { return kv.second == mem_handle; });
if (it != _qnn_mem_set.end()) { if (it == _qnn_rpc_buffer_to_handles.end()) {
_qnn_mem_set.erase(it); QNN_LOG_WARN("failed to find shared memory handler: %p\n", mem_handle);
return;
} }
_qnn_rpc_buffer_to_handles.erase(it);
} }
bool is_rpcmem_allocated(void *buf) { return _qnn_mem_set.count(buf) != 0U; } bool is_rpcmem_allocated(void *buf) { return _rpcmem_store_map.count(buf) != 0; }
bool is_rpcmem_registered(void *buf) { return _qnn_rpc_buffer_to_handles.count(buf) != 0U; }
const qnn::qcom_socinfo &get_soc_info() { return _soc_info; } const qnn::qcom_socinfo &get_soc_info() { return _soc_info; }
@ -892,7 +881,7 @@ private:
QnnHtpDevice_PerfInfrastructure_t *_qnn_htp_perfinfra = nullptr; QnnHtpDevice_PerfInfrastructure_t *_qnn_htp_perfinfra = nullptr;
uint32_t _qnn_power_configid = 1; uint32_t _qnn_power_configid = 1;
std::unordered_map<void *, Qnn_MemHandle_t> _qnn_mem_set; std::unordered_map<void *, Qnn_MemHandle_t> _qnn_rpc_buffer_to_handles;
std::mutex _init_mutex; std::mutex _init_mutex;
std::unordered_map<BackendIdType, void *> _loaded_lib_handle; std::unordered_map<BackendIdType, void *> _loaded_lib_handle;