Make explicit reference between init modules.

Make explicit reference to hsa_api_trace.cpp from
initialization of hsa_table_interface.cpp.  Breaks
the ability to use hsa_table_interface.cpp in plugins.

Change-Id: I22a42d3a132512b0d9ec7a1ca629b169e7f8eba7

runtime/hsa-runtime/core/common/hsa_table_interface.cpp

@@ -57,6 +57,12 @@ const HsaApiTable* hsa_table_interface_get_table() {
   return hsaApiTable;
 }
 
+class Init {
+ public:
+  Init() { rocr::core::LoadInitialHsaApiTable(); }
+};
+static Init LinkAtLoadOrFirstTranslationUnitAccess;
+
 // Pass through stub functions
 hsa_status_t HSA_API hsa_init() { return coreApiTable->hsa_init_fn(); }
 

runtime/hsa-runtime/core/inc/hsa_api_trace_int.h

@@ -71,6 +71,8 @@ namespace core {
 
   extern HsaApiTable hsa_api_table_;
   extern HsaApiTable hsa_internal_api_table_;
+
+  void LoadInitialHsaApiTable();
 }   //  namespace core
 }   //  namespace rocr
 

runtime/hsa-runtime/core/runtime/hsa_api_trace.cpp

@@ -392,10 +392,9 @@ void HsaApiTable::UpdateAmdExts() {
   amd_ext_api.hsa_amd_deregister_deallocation_callback_fn = AMD::hsa_amd_deregister_deallocation_callback;
 }
 
-class Init {
+void LoadInitialHsaApiTable() {
- public:
+  hsa_table_interface_init(&hsa_api_table_.hsa_api);
-  Init() { hsa_table_interface_init(&hsa_api_table_.hsa_api); }
+}
-};
+
-static Init LinkAtLoad;
 }   //  namespace core
 }   //  namespace rocr