From 6d2bca792b69ac1e869b3ec500bc57ceb7c47448 Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Thu, 15 Oct 2020 19:25:09 -0400
Subject: [PATCH] code obj tests: adding load base

Change-Id: I5fdb25b67eaae43b3c01cd8de3824f9343c37794
---
 test/app/codeobj_test.cpp | 8 ++++----
 test/app/hsaco_test.cpp   | 8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/test/app/codeobj_test.cpp b/test/app/codeobj_test.cpp
index 086bcfb696..124715cdd9 100644
--- a/test/app/codeobj_test.cpp
+++ b/test/app/codeobj_test.cpp
@@ -44,15 +44,15 @@ void check_status(roctracer_status_t status) {
 // codeobj callback
 void codeobj_callback(uint32_t domain, uint32_t cid, const void* data, void* arg) {
   const hsa_evt_data_t* evt_data = reinterpret_cast<const hsa_evt_data_t*>(data);
-  const uint32_t uri_length = evt_data->codeobj.uri_length;
   const char* uri = evt_data->codeobj.uri;
-  printf("codeobj_callback domain(%u) cid(%u): load_delta(0x%lx) load_size(0x%lx) uri_length(%u) uri(\"%s\")\n",
+  printf("codeobj_callback domain(%u) cid(%u): load_base(0x%lx) load_size(0x%lx) load_delta(0x%lx) uri(\"%s\")\n",
     domain,
     cid,
-    evt_data->codeobj.load_delta,
+    evt_data->codeobj.load_base,
     evt_data->codeobj.load_size,
-    uri_length,
+    evt_data->codeobj.load_delta,
     uri);
+  free((void*)uri);
   fflush(stdout);
 }
 
diff --git a/test/app/hsaco_test.cpp b/test/app/hsaco_test.cpp
index 0f2e42adc5..23200137e8 100644
--- a/test/app/hsaco_test.cpp
+++ b/test/app/hsaco_test.cpp
@@ -50,11 +50,16 @@ hsa_status_t code_object_callback(
 {
   printf("code_object_callback\n"); fflush(stdout);
 
+  uint64_t load_base = 0;
   uint64_t load_size = 0;
   uint64_t load_delta = 0;
   uint32_t uri_len = 0;
   char* uri_str = NULL;
 
+  HSA_RT(loader_api_table.hsa_ven_amd_loader_loaded_code_object_get_info(
+    loaded_code_object,
+    HSA_VEN_AMD_LOADER_LOADED_CODE_OBJECT_INFO_LOAD_BASE,
+    &load_base));
   HSA_RT(loader_api_table.hsa_ven_amd_loader_loaded_code_object_get_info(
     loaded_code_object,
     HSA_VEN_AMD_LOADER_LOADED_CODE_OBJECT_INFO_LOAD_SIZE,
@@ -79,11 +84,14 @@ hsa_status_t code_object_callback(
     HSA_VEN_AMD_LOADER_LOADED_CODE_OBJECT_INFO_URI,
     uri_str));
 
+  printf("load_base(0x%lx)\n", load_base); fflush(stdout);
   printf("load_size(0x%lx)\n", load_size); fflush(stdout);
   printf("load_delta(0x%lx)\n", load_delta); fflush(stdout);
   printf("uri_len(%u)\n", uri_len); fflush(stdout);
   printf("uri_str(\"%s\")\n", uri_str); fflush(stdout);
 
+  free(uri_str);
+
   return HSA_STATUS_SUCCESS;
 }