From da4b2448875c4919bd69c2a08c0f67a7d1b7535a Mon Sep 17 00:00:00 2001 From: Evgeny Date: Thu, 21 May 2020 11:51:17 -0500 Subject: [PATCH] renaming PCSAMPLE API as RESERVED1 Change-Id: I0f95e4be5b359dc36fc3542bf0e321094db78a79 --- inc/roctracer_hsa.h | 2 +- test/MatrixTranspose_test/MatrixTranspose.cpp | 2 +- test/tool/tracer_tool.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/roctracer_hsa.h b/inc/roctracer_hsa.h index 2704850646..26fb8a971e 100644 --- a/inc/roctracer_hsa.h +++ b/inc/roctracer_hsa.h @@ -33,7 +33,7 @@ enum hsa_op_id_t { HSA_OP_ID_DISPATCH = 0, HSA_OP_ID_COPY = 1, HSA_OP_ID_BARRIER = 2, - HSA_OP_ID_PCSAMPLE = 3, + HSA_OP_ID_RESERVED1 = 3, HSA_OP_ID_NUMBER = 4 }; diff --git a/test/MatrixTranspose_test/MatrixTranspose.cpp b/test/MatrixTranspose_test/MatrixTranspose.cpp index c529404ed1..94c872f6b3 100644 --- a/test/MatrixTranspose_test/MatrixTranspose.cpp +++ b/test/MatrixTranspose_test/MatrixTranspose.cpp @@ -374,7 +374,7 @@ void init_tracing() { #endif ROCTRACER_CALL(roctracer_enable_domain_activity(ACTIVITY_DOMAIN_HCC_OPS)); // Enable PC sampling - ROCTRACER_CALL(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HSA_OPS, HSA_OP_ID_PCSAMPLE)); + ROCTRACER_CALL(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HSA_OPS, HSA_OP_ID_RESERVED1)); // Enable KFD API tracing ROCTRACER_CALL(roctracer_enable_domain_callback(ACTIVITY_DOMAIN_KFD_API, api_callback, NULL)); // Enable rocTX diff --git a/test/tool/tracer_tool.cpp b/test/tool/tracer_tool.cpp index dea72aa8d3..b14c9dd154 100644 --- a/test/tool/tracer_tool.cpp +++ b/test/tool/tracer_tool.cpp @@ -518,7 +518,7 @@ void pool_activity_callback(const char* begin, const char* end, void* arg) { fflush(hcc_activity_file_handle); break; case ACTIVITY_DOMAIN_HSA_OPS: - if (record->op == HSA_OP_ID_PCSAMPLE) { + if (record->op == HSA_OP_ID_RESERVED1) { fprintf(pc_sample_file_handle, "%u %lu 0x%lx %s\n", record->pc_sample.se, record->pc_sample.cycle, record->pc_sample.pc, name); fflush(pc_sample_file_handle); @@ -955,8 +955,8 @@ extern "C" PUBLIC_API bool OnLoad(HsaApiTable* table, uint64_t runtime_version, if (trace_pcs) { fprintf(stdout, " PCS-trace()\n"); fflush(stdout); open_tracing_pool(); - pc_sample_file_handle = open_output_file(output_prefix, "pc_sample_trace.txt"); - ROCTRACER_CALL(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HSA_OPS, HSA_OP_ID_PCSAMPLE)); + pc_sample_file_handle = open_output_file(output_prefix, "pcs_trace.txt"); + ROCTRACER_CALL(roctracer_enable_op_activity(ACTIVITY_DOMAIN_HSA_OPS, HSA_OP_ID_RESERVED1)); } ONLOAD_TRACE_END();