From 2755a4e0a7bb90c1d957096818c59be3f7325745 Mon Sep 17 00:00:00 2001 From: Sean Keely Date: Fri, 27 Jan 2017 17:45:26 -0600 Subject: [PATCH] Remove old names from API table interfaces. Change-Id: I41ca38b596e1dac85e871f583e3ffe7078b790e7 [ROCm/ROCR-Runtime commit: 796d31d94d21979956054a6135b05316601890fd] --- .../runtime/hsa-runtime/inc/hsa_api_trace.h | 170 ++++-------------- 1 file changed, 34 insertions(+), 136 deletions(-) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/inc/hsa_api_trace.h b/projects/rocr-runtime/runtime/hsa-runtime/inc/hsa_api_trace.h index 6581e10957..4ccc8c24df 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/inc/hsa_api_trace.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/inc/hsa_api_trace.h @@ -164,52 +164,22 @@ struct CoreApiTable { decltype(hsa_soft_queue_create)* hsa_soft_queue_create_fn; decltype(hsa_queue_destroy)* hsa_queue_destroy_fn; decltype(hsa_queue_inactivate)* hsa_queue_inactivate_fn; - union { - decltype(hsa_queue_load_read_index_scacquire)* hsa_queue_load_read_index_scacquire_fn; - decltype(hsa_queue_load_read_index_acquire)* hsa_queue_load_read_index_acquire_fn; - }; + decltype(hsa_queue_load_read_index_scacquire)* hsa_queue_load_read_index_scacquire_fn; decltype(hsa_queue_load_read_index_relaxed)* hsa_queue_load_read_index_relaxed_fn; - union { - decltype(hsa_queue_load_write_index_scacquire)* hsa_queue_load_write_index_scacquire_fn; - decltype(hsa_queue_load_write_index_acquire)* hsa_queue_load_write_index_acquire_fn; - }; + decltype(hsa_queue_load_write_index_scacquire)* hsa_queue_load_write_index_scacquire_fn; decltype(hsa_queue_load_write_index_relaxed)* hsa_queue_load_write_index_relaxed_fn; decltype(hsa_queue_store_write_index_relaxed)* hsa_queue_store_write_index_relaxed_fn; - union { - decltype(hsa_queue_store_write_index_screlease)* hsa_queue_store_write_index_screlease_fn; - decltype(hsa_queue_store_write_index_release)* hsa_queue_store_write_index_release_fn; - }; - union { - decltype(hsa_queue_cas_write_index_scacq_screl)* hsa_queue_cas_write_index_scacq_screl_fn; - decltype(hsa_queue_cas_write_index_acq_rel)* hsa_queue_cas_write_index_acq_rel_fn; - }; - union { - decltype(hsa_queue_cas_write_index_scacquire)* hsa_queue_cas_write_index_scacquire_fn; - decltype(hsa_queue_cas_write_index_acquire)* hsa_queue_cas_write_index_acquire_fn; - }; + decltype(hsa_queue_store_write_index_screlease)* hsa_queue_store_write_index_screlease_fn; + decltype(hsa_queue_cas_write_index_scacq_screl)* hsa_queue_cas_write_index_scacq_screl_fn; + decltype(hsa_queue_cas_write_index_scacquire)* hsa_queue_cas_write_index_scacquire_fn; decltype(hsa_queue_cas_write_index_relaxed)* hsa_queue_cas_write_index_relaxed_fn; - union { - decltype(hsa_queue_cas_write_index_screlease)* hsa_queue_cas_write_index_screlease_fn; - decltype(hsa_queue_cas_write_index_release)* hsa_queue_cas_write_index_release_fn; - }; - union { - decltype(hsa_queue_add_write_index_scacq_screl)* hsa_queue_add_write_index_scacq_screl_fn; - decltype(hsa_queue_add_write_index_acq_rel)* hsa_queue_add_write_index_acq_rel_fn; - }; - union { - decltype(hsa_queue_add_write_index_scacquire)* hsa_queue_add_write_index_scacquire_fn; - decltype(hsa_queue_add_write_index_acquire)* hsa_queue_add_write_index_acquire_fn; - }; + decltype(hsa_queue_cas_write_index_screlease)* hsa_queue_cas_write_index_screlease_fn; + decltype(hsa_queue_add_write_index_scacq_screl)* hsa_queue_add_write_index_scacq_screl_fn; + decltype(hsa_queue_add_write_index_scacquire)* hsa_queue_add_write_index_scacquire_fn; decltype(hsa_queue_add_write_index_relaxed)* hsa_queue_add_write_index_relaxed_fn; - union { - decltype(hsa_queue_add_write_index_screlease)* hsa_queue_add_write_index_screlease_fn; - decltype(hsa_queue_add_write_index_release)* hsa_queue_add_write_index_release_fn; - }; + decltype(hsa_queue_add_write_index_screlease)* hsa_queue_add_write_index_screlease_fn; decltype(hsa_queue_store_read_index_relaxed)* hsa_queue_store_read_index_relaxed_fn; - union { - decltype(hsa_queue_store_read_index_screlease)* hsa_queue_store_read_index_screlease_fn; - decltype(hsa_queue_store_read_index_release)* hsa_queue_store_read_index_release_fn; - }; + decltype(hsa_queue_store_read_index_screlease)* hsa_queue_store_read_index_screlease_fn; decltype(hsa_agent_iterate_regions)* hsa_agent_iterate_regions_fn; decltype(hsa_region_get_info)* hsa_region_get_info_fn; decltype(hsa_agent_get_exception_policies)* hsa_agent_get_exception_policies_fn; @@ -223,111 +193,39 @@ struct CoreApiTable { decltype(hsa_signal_create)* hsa_signal_create_fn; decltype(hsa_signal_destroy)* hsa_signal_destroy_fn; decltype(hsa_signal_load_relaxed)* hsa_signal_load_relaxed_fn; - union { - decltype(hsa_signal_load_scacquire)* hsa_signal_load_scacquire_fn; - decltype(hsa_signal_load_acquire)* hsa_signal_load_acquire_fn; - }; + decltype(hsa_signal_load_scacquire)* hsa_signal_load_scacquire_fn; decltype(hsa_signal_store_relaxed)* hsa_signal_store_relaxed_fn; - union { - decltype(hsa_signal_store_screlease)* hsa_signal_store_screlease_fn; - decltype(hsa_signal_store_release)* hsa_signal_store_release_fn; - }; + decltype(hsa_signal_store_screlease)* hsa_signal_store_screlease_fn; decltype(hsa_signal_wait_relaxed)* hsa_signal_wait_relaxed_fn; - union { - decltype(hsa_signal_wait_scacquire)* hsa_signal_wait_scacquire_fn; - decltype(hsa_signal_wait_acquire)* hsa_signal_wait_acquire_fn; - }; + decltype(hsa_signal_wait_scacquire)* hsa_signal_wait_scacquire_fn; decltype(hsa_signal_and_relaxed)* hsa_signal_and_relaxed_fn; - union { - decltype(hsa_signal_and_scacquire)* hsa_signal_and_scacquire_fn; - decltype(hsa_signal_and_acquire)* hsa_signal_and_acquire_fn; - }; - union { - decltype(hsa_signal_and_screlease)* hsa_signal_and_screlease_fn; - decltype(hsa_signal_and_release)* hsa_signal_and_release_fn; - }; - union { - decltype(hsa_signal_and_scacq_screl)* hsa_signal_and_scacq_screl_fn; - decltype(hsa_signal_and_acq_rel)* hsa_signal_and_acq_rel_fn; - }; + decltype(hsa_signal_and_scacquire)* hsa_signal_and_scacquire_fn; + decltype(hsa_signal_and_screlease)* hsa_signal_and_screlease_fn; + decltype(hsa_signal_and_scacq_screl)* hsa_signal_and_scacq_screl_fn; decltype(hsa_signal_or_relaxed)* hsa_signal_or_relaxed_fn; - union { - decltype(hsa_signal_or_scacquire)* hsa_signal_or_scacquire_fn; - decltype(hsa_signal_or_acquire)* hsa_signal_or_acquire_fn; - }; - union { - decltype(hsa_signal_or_screlease)* hsa_signal_or_screlease_fn; - decltype(hsa_signal_or_release)* hsa_signal_or_release_fn; - }; - union { - decltype(hsa_signal_or_scacq_screl)* hsa_signal_or_scacq_screl_fn; - decltype(hsa_signal_or_acq_rel)* hsa_signal_or_acq_rel_fn; - }; + decltype(hsa_signal_or_scacquire)* hsa_signal_or_scacquire_fn; + decltype(hsa_signal_or_screlease)* hsa_signal_or_screlease_fn; + decltype(hsa_signal_or_scacq_screl)* hsa_signal_or_scacq_screl_fn; decltype(hsa_signal_xor_relaxed)* hsa_signal_xor_relaxed_fn; - union { - decltype(hsa_signal_xor_scacquire)* hsa_signal_xor_scacquire_fn; - decltype(hsa_signal_xor_acquire)* hsa_signal_xor_acquire_fn; - }; - union { - decltype(hsa_signal_xor_screlease)* hsa_signal_xor_screlease_fn; - decltype(hsa_signal_xor_release)* hsa_signal_xor_release_fn; - }; - union { - decltype(hsa_signal_xor_scacq_screl)* hsa_signal_xor_scacq_screl_fn; - decltype(hsa_signal_xor_acq_rel)* hsa_signal_xor_acq_rel_fn; - }; + decltype(hsa_signal_xor_scacquire)* hsa_signal_xor_scacquire_fn; + decltype(hsa_signal_xor_screlease)* hsa_signal_xor_screlease_fn; + decltype(hsa_signal_xor_scacq_screl)* hsa_signal_xor_scacq_screl_fn; decltype(hsa_signal_exchange_relaxed)* hsa_signal_exchange_relaxed_fn; - union { - decltype(hsa_signal_exchange_scacquire)* hsa_signal_exchange_scacquire_fn; - decltype(hsa_signal_exchange_acquire)* hsa_signal_exchange_acquire_fn; - }; - union { - decltype(hsa_signal_exchange_screlease)* hsa_signal_exchange_screlease_fn; - decltype(hsa_signal_exchange_release)* hsa_signal_exchange_release_fn; - }; - union { - decltype(hsa_signal_exchange_scacq_screl)* hsa_signal_exchange_scacq_screl_fn; - decltype(hsa_signal_exchange_acq_rel)* hsa_signal_exchange_acq_rel_fn; - }; + decltype(hsa_signal_exchange_scacquire)* hsa_signal_exchange_scacquire_fn; + decltype(hsa_signal_exchange_screlease)* hsa_signal_exchange_screlease_fn; + decltype(hsa_signal_exchange_scacq_screl)* hsa_signal_exchange_scacq_screl_fn; decltype(hsa_signal_add_relaxed)* hsa_signal_add_relaxed_fn; - union { - decltype(hsa_signal_add_scacquire)* hsa_signal_add_scacquire_fn; - decltype(hsa_signal_add_acquire)* hsa_signal_add_acquire_fn; - }; - union { - decltype(hsa_signal_add_screlease)* hsa_signal_add_screlease_fn; - decltype(hsa_signal_add_release)* hsa_signal_add_release_fn; - }; - union { - decltype(hsa_signal_add_scacq_screl)* hsa_signal_add_scacq_screl_fn; - decltype(hsa_signal_add_acq_rel)* hsa_signal_add_acq_rel_fn; - }; + decltype(hsa_signal_add_scacquire)* hsa_signal_add_scacquire_fn; + decltype(hsa_signal_add_screlease)* hsa_signal_add_screlease_fn; + decltype(hsa_signal_add_scacq_screl)* hsa_signal_add_scacq_screl_fn; decltype(hsa_signal_subtract_relaxed)* hsa_signal_subtract_relaxed_fn; - union { - decltype(hsa_signal_subtract_scacquire)* hsa_signal_subtract_scacquire_fn; - decltype(hsa_signal_subtract_acquire)* hsa_signal_subtract_acquire_fn; - }; - union { - decltype(hsa_signal_subtract_screlease)* hsa_signal_subtract_screlease_fn; - decltype(hsa_signal_subtract_release)* hsa_signal_subtract_release_fn; - }; - union { - decltype(hsa_signal_subtract_scacq_screl)* hsa_signal_subtract_scacq_screl_fn; - decltype(hsa_signal_subtract_acq_rel)* hsa_signal_subtract_acq_rel_fn; - }; + decltype(hsa_signal_subtract_scacquire)* hsa_signal_subtract_scacquire_fn; + decltype(hsa_signal_subtract_screlease)* hsa_signal_subtract_screlease_fn; + decltype(hsa_signal_subtract_scacq_screl)* hsa_signal_subtract_scacq_screl_fn; decltype(hsa_signal_cas_relaxed)* hsa_signal_cas_relaxed_fn; - union { - decltype(hsa_signal_cas_scacquire)* hsa_signal_cas_scacquire_fn; - decltype(hsa_signal_cas_acquire)* hsa_signal_cas_acquire_fn; - }; - union { - decltype(hsa_signal_cas_screlease)* hsa_signal_cas_screlease_fn; - decltype(hsa_signal_cas_release)* hsa_signal_cas_release_fn; - }; - union { - decltype(hsa_signal_cas_scacq_screl)* hsa_signal_cas_scacq_screl_fn; - decltype(hsa_signal_cas_acq_rel)* hsa_signal_cas_acq_rel_fn; - }; + decltype(hsa_signal_cas_scacquire)* hsa_signal_cas_scacquire_fn; + decltype(hsa_signal_cas_screlease)* hsa_signal_cas_screlease_fn; + decltype(hsa_signal_cas_scacq_screl)* hsa_signal_cas_scacq_screl_fn; //===--- Instruction Set Architecture -----------------------------------===//