C compatibility for public headers (#566)

* C compatibility for public headers

- add tests/tools/c-tool.c
  - builds a tool (which does nothing) with C language
  - ensures that tool can be compiled in C
- add tests/c-tool/CMakeLists.txt
  - ensures that tool library build from C is a valid tool
- rocprofiler_counter_info_v0_t is_derived is int instead of bool
  - C does not have bool unless <stdbool.h> is included
- add `include/rocprofiler-sdk/hsa/api_trace_version.h
  - handles providing HSA_*_TABLE_(MAJOR|STEP)_VERSION values if compiled from C
- cmake define in version.h.in for ROCPROFILER_HSA_*_TABLE_(MAJOR|STEP)_VERSION
  - HSA table versions compiled with
- use rocprofiler_(hsa|hip|marker)_api_no_args struct to handle incompatibility b/t empty structs in C vs. C++ (size of 0 vs. size of 1)
- extern "C" in include/rocprofiler-sdk/{hsa,hip,marker}/api_args.h
- fixed spelling error: derrived -> derived
- scope YY_NO_INPUT compile definition to lib/rocprofiler-sdk/counters/parser/*

* Revert CDash dashboard
This commit is contained in:
Jonathan R. Madsen
2024-02-29 23:49:54 -06:00
committed by GitHub
orang tua 31dcfabe23
melakukan a1267e1fd2
27 mengubah file dengan 432 tambahan dan 23 penghapusan
+3 -3
Melihat File
@@ -531,11 +531,11 @@ typedef struct
*/
typedef struct
{
int is_derived; ///< If this counter is a derived counter
const char* name; ///< Name of the counter
const char* description; ///< Description of the counter
bool is_derived; ///< If this counter is a derrived counter
const char* block; ///< Block of the counter (non-derrived only)
const char* expression; ///< Counter expression (derrived counters only)
const char* block; ///< Block of the counter (non-derived only)
const char* expression; ///< Counter expression (derived counters only)
} rocprofiler_counter_info_v0_t;
/**
@@ -23,6 +23,7 @@
#pragma once
#include <rocprofiler-sdk/defines.h>
#include <rocprofiler-sdk/version.h>
#include <hip/hip_runtime.h>
#include <hip/hip_runtime_api.h>
@@ -30,6 +31,18 @@
// must be included after
#include <hip/hip_deprecated.h>
#include <hip/amd_detail/amd_hip_gl_interop.h>
ROCPROFILER_EXTERN_C_INIT
// Empty struct has a size of 0 in C but size of 1 in C++.
// This struct is added to the union members which represent
// functions with no arguments to ensure ABI compatibility
typedef struct rocprofiler_hip_api_no_args
{
char empty;
} rocprofiler_hip_api_no_args;
typedef union rocprofiler_hip_api_retval_u
{
int int_retval;
@@ -277,6 +290,9 @@ typedef union rocprofiler_hip_api_args_u
} hipCtxSetSharedMemConfig;
struct
{
// Empty struct has a size of 0 in C but size of 1 in C++.
// Add the rocprofiler_hip_api_no_args struct to fix this
rocprofiler_hip_api_no_args no_args;
} hipCtxSynchronize;
struct
{
@@ -419,6 +435,9 @@ typedef union rocprofiler_hip_api_args_u
} hipDevicePrimaryCtxSetFlags;
struct
{
// Empty struct has a size of 0 in C but size of 1 in C++.
// Add the rocprofiler_hip_api_no_args struct to fix this
rocprofiler_hip_api_no_args no_args;
} hipDeviceReset;
struct
{
@@ -446,6 +465,9 @@ typedef union rocprofiler_hip_api_args_u
} hipDeviceSetSharedMemConfig;
struct
{
// Empty struct has a size of 0 in C but size of 1 in C++.
// Add the rocprofiler_hip_api_no_args struct to fix this
rocprofiler_hip_api_no_args no_args;
} hipDeviceSynchronize;
struct
{
@@ -668,6 +690,9 @@ typedef union rocprofiler_hip_api_args_u
} hipGetErrorString;
struct
{
// Empty struct has a size of 0 in C but size of 1 in C++.
// Add the rocprofiler_hip_api_no_args struct to fix this
rocprofiler_hip_api_no_args no_args;
} hipGetLastError;
struct
{
@@ -2045,6 +2070,9 @@ typedef union rocprofiler_hip_api_args_u
} hipOccupancyMaxPotentialBlockSize;
struct
{
// Empty struct has a size of 0 in C but size of 1 in C++.
// Add the rocprofiler_hip_api_no_args struct to fix this
rocprofiler_hip_api_no_args no_args;
} hipPeekAtLastError;
struct
{
@@ -2065,9 +2093,15 @@ typedef union rocprofiler_hip_api_args_u
} hipPointerSetAttribute;
struct
{
// Empty struct has a size of 0 in C but size of 1 in C++.
// Add the rocprofiler_hip_api_no_args struct to fix this
rocprofiler_hip_api_no_args no_args;
} hipProfilerStart;
struct
{
// Empty struct has a size of 0 in C but size of 1 in C++.
// Add the rocprofiler_hip_api_no_args struct to fix this
rocprofiler_hip_api_no_args no_args;
} hipProfilerStop;
struct
{
@@ -2736,3 +2770,5 @@ typedef union rocprofiler_hip_api_args_u
// hipCtx_t ctx;
// } hipDrvGraphAddMemsetNode;
} rocprofiler_hip_api_args_t;
ROCPROFILER_EXTERN_C_FINI
+4 -2
Melihat File
@@ -32,12 +32,14 @@
# endif
#endif
#include <hsa/hsa.h>
#include <rocprofiler-sdk/hsa/api_trace_version.h>
#include <rocprofiler-sdk/hsa/api_args.h>
#include <rocprofiler-sdk/hsa/api_id.h>
#include <rocprofiler-sdk/hsa/table_id.h>
#include <hsa/hsa.h>
#if defined(ROCPROFILER_DEFINED_AMD_INTERNAL_BUILD) && ROCPROFILER_DEFINED_AMD_INTERNAL_BUILD > 0
# undef AMD_INTERNAL_BUILD
#endif
@@ -3,8 +3,9 @@
# Installation of public HSA headers
#
#
set(ROCPROFILER_HSA_HEADER_FILES amd_ext_api_id.h api_args.h api_id.h core_api_id.h
finalize_ext_api_id.h image_ext_api_id.h table_id.h)
set(ROCPROFILER_HSA_HEADER_FILES
amd_ext_api_id.h api_args.h api_id.h api_trace_version.h core_api_id.h
finalize_ext_api_id.h image_ext_api_id.h table_id.h)
install(
FILES ${ROCPROFILER_HSA_HEADER_FILES}
@@ -22,6 +22,7 @@
#pragma once
#include <rocprofiler-sdk/hsa/api_trace_version.h>
#include <rocprofiler-sdk/version.h>
/**
@@ -22,14 +22,25 @@
#pragma once
#include <rocprofiler-sdk/defines.h>
#include <rocprofiler-sdk/hsa/api_trace_version.h>
#include <rocprofiler-sdk/version.h>
#include <hsa/hsa.h>
#include <hsa/hsa_api_trace.h>
#include <hsa/hsa_ext_amd.h>
#include <hsa/hsa_ext_finalize.h>
#include <hsa/hsa_ext_image.h>
ROCPROFILER_EXTERN_C_INIT
// Empty struct has a size of 0 in C but size of 1 in C++.
// This struct is added to the union members which represent
// functions with no arguments to ensure ABI compatibility
typedef struct rocprofiler_hsa_api_no_args
{
char empty;
} rocprofiler_hsa_api_no_args;
typedef union rocprofiler_hsa_api_retval_u
{
uint64_t uint64_t_retval;
@@ -38,18 +49,38 @@ typedef union rocprofiler_hsa_api_retval_u
hsa_status_t hsa_status_t_retval;
} rocprofiler_hsa_api_retval_t;
// the following hsa_* typedefs are only in hsa/hsa_api_trace.h but we cannot include that file here
// because it is not C-compatible
typedef hsa_status_t (*hsa_ext_program_iterate_modules_cb_t)(hsa_ext_program_t program,
hsa_ext_module_t module,
void* data);
typedef void (*hsa_amd_queue_intercept_packet_writer)(const void* pkts, uint64_t pkt_count);
typedef void (*hsa_amd_queue_intercept_handler)(const void* pkts,
uint64_t pkt_count,
uint64_t user_pkt_index,
void* data,
hsa_amd_queue_intercept_packet_writer writer);
typedef void (*hsa_amd_runtime_queue_notifier)(const hsa_queue_t* queue,
hsa_agent_t agent,
void* data);
typedef union rocprofiler_hsa_api_args_u
{
// block: CoreApi API
struct
{
// Empty struct has a size of 0 in C but size of 1 in C++.
// Add the rocprofiler_hsa_api_no_args struct to fix this
rocprofiler_hsa_api_no_args no_args;
} hsa_init;
struct
{
// Empty struct has a size of 0 in C but size of 1 in C++.
// Add the rocprofiler_hsa_api_no_args struct to fix this
rocprofiler_hsa_api_no_args no_args;
} hsa_shut_down;
struct
{
@@ -1360,3 +1391,5 @@ typedef union rocprofiler_hsa_api_args_u
# endif
#endif
} rocprofiler_hsa_api_args_t;
ROCPROFILER_EXTERN_C_FINI
@@ -0,0 +1,121 @@
// MIT License
//
// Copyright (c) 2023 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 <rocprofiler-sdk/version.h>
#if defined(__cplusplus)
# include <hsa/hsa_api_trace.h> // safe to include from C++
#elif defined(__has_include)
# if __has_include(<hsa/hsa_api_trace_version.h>)
# include <hsa/hsa_api_trace_version.h>
# endif
#endif
#ifndef HSA_API_TABLE_MAJOR_VERSION
# ifdef ROCPROFILER_HSA_API_TABLE_MAJOR_VERSION
# define HSA_API_TABLE_MAJOR_VERSION ROCPROFILER_HSA_API_TABLE_MAJOR_VERSION
# endif
#endif
#ifndef HSA_CORE_API_TABLE_MAJOR_VERSION
# ifdef ROCPROFILER_HSA_CORE_API_TABLE_MAJOR_VERSION
# define HSA_CORE_API_TABLE_MAJOR_VERSION ROCPROFILER_HSA_CORE_API_TABLE_MAJOR_VERSION
# endif
#endif
#ifndef HSA_AMD_EXT_API_TABLE_MAJOR_VERSION
# ifdef ROCPROFILER_HSA_AMD_EXT_API_TABLE_MAJOR_VERSION
# define HSA_AMD_EXT_API_TABLE_MAJOR_VERSION ROCPROFILER_HSA_AMD_EXT_API_TABLE_MAJOR_VERSION
# endif
#endif
#ifndef HSA_FINALIZER_API_TABLE_MAJOR_VERSION
# ifdef ROCPROFILER_HSA_FINALIZER_API_TABLE_MAJOR_VERSION
# define HSA_FINALIZER_API_TABLE_MAJOR_VERSION \
ROCPROFILER_HSA_FINALIZER_API_TABLE_MAJOR_VERSION
# endif
#endif
#ifndef HSA_IMAGE_API_TABLE_MAJOR_VERSION
# ifdef ROCPROFILER_HSA_IMAGE_API_TABLE_MAJOR_VERSION
# define HSA_IMAGE_API_TABLE_MAJOR_VERSION ROCPROFILER_HSA_IMAGE_API_TABLE_MAJOR_VERSION
# endif
#endif
#ifndef HSA_AQLPROFILE_API_TABLE_MAJOR_VERSION
# ifdef ROCPROFILER_HSA_AQLPROFILE_API_TABLE_MAJOR_VERSION
# define HSA_AQLPROFILE_API_TABLE_MAJOR_VERSION \
ROCPROFILER_HSA_AQLPROFILE_API_TABLE_MAJOR_VERSION
# endif
#endif
#ifndef HSA_TOOLS_API_TABLE_MAJOR_VERSION
# ifdef ROCPROFILER_HSA_TOOLS_API_TABLE_MAJOR_VERSION
# define HSA_TOOLS_API_TABLE_MAJOR_VERSION ROCPROFILER_HSA_TOOLS_API_TABLE_MAJOR_VERSION
# endif
#endif
#ifndef HSA_API_TABLE_STEP_VERSION
# ifdef ROCPROFILER_HSA_API_TABLE_STEP_VERSION
# define HSA_API_TABLE_STEP_VERSION ROCPROFILER_HSA_API_TABLE_STEP_VERSION
# endif
#endif
#ifndef HSA_CORE_API_TABLE_STEP_VERSION
# ifdef ROCPROFILER_HSA_CORE_API_TABLE_STEP_VERSION
# define HSA_CORE_API_TABLE_STEP_VERSION ROCPROFILER_HSA_CORE_API_TABLE_STEP_VERSION
# endif
#endif
#ifndef HSA_AMD_EXT_API_TABLE_STEP_VERSION
# ifdef ROCPROFILER_HSA_AMD_EXT_API_TABLE_STEP_VERSION
# define HSA_AMD_EXT_API_TABLE_STEP_VERSION ROCPROFILER_HSA_AMD_EXT_API_TABLE_STEP_VERSION
# endif
#endif
#ifndef HSA_FINALIZER_API_TABLE_STEP_VERSION
# ifdef ROCPROFILER_HSA_FINALIZER_API_TABLE_STEP_VERSION
# define HSA_FINALIZER_API_TABLE_STEP_VERSION \
ROCPROFILER_HSA_FINALIZER_API_TABLE_STEP_VERSION
# endif
#endif
#ifndef HSA_IMAGE_API_TABLE_STEP_VERSION
# ifdef ROCPROFILER_HSA_IMAGE_API_TABLE_STEP_VERSION
# define HSA_IMAGE_API_TABLE_STEP_VERSION ROCPROFILER_HSA_IMAGE_API_TABLE_STEP_VERSION
# endif
#endif
#ifndef HSA_AQLPROFILE_API_TABLE_STEP_VERSION
# ifdef ROCPROFILER_HSA_AQLPROFILE_API_TABLE_STEP_VERSION
# define HSA_AQLPROFILE_API_TABLE_STEP_VERSION \
ROCPROFILER_HSA_AQLPROFILE_API_TABLE_STEP_VERSION
# endif
#endif
#ifndef HSA_TOOLS_API_TABLE_STEP_VERSION
# ifdef ROCPROFILER_HSA_TOOLS_API_TABLE_STEP_VERSION
# define HSA_TOOLS_API_TABLE_STEP_VERSION ROCPROFILER_HSA_TOOLS_API_TABLE_STEP_VERSION
# endif
#endif
@@ -22,11 +22,24 @@
#pragma once
#include <rocprofiler-sdk/defines.h>
#include <rocprofiler-sdk/version.h>
#include <rocprofiler-sdk-roctx/api_trace.h>
#include <rocprofiler-sdk-roctx/types.h>
#include <stdint.h>
ROCPROFILER_EXTERN_C_INIT
// Empty struct has a size of 0 in C but size of 1 in C++.
// This struct is added to the union members which represent
// functions with no arguments to ensure ABI compatibility
typedef struct rocprofiler_marker_api_no_args
{
char empty;
} rocprofiler_marker_api_no_args;
typedef union rocprofiler_marker_api_retval_u
{
int32_t int32_t_retval;
@@ -46,6 +59,9 @@ typedef union rocprofiler_marker_api_args_u
} roctxRangePushA;
struct
{
// Empty struct has a size of 0 in C but size of 1 in C++.
// Add the rocprofiler_marker_api_no_args struct to fix this
rocprofiler_marker_api_no_args no_args;
} roctxRangePop;
struct
{
@@ -87,3 +103,5 @@ typedef union rocprofiler_marker_api_args_u
const struct ihipStream_t* stream;
} roctxNameHipStream;
} rocprofiler_marker_api_args_t;
ROCPROFILER_EXTERN_C_FINI
@@ -105,6 +105,22 @@
#define ROCPROFILER_HSA_RUNTIME_VERSION_MAJOR @HSA_RUNTIME_VERSION_MAJOR@
#define ROCPROFILER_HSA_RUNTIME_VERSION_MINOR @HSA_RUNTIME_VERSION_MINOR@
#cmakedefine ROCPROFILER_HSA_API_TABLE_MAJOR_VERSION @ROCPROFILER_HSA_API_TABLE_MAJOR_VERSION@
#cmakedefine ROCPROFILER_HSA_CORE_API_TABLE_MAJOR_VERSION @ROCPROFILER_HSA_CORE_API_TABLE_MAJOR_VERSION@
#cmakedefine ROCPROFILER_HSA_AMD_EXT_API_TABLE_MAJOR_VERSION @ROCPROFILER_HSA_AMD_EXT_API_TABLE_MAJOR_VERSION@
#cmakedefine ROCPROFILER_HSA_FINALIZER_API_TABLE_MAJOR_VERSION @ROCPROFILER_HSA_FINALIZER_API_TABLE_MAJOR_VERSION@
#cmakedefine ROCPROFILER_HSA_IMAGE_API_TABLE_MAJOR_VERSION @ROCPROFILER_HSA_IMAGE_API_TABLE_MAJOR_VERSION@
#cmakedefine ROCPROFILER_HSA_AQLPROFILE_API_TABLE_MAJOR_VERSION @ROCPROFILER_HSA_AQLPROFILE_API_TABLE_MAJOR_VERSION@
#cmakedefine ROCPROFILER_HSA_TOOLS_API_TABLE_MAJOR_VERSION @ROCPROFILER_HSA_TOOLS_API_TABLE_MAJOR_VERSION@
#cmakedefine ROCPROFILER_HSA_API_TABLE_STEP_VERSION @ROCPROFILER_HSA_API_TABLE_STEP_VERSION@
#cmakedefine ROCPROFILER_HSA_CORE_API_TABLE_STEP_VERSION @ROCPROFILER_HSA_CORE_API_TABLE_STEP_VERSION@
#cmakedefine ROCPROFILER_HSA_AMD_EXT_API_TABLE_STEP_VERSION @ROCPROFILER_HSA_AMD_EXT_API_TABLE_STEP_VERSION@
#cmakedefine ROCPROFILER_HSA_FINALIZER_API_TABLE_STEP_VERSION @ROCPROFILER_HSA_FINALIZER_API_TABLE_STEP_VERSION@
#cmakedefine ROCPROFILER_HSA_IMAGE_API_TABLE_STEP_VERSION @ROCPROFILER_HSA_IMAGE_API_TABLE_STEP_VERSION@
#cmakedefine ROCPROFILER_HSA_AQLPROFILE_API_TABLE_STEP_VERSION @ROCPROFILER_HSA_AQLPROFILE_API_TABLE_STEP_VERSION@
#cmakedefine ROCPROFILER_HSA_TOOLS_API_TABLE_STEP_VERSION @ROCPROFILER_HSA_TOOLS_API_TABLE_STEP_VERSION@
// clang-format on
#define ROCPROFILER_VERSION \