From 388803348229eb29bd1c0ad351d26889be40ff4d Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Fri, 25 Oct 2019 14:17:24 -0400
Subject: [PATCH] P4 to Git Change 2019704 by cpaquot@cpaquot-ocl-lc-lnx on
 2019/10/25 14:07:38

	SWDEV-208972 - [HIP] Enable LOG_LEVEL in release bits.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/utils/debug.hpp#9 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#322 edit


[ROCm/clr commit: 0ce1ad6acbd5473f291f6ba4fb80b28f756a7a21]
---
 projects/clr/rocclr/runtime/utils/debug.hpp | 16 ----------------
 projects/clr/rocclr/runtime/utils/flags.hpp |  2 +-
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/projects/clr/rocclr/runtime/utils/debug.hpp b/projects/clr/rocclr/runtime/utils/debug.hpp
index d21f2d89f2..e89fe7c8c7 100644
--- a/projects/clr/rocclr/runtime/utils/debug.hpp
+++ b/projects/clr/rocclr/runtime/utils/debug.hpp
@@ -87,38 +87,26 @@ inline void warning(const char* msg) { amd::report_warning(msg); }
 #define Untested(msg) (void)(0)
 #endif /*NDEBUG*/
 
-#ifdef DEBUG
 #define Log(level, msg)                                                                            \
   do {                                                                                             \
     if (LOG_LEVEL >= level) {                                                                      \
       amd::log_entry(level, __FILE__, __LINE__, msg);                                              \
     }                                                                                              \
   } while (false)
-#else  // !DEBUG
-#define Log(level, msg) (void)(0)
-#endif  // !DEBUG
 
-#ifdef DEBUG
 #define LogTS(level, msg)                                                                          \
   do {                                                                                             \
     if (LOG_LEVEL >= level) {                                                                      \
       amd::log_timestamped(level, __FILE__, __LINE__, msg);                                        \
     }                                                                                              \
   } while (false)
-#else  // !DEBUG
-#define Log(level, msg) (void)(0)
-#endif  // !DEBUG
 
-#ifdef DEBUG
 #define Logf(level, format, ...)                                                                   \
   do {                                                                                             \
     if (LOG_LEVEL >= level) {                                                                      \
       amd::log_printf(level, __FILE__, __LINE__, format, __VA_ARGS__);                             \
     }                                                                                              \
   } while (false)
-#else  // !DEBUG
-#define Logf(level, format, ...) (void)(0)
-#endif  // !DEBUG
 
 #define CondLog(cond, msg)                                                                         \
   do {                                                                                             \
@@ -127,16 +115,12 @@ inline void warning(const char* msg) { amd::report_warning(msg); }
     }                                                                                              \
   } while (false)
 
-#ifdef DEBUG
 #define LogGuarantee(cond, level, msg)                                                             \
   do {                                                                                             \
     if (LOG_LEVEL >= level) {                                                                      \
       guarantee(cond);                                                                             \
     }                                                                                              \
   } while (false)
-#else  // !DEBUG
-#define LogGuarantee(cond, level, msg) (void)(0)
-#endif  // !DEBUG
 
 #define LogInfo(msg) Log(amd::LOG_INFO, msg)
 #define LogError(msg) Log(amd::LOG_ERROR, msg)
diff --git a/projects/clr/rocclr/runtime/utils/flags.hpp b/projects/clr/rocclr/runtime/utils/flags.hpp
index 75ea3a2efa..cfceb6cc2a 100644
--- a/projects/clr/rocclr/runtime/utils/flags.hpp
+++ b/projects/clr/rocclr/runtime/utils/flags.hpp
@@ -8,7 +8,7 @@
 
 #define RUNTIME_FLAGS(debug,release,release_on_stg)                           \
                                                                               \
-debug(int, LOG_LEVEL, 0,                                                      \
+release(int, LOG_LEVEL, 0,                                                    \
         "The default log level")                                              \
 debug(uint, DEBUG_GPU_FLAGS, 0,                                               \
         "The debug options for GPU device")                                   \