[Openmp-commits] [openmp] 1ff0bdb - [OpenMP] Fix Slice Duplicate in Profiler

[Aaron Jarmusch via Openmp-commits]

Author: Aaron Jarmusch
Date: 2023-08-24T20:52:15Z
New Revision: 1ff0bdb86dbfb7c70bbbabcae3affff59a0e0806

URL: https://github.com/llvm/llvm-project/commit/1ff0bdb86dbfb7c70bbbabcae3affff59a0e0806
DIFF: https://github.com/llvm/llvm-project/commit/1ff0bdb86dbfb7c70bbbabcae3affff59a0e0806.diff

LOG: [OpenMP] Fix Slice Duplicate in Profiler

Fixed the broken commit - 6579021f02aed021d8cfab808072aa50311e6d12
Fix for the AMDGPU buildbot reported by @jplehr.

Added: 
    

Modified: 
    openmp/libomptarget/src/interface.cpp
    openmp/libomptarget/src/private.h

Removed: 
    


################################################################################
diff  --git a/openmp/libomptarget/src/interface.cpp b/openmp/libomptarget/src/interface.cpp
index 3b4ee24400c041..73c80a096aebb7 100644
--- a/openmp/libomptarget/src/interface.cpp
+++ b/openmp/libomptarget/src/interface.cpp
@@ -191,6 +191,7 @@ EXTERN void __tgt_target_data_update_mapper(ident_t *Loc, int64_t DeviceId,
                                             void **Args, int64_t *ArgSizes,
                                             int64_t *ArgTypes,
                                             map_var_info_t *ArgNames,
+                                            void **ArgMappers) {
   
   targetDataMapper<AsyncInfoTy>(
       Loc, DeviceId, ArgNum, ArgsBase, Args, ArgSizes, ArgTypes, ArgNames,

diff  --git a/openmp/libomptarget/src/private.h b/openmp/libomptarget/src/private.h
index 2d700426361408..ae6e4b15b62ce4 100644
--- a/openmp/libomptarget/src/private.h
+++ b/openmp/libomptarget/src/private.h
@@ -431,11 +431,13 @@ class ExponentialBackoff {
   llvm::TimeTraceScope TimeScope(NAME, SI.getProfileLocation())
 #define TIMESCOPE_WITH_RTM_AND_IDENT(RegionTypeMsg, IDENT)                     \
   SourceInfo SI(IDENT);                                                        \
-  llvm::TimeTraceScope TimeScope(__FUNCTION__, SI.getProfileLocation() + RegionTypeMsg)
+  std::string ProfileLocation = SI.getProfileLocation();                       \
+  std::string RTM = RegionTypeMsg;                                             \
+  llvm::TimeTraceScope TimeScope(__FUNCTION__, ProfileLocation + RTM)
 #else
 #define TIMESCOPE()
 #define TIMESCOPE_WITH_IDENT(IDENT)
 #define TIMESCOPE_WITH_NAME_AND_IDENT(NAME, IDENT)
-#define TIMESCOPE_WITH_RTM_AND_IDENT(RegionTypeMsg, IDENT)                                    \
+#define TIMESCOPE_WITH_RTM_AND_IDENT(RegionTypeMsg, IDENT)                                    
 
 #endif