diff --git a/projects/roctracer/CMakeLists.txt b/projects/roctracer/CMakeLists.txt index b30adb3b16..e77573c7fe 100644 --- a/projects/roctracer/CMakeLists.txt +++ b/projects/roctracer/CMakeLists.txt @@ -89,7 +89,6 @@ set ( PUBLIC_HEADERS roctx.h roctracer.h roctracer_ext.h - roctracer_hcc.h roctracer_hip.h roctracer_hsa.h roctracer_roctx.h diff --git a/projects/roctracer/doc/roctracer_spec.md b/projects/roctracer/doc/roctracer_spec.md index 33666bd97d..88629e9af9 100644 --- a/projects/roctracer/doc/roctracer_spec.md +++ b/projects/roctracer/doc/roctracer_spec.md @@ -390,7 +390,6 @@ void roctracer_stop(); ### 4.1. HIP API and HCC ops, GPU Activity Tracing ``` #include -#include // HIP API callback function void hip_api_callback( @@ -611,7 +610,6 @@ int main() { // HIP/HCC Callbacks/Activity tracing ///////////////////////////////////////////////////////////////////////////// #include -#include // Macro to check ROC-tracer calls status #define ROCTRACER_CALL(call) \ diff --git a/projects/roctracer/inc/roctracer_hcc.h b/projects/roctracer/inc/roctracer_hcc.h deleted file mode 100644 index 16800bd11c..0000000000 --- a/projects/roctracer/inc/roctracer_hcc.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (c) 2018-2022 Advanced Micro Devices, Inc. - - 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. */ - -#ifndef INC_ROCTRACER_HCC_H_ -#define INC_ROCTRACER_HCC_H_ - -enum { HIP_OP_ID_DISPATCH = 0, HIP_OP_ID_COPY = 1, HIP_OP_ID_BARRIER = 2, HIP_OP_ID_NUMBER = 3 }; - -#ifdef __cplusplus -extern "C" { -#endif -typedef void(hipInitAsyncActivityCallback_t)(void* id_callback, void* op_callback, void* arg); -typedef bool(hipEnableAsyncActivityCallback_t)(unsigned op, bool enable); -typedef const char*(hipGetOpName_t)(unsigned op); -#ifdef __cplusplus -} -#endif - -#include - -#endif // INC_ROCTRACER_HCC_H_ diff --git a/projects/roctracer/inc/roctracer_hip.h b/projects/roctracer/inc/roctracer_hip.h index fc12e6770b..427e01e8d4 100644 --- a/projects/roctracer/inc/roctracer_hip.h +++ b/projects/roctracer/inc/roctracer_hip.h @@ -41,6 +41,8 @@ inline static std::ostream& operator<<(std::ostream& out, const char& v) { #include +enum { HIP_OP_ID_DISPATCH = 0, HIP_OP_ID_COPY = 1, HIP_OP_ID_BARRIER = 2, HIP_OP_ID_NUMBER = 3 }; + #ifdef __cplusplus extern "C" { #endif // __cplusplus @@ -48,6 +50,10 @@ extern "C" { // Traced calls ID enumeration typedef enum hip_api_id_t roctracer_hip_api_cid_t; +typedef void(hipInitAsyncActivityCallback_t)(void* id_callback, void* op_callback, void* arg); +typedef bool(hipEnableAsyncActivityCallback_t)(unsigned op, bool enable); +typedef const char*(hipGetOpName_t)(unsigned op); + #ifdef __cplusplus } // extern "C" block #endif // __cplusplus diff --git a/projects/roctracer/src/core/loader.h b/projects/roctracer/src/core/loader.h index 68906ff1e1..246f0150e5 100644 --- a/projects/roctracer/src/core/loader.h +++ b/projects/roctracer/src/core/loader.h @@ -242,7 +242,7 @@ class HipApi { #endif // HCC runtime library loader class -#include "inc/roctracer_hcc.h" +#include "inc/roctracer_hip.h" class HccApi { public: typedef BaseLoader Loader; diff --git a/projects/roctracer/src/core/roctracer.cpp b/projects/roctracer/src/core/roctracer.cpp index c9e4103a67..9fb92ade3c 100644 --- a/projects/roctracer/src/core/roctracer.cpp +++ b/projects/roctracer/src/core/roctracer.cpp @@ -19,7 +19,6 @@ THE SOFTWARE. */ #include "inc/roctracer.h" -#include "inc/roctracer_hcc.h" #include "inc/roctracer_hip.h" #include "inc/roctracer_ext.h" #include "inc/roctracer_roctx.h" diff --git a/projects/roctracer/test/MatrixTranspose_test/MatrixTranspose.cpp b/projects/roctracer/test/MatrixTranspose_test/MatrixTranspose.cpp index b3a607a32c..35abedff85 100644 --- a/projects/roctracer/test/MatrixTranspose_test/MatrixTranspose.cpp +++ b/projects/roctracer/test/MatrixTranspose_test/MatrixTranspose.cpp @@ -237,7 +237,6 @@ int main() { // #if 1 #include -#include #include #include diff --git a/projects/roctracer/test/tool/tracer_tool.cpp b/projects/roctracer/test/tool/tracer_tool.cpp index d622a968a2..209efe9895 100644 --- a/projects/roctracer/test/tool/tracer_tool.cpp +++ b/projects/roctracer/test/tool/tracer_tool.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include "src/core/loader.h"