From 08e0bca56736fa6cd5a85d66fffb347510decf22 Mon Sep 17 00:00:00 2001 From: Ramesh Errabolu Date: Sat, 27 May 2017 17:36:08 -0500 Subject: [PATCH] Support Perf Cntrs (PMC) and Thread Trace (SQTT) over AQL queues Change-Id: I716b722895d90b46914c31377e791ad602acecc1 --- runtime/hsa-runtime-tools/CMakeLists.txt | 2 ++ runtime/hsa-runtime/core/util/flag.h | 19 ------------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/runtime/hsa-runtime-tools/CMakeLists.txt b/runtime/hsa-runtime-tools/CMakeLists.txt index 1ec569fc87..1d40d6eb48 100755 --- a/runtime/hsa-runtime-tools/CMakeLists.txt +++ b/runtime/hsa-runtime-tools/CMakeLists.txt @@ -146,6 +146,8 @@ set ( DEBUGGER_SRC ${TOOLS_SOURCE_DIR}/debugger/cwsr_trapstring_perf.cpp set ( INTERCEPT_SRC ${TOOLS_SOURCE_DIR}/intercept/amd_sw_aql_command_processor.cpp ${TOOLS_SOURCE_DIR}/intercept/hsa_amd_tools.cpp + ${TOOLS_SOURCE_DIR}/intercept/aql_pm4_factory.cpp + ${TOOLS_SOURCE_DIR}/intercept/aql_proxy_queue.cpp ${TOOLS_SOURCE_DIR}/intercept/profiler.cpp ) set ( PROFILER_SRC ${TOOLS_SOURCE_DIR}/profiler/gpu_countergroup.cpp diff --git a/runtime/hsa-runtime/core/util/flag.h b/runtime/hsa-runtime/core/util/flag.h index d7add470c5..ce256e6bdd 100644 --- a/runtime/hsa-runtime/core/util/flag.h +++ b/runtime/hsa-runtime/core/util/flag.h @@ -69,18 +69,9 @@ class Flag { var = os::GetEnvVar("HSA_ENABLE_INTERRUPT"); enable_interrupt_ = (var == "0") ? false : true; - var = os::GetEnvVar("HSA_ENABLE_THREAD_TRACE"); - enable_thread_trace_ = (var == "1") ? true : false; - - var = os::GetEnvVar("HSA_THREAD_TRACE_MEM_SIZE"); - thread_trace_buff_size_ = atoi(var.c_str()); - var = os::GetEnvVar("HSA_ENABLE_SDMA"); enable_sdma_ = (var == "0") ? false : true; - var = os::GetEnvVar("HSA_EMULATE_AQL"); - emulate_aql_ = (var == "1") ? true : false; - var = os::GetEnvVar("HSA_RUNNING_UNDER_VALGRIND"); running_valgrind_ = (var == "1") ? true : false; @@ -104,14 +95,8 @@ class Flag { bool enable_interrupt() const { return enable_interrupt_; } - bool enable_thread_trace() const { return enable_thread_trace_; } - - bool thread_trace_buff_size() const { return thread_trace_buff_size_; } - bool enable_sdma() const { return enable_sdma_; } - bool emulate_aql() const { return emulate_aql_; } - bool running_valgrind() const { return running_valgrind_; } bool sdma_wait_idle() const { return sdma_wait_idle_; } @@ -127,14 +112,10 @@ class Flag { bool enable_vm_fault_message_; bool enable_interrupt_; bool enable_sdma_; - bool emulate_aql_; bool running_valgrind_; bool sdma_wait_idle_; bool enable_queue_fault_message_; - bool enable_thread_trace_; - size_t thread_trace_buff_size_; - uint32_t max_queues_; size_t scratch_mem_size_;