build compatibility

Change-Id: Ifde4b2e4e7cb48d5c06ccce5eb76b7b943c4114a

cmake_modules/env.cmake

@@ -66,6 +66,11 @@ if ( DEFINED ENV{CMAKE_DEBUG_TRACE} )
   add_definitions ( -DDEBUG_TRACE=1 )
 endif()
 
+## Enable AQL-profile new API
+if ( NOT DEFINED ENV{CMAKE_CURR_API} )
+  add_definitions ( -DAQLPROF_NEW_API=1 )
+endif()
+
 ## Enable direct loading of AQL-profile HSA extension
 if ( DEFINED ENV{CMAKE_LD_AQLPROFILE} )
   add_definitions ( -DROCP_LD_AQLPROFILE=1 )

src/core/profile.h

@@ -142,10 +142,14 @@ class Profile {
       if (status != HSA_STATUS_SUCCESS) AQL_EXC_RAISING(status, "aqlprofile_start");
       status = api->hsa_ven_amd_aqlprofile_stop(&profile_, &stop);
       if (status != HSA_STATUS_SUCCESS) AQL_EXC_RAISING(status, "aqlprofile_stop");
+#ifdef AQLPROF_NEW_API
       hsa_status_t rd_status = api->hsa_ven_amd_aqlprofile_read(&profile_, &read);
 #if 0 // Read API returns error if disabled
       if (rd_status != HSA_STATUS_SUCCESS) AQL_EXC_RAISING(status, "aqlprofile_read");
 #endif
+#else
+      hsa_status_t rd_status = HSA_STATUS_ERROR;
+#endif
 
       // Set completion signal
       hsa_signal_t dummy_signal{};

src/util/hsa_rsrc_factory.cpp

@@ -162,8 +162,10 @@ hsa_status_t HsaRsrcFactory::LoadAqlProfileLib(aqlprofile_pfn_t* api) {
       (decltype(::hsa_ven_amd_aqlprofile_start)*)dlsym(handle, "hsa_ven_amd_aqlprofile_start");
   api->hsa_ven_amd_aqlprofile_stop =
       (decltype(::hsa_ven_amd_aqlprofile_stop)*)dlsym(handle, "hsa_ven_amd_aqlprofile_stop");
+#ifdef AQLPROF_NEW_API
   api->hsa_ven_amd_aqlprofile_read =
       (decltype(::hsa_ven_amd_aqlprofile_read)*)dlsym(handle, "hsa_ven_amd_aqlprofile_read");
+#endif
   api->hsa_ven_amd_aqlprofile_legacy_get_pm4 =
       (decltype(::hsa_ven_amd_aqlprofile_legacy_get_pm4)*)dlsym(
           handle, "hsa_ven_amd_aqlprofile_legacy_get_pm4");

test/tool/tool.cpp

@@ -919,8 +919,10 @@ extern "C" PUBLIC_API void OnLoadToolProp(rocprofiler_settings_t* settings)
         HSA_VEN_AMD_AQLPROFILE_PARAMETER_NAME_TOKEN_MASK;
     parameters_dict["TOKEN_MASK2"] =
         HSA_VEN_AMD_AQLPROFILE_PARAMETER_NAME_TOKEN_MASK2;
+#ifdef AQLPROF_NEW_API
     parameters_dict["SE_MASK"] =
         HSA_VEN_AMD_AQLPROFILE_PARAMETER_NAME_SE_MASK;
+#endif
 
     printf("    %s (", name.c_str());
     features[index] = {};

test/util/hsa_rsrc_factory.cpp

@@ -159,8 +159,10 @@ hsa_status_t HsaRsrcFactory::LoadAqlProfileLib(aqlprofile_pfn_t* api) {
       (decltype(::hsa_ven_amd_aqlprofile_start)*)dlsym(handle, "hsa_ven_amd_aqlprofile_start");
   api->hsa_ven_amd_aqlprofile_stop =
       (decltype(::hsa_ven_amd_aqlprofile_stop)*)dlsym(handle, "hsa_ven_amd_aqlprofile_stop");
+#ifdef AQLPROF_NEW_API
   api->hsa_ven_amd_aqlprofile_read =
       (decltype(::hsa_ven_amd_aqlprofile_read)*)dlsym(handle, "hsa_ven_amd_aqlprofile_read");
+#endif
   api->hsa_ven_amd_aqlprofile_legacy_get_pm4 =
       (decltype(::hsa_ven_amd_aqlprofile_legacy_get_pm4)*)dlsym(
           handle, "hsa_ven_amd_aqlprofile_legacy_get_pm4");