From 06bc6d9980790403cebc7df5a6177776a3139027 Mon Sep 17 00:00:00 2001 From: Jaydeep Patel Date: Mon, 10 Apr 2023 07:51:22 +0000 Subject: [PATCH] SWDEV-391178 - Extern monitor to avoid copy in multithreading. Defining monitor in header cause copy and hence it's moved to cpp. Change-Id: Ib07bbde2808d9cb2af9349076f777e8a5b28d210 [ROCm/clr commit: e8eb1772f2a248c70fa4f942f9567f8db10b8811] --- projects/clr/hipamd/src/hip_context.cpp | 2 +- projects/clr/hipamd/src/hip_internal.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/hipamd/src/hip_context.cpp b/projects/clr/hipamd/src/hip_context.cpp index f639d4ff66..82c22df926 100644 --- a/projects/clr/hipamd/src/hip_context.cpp +++ b/projects/clr/hipamd/src/hip_context.cpp @@ -26,7 +26,7 @@ #include "utils/versions.hpp" std::vector g_devices; - +amd::Monitor g_hipInitlock{"hipInit lock"}; namespace hip { thread_local TlsAggregator tls; amd::Context* host_context = nullptr; diff --git a/projects/clr/hipamd/src/hip_internal.hpp b/projects/clr/hipamd/src/hip_internal.hpp index b8028be29c..8066dbced6 100644 --- a/projects/clr/hipamd/src/hip_internal.hpp +++ b/projects/clr/hipamd/src/hip_internal.hpp @@ -71,7 +71,7 @@ typedef struct ihipIpcEventHandle_st { const char* ihipGetErrorName(hipError_t hip_error); -static amd::Monitor g_hipInitlock{"hipInit lock"}; +extern amd::Monitor g_hipInitlock; #define HIP_INIT(noReturn) {\ amd::ScopedLock lock(g_hipInitlock); \ if (!amd::Runtime::initialized()) { \