diff --git a/runtime/hsa-runtime/core/inc/hsa_ext_amd_impl.h b/runtime/hsa-runtime/core/inc/hsa_ext_amd_impl.h index 2c5a40d2f1..1527682f7f 100644 --- a/runtime/hsa-runtime/core/inc/hsa_ext_amd_impl.h +++ b/runtime/hsa-runtime/core/inc/hsa_ext_amd_impl.h @@ -54,54 +54,54 @@ namespace rocr { namespace AMD { // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_coherency_get_type(hsa_agent_t agent, +hsa_status_t hsa_amd_coherency_get_type(hsa_agent_t agent, hsa_amd_coherency_type_t* type); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_coherency_set_type(hsa_agent_t agent, +hsa_status_t hsa_amd_coherency_set_type(hsa_agent_t agent, hsa_amd_coherency_type_t type); // Mirrors Amd Extension Apis -hsa_status_t HSA_API +hsa_status_t hsa_amd_profiling_set_profiler_enabled(hsa_queue_t* queue, int enable); // Mirrors Amd Extension Apis -hsa_status_t HSA_API +hsa_status_t hsa_amd_profiling_async_copy_enable(bool enable); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_profiling_get_dispatch_time( +hsa_status_t hsa_amd_profiling_get_dispatch_time( hsa_agent_t agent, hsa_signal_t signal, hsa_amd_profiling_dispatch_time_t* time); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_profiling_get_async_copy_time( +hsa_status_t hsa_amd_profiling_get_async_copy_time( hsa_signal_t signal, hsa_amd_profiling_async_copy_time_t* time); // Mirrors Amd Extension Apis -hsa_status_t HSA_API +hsa_status_t hsa_amd_profiling_convert_tick_to_system_domain(hsa_agent_t agent, uint64_t agent_tick, uint64_t* system_tick); // Mirrors Amd Extension Apis -hsa_status_t HSA_API +hsa_status_t hsa_amd_signal_async_handler(hsa_signal_t signal, hsa_signal_condition_t cond, hsa_signal_value_t value, hsa_amd_signal_handler handler, void* arg); // Mirrors Amd Extension Apis -hsa_status_t HSA_API +hsa_status_t hsa_amd_async_function(void (*callback)(void* arg), void* arg); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_signal_create(hsa_signal_value_t initial_value, uint32_t num_consumers, +hsa_status_t hsa_amd_signal_create(hsa_signal_value_t initial_value, uint32_t num_consumers, const hsa_agent_t* consumers, uint64_t attributes, hsa_signal_t* signal); // Mirrors Amd Extension Apis -uint32_t HSA_API +uint32_t hsa_amd_signal_wait_any(uint32_t signal_count, hsa_signal_t* signals, hsa_signal_condition_t* conds, hsa_signal_value_t* values, uint64_t timeout_hint, @@ -109,32 +109,32 @@ uint32_t HSA_API hsa_signal_value_t* satisfying_value); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_queue_cu_set_mask(const hsa_queue_t* queue, +hsa_status_t hsa_amd_queue_cu_set_mask(const hsa_queue_t* queue, uint32_t num_cu_mask_count, const uint32_t* cu_mask); // Mirrors Amd Extension Apis -hsa_status_t HSA_API +hsa_status_t hsa_amd_memory_pool_get_info(hsa_amd_memory_pool_t memory_pool, hsa_amd_memory_pool_info_t attribute, void* value); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_agent_iterate_memory_pools( +hsa_status_t hsa_amd_agent_iterate_memory_pools( hsa_agent_t agent, hsa_status_t (*callback)(hsa_amd_memory_pool_t memory_pool, void* data), void* data); // Mirrors Amd Extension Apis -hsa_status_t HSA_API +hsa_status_t hsa_amd_memory_pool_allocate(hsa_amd_memory_pool_t memory_pool, size_t size, uint32_t flags, void** ptr); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_memory_pool_free(void* ptr); +hsa_status_t hsa_amd_memory_pool_free(void* ptr); // Mirrors Amd Extension Apis -hsa_status_t HSA_API +hsa_status_t hsa_amd_memory_async_copy(void* dst, hsa_agent_t dst_agent, const void* src, hsa_agent_t src_agent, size_t size, uint32_t num_dep_signals, @@ -142,52 +142,52 @@ hsa_status_t HSA_API hsa_signal_t completion_signal); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_memory_async_copy_rect( +hsa_status_t hsa_amd_memory_async_copy_rect( const hsa_pitched_ptr_t* dst, const hsa_dim3_t* dst_offset, const hsa_pitched_ptr_t* src, const hsa_dim3_t* src_offset, const hsa_dim3_t* range, hsa_agent_t copy_agent, hsa_amd_copy_direction_t dir, uint32_t num_dep_signals, const hsa_signal_t* dep_signals, hsa_signal_t completion_signal); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_agent_memory_pool_get_info( +hsa_status_t hsa_amd_agent_memory_pool_get_info( hsa_agent_t agent, hsa_amd_memory_pool_t memory_pool, hsa_amd_agent_memory_pool_info_t attribute, void* value); // Mirrors Amd Extension Apis -hsa_status_t HSA_API +hsa_status_t hsa_amd_agents_allow_access(uint32_t num_agents, const hsa_agent_t* agents, const uint32_t* flags, const void* ptr); // Mirrors Amd Extension Apis -hsa_status_t HSA_API +hsa_status_t hsa_amd_memory_pool_can_migrate(hsa_amd_memory_pool_t src_memory_pool, hsa_amd_memory_pool_t dst_memory_pool, bool* result); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_memory_migrate(const void* ptr, +hsa_status_t hsa_amd_memory_migrate(const void* ptr, hsa_amd_memory_pool_t memory_pool, uint32_t flags); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_memory_lock(void* host_ptr, size_t size, +hsa_status_t hsa_amd_memory_lock(void* host_ptr, size_t size, hsa_agent_t* agents, int num_agent, void** agent_ptr); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_memory_lock_to_pool(void* host_ptr, size_t size, hsa_agent_t* agents, +hsa_status_t hsa_amd_memory_lock_to_pool(void* host_ptr, size_t size, hsa_agent_t* agents, int num_agent, hsa_amd_memory_pool_t pool, uint32_t flags, void** agent_ptr); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_memory_unlock(void* host_ptr); +hsa_status_t hsa_amd_memory_unlock(void* host_ptr); // Mirrors Amd Extension Apis -hsa_status_t HSA_API +hsa_status_t hsa_amd_memory_fill(void* ptr, uint32_t value, size_t count); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_interop_map_buffer(uint32_t num_agents, +hsa_status_t hsa_amd_interop_map_buffer(uint32_t num_agents, hsa_agent_t* agents, int interop_handle, uint32_t flags, @@ -197,49 +197,49 @@ hsa_status_t HSA_API hsa_amd_interop_map_buffer(uint32_t num_agents, const void** metadata); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_interop_unmap_buffer(void* ptr); +hsa_status_t hsa_amd_interop_unmap_buffer(void* ptr); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_pointer_info(void* ptr, hsa_amd_pointer_info_t* info, +hsa_status_t hsa_amd_pointer_info(void* ptr, hsa_amd_pointer_info_t* info, void* (*alloc)(size_t), uint32_t* num_agents_accessible, hsa_agent_t** accessible); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_pointer_info_set_userdata(void* ptr, void* userdata); +hsa_status_t hsa_amd_pointer_info_set_userdata(void* ptr, void* userdata); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_ipc_memory_create(void* ptr, size_t len, hsa_amd_ipc_memory_t* handle); +hsa_status_t hsa_amd_ipc_memory_create(void* ptr, size_t len, hsa_amd_ipc_memory_t* handle); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_ipc_memory_attach(const hsa_amd_ipc_memory_t* handle, size_t len, +hsa_status_t hsa_amd_ipc_memory_attach(const hsa_amd_ipc_memory_t* handle, size_t len, uint32_t num_agents, const hsa_agent_t* mapping_agents, void** mapped_ptr); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_ipc_memory_detach(void* mapped_ptr); +hsa_status_t hsa_amd_ipc_memory_detach(void* mapped_ptr); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_ipc_signal_create(hsa_signal_t signal, hsa_amd_ipc_signal_t* handle); +hsa_status_t hsa_amd_ipc_signal_create(hsa_signal_t signal, hsa_amd_ipc_signal_t* handle); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_ipc_signal_attach(const hsa_amd_ipc_signal_t* handle, +hsa_status_t hsa_amd_ipc_signal_attach(const hsa_amd_ipc_signal_t* handle, hsa_signal_t* signal); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_register_system_event_handler(hsa_amd_system_event_callback_t callback, +hsa_status_t hsa_amd_register_system_event_handler(hsa_amd_system_event_callback_t callback, void* data); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_queue_set_priority(hsa_queue_t* queue, +hsa_status_t hsa_amd_queue_set_priority(hsa_queue_t* queue, hsa_amd_queue_priority_t priority); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_register_deallocation_callback( +hsa_status_t hsa_amd_register_deallocation_callback( void* ptr, hsa_amd_deallocation_callback_t callback, void* user_data); // Mirrors Amd Extension Apis -hsa_status_t HSA_API hsa_amd_deregister_deallocation_callback( +hsa_status_t hsa_amd_deregister_deallocation_callback( void* ptr, hsa_amd_deallocation_callback_t callback); } // namespace amd diff --git a/runtime/hsa-runtime/core/inc/hsa_internal.h b/runtime/hsa-runtime/core/inc/hsa_internal.h index 55078aa32c..fb86eb9578 100644 --- a/runtime/hsa-runtime/core/inc/hsa_internal.h +++ b/runtime/hsa-runtime/core/inc/hsa_internal.h @@ -49,221 +49,221 @@ namespace rocr { namespace HSA { // Define core namespace interfaces - copy of function declarations in hsa.h - hsa_status_t HSA_API hsa_init(); - hsa_status_t HSA_API hsa_shut_down(); - hsa_status_t HSA_API + hsa_status_t hsa_init(); + hsa_status_t hsa_shut_down(); + hsa_status_t hsa_system_get_info(hsa_system_info_t attribute, void *value); - hsa_status_t HSA_API hsa_extension_get_name(uint16_t extension, const char** name); - hsa_status_t HSA_API hsa_system_extension_supported(uint16_t extension, uint16_t version_major, + hsa_status_t hsa_extension_get_name(uint16_t extension, const char** name); + hsa_status_t hsa_system_extension_supported(uint16_t extension, uint16_t version_major, uint16_t version_minor, bool* result); - hsa_status_t HSA_API hsa_system_major_extension_supported(uint16_t extension, + hsa_status_t hsa_system_major_extension_supported(uint16_t extension, uint16_t version_major, uint16_t* version_minor, bool* result); - hsa_status_t HSA_API + hsa_status_t hsa_system_get_extension_table(uint16_t extension, uint16_t version_major, uint16_t version_minor, void *table); - hsa_status_t HSA_API hsa_system_get_major_extension_table(uint16_t extension, + hsa_status_t hsa_system_get_major_extension_table(uint16_t extension, uint16_t version_major, size_t table_length, void* table); - hsa_status_t HSA_API + hsa_status_t hsa_iterate_agents(hsa_status_t (*callback)(hsa_agent_t agent, void *data), void *data); - hsa_status_t HSA_API hsa_agent_get_info(hsa_agent_t agent, + hsa_status_t hsa_agent_get_info(hsa_agent_t agent, hsa_agent_info_t attribute, void *value); - hsa_status_t HSA_API hsa_agent_get_exception_policies(hsa_agent_t agent, + hsa_status_t hsa_agent_get_exception_policies(hsa_agent_t agent, hsa_profile_t profile, uint16_t *mask); - hsa_status_t HSA_API hsa_cache_get_info(hsa_cache_t cache, hsa_cache_info_t attribute, + hsa_status_t hsa_cache_get_info(hsa_cache_t cache, hsa_cache_info_t attribute, void* value); - hsa_status_t HSA_API hsa_agent_iterate_caches( + hsa_status_t hsa_agent_iterate_caches( hsa_agent_t agent, hsa_status_t (*callback)(hsa_cache_t cache, void* data), void* value); - hsa_status_t HSA_API + hsa_status_t hsa_agent_extension_supported(uint16_t extension, hsa_agent_t agent, uint16_t version_major, uint16_t version_minor, bool *result); - hsa_status_t HSA_API hsa_agent_major_extension_supported(uint16_t extension, hsa_agent_t agent, + hsa_status_t hsa_agent_major_extension_supported(uint16_t extension, hsa_agent_t agent, uint16_t version_major, uint16_t* version_minor, bool* result); - hsa_status_t HSA_API + hsa_status_t hsa_queue_create(hsa_agent_t agent, uint32_t size, hsa_queue_type32_t type, void (*callback)(hsa_status_t status, hsa_queue_t *source, void *data), void *data, uint32_t private_segment_size, uint32_t group_segment_size, hsa_queue_t **queue); - hsa_status_t HSA_API + hsa_status_t hsa_soft_queue_create(hsa_region_t region, uint32_t size, hsa_queue_type32_t type, uint32_t features, hsa_signal_t completion_signal, hsa_queue_t **queue); - hsa_status_t HSA_API hsa_queue_destroy(hsa_queue_t *queue); - hsa_status_t HSA_API hsa_queue_inactivate(hsa_queue_t *queue); - uint64_t HSA_API hsa_queue_load_read_index_scacquire(const hsa_queue_t* queue); - uint64_t HSA_API hsa_queue_load_read_index_relaxed(const hsa_queue_t *queue); - uint64_t HSA_API hsa_queue_load_write_index_scacquire(const hsa_queue_t* queue); - uint64_t HSA_API hsa_queue_load_write_index_relaxed(const hsa_queue_t *queue); - void HSA_API hsa_queue_store_write_index_relaxed(const hsa_queue_t *queue, + hsa_status_t hsa_queue_destroy(hsa_queue_t *queue); + hsa_status_t hsa_queue_inactivate(hsa_queue_t *queue); + uint64_t hsa_queue_load_read_index_scacquire(const hsa_queue_t* queue); + uint64_t hsa_queue_load_read_index_relaxed(const hsa_queue_t *queue); + uint64_t hsa_queue_load_write_index_scacquire(const hsa_queue_t* queue); + uint64_t hsa_queue_load_write_index_relaxed(const hsa_queue_t *queue); + void hsa_queue_store_write_index_relaxed(const hsa_queue_t *queue, uint64_t value); - void HSA_API hsa_queue_store_write_index_screlease(const hsa_queue_t* queue, uint64_t value); - uint64_t HSA_API hsa_queue_cas_write_index_scacq_screl(const hsa_queue_t* queue, + void hsa_queue_store_write_index_screlease(const hsa_queue_t* queue, uint64_t value); + uint64_t hsa_queue_cas_write_index_scacq_screl(const hsa_queue_t* queue, uint64_t expected, uint64_t value); - uint64_t HSA_API hsa_queue_cas_write_index_scacquire(const hsa_queue_t* queue, uint64_t expected, + uint64_t hsa_queue_cas_write_index_scacquire(const hsa_queue_t* queue, uint64_t expected, uint64_t value); - uint64_t HSA_API hsa_queue_cas_write_index_relaxed(const hsa_queue_t *queue, + uint64_t hsa_queue_cas_write_index_relaxed(const hsa_queue_t *queue, uint64_t expected, uint64_t value); - uint64_t HSA_API hsa_queue_cas_write_index_screlease(const hsa_queue_t* queue, uint64_t expected, + uint64_t hsa_queue_cas_write_index_screlease(const hsa_queue_t* queue, uint64_t expected, uint64_t value); - uint64_t HSA_API hsa_queue_add_write_index_scacq_screl(const hsa_queue_t* queue, uint64_t value); - uint64_t HSA_API hsa_queue_add_write_index_scacquire(const hsa_queue_t* queue, uint64_t value); - uint64_t HSA_API + uint64_t hsa_queue_add_write_index_scacq_screl(const hsa_queue_t* queue, uint64_t value); + uint64_t hsa_queue_add_write_index_scacquire(const hsa_queue_t* queue, uint64_t value); + uint64_t hsa_queue_add_write_index_relaxed(const hsa_queue_t *queue, uint64_t value); - uint64_t HSA_API hsa_queue_add_write_index_screlease(const hsa_queue_t* queue, uint64_t value); - void HSA_API hsa_queue_store_read_index_relaxed(const hsa_queue_t *queue, + uint64_t hsa_queue_add_write_index_screlease(const hsa_queue_t* queue, uint64_t value); + void hsa_queue_store_read_index_relaxed(const hsa_queue_t *queue, uint64_t value); - void HSA_API hsa_queue_store_read_index_screlease(const hsa_queue_t* queue, uint64_t value); - hsa_status_t HSA_API hsa_agent_iterate_regions( + void hsa_queue_store_read_index_screlease(const hsa_queue_t* queue, uint64_t value); + hsa_status_t hsa_agent_iterate_regions( hsa_agent_t agent, hsa_status_t (*callback)(hsa_region_t region, void *data), void *data); - hsa_status_t HSA_API hsa_region_get_info(hsa_region_t region, + hsa_status_t hsa_region_get_info(hsa_region_t region, hsa_region_info_t attribute, void *value); - hsa_status_t HSA_API hsa_memory_register(void *address, size_t size); - hsa_status_t HSA_API hsa_memory_deregister(void *address, size_t size); - hsa_status_t HSA_API + hsa_status_t hsa_memory_register(void *address, size_t size); + hsa_status_t hsa_memory_deregister(void *address, size_t size); + hsa_status_t hsa_memory_allocate(hsa_region_t region, size_t size, void **ptr); - hsa_status_t HSA_API hsa_memory_free(void *ptr); - hsa_status_t HSA_API hsa_memory_copy(void *dst, const void *src, size_t size); - hsa_status_t HSA_API hsa_memory_assign_agent(void *ptr, hsa_agent_t agent, + hsa_status_t hsa_memory_free(void *ptr); + hsa_status_t hsa_memory_copy(void *dst, const void *src, size_t size); + hsa_status_t hsa_memory_assign_agent(void *ptr, hsa_agent_t agent, hsa_access_permission_t access); - hsa_status_t HSA_API + hsa_status_t hsa_signal_create(hsa_signal_value_t initial_value, uint32_t num_consumers, const hsa_agent_t *consumers, hsa_signal_t *signal); - hsa_status_t HSA_API hsa_signal_destroy(hsa_signal_t signal); - hsa_signal_value_t HSA_API hsa_signal_load_relaxed(hsa_signal_t signal); - hsa_signal_value_t HSA_API hsa_signal_load_scacquire(hsa_signal_t signal); - void HSA_API + hsa_status_t hsa_signal_destroy(hsa_signal_t signal); + hsa_signal_value_t hsa_signal_load_relaxed(hsa_signal_t signal); + hsa_signal_value_t hsa_signal_load_scacquire(hsa_signal_t signal); + void hsa_signal_store_relaxed(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_store_screlease(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_silent_store_relaxed(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_silent_store_screlease(hsa_signal_t signal, hsa_signal_value_t value); - hsa_signal_value_t HSA_API + void hsa_signal_store_screlease(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_silent_store_relaxed(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_silent_store_screlease(hsa_signal_t signal, hsa_signal_value_t value); + hsa_signal_value_t hsa_signal_wait_relaxed(hsa_signal_t signal, hsa_signal_condition_t condition, hsa_signal_value_t compare_value, uint64_t timeout_hint, hsa_wait_state_t wait_expectancy_hint); - hsa_signal_value_t HSA_API hsa_signal_wait_scacquire(hsa_signal_t signal, + hsa_signal_value_t hsa_signal_wait_scacquire(hsa_signal_t signal, hsa_signal_condition_t condition, hsa_signal_value_t compare_value, uint64_t timeout_hint, hsa_wait_state_t wait_expectancy_hint); - hsa_status_t HSA_API hsa_signal_group_create(uint32_t num_signals, const hsa_signal_t* signals, + hsa_status_t hsa_signal_group_create(uint32_t num_signals, const hsa_signal_t* signals, uint32_t num_consumers, const hsa_agent_t* consumers, hsa_signal_group_t* signal_group); - hsa_status_t HSA_API hsa_signal_group_destroy(hsa_signal_group_t signal_group); - hsa_status_t HSA_API hsa_signal_group_wait_any_scacquire(hsa_signal_group_t signal_group, + hsa_status_t hsa_signal_group_destroy(hsa_signal_group_t signal_group); + hsa_status_t hsa_signal_group_wait_any_scacquire(hsa_signal_group_t signal_group, const hsa_signal_condition_t* conditions, const hsa_signal_value_t* compare_values, hsa_wait_state_t wait_state_hint, hsa_signal_t* signal, hsa_signal_value_t* value); - hsa_status_t HSA_API hsa_signal_group_wait_any_relaxed(hsa_signal_group_t signal_group, + hsa_status_t hsa_signal_group_wait_any_relaxed(hsa_signal_group_t signal_group, const hsa_signal_condition_t* conditions, const hsa_signal_value_t* compare_values, hsa_wait_state_t wait_state_hint, hsa_signal_t* signal, hsa_signal_value_t* value); - void HSA_API + void hsa_signal_and_relaxed(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_and_scacquire(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_and_screlease(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_and_scacq_screl(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API + void hsa_signal_and_scacquire(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_and_screlease(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_and_scacq_screl(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_or_relaxed(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_or_scacquire(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_or_screlease(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_or_scacq_screl(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API + void hsa_signal_or_scacquire(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_or_screlease(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_or_scacq_screl(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_xor_relaxed(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_xor_scacquire(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_xor_screlease(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_xor_scacq_screl(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API + void hsa_signal_xor_scacquire(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_xor_screlease(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_xor_scacq_screl(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_add_relaxed(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_add_scacquire(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_add_screlease(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_add_scacq_screl(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API + void hsa_signal_add_scacquire(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_add_screlease(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_add_scacq_screl(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_subtract_relaxed(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_subtract_scacquire(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_subtract_screlease(hsa_signal_t signal, hsa_signal_value_t value); - void HSA_API hsa_signal_subtract_scacq_screl(hsa_signal_t signal, hsa_signal_value_t value); - hsa_signal_value_t HSA_API + void hsa_signal_subtract_scacquire(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_subtract_screlease(hsa_signal_t signal, hsa_signal_value_t value); + void hsa_signal_subtract_scacq_screl(hsa_signal_t signal, hsa_signal_value_t value); + hsa_signal_value_t hsa_signal_exchange_relaxed(hsa_signal_t signal, hsa_signal_value_t value); - hsa_signal_value_t HSA_API hsa_signal_exchange_scacquire(hsa_signal_t signal, + hsa_signal_value_t hsa_signal_exchange_scacquire(hsa_signal_t signal, hsa_signal_value_t value); - hsa_signal_value_t HSA_API hsa_signal_exchange_screlease(hsa_signal_t signal, + hsa_signal_value_t hsa_signal_exchange_screlease(hsa_signal_t signal, hsa_signal_value_t value); - hsa_signal_value_t HSA_API hsa_signal_exchange_scacq_screl(hsa_signal_t signal, + hsa_signal_value_t hsa_signal_exchange_scacq_screl(hsa_signal_t signal, hsa_signal_value_t value); - hsa_signal_value_t HSA_API hsa_signal_cas_relaxed(hsa_signal_t signal, + hsa_signal_value_t hsa_signal_cas_relaxed(hsa_signal_t signal, hsa_signal_value_t expected, hsa_signal_value_t value); - hsa_signal_value_t HSA_API hsa_signal_cas_scacquire(hsa_signal_t signal, + hsa_signal_value_t hsa_signal_cas_scacquire(hsa_signal_t signal, hsa_signal_value_t expected, hsa_signal_value_t value); - hsa_signal_value_t HSA_API hsa_signal_cas_screlease(hsa_signal_t signal, + hsa_signal_value_t hsa_signal_cas_screlease(hsa_signal_t signal, hsa_signal_value_t expected, hsa_signal_value_t value); - hsa_signal_value_t HSA_API hsa_signal_cas_scacq_screl(hsa_signal_t signal, + hsa_signal_value_t hsa_signal_cas_scacq_screl(hsa_signal_t signal, hsa_signal_value_t expected, hsa_signal_value_t value); //===--- Instruction Set Architecture -----------------------------------===// - hsa_status_t HSA_API hsa_isa_from_name( + hsa_status_t hsa_isa_from_name( const char *name, hsa_isa_t *isa); - hsa_status_t HSA_API hsa_agent_iterate_isas( + hsa_status_t hsa_agent_iterate_isas( hsa_agent_t agent, hsa_status_t (*callback)(hsa_isa_t isa, void *data), void *data); - /* deprecated */ hsa_status_t HSA_API hsa_isa_get_info( + /* deprecated */ hsa_status_t hsa_isa_get_info( hsa_isa_t isa, hsa_isa_info_t attribute, uint32_t index, void *value); - hsa_status_t HSA_API hsa_isa_get_info_alt( + hsa_status_t hsa_isa_get_info_alt( hsa_isa_t isa, hsa_isa_info_t attribute, void *value); - hsa_status_t HSA_API hsa_isa_get_exception_policies( + hsa_status_t hsa_isa_get_exception_policies( hsa_isa_t isa, hsa_profile_t profile, uint16_t *mask); - hsa_status_t HSA_API hsa_isa_get_round_method( + hsa_status_t hsa_isa_get_round_method( hsa_isa_t isa, hsa_fp_type_t fp_type, hsa_flush_mode_t flush_mode, hsa_round_method_t *round_method); - hsa_status_t HSA_API hsa_wavefront_get_info( + hsa_status_t hsa_wavefront_get_info( hsa_wavefront_t wavefront, hsa_wavefront_info_t attribute, void *value); - hsa_status_t HSA_API hsa_isa_iterate_wavefronts( + hsa_status_t hsa_isa_iterate_wavefronts( hsa_isa_t isa, hsa_status_t (*callback)(hsa_wavefront_t wavefront, void *data), void *data); - /* deprecated */ hsa_status_t HSA_API hsa_isa_compatible( + /* deprecated */ hsa_status_t hsa_isa_compatible( hsa_isa_t code_object_isa, hsa_isa_t agent_isa, bool *result); //===--- Code Objects (deprecated) --------------------------------------===// - /* deprecated */ hsa_status_t HSA_API hsa_code_object_serialize( + /* deprecated */ hsa_status_t hsa_code_object_serialize( hsa_code_object_t code_object, hsa_status_t (*alloc_callback)(size_t size, hsa_callback_data_t data, @@ -272,31 +272,31 @@ namespace HSA { const char *options, void **serialized_code_object, size_t *serialized_code_object_size); - /* deprecated */ hsa_status_t HSA_API hsa_code_object_deserialize( + /* deprecated */ hsa_status_t hsa_code_object_deserialize( void *serialized_code_object, size_t serialized_code_object_size, const char *options, hsa_code_object_t *code_object); - /* deprecated */ hsa_status_t HSA_API hsa_code_object_destroy( + /* deprecated */ hsa_status_t hsa_code_object_destroy( hsa_code_object_t code_object); - /* deprecated */ hsa_status_t HSA_API hsa_code_object_get_info( + /* deprecated */ hsa_status_t hsa_code_object_get_info( hsa_code_object_t code_object, hsa_code_object_info_t attribute, void *value); - /* deprecated */ hsa_status_t HSA_API hsa_code_object_get_symbol( + /* deprecated */ hsa_status_t hsa_code_object_get_symbol( hsa_code_object_t code_object, const char *symbol_name, hsa_code_symbol_t *symbol); - /* deprecated */ hsa_status_t HSA_API hsa_code_object_get_symbol_from_name( + /* deprecated */ hsa_status_t hsa_code_object_get_symbol_from_name( hsa_code_object_t code_object, const char *module_name, const char *symbol_name, hsa_code_symbol_t *symbol); - /* deprecated */ hsa_status_t HSA_API hsa_code_symbol_get_info( + /* deprecated */ hsa_status_t hsa_code_symbol_get_info( hsa_code_symbol_t code_symbol, hsa_code_symbol_info_t attribute, void *value); - /* deprecated */ hsa_status_t HSA_API hsa_code_object_iterate_symbols( + /* deprecated */ hsa_status_t hsa_code_object_iterate_symbols( hsa_code_object_t code_object, hsa_status_t (*callback)(hsa_code_object_t code_object, hsa_code_symbol_t symbol, @@ -305,94 +305,94 @@ namespace HSA { //===--- Executable -----------------------------------------------------===// - hsa_status_t HSA_API hsa_code_object_reader_create_from_file( + hsa_status_t hsa_code_object_reader_create_from_file( hsa_file_t file, hsa_code_object_reader_t *code_object_reader); - hsa_status_t HSA_API hsa_code_object_reader_create_from_memory( + hsa_status_t hsa_code_object_reader_create_from_memory( const void *code_object, size_t size, hsa_code_object_reader_t *code_object_reader); - hsa_status_t HSA_API hsa_code_object_reader_destroy( + hsa_status_t hsa_code_object_reader_destroy( hsa_code_object_reader_t code_object_reader); - /* deprecated */ hsa_status_t HSA_API hsa_executable_create( + /* deprecated */ hsa_status_t hsa_executable_create( hsa_profile_t profile, hsa_executable_state_t executable_state, const char *options, hsa_executable_t *executable); - hsa_status_t HSA_API hsa_executable_create_alt( + hsa_status_t hsa_executable_create_alt( hsa_profile_t profile, hsa_default_float_rounding_mode_t default_float_rounding_mode, const char *options, hsa_executable_t *executable); - hsa_status_t HSA_API hsa_executable_destroy( + hsa_status_t hsa_executable_destroy( hsa_executable_t executable); - /* deprecated */ hsa_status_t HSA_API hsa_executable_load_code_object( + /* deprecated */ hsa_status_t hsa_executable_load_code_object( hsa_executable_t executable, hsa_agent_t agent, hsa_code_object_t code_object, const char *options); - hsa_status_t HSA_API hsa_executable_load_program_code_object( + hsa_status_t hsa_executable_load_program_code_object( hsa_executable_t executable, hsa_code_object_reader_t code_object_reader, const char *options, hsa_loaded_code_object_t *loaded_code_object); - hsa_status_t HSA_API hsa_executable_load_agent_code_object( + hsa_status_t hsa_executable_load_agent_code_object( hsa_executable_t executable, hsa_agent_t agent, hsa_code_object_reader_t code_object_reader, const char *options, hsa_loaded_code_object_t *loaded_code_object); - hsa_status_t HSA_API hsa_executable_freeze( + hsa_status_t hsa_executable_freeze( hsa_executable_t executable, const char *options); - hsa_status_t HSA_API hsa_executable_get_info( + hsa_status_t hsa_executable_get_info( hsa_executable_t executable, hsa_executable_info_t attribute, void *value); - hsa_status_t HSA_API hsa_executable_global_variable_define( + hsa_status_t hsa_executable_global_variable_define( hsa_executable_t executable, const char *variable_name, void *address); - hsa_status_t HSA_API hsa_executable_agent_global_variable_define( + hsa_status_t hsa_executable_agent_global_variable_define( hsa_executable_t executable, hsa_agent_t agent, const char *variable_name, void *address); - hsa_status_t HSA_API hsa_executable_readonly_variable_define( + hsa_status_t hsa_executable_readonly_variable_define( hsa_executable_t executable, hsa_agent_t agent, const char *variable_name, void *address); - hsa_status_t HSA_API hsa_executable_validate( + hsa_status_t hsa_executable_validate( hsa_executable_t executable, uint32_t *result); - hsa_status_t HSA_API hsa_executable_validate_alt( + hsa_status_t hsa_executable_validate_alt( hsa_executable_t executable, const char *options, uint32_t *result); - /* deprecated */ hsa_status_t HSA_API hsa_executable_get_symbol( + /* deprecated */ hsa_status_t hsa_executable_get_symbol( hsa_executable_t executable, const char *module_name, const char *symbol_name, hsa_agent_t agent, int32_t call_convention, hsa_executable_symbol_t *symbol); - hsa_status_t HSA_API hsa_executable_get_symbol_by_name( + hsa_status_t hsa_executable_get_symbol_by_name( hsa_executable_t executable, const char *symbol_name, const hsa_agent_t *agent, hsa_executable_symbol_t *symbol); - hsa_status_t HSA_API hsa_executable_symbol_get_info( + hsa_status_t hsa_executable_symbol_get_info( hsa_executable_symbol_t executable_symbol, hsa_executable_symbol_info_t attribute, void *value); - /* deprecated */ hsa_status_t HSA_API hsa_executable_iterate_symbols( + /* deprecated */ hsa_status_t hsa_executable_iterate_symbols( hsa_executable_t executable, hsa_status_t (*callback)(hsa_executable_t executable, hsa_executable_symbol_t symbol, void *data), void *data); - hsa_status_t HSA_API hsa_executable_iterate_agent_symbols( + hsa_status_t hsa_executable_iterate_agent_symbols( hsa_executable_t executable, hsa_agent_t agent, hsa_status_t (*callback)(hsa_executable_t exec, @@ -400,7 +400,7 @@ namespace HSA { hsa_executable_symbol_t symbol, void *data), void *data); - hsa_status_t HSA_API hsa_executable_iterate_program_symbols( + hsa_status_t hsa_executable_iterate_program_symbols( hsa_executable_t executable, hsa_status_t (*callback)(hsa_executable_t exec, hsa_executable_symbol_t symbol, @@ -409,7 +409,7 @@ namespace HSA { //===--- Runtime Notifications ------------------------------------------===// - hsa_status_t HSA_API hsa_status_string( + hsa_status_t hsa_status_string( hsa_status_t status, const char **status_string); diff --git a/runtime/hsa-runtime/core/runtime/hsa_ext_amd.cpp b/runtime/hsa-runtime/core/runtime/hsa_ext_amd.cpp index 95f9e82d0e..c1a3915fdc 100644 --- a/runtime/hsa-runtime/core/runtime/hsa_ext_amd.cpp +++ b/runtime/hsa-runtime/core/runtime/hsa_ext_amd.cpp @@ -269,7 +269,7 @@ hsa_status_t hsa_amd_memory_async_copy(void* dst, hsa_agent_t dst_agent_handle, CATCH; } -hsa_status_t HSA_API hsa_amd_memory_async_copy_rect( +hsa_status_t hsa_amd_memory_async_copy_rect( const hsa_pitched_ptr_t* dst, const hsa_dim3_t* dst_offset, const hsa_pitched_ptr_t* src, const hsa_dim3_t* src_offset, const hsa_dim3_t* range, hsa_agent_t copy_agent, hsa_amd_copy_direction_t dir, uint32_t num_dep_signals, const hsa_signal_t* dep_signals, @@ -931,7 +931,7 @@ hsa_status_t hsa_amd_register_system_event_handler(hsa_amd_system_event_callback CATCH; } -hsa_status_t HSA_API hsa_amd_queue_set_priority(hsa_queue_t* queue, +hsa_status_t hsa_amd_queue_set_priority(hsa_queue_t* queue, hsa_amd_queue_priority_t priority) { TRY; IS_OPEN();