P4 to Git Change 1972970 by kjayapra@0_HIPWS_P2P1_ROCM on 2019/07/24 13:47:29

SWDEV-144570 - Use Comgr feature flag around COMGR related API usage.

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/devprogram.cpp#52 edit


[ROCm/clr commit: 7efe014e65]

projects/clr/rocclr/runtime/device/devprogram.cpp

@@ -3098,6 +3098,7 @@ bool Program::FindGlobalVarSize(void* binary, size_t binSize) {
   return true;
 }
 
+#if defined(USE_COMGR_LIBRARY)
 amd_comgr_status_t getSymbolFromModule(amd_comgr_symbol_t symbol, void* userData) {
   size_t nlen;
   amd_comgr_status_t status;
@@ -3131,8 +3132,10 @@ amd_comgr_status_t getSymbolFromModule(amd_comgr_symbol_t symbol, void* userData
   delete[] name;
   return status;
 }
+#endif /* USE_COMGR_LIBRARY */
 
 bool Program::getGlobalSymbolsFromCodeObj(std::vector<std::string>* var_names) const {
+#if defined(USE_COMGR_LIBRARY)
   amd_comgr_status_t status = AMD_COMGR_STATUS_SUCCESS;
   amd_comgr_data_t dataObject;
 
@@ -3157,6 +3160,7 @@ bool Program::getGlobalSymbolsFromCodeObj(std::vector<std::string>* var_names) c
     buildLog_ += "COMGR:  Cannot iterate comgr symbols \n";
     return false;
   }
+#endif /* USE_COMGR_LIBRARY */
 
   return true;
 }