diff --git a/projects/amdsmi/include/amd_smi/amdsmi.h b/projects/amdsmi/include/amd_smi/amdsmi.h index d6146adb46..54cde8f430 100644 --- a/projects/amdsmi/include/amd_smi/amdsmi.h +++ b/projects/amdsmi/include/amd_smi/amdsmi.h @@ -693,7 +693,7 @@ typedef enum { /** * @brief Pre-set Profile Selections. These bitmasks can be AND'd with the * ::amdsmi_power_profile_status_t.available_profiles returned from - * :: amdsmi_dev_get_power_profile_presets to determine which power profiles + * :: amdsmi_get_gpu_power_profile_presets to determine which power profiles * are supported by the system. */ typedef enum { @@ -1713,7 +1713,7 @@ amdsmi_status_t * @details This function will attempt to set the current profile to the provided * profile, given a processor handle @p processor_handle and a @p profile. The provided * profile must be one of the currently supported profiles, as indicated by a - * call to :: amdsmi_dev_get_power_profile_presets() + * call to :: amdsmi_get_gpu_power_profile_presets() * * @param[in] processor_handle a processor handle * @@ -2431,7 +2431,7 @@ amdsmi_status_t amdsmi_dev_get_od_volt_curve_regions(amdsmi_processor_handle pr * @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail */ amdsmi_status_t - amdsmi_dev_get_power_profile_presets(amdsmi_processor_handle processor_handle, uint32_t sensor_ind, + amdsmi_get_gpu_power_profile_presets(amdsmi_processor_handle processor_handle, uint32_t sensor_ind, amdsmi_power_profile_status_t *status); /** @} End PerfQuer */ diff --git a/projects/amdsmi/py-interface/README.md b/projects/amdsmi/py-interface/README.md index 72f3b45f1a..c405ab47af 100644 --- a/projects/amdsmi/py-interface/README.md +++ b/projects/amdsmi/py-interface/README.md @@ -2200,7 +2200,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_get_power_profile_presets +## amdsmi_get_gpu_power_profile_presets Description: Get the list of available preset power profiles and an indication of which profile is currently active @@ -2216,7 +2216,7 @@ Field | Description `current`| Which power profile is currently active `num_profiles`| How many power profiles are available -Exceptions that can be thrown by ` amdsmi_dev_get_power_profile_presets` function: +Exceptions that can be thrown by ` amdsmi_get_gpu_power_profile_presets` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2229,7 +2229,7 @@ try: print("No GPUs on machine") else: for device in devices: - amdsmi_dev_get_power_profile_presets(device, 0) + amdsmi_get_gpu_power_profile_presets(device, 0) except AmdSmiException as e: print(e) ``` @@ -2431,7 +2431,7 @@ try: except AmdSmiException as e: print(e) ``` -## amdsmi_dev_get_power_profile_presets +## amdsmi_get_gpu_power_profile_presets Description: Get the list of available preset power profiles and an indication of which profile is currently active. @@ -2447,7 +2447,7 @@ Field | Description `current`| Which power profile is currently active `num_profiles`| How many power profiles are available -Exceptions that can be thrown by ` amdsmi_dev_get_power_profile_presets` function: +Exceptions that can be thrown by ` amdsmi_get_gpu_power_profile_presets` function: * `AmdSmiLibraryException` * `AmdSmiRetryException` * `AmdSmiParameterException` @@ -2460,7 +2460,7 @@ try: print("No GPUs on machine") else: for device in devices: - status = amdsmi_dev_get_power_profile_presets(device, 0) + status = amdsmi_get_gpu_power_profile_presets(device, 0) print(status) except AmdSmiException as e: print(e) diff --git a/projects/amdsmi/py-interface/__init__.py b/projects/amdsmi/py-interface/__init__.py index 3e8626c28f..d46b4bd25f 100644 --- a/projects/amdsmi/py-interface/__init__.py +++ b/projects/amdsmi/py-interface/__init__.py @@ -87,7 +87,7 @@ from .amdsmi_interface import amdsmi_dev_set_od_clk_info from .amdsmi_interface import amdsmi_dev_set_od_volt_info from .amdsmi_interface import amdsmi_set_gpu_perf_level_v1 from .amdsmi_interface import amdsmi_set_gpu_perf_level -from .amdsmi_interface import amdsmi_dev_get_power_profile_presets +from .amdsmi_interface import amdsmi_get_gpu_power_profile_presets from .amdsmi_interface import amdsmi_reset_gpu from .amdsmi_interface import amdsmi_set_gpu_perf_determinism_mode from .amdsmi_interface import amdsmi_set_gpu_fan_speed @@ -113,7 +113,7 @@ from .amdsmi_interface import amdsmi_get_clk_freq from .amdsmi_interface import amdsmi_dev_get_od_volt_info from .amdsmi_interface import amdsmi_get_gpu_metrics_info from .amdsmi_interface import amdsmi_dev_get_od_volt_curve_regions -from .amdsmi_interface import amdsmi_dev_get_power_profile_presets +from .amdsmi_interface import amdsmi_get_gpu_power_profile_presets # # Performance Counters from .amdsmi_interface import amdsmi_dev_counter_group_supported diff --git a/projects/amdsmi/py-interface/amdsmi_interface.py b/projects/amdsmi/py-interface/amdsmi_interface.py index 12363de08c..bef6e8801b 100644 --- a/projects/amdsmi/py-interface/amdsmi_interface.py +++ b/projects/amdsmi/py-interface/amdsmi_interface.py @@ -1467,7 +1467,7 @@ def amdsmi_set_gpu_perf_level( processor_handle, perf_level)) -def amdsmi_dev_get_power_profile_presets( +def amdsmi_get_gpu_power_profile_presets( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int ) -> Dict[str, Any]: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -1481,7 +1481,7 @@ def amdsmi_dev_get_power_profile_presets( status = amdsmi_wrapper.amdsmi_power_profile_status_t() _check_res( - amdsmi_wrapper. amdsmi_dev_get_power_profile_presets( + amdsmi_wrapper. amdsmi_get_gpu_power_profile_presets( processor_handle, sensor_idx, ctypes.byref(status) ) ) @@ -2438,7 +2438,7 @@ def amdsmi_dev_get_od_volt_curve_regions( return result -def amdsmi_dev_get_power_profile_presets( +def amdsmi_get_gpu_power_profile_presets( processor_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int ) -> Dict[str, Any]: if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle): @@ -2450,7 +2450,7 @@ def amdsmi_dev_get_power_profile_presets( status = amdsmi_wrapper.amdsmi_power_profile_status_t() _check_res( - amdsmi_wrapper. amdsmi_dev_get_power_profile_presets( + amdsmi_wrapper. amdsmi_get_gpu_power_profile_presets( processor_handle, sensor_idx, ctypes.byref(status) ) ) diff --git a/projects/amdsmi/py-interface/amdsmi_wrapper.py b/projects/amdsmi/py-interface/amdsmi_wrapper.py index 43757b11f8..9c0247a7fd 100644 --- a/projects/amdsmi/py-interface/amdsmi_wrapper.py +++ b/projects/amdsmi/py-interface/amdsmi_wrapper.py @@ -1553,9 +1553,9 @@ amdsmi_dev_set_od_volt_info.argtypes = [amdsmi_processor_handle, uint32_t, uint6 amdsmi_dev_get_od_volt_curve_regions = _libraries['libamd_smi.so'].amdsmi_dev_get_od_volt_curve_regions amdsmi_dev_get_od_volt_curve_regions.restype = amdsmi_status_t amdsmi_dev_get_od_volt_curve_regions.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_freq_volt_region_t)] -amdsmi_dev_get_power_profile_presets = _libraries['libamd_smi.so'].amdsmi_dev_get_power_profile_presets -amdsmi_dev_get_power_profile_presets.restype = amdsmi_status_t -amdsmi_dev_get_power_profile_presets.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(struct_c__SA_amdsmi_power_profile_status_t)] +amdsmi_get_gpu_power_profile_presets = _libraries['libamd_smi.so'].amdsmi_get_gpu_power_profile_presets +amdsmi_get_gpu_power_profile_presets.restype = amdsmi_status_t +amdsmi_get_gpu_power_profile_presets.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(struct_c__SA_amdsmi_power_profile_status_t)] amdsmi_set_gpu_perf_level = _libraries['libamd_smi.so'].amdsmi_set_gpu_perf_level amdsmi_set_gpu_perf_level.restype = amdsmi_status_t amdsmi_set_gpu_perf_level.argtypes = [amdsmi_processor_handle, amdsmi_dev_perf_level_t] @@ -1866,7 +1866,7 @@ __all__ = \ 'amdsmi_get_gpu_pci_replay_counter', 'amdsmi_get_gpu_pci_throughput', 'amdsmi_get_gpu_perf_level', 'amdsmi_get_power_ave', - 'amdsmi_dev_get_power_profile_presets', + 'amdsmi_get_gpu_power_profile_presets', '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', diff --git a/projects/amdsmi/py-interface/rocm_smi_tool.py b/projects/amdsmi/py-interface/rocm_smi_tool.py index 5ccc0a6ae5..a2e7c17077 100644 --- a/projects/amdsmi/py-interface/rocm_smi_tool.py +++ b/projects/amdsmi/py-interface/rocm_smi_tool.py @@ -318,7 +318,7 @@ class Formatter: | """ + self.style.text("29 Get device od volt. Api: amdsmi_dev_get_od_volt_info ") + """ | | """ + self.style.text("30 Get device gpu metrics. Api: amdsmi_get_gpu_metrics_info ") + """ | | """ + self.style.text("31 Get device od volt curve regions. Api: amdsmi_dev_get_od_volt_curve_regions ") + """ | - | """ + self.style.text("32 Get device power profile presets. Api: amdsmi_dev_get_power_profile_presets ") + """ | + | """ + self.style.text("32 Get device power profile presets. Api: amdsmi_get_gpu_power_profile_presets ") + """ | | """ + self.style.text("33 Get the build version. Api: amdsmi_get_version ") + """ | | """ + self.style.text("34 Get version string. Api: amdsmi_get_version_str ") + """ | | """ + self.style.text("35 Get device ecc counter. Api: amdsmi_dev_get_ecc_count ") + """ | @@ -454,7 +454,7 @@ def amdsmi_tool_perf_determinism_mode_set(dev, dic): def amdsmi_tool_dev_power_profile_presets_get(dev, dic): sensor_idx = dic["sensor_idx"] - return smi_api. amdsmi_dev_get_power_profile_presets(dev, sensor_idx) + return smi_api. amdsmi_get_gpu_power_profile_presets(dev, sensor_idx) def amdsmi_tool_version_str_get(): result = {} diff --git a/projects/amdsmi/src/amd_smi/amd_smi.cc b/projects/amdsmi/src/amd_smi/amd_smi.cc index a1fd6550ab..132b70796e 100644 --- a/projects/amdsmi/src/amd_smi/amd_smi.cc +++ b/projects/amdsmi/src/amd_smi/amd_smi.cc @@ -911,7 +911,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle, {"rsmi_dev_busy_percent_get", "amdsmi_get_busy_percent"}, {"rsmi_dev_memory_reserved_pages_get", "amdsmi_get_gpu_memory_reserved_pages"}, {"rsmi_dev_overdrive_level_get", "amdsmi_dev_get_overdrive_level"}, - {"rsmi_dev_power_profile_presets_get", " amdsmi_dev_get_power_profile_presets"}, + {"rsmi_dev_power_profile_presets_get", " amdsmi_get_gpu_power_profile_presets"}, {"rsmi_dev_perf_level_set", " amdsmi_set_gpu_perf_level"}, {"rsmi_dev_perf_level_set_v1", " amdsmi_set_gpu_perf_level_v1"}, {"rsmi_dev_perf_level_get", "amdsmi_get_gpu_perf_level"}, @@ -1141,7 +1141,7 @@ amdsmi_get_power_ave(amdsmi_processor_handle processor_handle, sensor_ind, power); } amdsmi_status_t - amdsmi_dev_get_power_profile_presets(amdsmi_processor_handle processor_handle, + amdsmi_get_gpu_power_profile_presets(amdsmi_processor_handle processor_handle, uint32_t sensor_ind, amdsmi_power_profile_status_t *status) { AMDSMI_CHECK_INIT(); diff --git a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc index 62feb84d1a..31965fb834 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc @@ -287,7 +287,7 @@ void TestMutualExclusion::Run(void) { amdsmi_dev_power_cap_get amdsmi_dev_power_cap_range_get amdsmi_set_power_cap - amdsmi_dev_get_power_profile_presets + amdsmi_get_gpu_power_profile_presets amdsmi_set_gpu_power_profile amdsmi_get_gpu_memory_total amdsmi_get_gpu_memory_usage diff --git a/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc b/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc index 735b468e44..f341c7c069 100755 --- a/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc +++ b/projects/amdsmi/tests/amd_smi_test/functional/power_read_write.cc @@ -122,7 +122,7 @@ void TestPowerReadWrite::Run(void) { for (uint32_t dv_ind = 0; dv_ind < num_monitor_devs(); ++dv_ind) { PrintDeviceHeader(processor_handles_[dv_ind]); - ret = amdsmi_dev_get_power_profile_presets(processor_handles_[dv_ind], 0, &status); + ret = amdsmi_get_gpu_power_profile_presets(processor_handles_[dv_ind], 0, &status); if (ret == AMDSMI_STATUS_NOT_SUPPORTED) { std::cout << "The power profile presets settings is not supported. " << std::endl; @@ -131,7 +131,7 @@ void TestPowerReadWrite::Run(void) { CHK_ERR_ASRT(ret) // Verify api support checking functionality is working - ret = amdsmi_dev_get_power_profile_presets(processor_handles_[dv_ind], 0, nullptr); + ret = amdsmi_get_gpu_power_profile_presets(processor_handles_[dv_ind], 0, nullptr); ASSERT_EQ(ret, AMDSMI_STATUS_INVAL); IF_VERB(STANDARD) { @@ -180,7 +180,7 @@ void TestPowerReadWrite::Run(void) { CHK_ERR_ASRT(ret) ASSERT_EQ(pfl, AMDSMI_DEV_PERF_LEVEL_MANUAL); - ret = amdsmi_dev_get_power_profile_presets(processor_handles_[dv_ind], 0, &status); + ret = amdsmi_get_gpu_power_profile_presets(processor_handles_[dv_ind], 0, &status); CHK_ERR_ASRT(ret) ASSERT_EQ(status.current, new_prof); @@ -192,7 +192,7 @@ void TestPowerReadWrite::Run(void) { CHK_ERR_ASRT(ret) ASSERT_EQ(pfl, AMDSMI_DEV_PERF_LEVEL_AUTO); - ret = amdsmi_dev_get_power_profile_presets(processor_handles_[dv_ind], 0, &status); + ret = amdsmi_get_gpu_power_profile_presets(processor_handles_[dv_ind], 0, &status); CHK_ERR_ASRT(ret) ASSERT_EQ(status.current, orig_profile);