Skip to content

Commit 1ff0bdb

Browse files
committed
[OpenMP] Fix Slice Duplicate in Profiler
Fixed the broken commit - 6579021 Fix for the AMDGPU buildbot reported by @jplehr.
1 parent e070a5d commit 1ff0bdb

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

openmp/libomptarget/src/interface.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ EXTERN void __tgt_target_data_update_mapper(ident_t *Loc, int64_t DeviceId,
191191
void **Args, int64_t *ArgSizes,
192192
int64_t *ArgTypes,
193193
map_var_info_t *ArgNames,
194+
void **ArgMappers) {
194195

195196
targetDataMapper<AsyncInfoTy>(
196197
Loc, DeviceId, ArgNum, ArgsBase, Args, ArgSizes, ArgTypes, ArgNames,

openmp/libomptarget/src/private.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,11 +431,13 @@ class ExponentialBackoff {
431431
llvm::TimeTraceScope TimeScope(NAME, SI.getProfileLocation())
432432
#define TIMESCOPE_WITH_RTM_AND_IDENT(RegionTypeMsg, IDENT) \
433433
SourceInfo SI(IDENT); \
434-
llvm::TimeTraceScope TimeScope(__FUNCTION__, SI.getProfileLocation() + RegionTypeMsg)
434+
std::string ProfileLocation = SI.getProfileLocation(); \
435+
std::string RTM = RegionTypeMsg; \
436+
llvm::TimeTraceScope TimeScope(__FUNCTION__, ProfileLocation + RTM)
435437
#else
436438
#define TIMESCOPE()
437439
#define TIMESCOPE_WITH_IDENT(IDENT)
438440
#define TIMESCOPE_WITH_NAME_AND_IDENT(NAME, IDENT)
439-
#define TIMESCOPE_WITH_RTM_AND_IDENT(RegionTypeMsg, IDENT) \
441+
#define TIMESCOPE_WITH_RTM_AND_IDENT(RegionTypeMsg, IDENT)
440442

441443
#endif

0 commit comments

Comments
 (0)