AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove remaining roctracer references (#82)

Browse Source
This commit is contained in:
David Galiffi
2025-02-07 23:27:58 -05:00
committed by GitHub
parent b3eee295dd
commit e437200e9e
25 changed files with 254 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/bin/rocprof-sys-instrument/internal_libs.cpp
+2 -2
View File
@@ -320,13 +320,13 @@ get_internal_basic_libs_impl()
"libunwind-setjmp.so",
"libunwind.so",
"libunwind-x86_64.so",
"libpapi.so",
"libpfm.so",
"librocm_smi64.so",
"libroctx64.so",
"librocmtools.so",
"libroctracer64.so",
"librocprofiler64.so",
"libpapi.so",
"libpfm.so",
"librocprofiler-register.so",
"librocprofiler-sdk.so",
"librocprofiler-sdk-roctx.so",
source/bin/rocprof-sys-instrument/rocprof-sys-instrument.cpp
+2 -2
View File
@@ -360,8 +360,8 @@ main(int argc, char** argv)
itr, std::regex{
"lib(dyninstAPI|stackwalk|pcontrol|patchAPI|parseAPI|"
"instructionAPI|symtabAPI|dynDwarf|common|dynElf|tbb|tbbmalloc|"
"tbbmalloc_proxy|gotcha|libunwind|roctracer64|hsa-runtime|amdhip|"
"amd_comgr|rocm_smi64|rocprofiler64|rocprofiler-register|"
"tbbmalloc_proxy|gotcha|libunwind|hsa-runtime|amdhip|"
"amd_comgr|rocm_smi64|rocprofiler-register|"
"rocprofiler-sdk|rocprofiler-sdk-roctx|amd_smi)\\.(so|a)" }))
{
if(!find(filepath::dirname(itr), lib_search_paths))
source/bin/rocprof-sys-sample/impl.cpp
+5 -14
View File
@@ -713,20 +713,11 @@ parse_args(int argc, char** argv, std::vector<char*>& _env)
}
});
std::set<std::string> _backend_choices = { "all",
"kokkosp",
"mpip",
"ompt",
"rcclp",
"rocm-smi",
"roctracer",
"rocprofiler",
"roctx",
"mutex-locks",
"spin-locks",
"rw-locks",
"rocprofiler-sdk",
"rocm" };
std::set<std::string> _backend_choices = {
"all", "kokkosp", "mpip", "ompt",
"rcclp", "rocm-smi", "mutex-locks", "spin-locks",
"rw-locks", "rocprofiler-sdk", "rocm"
};
#if !defined(ROCPROFSYS_USE_MPI) && !defined(ROCPROFSYS_USE_MPI_HEADERS)
_backend_choices.erase("mpip");
source/lib/core/argparse.cpp
+4 -3
View File
@@ -543,9 +543,10 @@ add_core_arguments(parser_t& _parser, parser_data& _data)
_data.processed_environs.emplace("periods");
}
strset_t _backend_choices = { "all", "kokkosp", "mpip", "ompt",
"rcclp", "rocm-smi", "roctracer", "rocprofiler",
"roctx", "mutex-locks", "spin-locks", "rw-locks" };
strset_t _backend_choices = {
"all", "kokkosp", "mpip", "ompt", "rcclp",
"rocm-smi", "rocprofiler-sdk", "mutex-locks", "spin-locks", "rw-locks"
};
#if !defined(ROCPROFSYS_USE_MPI) && !defined(ROCPROFSYS_USE_MPI_HEADERS)
_backend_choices.erase("mpip");
source/lib/core/components/fwd.hpp
-12
View File
@@ -39,8 +39,6 @@
#include <type_traits>
ROCPROFSYS_DECLARE_COMPONENT(roctracer)
ROCPROFSYS_DECLARE_COMPONENT(rocprofiler)
ROCPROFSYS_DECLARE_COMPONENT(rcclp_handle)
ROCPROFSYS_DECLARE_COMPONENT(comm_data)
@@ -127,12 +125,6 @@ ROCPROFSYS_DEFINE_CONCRETE_TRAIT(is_available, component::sampling_gpu_memory, f
ROCPROFSYS_DEFINE_CONCRETE_TRAIT(is_available, component::sampling_gpu_vcn, false_type)
#endif
TIMEMORY_SET_COMPONENT_API(rocprofsys::component::roctracer, project::rocprofsys,
tpls::rocm, device::gpu, os::supports_linux,
category::external)
TIMEMORY_SET_COMPONENT_API(rocprofsys::component::rocprofiler, project::rocprofsys,
tpls::rocm, device::gpu, os::supports_linux,
category::external, category::hardware_counter)
TIMEMORY_SET_COMPONENT_API(rocprofsys::component::sampling_wall_clock,
project::rocprofsys, category::timing, os::supports_unix,
category::sampling, category::interrupt_sampling)
@@ -160,10 +152,6 @@ TIMEMORY_SET_COMPONENT_API(rocprofsys::component::sampling_gpu_vcn, project::roc
tpls::rocm, device::gpu, os::supports_linux,
category::sampling, category::process_sampling)
TIMEMORY_METADATA_SPECIALIZATION(rocprofsys::component::roctracer, "roctracer",
"High-precision ROCm API and kernel tracing", "")
TIMEMORY_METADATA_SPECIALIZATION(rocprofsys::component::rocprofiler, "rocprofiler",
"ROCm kernel hardware counters", "")
TIMEMORY_METADATA_SPECIALIZATION(rocprofsys::component::sampling_wall_clock,
"sampling_wall_clock", "Wall-clock timing",
"Derived from statistical sampling")
source/lib/core/hip_runtime.hpp
-51
View File
@@ -1,51 +0,0 @@
// MIT License
//
// Copyright (c) 2022-2025 Advanced Micro Devices, Inc. All Rights Reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in all
// copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
// SOFTWARE.
#pragma once
#include "core/defines.hpp"
#if defined(ROCPROFSYS_USE_ROCM) && ROCPROFSYS_USE_ROCM > 0
# if defined(HIP_INCLUDE_HIP_HIP_RUNTIME_H) || \
defined(HIP_INCLUDE_HIP_HIP_RUNTIME_API_H)
# error \
"include core/hip_runtime.hpp before <hip/hip_runtime.h> or <hip/hip_runtime_api.h>"
# endif
# define HIP_PROF_HIP_API_STRING 1
// following must be included before <roctracer_hip.h> for ROCm 6.0+
# if defined(USE_PROF_API)
# undef USE_PROF_API
# endif
# include <hip/hip_runtime.h>
# include <hip/hip_runtime_api.h>
// must be included after hip_runtime_api.h
# include <hip/hip_deprecated.h>
// must be included after hip_runtime_api.h
# include <roctracer/hip_ostream_ops.h>
// must be included after hip_runtime_api.h
# include <hip/amd_detail/hip_prof_str.h>
# include <hip/hip_version.h>
#endif
source/lib/rocprof-sys/library/components/backtrace.cpp
-1
View File
@@ -126,7 +126,6 @@ backtrace::filter_and_patch(const std::vector<entry_type>& _data)
if(_lbl.find("DYNINST_") != _npos) return 0;
if(_lbl.find("rocprofsys_") != _npos) return -1;
if(_lbl.find("rocprofiler_") != _npos) return -1;
if(_lbl.find("roctracer_") != _npos) return -1;
if(_lbl.find("perfetto::") != _npos) return -1;
if(_lbl.find("protozero::") == 0) return -1;
if(_lbl.find("gotcha_") != _npos) return -1;
source/lib/rocprof-sys/library/components/pthread_create_gotcha.cpp
+1 -1
View File
@@ -121,7 +121,7 @@ stop_bundle(bundle_t& _bundle, int64_t _tid, Args&&... _args)
{
auto _wc = *_bundle.get<comp::wall_clock>();
_wc.stop();
// update roctracer_data
// update data
_bundle.store(std::plus<double>{}, _wc.get() * _wc.unit());
// stop all
_bundle.stop();
source/lib/rocprof-sys/library/ptl.cpp
-51
View File
@@ -116,19 +116,6 @@ get_thread_pool_state()
} // namespace
} // namespace general
namespace roctracer
{
namespace
{
auto&
get_thread_pool_state()
{
static auto _v = State::PreInit;
return _v;
}
} // namespace
} // namespace roctracer
void
setup()
{
@@ -140,17 +127,6 @@ setup()
void
join()
{
if(roctracer::get_thread_pool_state() == State::Active)
{
ROCPROFSYS_DEBUG_F("waiting for all roctracer tasks to complete...\n");
for(size_t i = 0; i < thread_info::get_peak_num_threads(); ++i)
roctracer::get_task_group(i).join();
}
else
{
ROCPROFSYS_DEBUG_F("roctracer thread-pool is not active...\n");
}
if(general::get_thread_pool_state() == State::Active)
{
ROCPROFSYS_DEBUG_F("waiting for all general tasks to complete...\n");
@@ -162,22 +138,6 @@ join()
void
shutdown()
{
if(roctracer::get_thread_pool_state() == State::Active)
{
ROCPROFSYS_DEBUG_F("Waiting on completion of roctracer tasks...\n");
for(size_t i = 0; i < thread_info::get_peak_num_threads(); ++i)
{
roctracer::get_task_group(i).join();
roctracer::get_task_group(i).clear();
roctracer::get_task_group(i).set_pool(nullptr);
}
roctracer::get_thread_pool_state() = State::Finalized;
}
else
{
ROCPROFSYS_DEBUG_F("roctracer thread-pool is not active...\n");
}
if(general::get_thread_pool_state() == State::Active)
{
ROCPROFSYS_DEBUG_F("Waiting on completion of general tasks...\n");
@@ -219,16 +179,5 @@ general::get_task_group(int64_t _tid)
return *_v;
}
PTL::TaskGroup<void>&
roctracer::get_task_group(int64_t _tid)
{
struct local
{};
using thread_data_t = thread_data<PTL::TaskGroup<void>, local>;
static thread_local auto& _v = (roctracer::get_thread_pool_state() = State::Active,
thread_data_t::instance(construct_on_thread{ _tid },
&tasking::get_thread_pool()));
return *_v;
}
} // namespace tasking
} // namespace rocprofsys
source/lib/rocprof-sys/library/ptl.hpp
-11
View File
@@ -56,16 +56,5 @@ PTL::TaskGroup<void>&
get_task_group(int64_t _tid = utility::get_thread_index());
}
//--------------------------------------------------------------------------------------//
//
// roctracer
//
//--------------------------------------------------------------------------------------//
namespace roctracer
{
PTL::TaskGroup<void>&
get_task_group(int64_t _tid = utility::get_thread_index());
} // namespace roctracer
} // namespace tasking
} // namespace rocprofsys
source/lib/rocprof-sys/library/thread_info.hpp
+1 -1
View File
@@ -39,7 +39,7 @@ namespace rocprofsys
// InternalTID: zero-based, process-local thread-ID from atomic increment
// from user-created threads and rocprof-sys-created threads.
// This value may vary based on threads created by different
// backends, e.g., roctracer will create threads
// backends.
//
// SystemTID: system thread-ID. Should be same value as what is seen
// in debugger, etc.