Skip to content

Commit

Permalink
ggml-qnn: refine code format to make potential collaborators happy
Browse files Browse the repository at this point in the history
  • Loading branch information
@zhouwg
zhouwg committed Feb 25, 2025
1 parent a47bbf3 commit c902c4d
Showing 1 changed file with 38 additions and 37 deletions.
75 changes: 38 additions & 37 deletions ggml/src/ggml-qnn/ggml-qnn.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1743,39 +1743,38 @@ class qnn_instance {
static constexpr const int _required_num_providers = 1;

private:
std::string _lib_path;
std::string _backend_name;
std::string _model_name; // name of prebuilt QNN model, might be used in the future
BackendIdType _backend_id;
std::string _lib_path;
std::string _backend_name;
std::string _model_name; // name of prebuilt QNN model, might be used in the future
BackendIdType _backend_id;

bool _debug_tensor = false; // flag to indicate if requested graph is to be run in debug mode
bool _do_node_validations = true; // flag to indicate whether all add_node calls need to be validated
QnnLog_Level_t _qnn_log_level = QNN_LOG_LEVEL_DEBUG;

ggml_qnn_profile_level _profile_level = ggml_qnn_profile_level::profile_detail;

qnn_interface _qnn_interface;

void * _system_lib_handle = nullptr;
void * _system_lib_handle = nullptr;

Qnn_GraphHandle_t _qnn_graph_handle = nullptr;
Qnn_GraphHandle_t _qnn_graph_handle = nullptr;

Qnn_LogHandle_t _qnn_log_handle = nullptr;
Qnn_LogHandle_t _qnn_log_handle = nullptr;

Qnn_ProfileHandle_t _qnn_profile_handle = nullptr;

Qnn_DeviceHandle_t _qnn_device_handle = nullptr;
Qnn_DeviceHandle_t _qnn_device_handle = nullptr;

Qnn_BackendHandle_t _qnn_backend_handle = nullptr;

Qnn_ContextHandle_t _qnn_context_handle = nullptr;

QnnSystemContext_Handle_t _qnn_system_handle = nullptr;

QnnHtpDevice_PerfInfrastructure_t *_qnn_htp_perfinfra = nullptr;
uint32_t _qnn_power_configid = 1;
uint32_t _qnn_rpc_pollingtime = 9999; // 0-10000 us for high performing
QnnHtpDevice_PerfInfrastructure_t * _qnn_htp_perfinfra = nullptr;
uint32_t _qnn_power_configid = 1;
uint32_t _qnn_rpc_pollingtime = 9999; // 0-10000 us for high performing

qnn_interface _qnn_interface;
QNN_INTERFACE_VER_TYPE _qnn_raw_interface;
QNN_SYSTEM_INTERFACE_VER_TYPE _qnn_raw_system_interface;

Expand All @@ -1787,7 +1786,6 @@ class qnn_instance {
static std::unordered_map<std::string, BackendIdType> _lib_path_to_backend_id;
static std::unordered_map<BackendIdType, const QnnInterface_t *> _loaded_backend;

void * _rpc_lib_handle = nullptr;
std::atomic_bool _rpcmem_initialized{false};
pfn_rpc_mem_alloc _pfn_rpc_mem_alloc;
pfn_rpc_mem_free _pfn_rpc_mem_free;
Expand All @@ -1796,12 +1794,13 @@ class qnn_instance {
pfn_rpc_mem_deinit _pfn_rpc_mem_deinit;
std::unordered_map<void *, void *> _rpcmem_store_map;
std::unordered_map<void *, size_t> _rpcmem_usage_map;
size_t _rpcmem_capacity = 512; // mempool size in Mbytes
size_t _rpcmem_usage = 0; // mempool usage in Mbytes
size_t _rpcmem_capacity = 512; // mempool size in Mbytes

std::string _graph_name;
QNNBackend _device_id;
bool _enable_qnn_rpc = false; //TODO:unknown issue with QNN RPC feature
void * _rpc_lib_handle = nullptr;
bool _enable_qnn_rpc = false; //TODO:unknown issue with QNN RPC feature

DISABLE_COPY(qnn_instance);
DISABLE_MOVE(qnn_instance);
Expand Down Expand Up @@ -1925,13 +1924,13 @@ int qnn_instance::register_rpcmem(void * p_data, Qnn_Tensor_t * p_tensor) {

if (is_rpcmem_registered((QNN_VER_PTR(*p_tensor)->memHandle))) {
GGMLQNN_LOG_WARN("tensor %s has been registered shared memory\n", (QNN_VER_PTR(*p_tensor)->name));
return 4;
return 3;
}

int32_t mem_fd = rpcmem_to_fd(p_data);
if (-1 == mem_fd) {
GGMLQNN_LOG_WARN("failed to get file descriptor\n");
return 5;
return 4;
}
GGMLQNN_LOG_DEBUG("mem_fd %d\n", mem_fd);
Qnn_MemDescriptor_t descriptor = {
Expand All @@ -1947,9 +1946,8 @@ int qnn_instance::register_rpcmem(void * p_data, Qnn_Tensor_t * p_tensor) {
/*numDescriptors=*/1,
&handle);
if (error != QNN_SUCCESS) {
GGMLQNN_LOG_WARN("failed to register shared memory, error %d, %s\n", QNN_GET_ERROR_CODE(error),
strerror(error));
return 6;
GGMLQNN_LOG_WARN("failed to register shared memory, error %d, %s\n", QNN_GET_ERROR_CODE(error), strerror(error));
return 5;
} else {
GGMLQNN_LOG_INFO("tensor %s successfully register shared memory\n", (QNN_VER_PTR(*p_tensor)->name));
}
Expand Down Expand Up @@ -1988,8 +1986,7 @@ Qnn_MemHandle_t qnn_instance::register_rpcmem(void * p_data, const uint32_t ran
{{mem_fd}}
};
Qnn_MemHandle_t handle = nullptr;
auto error = _qnn_interface.qnn_mem_register(_qnn_context_handle, &descriptor,
/*numDescriptors=*/1, &handle);
auto error = _qnn_interface.qnn_mem_register(_qnn_context_handle, &descriptor, /*numDescriptors=*/1, &handle);
if (error != QNN_SUCCESS) {
GGMLQNN_LOG_WARN("failed to register shared memory, error %d, %s", QNN_GET_ERROR_CODE(error), strerror(error));
return nullptr;
Expand Down Expand Up @@ -2407,7 +2404,7 @@ int qnn_instance::qnn_init(const QnnSaver_Config_t ** saver_config) {
if (QNN_PROFILE_NO_ERROR != _qnn_raw_interface.profileCreate(
_qnn_backend_handle, QNN_PROFILE_LEVEL_BASIC, &_qnn_profile_handle)) {
GGMLQNN_LOG_WARN("unable to create profile handle in the backend\n");
return 7;
return 6;
} else {
GGMLQNN_LOG_DEBUG("initialize qnn profile successfully\n");
}
Expand All @@ -2433,7 +2430,7 @@ int qnn_instance::qnn_init(const QnnSaver_Config_t ** saver_config) {
#endif
if (nullptr == _rpc_lib_handle) {
GGMLQNN_LOG_WARN("failed to load qualcomm's rpc lib, error:%s\n", dlerror());
return 9;
return 8;
} else {
GGMLQNN_LOG_DEBUG("load rpcmem lib successfully\n");
set_rpcmem_initialized(true);
Expand All @@ -2447,7 +2444,7 @@ int qnn_instance::qnn_init(const QnnSaver_Config_t ** saver_config) {
|| nullptr == _pfn_rpc_mem_to_fd) {
GGMLQNN_LOG_WARN("unable to access symbols in QNN RPC lib. dlerror(): %s", dlerror());
dlclose(_rpc_lib_handle);
return 10;
return 9;
}

if (nullptr != _pfn_rpc_mem_init) // make Qualcomm's SoC based low-end phone happy
Expand All @@ -2459,7 +2456,7 @@ int qnn_instance::qnn_init(const QnnSaver_Config_t ** saver_config) {
&_qnn_context_handle);
if (nullptr == _qnn_context_handle) {
GGMLQNN_LOG_WARN("why failed to initialize qnn context, error:%s\n", strerror(errno));
return 8;
return 10;
} else {
GGMLQNN_LOG_DEBUG("initialize qnn context successfully\n");
}
Expand Down Expand Up @@ -2751,29 +2748,33 @@ static bool ggml_qnn_can_handle_op(const struct ggml_tensor * tensor) {
return true;
}
if (ggml_is_empty(tensor) || tensor->op == GGML_OP_RESHAPE
|| tensor->op == GGML_OP_TRANSPOSE || tensor->op == GGML_OP_VIEW
|| tensor->op == GGML_OP_PERMUTE) {
|| tensor->op == GGML_OP_TRANSPOSE
|| tensor->op == GGML_OP_VIEW
|| tensor->op == GGML_OP_PERMUTE
) {
return false;
}

//TODO: support other op
bool supported_op = ((tensor->op == GGML_OP_ADD) || (tensor->op == GGML_OP_MUL_MAT)
|| (tensor->op == GGML_OP_MUL));
bool supported_op = ((tensor->op == GGML_OP_ADD)
|| (tensor->op == GGML_OP_MUL_MAT)
|| (tensor->op == GGML_OP_MUL)
);
if (!supported_op) {
return false;
}

struct ggml_tensor * src0 = tensor->src[0];
struct ggml_tensor * src1 = tensor->src[1];

const int64_t ne00 = tensor->src[0]->ne[0];
const int64_t ne01 = tensor->src[0]->ne[1];
const int64_t ne00 = tensor->src[0]->ne[0];
const int64_t ne01 = tensor->src[0]->ne[1];

const int64_t ne10 = tensor->src[1]->ne[0];
const int64_t ne11 = tensor->src[1]->ne[1];
const int64_t ne10 = tensor->src[1]->ne[0];
const int64_t ne11 = tensor->src[1]->ne[1];

const int64_t ne0 = tensor->ne[0];
const int64_t ne1 = tensor->ne[1];
const int64_t ne0 = tensor->ne[0];
const int64_t ne1 = tensor->ne[1];

const uint32_t src0_rank = ggml_get_tensor_rank(src0);
const uint32_t src1_rank = ggml_get_tensor_rank(src1);
Expand Down

0 comments on commit c902c4d

Please sign in to comment.