From 90607682ef430f101ccc50fd9cc09c9e411aea8b Mon Sep 17 00:00:00 2001 From: Suma Hegde Date: Tue, 28 Feb 2023 02:23:06 -0500 Subject: [PATCH] Renamed APIs amdsmi_dev_open_supported_func_iterator -> amdsmi_open_supported_func_iterator amdsmi_dev_open_supported_variant_iterator -> amdsmi_open_supported_variant_iterator amdsmi_dev_close_supported_func_iterator -> amdsmi_close_supported_func_iterator Change-Id: Ie9b2efa5aee7095c3c835b91de1951df6b065510 [ROCm/amdsmi commit: edd8f1ae2375ad11b0775bf39af44dce583b30d0] --- projects/amdsmi/include/amd_smi/amdsmi.h | 28 +++++++-------- projects/amdsmi/py-interface/README.md | 36 +++++++++---------- projects/amdsmi/py-interface/__init__.py | 6 ++-- .../amdsmi/py-interface/amdsmi_interface.py | 12 +++---- .../amdsmi/py-interface/amdsmi_wrapper.py | 24 ++++++------- projects/amdsmi/py-interface/rocm_smi_tool.py | 12 +++---- projects/amdsmi/src/amd_smi/amd_smi.cc | 6 ++-- .../functional/api_support_read.cc | 14 ++++---- 8 files changed, 69 insertions(+), 69 deletions(-) diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index 348a41cfe2..30f8843b02 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -3283,13 +3283,13 @@ amdsmi_is_P2P_accessible(amdsmi_processor_handle processor_handle_src, amdsmi_pr * // ... ... * * std::cout << "Supported AMDSMI Functions:" << std::endl; * - * err = amdsmi_dev_open_supported_func_iterator(device, &iter_handle); + * err = amdsmi_open_supported_func_iterator(device, &iter_handle); * * while (1) { * err = amdsmi_get_func_iter_value(iter_handle, &value); * std::cout << "Function Name: " << value.name << std::endl; * - * err = amdsmi_dev_open_supported_variant_iterator(iter_handle, &var_iter); + * err = amdsmi_open_supported_variant_iterator(iter_handle, &var_iter); * if (err != AMDSMI_STATUS_NO_DATA) { * std::cout << "\tVariants/Monitors: "; * while (1) { @@ -3302,7 +3302,7 @@ amdsmi_is_P2P_accessible(amdsmi_processor_handle processor_handle_src, amdsmi_pr * std::cout << " ("; * * err = - * amdsmi_dev_open_supported_variant_iterator(var_iter, &sub_var_iter); + * amdsmi_open_supported_variant_iterator(var_iter, &sub_var_iter); * if (err != AMDSMI_STATUS_NO_DATA) { * * while (1) { @@ -3315,7 +3315,7 @@ amdsmi_is_P2P_accessible(amdsmi_processor_handle processor_handle_src, amdsmi_pr * break; * } * } - * err = amdsmi_dev_close_supported_func_iterator(&sub_var_iter); + * err = amdsmi_close_supported_func_iterator(&sub_var_iter); * } * * std::cout << "), "; @@ -3328,7 +3328,7 @@ amdsmi_is_P2P_accessible(amdsmi_processor_handle processor_handle_src, amdsmi_pr * } * std::cout << std::endl; * - * err = amdsmi_dev_close_supported_func_iterator(&var_iter); + * err = amdsmi_close_supported_func_iterator(&var_iter); * } * * err = amdsmi_next_func_iter(iter_handle); @@ -3337,7 +3337,7 @@ amdsmi_is_P2P_accessible(amdsmi_processor_handle processor_handle_src, amdsmi_pr * break; * } * } - * err = amdsmi_dev_close_supported_func_iterator(&iter_handle); + * err = amdsmi_close_supported_func_iterator(&iter_handle); * } * @endcode * @@ -3352,9 +3352,9 @@ amdsmi_is_P2P_accessible(amdsmi_processor_handle processor_handle_src, amdsmi_pr * handle can be used to iterate through all the supported functions. * * Note that although this function takes in @p processor_handle as an argument, - * ::amdsmi_dev_open_supported_func_iterator itself will not be among the + * ::amdsmi_open_supported_func_iterator itself will not be among the * functions listed as supported. This is because - * ::amdsmi_dev_open_supported_func_iterator does not depend on hardware or + * ::amdsmi_open_supported_func_iterator does not depend on hardware or * driver support and should always be supported. * * @param[in] processor_handle a processor handle of device for which support information is @@ -3366,7 +3366,7 @@ amdsmi_is_P2P_accessible(amdsmi_processor_handle processor_handle_src, amdsmi_pr * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_open_supported_func_iterator(amdsmi_processor_handle processor_handle, +amdsmi_open_supported_func_iterator(amdsmi_processor_handle processor_handle, amdsmi_func_id_iter_handle_t *handle); /** @@ -3376,13 +3376,13 @@ amdsmi_dev_open_supported_func_iterator(amdsmi_processor_handle processor_handle * write a function iterator handle to the caller-provided memory pointed to * by @p var_iter. This handle can be used to iterate through all the supported * variants of the provided handle. @p obj_h may be a handle to a function - * object, as provided by a call to ::amdsmi_dev_open_supported_func_iterator, or + * object, as provided by a call to ::amdsmi_open_supported_func_iterator, or * it may be a variant itself (from a call to - * ::amdsmi_dev_open_supported_variant_iterator), it which case @p var_iter will + * ::amdsmi_open_supported_variant_iterator), it which case @p var_iter will * be an iterator of the sub-variants of @p obj_h (e.g., monitors). * * This call allocates a small amount of memory to @p var_iter. To free this memory - * ::amdsmi_dev_close_supported_func_iterator should be called on the returned + * ::amdsmi_close_supported_func_iterator should be called on the returned * iterator handle @p var_iter when it is no longer needed. * * @param[in] obj_h an iterator handle for which the variants are being requested @@ -3393,7 +3393,7 @@ amdsmi_dev_open_supported_func_iterator(amdsmi_processor_handle processor_handle * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_open_supported_variant_iterator(amdsmi_func_id_iter_handle_t obj_h, +amdsmi_open_supported_variant_iterator(amdsmi_func_id_iter_handle_t obj_h, amdsmi_func_id_iter_handle_t *var_iter); /** @@ -3425,7 +3425,7 @@ amdsmi_next_func_iter(amdsmi_func_id_iter_handle_t handle); * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t -amdsmi_dev_close_supported_func_iterator(amdsmi_func_id_iter_handle_t *handle); +amdsmi_close_supported_func_iterator(amdsmi_func_id_iter_handle_t *handle); /** * @brief Get the value associated with a function/variant iterator diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index 9977a11e08..035c50d74c 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -1041,7 +1041,7 @@ except AmdSmiException as e: ``` -## amdsmi_dev_open_supported_func_iterator +## amdsmi_open_supported_func_iterator Description: Get a function name iterator of supported AMDSMI functions for a device Input parameters: @@ -1050,7 +1050,7 @@ Input parameters: Output: Handle for a function iterator -Exceptions that can be thrown by `amdsmi_dev_open_supported_func_iterator` function: +Exceptions that can be thrown by `amdsmi_open_supported_func_iterator` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -1063,14 +1063,14 @@ try: print("No GPUs on machine") else: for device in devices: - obj_handle = amdsmi_dev_open_supported_func_iterator(device) + obj_handle = amdsmi_open_supported_func_iterator(device) print(obj_handle) - amdsmi_dev_close_supported_func_iterator(obj_handle) + amdsmi_close_supported_func_iterator(obj_handle) except AmdSmiException as e: print(e) ``` -## amdsmi_dev_open_supported_variant_iterator +## amdsmi_open_supported_variant_iterator Description: Get a variant iterator for a given handle Input parameters: @@ -1079,7 +1079,7 @@ Input parameters: Output: Variant iterator handle -Exceptions that can be thrown by `amdsmi_dev_open_supported_variant_iterator` function: +Exceptions that can be thrown by `amdsmi_open_supported_variant_iterator` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -1092,11 +1092,11 @@ try: print("No GPUs on machine") else: for device in devices: - obj_handle = amdsmi_dev_open_supported_func_iterator(device) - var_iter = amdsmi_dev_open_supported_variant_iterator(obj_handle) + obj_handle = amdsmi_open_supported_func_iterator(device) + var_iter = amdsmi_open_supported_variant_iterator(obj_handle) print(var_iter) - amdsmi_dev_close_supported_func_iterator(obj_handle) - amdsmi_dev_close_supported_func_iterator(var_iter) + amdsmi_close_supported_func_iterator(obj_handle) + amdsmi_close_supported_func_iterator(var_iter) except AmdSmiException as e: print(e) ``` @@ -1123,16 +1123,16 @@ try: print("No GPUs on machine") else: for device in devices: - obj_handle = amdsmi_dev_open_supported_func_iterator(device) + obj_handle = amdsmi_open_supported_func_iterator(device) print(obj_handle) obj_handle = amdsmi_next_func_iter(obj_handle) print(obj_handle) - amdsmi_dev_close_supported_func_iterator(obj_handle) + amdsmi_close_supported_func_iterator(obj_handle) except AmdSmiException as e: print(e) ``` -## amdsmi_dev_close_supported_func_iterator +## amdsmi_close_supported_func_iterator Description: Close a variant iterator handle Input parameters: @@ -1141,7 +1141,7 @@ Input parameters: Output: None -Exceptions that can be thrown by `amdsmi_dev_close_supported_func_iterator` function: +Exceptions that can be thrown by `amdsmi_close_supported_func_iterator` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -1154,8 +1154,8 @@ try: print("No GPUs on machine") else: for device in devices: - obj_handle = amdsmi_dev_open_supported_func_iterator(device) - amdsmi_dev_close_supported_func_iterator(obj_handle) + obj_handle = amdsmi_open_supported_func_iterator(device) + amdsmi_close_supported_func_iterator(obj_handle) except AmdSmiException as e: print(e) ``` @@ -1188,10 +1188,10 @@ try: print("No GPUs on machine") else: for device in devices: - obj_handle = amdsmi_dev_open_supported_func_iterator(device) + obj_handle = amdsmi_open_supported_func_iterator(device) value = amdsmi_get_func_iter_value(obj_handle) print(value) - amdsmi_dev_close_supported_func_iterator(obj_handle) + amdsmi_close_supported_func_iterator(obj_handle) except AmdSmiException as e: print(e) ``` diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index 03b4e5f210..ae5eaaf648 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -72,9 +72,9 @@ from .amdsmi_interface import amdsmi_get_gpu_board_info from .amdsmi_interface import amdsmi_get_gpu_ras_block_features_enabled # # Supported Function Checks -from .amdsmi_interface import amdsmi_dev_open_supported_func_iterator -from .amdsmi_interface import amdsmi_dev_open_supported_variant_iterator -from .amdsmi_interface import amdsmi_dev_close_supported_func_iterator +from .amdsmi_interface import amdsmi_open_supported_func_iterator +from .amdsmi_interface import amdsmi_open_supported_variant_iterator +from .amdsmi_interface import amdsmi_close_supported_func_iterator from .amdsmi_interface import amdsmi_next_func_iter from .amdsmi_interface import amdsmi_get_func_iter_value diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index c4d4d4924a..019ce5d44d 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -1608,7 +1608,7 @@ def amdsmi_set_gpu_overdrive_level( ) -def amdsmi_dev_open_supported_func_iterator( +def amdsmi_open_supported_func_iterator( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, ) -> amdsmi_wrapper.amdsmi_func_id_iter_handle_t: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -1618,7 +1618,7 @@ def amdsmi_dev_open_supported_func_iterator( obj_handle = amdsmi_wrapper.amdsmi_func_id_iter_handle_t() _check_res( - amdsmi_wrapper.amdsmi_dev_open_supported_func_iterator( + amdsmi_wrapper.amdsmi_open_supported_func_iterator( processor_handle, ctypes.byref(obj_handle) ) ) @@ -1641,7 +1641,7 @@ def amdsmi_get_gpu_pci_id(processor_handle: amdsmi_wrapper.amdsmi_processor_hand return bdfid.value -def amdsmi_dev_open_supported_variant_iterator( +def amdsmi_open_supported_variant_iterator( obj_handle: amdsmi_wrapper.amdsmi_func_id_iter_handle_t, ) -> amdsmi_wrapper.amdsmi_func_id_iter_handle_t: if not isinstance(obj_handle, amdsmi_wrapper.amdsmi_func_id_iter_handle_t): @@ -1651,7 +1651,7 @@ def amdsmi_dev_open_supported_variant_iterator( var_iter = amdsmi_wrapper.amdsmi_func_id_iter_handle_t() _check_res( - amdsmi_wrapper.amdsmi_dev_open_supported_variant_iterator( + amdsmi_wrapper.amdsmi_open_supported_variant_iterator( obj_handle, ctypes.byref(var_iter) ) ) @@ -1659,7 +1659,7 @@ def amdsmi_dev_open_supported_variant_iterator( return var_iter -def amdsmi_dev_close_supported_func_iterator( +def amdsmi_close_supported_func_iterator( obj_handle: amdsmi_wrapper.amdsmi_func_id_iter_handle_t, ) -> None: if not isinstance(obj_handle, amdsmi_wrapper.amdsmi_func_id_iter_handle_t): @@ -1668,7 +1668,7 @@ def amdsmi_dev_close_supported_func_iterator( ) _check_res( - amdsmi_wrapper.amdsmi_dev_close_supported_func_iterator( + amdsmi_wrapper.amdsmi_close_supported_func_iterator( obj_handle, ctypes.byref(obj_handle) ) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index 64eb00d497..d65660dae2 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1637,18 +1637,18 @@ amdsmi_topo_get_link_type.argtypes = [amdsmi_processor_handle, amdsmi_processor_ amdsmi_is_P2P_accessible = _libraries['libamd_smi.so'].amdsmi_is_P2P_accessible amdsmi_is_P2P_accessible.restype = amdsmi_status_t amdsmi_is_P2P_accessible.argtypes = [amdsmi_processor_handle, amdsmi_processor_handle, ctypes.POINTER(ctypes.c_bool)] -amdsmi_dev_open_supported_func_iterator = _libraries['libamd_smi.so'].amdsmi_dev_open_supported_func_iterator -amdsmi_dev_open_supported_func_iterator.restype = amdsmi_status_t -amdsmi_dev_open_supported_func_iterator.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.POINTER(struct_amdsmi_func_id_iter_handle))] -amdsmi_dev_open_supported_variant_iterator = _libraries['libamd_smi.so'].amdsmi_dev_open_supported_variant_iterator -amdsmi_dev_open_supported_variant_iterator.restype = amdsmi_status_t -amdsmi_dev_open_supported_variant_iterator.argtypes = [amdsmi_func_id_iter_handle_t, ctypes.POINTER(ctypes.POINTER(struct_amdsmi_func_id_iter_handle))] +amdsmi_open_supported_func_iterator = _libraries['libamd_smi.so'].amdsmi_open_supported_func_iterator +amdsmi_open_supported_func_iterator.restype = amdsmi_status_t +amdsmi_open_supported_func_iterator.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.POINTER(struct_amdsmi_func_id_iter_handle))] +amdsmi_open_supported_variant_iterator = _libraries['libamd_smi.so'].amdsmi_open_supported_variant_iterator +amdsmi_open_supported_variant_iterator.restype = amdsmi_status_t +amdsmi_open_supported_variant_iterator.argtypes = [amdsmi_func_id_iter_handle_t, ctypes.POINTER(ctypes.POINTER(struct_amdsmi_func_id_iter_handle))] amdsmi_next_func_iter = _libraries['libamd_smi.so'].amdsmi_next_func_iter amdsmi_next_func_iter.restype = amdsmi_status_t amdsmi_next_func_iter.argtypes = [amdsmi_func_id_iter_handle_t] -amdsmi_dev_close_supported_func_iterator = _libraries['libamd_smi.so'].amdsmi_dev_close_supported_func_iterator -amdsmi_dev_close_supported_func_iterator.restype = amdsmi_status_t -amdsmi_dev_close_supported_func_iterator.argtypes = [ctypes.POINTER(ctypes.POINTER(struct_amdsmi_func_id_iter_handle))] +amdsmi_close_supported_func_iterator = _libraries['libamd_smi.so'].amdsmi_close_supported_func_iterator +amdsmi_close_supported_func_iterator.restype = amdsmi_status_t +amdsmi_close_supported_func_iterator.argtypes = [ctypes.POINTER(ctypes.POINTER(struct_amdsmi_func_id_iter_handle))] amdsmi_get_func_iter_value = _libraries['libamd_smi.so'].amdsmi_get_func_iter_value amdsmi_get_func_iter_value.restype = amdsmi_status_t amdsmi_get_func_iter_value.argtypes = [amdsmi_func_id_iter_handle_t, ctypes.POINTER(union_c__UA_amdsmi_func_id_value_t)] @@ -1849,7 +1849,7 @@ __all__ = \ 'amdsmi_counter_command_t', 'amdsmi_counter_command_t__enumvalues', 'amdsmi_get_gpu_available_counters', 'amdsmi_counter_value_t', - 'amdsmi_dev_close_supported_func_iterator', + 'amdsmi_close_supported_func_iterator', 'amdsmi_gpu_counter_group_supported', 'amdsmi_gpu_create_counter', 'amdsmi_gpu_destroy_counter', 'amdsmi_get_busy_percent', 'amdsmi_get_gpu_drm_render_minor', 'amdsmi_get_gpu_ecc_count', @@ -1870,8 +1870,8 @@ __all__ = \ 'amdsmi_get_gpu_subsystem_id', 'amdsmi_get_gpu_subsystem_name', 'amdsmi_get_temp_metric', 'amdsmi_get_gpu_vendor_name', 'amdsmi_get_gpu_volt_metric', 'amdsmi_get_gpu_vram_vendor', - 'amdsmi_dev_open_supported_func_iterator', - 'amdsmi_dev_open_supported_variant_iterator', + 'amdsmi_open_supported_func_iterator', + 'amdsmi_open_supported_variant_iterator', 'amdsmi_dev_perf_level_t', 'amdsmi_dev_perf_level_t__enumvalues', 'amdsmi_reset_gpu_fan', 'amdsmi_reset_gpu', 'amdsmi_reset_gpu_xgmi_error', 'amdsmi_set_clk_freq', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index f02bb83db1..f2d81110ba 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -363,8 +363,8 @@ class Formatter: | """ + self.style.text("74 Set dev perf level v1. Api: amdsmi_set_gpu_perf_level_v1 ") + """ | | """ + self.style.text("75 Set dev power cap. Api: amdsmi_set_power_cap ") + """ | | """ + self.style.text("76 Set dev power profile. Api: amdsmi_set_gpu_power_profile ") + """ | - | """ + self.style.text("77 Close dev supported func iterator. Api: amdsmi_dev_close_supported_func_iterator ") + """ | - | """ + self.style.text("78 Pen dev supported func iterator. Api: amdsmi_dev_open_supported_func_iterator ") + """ | + | """ + self.style.text("77 Close dev supported func iterator. Api: amdsmi_close_supported_func_iterator ") + """ | + | """ + self.style.text("78 Pen dev supported func iterator. Api: amdsmi_open_supported_func_iterator ") + """ | | """ + self.style.text("79 Get func iter next. Api: amdsmi_next_func_iter ") + """ | | """ + self.style.text("80 Get power cap info. Api: amdsmi_get_power_cap_info ") + """ | | """ + self.style.text("81 Get xgmi info. Api: amdsmi_get_xgmi_info ") + """ | @@ -709,11 +709,11 @@ def amdsmi_tool_dev_power_profile_set(dev, dic): return result def amdsmi_tool_dev_supported_func_iterator_close(dev): - obj_handle = smi_api.amdsmi_dev_open_supported_func_iterator(dev) - return smi_api.amdsmi_dev_close_supported_func_iterator(obj_handle) + obj_handle = smi_api.amdsmi_open_supported_func_iterator(dev) + return smi_api.amdsmi_close_supported_func_iterator(obj_handle) def amdsmi_tool_func_iter_next(dev): - obj_handle = smi_api.amdsmi_dev_open_supported_func_iterator(dev) + obj_handle = smi_api.amdsmi_open_supported_func_iterator(dev) return smi_api.amdsmi_next_func_iter(obj_handle) ############################################## @@ -969,7 +969,7 @@ commands = { 77: [amdsmi_tool_dev_supported_func_iterator_close, { "device_identifier1": [None, True] }], - 78: [smi_api.amdsmi_dev_open_supported_func_iterator, { + 78: [smi_api.amdsmi_open_supported_func_iterator, { "device_identifier1": [None, True] }], 79: [amdsmi_tool_func_iter_next, { diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index c73f2d37a6..59b995c714 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -835,7 +835,7 @@ amdsmi_reset_gpu_xgmi_error(amdsmi_processor_handle processor_handle) { } amdsmi_status_t -amdsmi_dev_open_supported_func_iterator(amdsmi_processor_handle processor_handle, +amdsmi_open_supported_func_iterator(amdsmi_processor_handle processor_handle, amdsmi_func_id_iter_handle_t *handle) { AMDSMI_CHECK_INIT(); @@ -846,7 +846,7 @@ amdsmi_dev_open_supported_func_iterator(amdsmi_processor_handle processor_handle } amdsmi_status_t -amdsmi_dev_open_supported_variant_iterator(amdsmi_func_id_iter_handle_t obj_h, +amdsmi_open_supported_variant_iterator(amdsmi_func_id_iter_handle_t obj_h, amdsmi_func_id_iter_handle_t *var_iter) { AMDSMI_CHECK_INIT(); @@ -868,7 +868,7 @@ amdsmi_next_func_iter(amdsmi_func_id_iter_handle_t handle) { } amdsmi_status_t -amdsmi_dev_close_supported_func_iterator(amdsmi_func_id_iter_handle_t *handle) { +amdsmi_close_supported_func_iterator(amdsmi_func_id_iter_handle_t *handle) { AMDSMI_CHECK_INIT(); if (handle == nullptr) diff --git a/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc b/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc index d7de667630..25dee643fe 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/api_support_read.cc @@ -106,7 +106,7 @@ void TestAPISupportRead::Run(void) { std::cout << "Supported AMDSMI Functions:" << std::endl; std::cout << "\tVariants (Monitors)" << std::endl; } - err = amdsmi_dev_open_supported_func_iterator(processor_handles_[i], &iter_handle); + err = amdsmi_open_supported_func_iterator(processor_handles_[i], &iter_handle); CHK_ERR_ASRT(err) while (1) { @@ -115,7 +115,7 @@ void TestAPISupportRead::Run(void) { IF_VERB(STANDARD) { std::cout << "Function Name: " << value.name << std::endl; } - err = amdsmi_dev_open_supported_variant_iterator(iter_handle, &var_iter); + err = amdsmi_open_supported_variant_iterator(iter_handle, &var_iter); if (err != AMDSMI_STATUS_NO_DATA) { CHK_ERR_ASRT(err) IF_VERB(STANDARD) { @@ -133,7 +133,7 @@ void TestAPISupportRead::Run(void) { std::cout << " ("; } err = - amdsmi_dev_open_supported_variant_iterator(var_iter, &sub_var_iter); + amdsmi_open_supported_variant_iterator(var_iter, &sub_var_iter); if (err != AMDSMI_STATUS_NO_DATA) { CHK_ERR_ASRT(err) @@ -150,7 +150,7 @@ void TestAPISupportRead::Run(void) { } CHK_ERR_ASRT(err) } - err = amdsmi_dev_close_supported_func_iterator(&sub_var_iter); + err = amdsmi_close_supported_func_iterator(&sub_var_iter); CHK_ERR_ASRT(err) } @@ -167,7 +167,7 @@ void TestAPISupportRead::Run(void) { IF_VERB(STANDARD) { std::cout << std::endl; } - err = amdsmi_dev_close_supported_func_iterator(&var_iter); + err = amdsmi_close_supported_func_iterator(&var_iter); CHK_ERR_ASRT(err) } @@ -178,10 +178,10 @@ void TestAPISupportRead::Run(void) { } CHK_ERR_ASRT(err) - // err = amdsmi_dev_open_supported_variant_iterator(iter_handle, &var_iter); + // err = amdsmi_open_supported_variant_iterator(iter_handle, &var_iter); // } - err = amdsmi_dev_close_supported_func_iterator(&iter_handle); + err = amdsmi_close_supported_func_iterator(&iter_handle); CHK_ERR_ASRT(err) } }