Skip to content

Commit 7079528

Browse files
author
zhouwg
committed
ggml-hexagon: fix units MB -> MiB
1 parent e73463e commit 7079528

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

‎ggml/src/ggml-hexagon/ggml-hexagon.cpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2290,7 +2290,7 @@ void * qnn_instance::alloc_rpcmem_internal(size_t bytes, size_t alignment) {
22902290

22912291
void * qnn_instance::alloc_rpcmem(size_t bytes, size_t alignment) {
22922292
if (_rpcmem_usage > (_rpcmem_capacity - (8 * SIZE_IN_MB))) { // reserve 8Mbytes in rpc mempool
2293-
GGMLHEXAGON_LOG_WARN("rpc mempool capacity: %d MB, usage: %d MB", _rpcmem_capacity / SIZE_IN_MB, _rpcmem_usage / SIZE_IN_MB);
2293+
GGMLHEXAGON_LOG_WARN("rpc mempool capacity: %d MiB, usage: %d MiB", _rpcmem_capacity / SIZE_IN_MB, _rpcmem_usage / SIZE_IN_MB);
22942294
return nullptr;
22952295
}
22962296

@@ -3178,7 +3178,7 @@ void qnn_instance::htp_probe_rpc_meminfo() {
31783178
for (size_t idx = 0; idx < probe_counts; idx++) {
31793179
rpc_buffer = static_cast<uint8_t *>(alloc_rpcmem_internal(probe_slots[idx] * SIZE_IN_MB, 4));
31803180
if (nullptr == rpc_buffer) {
3181-
GGMLHEXAGON_LOG_DEBUG("alloc rpcmem %d (MB) failure during probe rpc memory info, reason: %s\n", probe_slots[idx], strerror(errno));
3181+
GGMLHEXAGON_LOG_DEBUG("alloc rpcmem %d (MiB) failure during probe rpc memory info, reason: %s\n", probe_slots[idx], strerror(errno));
31823182
break;
31833183
} else {
31843184
candidate_size = probe_slots[idx];
@@ -3191,7 +3191,7 @@ void qnn_instance::htp_probe_rpc_meminfo() {
31913191

31923192
free_rpcmem();
31933193
_rpcmem_usage = 0;
3194-
GGMLHEXAGON_LOG_INFO("capacity of rpc ion memory %d MB\n", _rpcmem_capacity / SIZE_IN_MB);
3194+
GGMLHEXAGON_LOG_INFO("capacity of rpc ion memory %d MiB\n", _rpcmem_capacity / SIZE_IN_MB);
31953195
}
31963196

31973197
void qnn_instance::htp_print_info() {
@@ -3207,7 +3207,7 @@ void qnn_instance::htp_print_info() {
32073207
QnnHtpDevice_Arch_t htp_arch = chipinfo.arch;
32083208
GGMLHEXAGON_LOG_DEBUG("HTP_TYPE:%d(%s)", devinfo->devType,
32093209
(devinfo->devType == QNN_HTP_DEVICE_TYPE_ON_CHIP) ? "QNN_HTP_DEVICE_TYPE_ON_CHIP" : "QNN_HTP_DEVICE_TYPE_UNKNOWN");
3210-
GGMLHEXAGON_LOG_DEBUG("qualcomm soc_model:%d(%s), htp_arch:%d(%s), vtcm_size:%d MB，" \
3210+
GGMLHEXAGON_LOG_DEBUG("qualcomm soc_model:%d(%s), htp_arch:%d(%s), vtcm_size:%d MiB，" \
32113211
"dlbc_support:%d, signedpd_support:%d", \
32123212
chipinfo.socModel, ggmlhexagon_get_socmodel_desc(chipinfo.socModel), \
32133213
htp_arch, ggmlhexagon_get_htparch_desc(htp_arch), chipinfo.vtcmSize, \
@@ -4694,7 +4694,7 @@ static void ggmlhexagon_init_rpcmempool(ggml_backend_hexagon_context * ctx) {
46944694
for (size_t idx = 0; idx < probe_counts; idx++) {
46954695
rpc_buffer = static_cast<uint8_t *>(rpcmem_alloc(RPCMEM_HEAP_ID_SYSTEM, RPCMEM_DEFAULT_FLAGS, (probe_slots[idx] * SIZE_IN_MB)));
46964696
if (nullptr == rpc_buffer) {
4697-
GGMLHEXAGON_LOG_DEBUG("alloc rpcmem %d (MB) failure during probe rpc memory info, reason: %s\n", probe_slots[idx], strerror(errno));
4697+
GGMLHEXAGON_LOG_DEBUG("alloc rpcmem %d (MiB) failure during probe rpc memory info, reason: %s\n", probe_slots[idx], strerror(errno));
46984698
break;
46994699
} else {
47004700
candidate_size = probe_slots[idx];
@@ -4703,9 +4703,9 @@ static void ggmlhexagon_init_rpcmempool(ggml_backend_hexagon_context * ctx) {
47034703
}
47044704
}
47054705
ctx->rpc_mempool_capacity = candidate_size * SIZE_IN_MB;
4706-
GGMLHEXAGON_LOG_DEBUG("rpc memory capacity %ld(%d M) for device %d",
4706+
GGMLHEXAGON_LOG_DEBUG("rpc memory capacity %ld(%d MiB) for device %d",
47074707
ctx->rpc_mempool_capacity, ctx->rpc_mempool_capacity / SIZE_IN_MB, ctx->device);
4708-
GGMLHEXAGON_LOG_INFO("capacity of rpc memory %d MB", ctx->rpc_mempool_capacity / SIZE_IN_MB);
4708+
GGMLHEXAGON_LOG_INFO("capacity of rpc memory %d MiB", ctx->rpc_mempool_capacity / SIZE_IN_MB);
47094709

47104710
if ((g_hexagon_appcfg.hwaccel_approach == HWACCEL_CDSP) && (1 == g_hexagon_appcfg.enable_rpc_ion_mempool)) {
47114711
//FIXME: reasonable rpc memory pool size through a better approach rather than hardcoded size
@@ -4721,7 +4721,7 @@ static void ggmlhexagon_init_rpcmempool(ggml_backend_hexagon_context * ctx) {
47214721
GGMLHEXAGON_LOG_WARN("alloc rpc memorypool %d failed", ctx->rpc_mempool_len);
47224722
return;
47234723
} else {
4724-
GGMLHEXAGON_LOG_DEBUG("alloc rpc memorypool %p successfully %ld(%d M)",
4724+
GGMLHEXAGON_LOG_DEBUG("alloc rpc memorypool %p successfully %ld(%d MiB)",
47254725
ctx->rpc_mempool, ctx->rpc_mempool_len,
47264726
ctx->rpc_mempool_len / SIZE_IN_MB);
47274727
}
@@ -4830,9 +4830,9 @@ static int ggmlhexagon_init_dsp(ggml_backend_hexagon_context * ctx) {
48304830

48314831
if (nullptr == ctx)
48324832
return 1;
4833-
GGMLHEXAGON_LOG_INFO("init Hexagon DSP with backend %d(%s)", ctx->device, ggml_backend_hexagon_get_devname(ctx->device));
4833+
GGMLHEXAGON_LOG_INFO("init Hexagon cDSP with backend %d(%s)", ctx->device, ggml_backend_hexagon_get_devname(ctx->device));
48344834
if (0 != ctx->ggmlop_handle) {
4835-
GGMLHEXAGON_LOG_DEBUG("already init Hexagon DSP with backend %d(%s)", ctx->device, ggml_backend_hexagon_get_devname(ctx->device));
4835+
GGMLHEXAGON_LOG_DEBUG("already init Hexagon cDSP with backend %d(%s)", ctx->device, ggml_backend_hexagon_get_devname(ctx->device));
48364836
return 0;
48374837
}
48384838
ctx->ggmlop_handle = 0;
@@ -4848,7 +4848,7 @@ static int ggmlhexagon_init_dsp(ggml_backend_hexagon_context * ctx) {
48484848
GGMLHEXAGON_LOG_DEBUG("API is not supported on this target so cannot get domains info from the device. falling back to legacy approach of using default domain id");
48494849
hexagon_error = ggmlhexagon_get_dsp_support(&domain_id);
48504850
if (hexagon_error != AEE_SUCCESS) {
4851-
GGMLHEXAGON_LOG_DEBUG("error: 0x%x, defaulting to CDSP domain", hexagon_error);
4851+
GGMLHEXAGON_LOG_DEBUG("error: 0x%x, defaulting to cDSP domain", hexagon_error);
48524852
}
48534853
} else if (hexagon_error != AEE_SUCCESS) {
48544854
GGMLHEXAGON_LOG_DEBUG("error in getting domains information");
@@ -4871,7 +4871,7 @@ static int ggmlhexagon_init_dsp(ggml_backend_hexagon_context * ctx) {
48714871
GGMLHEXAGON_LOG_DEBUG("DSP domain is not provided, retrieving DSP information using Remote APIs");
48724872
hexagon_error = ggmlhexagon_get_dsp_support(&domain_id);
48734873
if (hexagon_error != AEE_SUCCESS) {
4874-
GGMLHEXAGON_LOG_DEBUG("error: 0x%x, defaulting to CDSP domain", hexagon_error);
4874+
GGMLHEXAGON_LOG_DEBUG("error: 0x%x, defaulting to cDSP domain", hexagon_error);
48754875
}
48764876
}
48774877
}
@@ -5438,7 +5438,7 @@ static ggml_backend_buffer_t ggml_backend_hexagon_buffer_type_alloc_buffer(
54385438
if ((HWACCEL_CDSP == g_hexagon_appcfg.hwaccel_approach) && (1 == g_hexagon_appcfg.enable_rpc_ion_mempool)) {
54395439
GGML_ASSERT(size + ctx->rpc_mempool_usage <= ctx->rpc_mempool_len);
54405440
buffer_ctx->buffer = (static_cast<char*>(ctx->rpc_mempool)) + ctx->rpc_mempool_usage;
5441-
GGMLHEXAGON_LOG_DEBUG("size %d(%d M), buffer_ctx->buffer %p", size, size / SIZE_IN_MB, buffer_ctx->buffer);
5441+
GGMLHEXAGON_LOG_DEBUG("size %d(%d MiB), buffer_ctx->buffer %p", size, size / SIZE_IN_MB, buffer_ctx->buffer);
54425442
GGML_ASSERT(nullptr != buffer_ctx->buffer);
54435443
ctx->rpc_mempool_usage += size_aligned;
54445444
} else {
@@ -5610,8 +5610,8 @@ static void ggml_backend_hexagon_device_get_memory(ggml_backend_dev_t dev, size_
56105610
}
56115611
*total = rpc_ion_memsize;
56125612
*free = (rpc_ion_memsize - rpc_ion_usage);
5613-
GGMLHEXAGON_LOG_DEBUG("rpc memsize %d M", rpc_ion_memsize / SIZE_IN_MB);
5614-
GGMLHEXAGON_LOG_DEBUG("rpc usage %d M\n\n", rpc_ion_usage / SIZE_IN_MB);
5613+
GGMLHEXAGON_LOG_DEBUG("rpc memsize %d MiB", rpc_ion_memsize / SIZE_IN_MB);
5614+
GGMLHEXAGON_LOG_DEBUG("rpc usage %d MiB\n\n", rpc_ion_usage / SIZE_IN_MB);
56155615
}
56165616
}
56175617

0 commit comments

Comments
 (0)