From 5f1d4d477902a9c058bd5506f17eeab6b7c5b7f5 Mon Sep 17 00:00:00 2001 From: Vyacheslav Zakharin Date: Tue, 26 Jan 2021 13:52:53 -0800 Subject: [PATCH] [libomptarget][NFC] Use portable printf format specifiers. Differential Revision: https://reviews.llvm.org/D95476 --- openmp/libomptarget/src/omptarget.cpp | 7 ++++--- openmp/libomptarget/src/private.h | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/openmp/libomptarget/src/omptarget.cpp b/openmp/libomptarget/src/omptarget.cpp index af80de1dafb4..90966d25fb26 100644 --- a/openmp/libomptarget/src/omptarget.cpp +++ b/openmp/libomptarget/src/omptarget.cpp @@ -764,8 +764,9 @@ static int targetDataNonContiguous(ident_t *loc, DeviceTy &Device, } } else { char *Ptr = (char *)ArgsBase + Offset; - DP("Transfer of non-contiguous : host ptr %lx offset %ld len %ld\n", - (uint64_t)Ptr, Offset, Size); + DP("Transfer of non-contiguous : host ptr " DPxMOD " offset %" PRIu64 + " len %" PRIu64 "\n", + DPxPTR(Ptr), Offset, Size); Ret = targetDataContiguous(loc, Device, ArgsBase, Ptr, Size, ArgType); } return Ret; @@ -894,7 +895,7 @@ uint64_t getLoopTripCount(int64_t DeviceId) { if (I != Device.LoopTripCnt.end()) { LoopTripCount = I->second; Device.LoopTripCnt.erase(I); - DP("loop trip count is %lu.\n", LoopTripCount); + DP("loop trip count is %" PRIu64 ".\n", LoopTripCount); } } diff --git a/openmp/libomptarget/src/private.h b/openmp/libomptarget/src/private.h index 9de1c3e3acc9..fb6f681d3020 100644 --- a/openmp/libomptarget/src/private.h +++ b/openmp/libomptarget/src/private.h @@ -112,9 +112,9 @@ static inline void dumpTargetPointerMappings(const ident_t *Loc, for (const auto &HostTargetMap : Device.HostDataToTargetMap) { SourceInfo Info(HostTargetMap.HstPtrName); INFO(OMP_INFOTYPE_ALL, Device.DeviceID, - DPxMOD " " DPxMOD " %-8lu %-8ld %s at %s:%d:%d\n", + DPxMOD " " DPxMOD " %-8" PRIuPTR " %-8" PRId64 " %s at %s:%d:%d\n", DPxPTR(HostTargetMap.HstPtrBegin), DPxPTR(HostTargetMap.TgtPtrBegin), - (long unsigned)(HostTargetMap.HstPtrEnd - HostTargetMap.HstPtrBegin), + HostTargetMap.HstPtrEnd - HostTargetMap.HstPtrBegin, HostTargetMap.getRefCount(), Info.getName(), Info.getFilename(), Info.getLine(), Info.getColumn()); } @@ -152,7 +152,7 @@ printKernelArguments(const ident_t *Loc, const int64_t DeviceId, else type = "use_address"; - INFO(OMP_INFOTYPE_ALL, DeviceId, "%s(%s)[%ld] %s\n", type, + INFO(OMP_INFOTYPE_ALL, DeviceId, "%s(%s)[%" PRId64 "] %s\n", type, getNameFromMapping(varName).c_str(), ArgSizes[i], implicit); } }