|
14 | 14 |
|
15 | 15 | #include "litert/runtime/magic_number_utils.h" |
16 | 16 |
|
| 17 | +#include <cinttypes> |
17 | 18 | #include <cstdint> |
18 | 19 | #include <cstring> |
19 | 20 | #include <string> |
@@ -96,19 +97,20 @@ void LogDebugInfo( |
96 | 97 | subgraph.NumOutputs(), subgraph.Ops().size()); |
97 | 98 | } |
98 | 99 |
|
99 | | - LITERT_LOG(LITERT_INFO, "Magic number configs: num_configs=%d", |
| 100 | + LITERT_LOG(LITERT_INFO, "Magic number configs: num_configs=%" PRId64, |
100 | 101 | magic_number_configs.num_configs); |
101 | 102 | for (int i = 0; i < magic_number_configs.num_configs; ++i) { |
102 | 103 | const auto& config = magic_number_configs.configs[i]; |
103 | 104 | LITERT_LOG(LITERT_INFO, |
104 | | - " config[%d]: magic_number=%d, target_number=%d, " |
105 | | - "signature_prefix=%s", |
| 105 | + " config[%d]: magic_number=%" PRId64 ", target_number=%" PRId64 |
| 106 | + ", signature_prefix=%s", |
106 | 107 | i, config.magic_number, config.target_number, |
107 | 108 | config.signature_prefix ? config.signature_prefix : "null"); |
108 | 109 | } |
109 | 110 |
|
110 | 111 | if (magic_number_verifications != nullptr) { |
111 | | - LITERT_LOG(LITERT_INFO, "Magic number verifications: num_verifications=%d", |
| 112 | + LITERT_LOG(LITERT_INFO, |
| 113 | + "Magic number verifications: num_verifications=%" PRId64, |
112 | 114 | magic_number_verifications->num_verifications); |
113 | 115 | for (int i = 0; i < magic_number_verifications->num_verifications; ++i) { |
114 | 116 | const auto& verification = magic_number_verifications->verifications[i]; |
@@ -149,8 +151,9 @@ Expected<int> UpdateMagicNumberInDimensions( |
149 | 151 | } |
150 | 152 |
|
151 | 153 | LITERT_LOG(LITERT_DEBUG, |
152 | | - "Update shape[%d] of tensor=%d from %d to %d, factor=%d", i, |
153 | | - tidx, magic_number, target_number, factor); |
| 154 | + "Update shape[%d] of tensor=%d from %" PRId64 " to %" PRId64 |
| 155 | + ", factor=%" PRId64, |
| 156 | + i, tidx, magic_number, target_number, factor); |
154 | 157 | layout.dimensions[i] = target_number * factor; |
155 | 158 | ++num_updated; |
156 | 159 |
|
@@ -178,8 +181,9 @@ int UpdateMagicNumber(T magic_number, T target_number, LiteRtOpCode op_code, |
178 | 181 |
|
179 | 182 | value = target_number * factor; |
180 | 183 | LITERT_LOG(LITERT_DEBUG, |
181 | | - "Update param data[%d] of op=%d from %d to %d, factor=%d", i, |
182 | | - op_code, magic_number, target_number, factor); |
| 184 | + "Update param data[%d] of op=%d from %" PRId64 " to %" PRId64 |
| 185 | + ", factor=%" PRId64, |
| 186 | + i, op_code, magic_number, target_number, factor); |
183 | 187 | memcpy(data, &value, sizeof(T)); |
184 | 188 | ++num_updated; |
185 | 189 | } |
@@ -268,10 +272,10 @@ Expected<int> ReplaceMagicNumberInSubgraph( |
268 | 272 | fb_model, *decomp_subgraph, |
269 | 273 | model.Subgraph(decomp_index))); |
270 | 274 | if (num_tensors_updated > 0) { |
271 | | - LITERT_LOG( |
272 | | - LITERT_DEBUG, |
273 | | - "%d tensors of subgraph %d have been updated for magic number %d.", |
274 | | - num_tensors_updated, decomp_index, magic_number); |
| 275 | + LITERT_LOG(LITERT_DEBUG, |
| 276 | + "%d tensors of subgraph %d have been updated for magic " |
| 277 | + "number %" PRId64, |
| 278 | + num_tensors_updated, decomp_index, magic_number); |
275 | 279 | } |
276 | 280 | updated_tensors += num_tensors_updated; |
277 | 281 | continue; |
@@ -313,22 +317,24 @@ Expected<int> UpdateMagicNumbersInModel( |
313 | 317 | continue; |
314 | 318 | } |
315 | 319 |
|
316 | | - LITERT_LOG(LITERT_DEBUG, "Replacing magic number %d in signature=%s", |
| 320 | + LITERT_LOG(LITERT_DEBUG, |
| 321 | + "Replacing magic number %" PRId64 " in signature=%s", |
317 | 322 | config.magic_number, signature->Key().data()); |
318 | 323 | LITERT_ASSIGN_OR_RETURN(int updated_tensors, |
319 | 324 | ReplaceMagicNumberInSubgraph( |
320 | 325 | config.magic_number, config.target_number, |
321 | 326 | model, fb_model, *tfl_subgraph, subgraph)); |
322 | 327 | if (updated_tensors == 0) { |
323 | | - LITERT_LOG(LITERT_DEBUG, "No magic number %d found in signature=%s", |
| 328 | + LITERT_LOG(LITERT_DEBUG, |
| 329 | + "No magic number %" PRId64 " found in signature=%s", |
324 | 330 | config.magic_number, signature->Key().data()); |
325 | 331 | continue; |
326 | 332 | } |
327 | 333 | total_updated_tensors += updated_tensors; |
328 | | - LITERT_LOG( |
329 | | - LITERT_INFO, |
330 | | - "%d tensors of signature %s have been updated for magic number %d.", |
331 | | - updated_tensors, signature->Key().data(), config.magic_number); |
| 334 | + LITERT_LOG(LITERT_INFO, |
| 335 | + "%d tensors of signature %s have been updated for magic " |
| 336 | + "number %" PRId64, |
| 337 | + updated_tensors, signature->Key().data(), config.magic_number); |
332 | 338 | } |
333 | 339 | } |
334 | 340 |
|
|
0 commit comments