Remove roctracer_hcc.h

roctracer_hip.h now contains the definitions for the HCC_OPS domain.

Change-Id: I132c993110254050aaa68828f3ca80f368ad24bc

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

doc/roctracer_spec.md

@@ -390,7 +390,6 @@ void roctracer_stop();
 ### 4.1. HIP API and HCC ops, GPU Activity Tracing
 ```
 #include <roctracer_hip.h>
-#include <roctracer_hcc.h>
 
 // HIP API callback function
 void hip_api_callback(
@@ -611,7 +610,6 @@ int main() {
 // HIP/HCC Callbacks/Activity tracing
 /////////////////////////////////////////////////////////////////////////////
 #include <roctracer_hip.h>
-#include <roctracer_hcc.h>
 
 // Macro to check ROC-tracer calls status
 #define ROCTRACER_CALL(call)                                               \

inc/roctracer_hcc.h

@@ -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 <roctracer.h>
-
-#endif  // INC_ROCTRACER_HCC_H_

inc/roctracer_hip.h

@@ -41,6 +41,8 @@ inline static std::ostream& operator<<(std::ostream& out, const char& v) {
 
 #include <roctracer.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  // __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

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<HccApi> Loader;

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"

test/MatrixTranspose_test/MatrixTranspose.cpp

@@ -237,7 +237,6 @@ int main() {
 //
 #if 1
 #include <roctracer_hip.h>
-#include <roctracer_hcc.h>
 #include <roctracer_hsa.h>
 #include <roctracer_roctx.h>
 

test/tool/tracer_tool.cpp

@@ -36,7 +36,6 @@
 #include <roctracer_roctx.h>
 #include <roctracer_hsa.h>
 #include <roctracer_hip.h>
-#include <roctracer_hcc.h>
 #include <ext/hsa_rt_utils.hpp>
 
 #include "src/core/loader.h"