Adding HSA_API macro to the API method declarations to be consistent with other HSA header files, TCS removing

Change-Id: Ic217d3b2bdbb22d3600c5ecaacb7ab53bf26096a
This commit is contained in:
Evgeny
2017-08-03 14:34:41 -05:00
zatwierdzone przez Evgeny Shcherbakov
rodzic 783a28b68c
commit 4824a2db0b
@@ -82,30 +82,30 @@ typedef enum {
// each block instance from the TCC block set, TCC0, TCC1, …, TCCN
// will have the same block ID HSA_VEN_AMD_AQLPROFILE_BLOCKS_TCC.
typedef enum {
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_CPF = 0,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_GRBM = 1,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_GRBMSE = 2,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_SPI = 3,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_SQ = 4,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_SQCS = 5,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_SX = 6,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_TA = 7,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_TCA = 8,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_TCC = 9,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_TD = 10,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_TCP = 11,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_GDS = 12,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_MC = 13,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_SRBM = 14,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_TCS = 15,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_CPC = 16,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_RMI = 17,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_GCEA = 18,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_ATC = 19,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_ATCL2 = 20,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_CPC = 0,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_CPF = 1,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_GDS = 2,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_GRBM = 3,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_GRBMSE = 4,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_RMI = 5,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_SPI = 6,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_SQ = 7,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_SQCS = 8,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_SRBM = 9,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_SX = 10,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_TA = 11,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_TCA = 12,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_TCC = 13,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_TCP = 14,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_TD = 15,
// MC blocks
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_MC = 16,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_ATC = 17,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_ATCL2 = 18,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_GCEA = 19,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_MCVML2 = 20,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_RPB = 21,
HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_MCVML2 = 22,
HSA_VEN_AMD_AQLPROFILE_BLOCKS_NUMBER = 23
HSA_VEN_AMD_AQLPROFILE_BLOCKS_NUMBER = 22
} hsa_ven_amd_aqlprofile_block_name_t;
// PMC event object structure
@@ -119,7 +119,7 @@ typedef struct {
} hsa_ven_amd_aqlprofile_event_t;
// Check if event is valid for the specific GPU
hsa_status_t hsa_ven_amd_aqlprofile_validate_event(
hsa_status_t HSA_API hsa_ven_amd_aqlprofile_validate_event(
hsa_agent_t agent, // HSA handle for the profiling GPU
const hsa_ven_amd_aqlprofile_event_t* event, // [in] Pointer on validated event
bool* result); // [out] True if the event valid, False otherwise
@@ -188,21 +188,21 @@ typedef struct {
// Method to populate the provided AQL packet with profiling start commands
// Only 'pm4_command' fields of the packet are set and the application
// is responsible to set Vendor Specific header type a completion signal
hsa_status_t hsa_ven_amd_aqlprofile_start(
hsa_status_t HSA_API hsa_ven_amd_aqlprofile_start(
const hsa_ven_amd_aqlprofile_profile_t* profile, // [in] profile contex object
hsa_ext_amd_aql_pm4_packet_t* aql_start_packet); // [out] profile start AQL packet
// Method to populate the provided AQL packet with profiling stop commands
// Only 'pm4_command' fields of the packet are set and the application
// is responsible to set Vendor Specific header type and a completion signal
hsa_status_t hsa_ven_amd_aqlprofile_stop(
hsa_status_t HSA_API hsa_ven_amd_aqlprofile_stop(
const hsa_ven_amd_aqlprofile_profile_t* profile, // [in] profile contex object
hsa_ext_amd_aql_pm4_packet_t* aql_stop_packet); // [out] profile stop AQL packet
// Legacy devices, PM4 profiling packet size
const unsigned HSA_VEN_AMD_AQLPROFILE_LEGACY_PM4_PACKET_SIZE = 192;
// Legacy devices, converting the profiling AQL packet to PM4 packet blob
hsa_status_t hsa_ven_amd_aqlprofile_legacy_get_pm4(
hsa_status_t HSA_API hsa_ven_amd_aqlprofile_legacy_get_pm4(
const hsa_ext_amd_aql_pm4_packet_t* aql_packet, // [in] AQL packet
void* data); // [out] PM4 packet blob
@@ -241,19 +241,19 @@ typedef hsa_status_t (*hsa_ven_amd_aqlprofile_data_callback_t)(
void* callback_data); // [in/out] data passed to the callback
// Method for getting the profile info
hsa_status_t hsa_ven_amd_aqlprofile_get_info(
hsa_status_t HSA_API hsa_ven_amd_aqlprofile_get_info(
const hsa_ven_amd_aqlprofile_profile_t* profile, // [in] profile context object
hsa_ven_amd_aqlprofile_info_type_t attribute, // [in] requested profile attribute
void* value); // [in/out] returned value
// Method for iterating the events output data
hsa_status_t hsa_ven_amd_aqlprofile_iterate_data(
hsa_status_t HSA_API hsa_ven_amd_aqlprofile_iterate_data(
const hsa_ven_amd_aqlprofile_profile_t* profile, // [in] profile context object
hsa_ven_amd_aqlprofile_data_callback_t callback, // [in] callback to iterate the output data
void* data); // [in/out] data passed to the callback
// Return error string
hsa_status_t hsa_ven_amd_aqlprofile_error_string(
hsa_status_t HSA_API hsa_ven_amd_aqlprofile_error_string(
const char** str); // [out] pointer on the error string
/**