Enable ocloc tests on release build

Changes required to run tests on release build.
intel · Nov 25, 2024 · 03f09ca · 03f09ca
1 parent 951a7eb
commit 03f09ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/IGC/common/debug/Debug.cpp b/IGC/common/debug/Debug.cpp
@@ -172,7 +172,7 @@ void Banner(raw_ostream & OS, std::string const& message)
 
 raw_ostream &ods()
 {
-#if defined( _DEBUG ) || defined( _INTERNAL )
+#if defined(IGC_DEBUG_VARIABLES)
     if ( IGC_IS_FLAG_ENABLED(PrintToConsole) )
     {
 #    if defined _WIN32 || WIN64

diff --git a/IGC/ocloc_tests/lit.site.cfg.py.in b/IGC/ocloc_tests/lit.site.cfg.py.in
@@ -22,7 +22,9 @@ config.ocloc_dir = "@IGC_OCLOC_BINARY_DIR@"
 config.ocloc_lib_dir = "@IGC_OCLOC_LIBRARY_DIR@"
 config.igc_lib_dir = "@IGC_LIBRARY_DIR@"
 config.cclang_lib_dir = "@OPENCL_CLANG_LIB_DIR@"
-config.regkeys_disabled = $<CONFIG:Release>
+# Mimic the c++ (define) IGC_DEBUG_VARIABLES
+# so the regkeys are supported on Linux release build too
+config.regkeys_disabled = $<AND:$<CONFIG:Release>,$<BOOL:"@MSVC@">>
 config.spirv_as_enabled = "@IGC_BUILD__PROJ__spirv_as@"
 config.spirv_as_dir = "@IGC_SPIRV_AS_DIR@"
 config.llvm_spirv_enabled = "@IGC_BUILD__PROJ__llvm_spirv@"