Renamed API amdsmi_dev_get_fan_rpms to

amdsmi_get_gpu_fan_rpms

grep -rli 'amdsmi_dev_get_fan_rpms' * | xargs -i@ sed -i
's/amdsmi_dev_get_fan_rpms/amdsmi_get_gpu_fan_rpms/g' @

Change-Id: Iaedac65cba608c3661dbf80399b236c7aa33dac1


[ROCm/amdsmi commit: 825b12a437]

projects/amdsmi/include/amd_smi/amdsmi.h

@@ -1911,7 +1911,7 @@ amdsmi_get_gpu_memory_reserved_pages(amdsmi_processor_handle processor_handle, u
  *
  *  @return ::amdsmi_status_t | ::AMDSMI_STATUS_SUCCESS on success, non-zero on fail
  */
-amdsmi_status_t amdsmi_dev_get_fan_rpms(amdsmi_processor_handle processor_handle, uint32_t sensor_ind,
+amdsmi_status_t amdsmi_get_gpu_fan_rpms(amdsmi_processor_handle processor_handle, uint32_t sensor_ind,
                                                               int64_t *speed);
 
 /**

projects/amdsmi/py-interface/README.md

@@ -1746,7 +1746,7 @@ try:
 except AmdSmiException as e:
     print(e)
 ```
-## amdsmi_dev_get_fan_rpms
+## amdsmi_get_gpu_fan_rpms
 Description: Get the fan speed in RPMs of the device with the specified device
 handle and 0-based sensor index.
 
@@ -1757,7 +1757,7 @@ more than one sensor, it could be greater than 0.
 
 Output: Fan speed in rpms as integer
 
-Exceptions that can be thrown by `amdsmi_dev_get_fan_rpms` function:
+Exceptions that can be thrown by `amdsmi_get_gpu_fan_rpms` function:
 * `AmdSmiLibraryException`
 * `AmdSmiRetryException`
 * `AmdSmiParameterException`
@@ -1770,7 +1770,7 @@ try:
         print("No GPUs on machine")
     else:
         for device in devices:
-            fan_rpm = amdsmi_dev_get_fan_rpms(device, 0)
+            fan_rpm = amdsmi_get_gpu_fan_rpms(device, 0)
             print(fan_rpm)
 except AmdSmiException as e:
     print(e)

projects/amdsmi/py-interface/__init__.py

@@ -97,7 +97,7 @@ from .amdsmi_interface import  amdsmi_dev_set_overdrive_level_v1
 from .amdsmi_interface import  amdsmi_dev_set_overdrive_level
 
 # # Physical State Queries
-from .amdsmi_interface import amdsmi_dev_get_fan_rpms
+from .amdsmi_interface import amdsmi_get_gpu_fan_rpms
 from .amdsmi_interface import amdsmi_dev_get_fan_speed
 from .amdsmi_interface import amdsmi_dev_get_fan_speed_max
 from .amdsmi_interface import  amdsmi_dev_get_temp_metric

projects/amdsmi/py-interface/amdsmi_interface.py

@@ -2060,7 +2060,7 @@ def amdsmi_dev_set_perf_level_v1(
         processor_handle, perf_lvl))
 
 
-def amdsmi_dev_get_fan_rpms(
+def amdsmi_get_gpu_fan_rpms(
     processor_handle: amdsmi_wrapper.amdsmi_processor_handle, sensor_idx: int
 ) -> int:
     if not isinstance(processor_handle, amdsmi_wrapper.amdsmi_processor_handle):
@@ -2071,7 +2071,7 @@ def amdsmi_dev_get_fan_rpms(
         raise AmdSmiParameterException(sensor_idx, int)
     fan_speed = ctypes.c_int64()
     _check_res(
-        amdsmi_wrapper.amdsmi_dev_get_fan_rpms(
+        amdsmi_wrapper.amdsmi_get_gpu_fan_rpms(
             processor_handle, sensor_idx, ctypes.byref(fan_speed)
         )
     )

projects/amdsmi/py-interface/amdsmi_wrapper.py

@@ -1487,9 +1487,9 @@ amdsmi_get_gpu_memory_busy_percent.argtypes = [amdsmi_processor_handle, ctypes.P
 amdsmi_get_gpu_memory_reserved_pages = _libraries['libamd_smi.so'].amdsmi_get_gpu_memory_reserved_pages
 amdsmi_get_gpu_memory_reserved_pages.restype = amdsmi_status_t
 amdsmi_get_gpu_memory_reserved_pages.argtypes = [amdsmi_processor_handle, ctypes.POINTER(ctypes.c_uint32), ctypes.POINTER(struct_c__SA_amdsmi_retired_page_record_t)]
-amdsmi_dev_get_fan_rpms = _libraries['libamd_smi.so'].amdsmi_dev_get_fan_rpms
-amdsmi_dev_get_fan_rpms.restype = amdsmi_status_t
-amdsmi_dev_get_fan_rpms.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_int64)]
+amdsmi_get_gpu_fan_rpms = _libraries['libamd_smi.so'].amdsmi_get_gpu_fan_rpms
+amdsmi_get_gpu_fan_rpms.restype = amdsmi_status_t
+amdsmi_get_gpu_fan_rpms.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_int64)]
 amdsmi_dev_get_fan_speed = _libraries['libamd_smi.so'].amdsmi_dev_get_fan_speed
 amdsmi_dev_get_fan_speed.restype = amdsmi_status_t
 amdsmi_dev_get_fan_speed.argtypes = [amdsmi_processor_handle, uint32_t, ctypes.POINTER(ctypes.c_int64)]
@@ -1854,7 +1854,7 @@ __all__ = \
     'amdsmi_dev_destroy_counter', 'amdsmi_dev_get_busy_percent',
     'amdsmi_get_gpu_drm_render_minor', 'amdsmi_dev_get_ecc_count',
     'amdsmi_dev_get_ecc_enabled', 'amdsmi_dev_get_ecc_status',
-    'amdsmi_get_energy_count', 'amdsmi_dev_get_fan_rpms',
+    'amdsmi_get_energy_count', 'amdsmi_get_gpu_fan_rpms',
     'amdsmi_dev_get_fan_speed', 'amdsmi_dev_get_fan_speed_max',
     'amdsmi_dev_get_gpu_clk_freq', 'amdsmi_dev_get_gpu_metrics_info',
     'amdsmi_get_gpu_id', 'amdsmi_get_gpu_memory_busy_percent',

projects/amdsmi/py-interface/rocm_smi_tool.py

@@ -304,7 +304,7 @@ class Formatter:
     |     """ + self.style.text("15   Get device memory usage.              Api: amdsmi_get_gpu_memory_usage            <bdf>") + """                        |
     |     """ + self.style.text("16   Get device memory busy percent.       Api: amdsmi_get_gpu_memory_busy_percent     <bdf>") + """                        |
     |     """ + self.style.text("17   Get device memory reserved pages.     Api: amdsmi_get_gpu_memory_reserved_pages   <bdf>") + """                        |
-    |     """ + self.style.text("18   Get device fan rpms.                  Api: amdsmi_dev_get_fan_rpms                <bdf><sensor_idx>") + """            |
+    |     """ + self.style.text("18   Get device fan rpms.                  Api: amdsmi_get_gpu_fan_rpms                <bdf><sensor_idx>") + """            |
     |     """ + self.style.text("19   Get device fan speed.                 Api: amdsmi_dev_get_fan_speed               <bdf><sensor_idx>") + """            |
     |     """ + self.style.text("20   Get device fan speed max.             Api: amdsmi_dev_get_fan_speed_max           <bdf><sensor_idx>") + """            |
     |     """ + self.style.text("21   Get device temp metric.               Api:  amdsmi_dev_get_temp_metric             <bdf>") + """                        |
@@ -403,7 +403,7 @@ def amdsmi_tool_dev_memory_usage_get(dev):
 
 def amdsmi_tool_dev_fan_rpms_get(dev, dic):
     sensor_idx = dic["sensor_idx"]
-    return smi_api.amdsmi_dev_get_fan_rpms(dev, sensor_idx)
+    return smi_api.amdsmi_get_gpu_fan_rpms(dev, sensor_idx)
 
 def amdsmi_tool_dev_fan_speed_get(dev, dic):
     sensor_idx = dic["sensor_idx"]

projects/amdsmi/src/amd_smi/amd_smi.cc

@@ -478,7 +478,7 @@ amdsmi_status_t amdsmi_get_caps_info(amdsmi_processor_handle processor_handle,
     return AMDSMI_STATUS_SUCCESS;
 }
 
-amdsmi_status_t amdsmi_dev_get_fan_rpms(amdsmi_processor_handle processor_handle,
+amdsmi_status_t amdsmi_get_gpu_fan_rpms(amdsmi_processor_handle processor_handle,
                             uint32_t sensor_ind, int64_t *speed) {
     return rsmi_wrapper(rsmi_dev_fan_rpms_get, processor_handle, sensor_ind,
             speed);
@@ -943,7 +943,7 @@ amdsmi_get_func_iter_value(amdsmi_func_id_iter_handle_t handle,
         {"rsmi_dev_power_cap_default_get", "amdsmi_get_power_cap_info"},
         {"rsmi_dev_power_cap_range_get", "amdsmi_get_power_cap_info"},
         {"rsmi_dev_power_cap_set", " amdsmi_set_power_cap"},
-        {"rsmi_dev_fan_rpms_get", "amdsmi_dev_get_fan_rpms"},
+        {"rsmi_dev_fan_rpms_get", "amdsmi_get_gpu_fan_rpms"},
         {"rsmi_dev_fan_speed_get", "amdsmi_dev_get_fan_speed"},
         {"rsmi_dev_fan_speed_max_get", "amdsmi_dev_get_fan_speed_max"},
         {"rsmi_dev_temp_metric_get", " amdsmi_dev_get_temp_metric"},

projects/amdsmi/tests/amd_smi_test/functional/fan_read.cc

@@ -130,14 +130,14 @@ void TestFanRead::Run(void) {
       IF_VERB(STANDARD) {
         std::cout << "\t**Current fan RPMs: ";
       }
-      err = amdsmi_dev_get_fan_rpms(processor_handles_[i], 0, &val_i64);
+      err = amdsmi_get_gpu_fan_rpms(processor_handles_[i], 0, &val_i64);
       CHK_ERR_ASRT(err)
       IF_VERB(STANDARD) {
         std::cout << val_i64 << std::endl;
       }
 
       // Verify api support checking functionality is working
-      err = amdsmi_dev_get_fan_rpms(processor_handles_[i], 0, nullptr);
+      err = amdsmi_get_gpu_fan_rpms(processor_handles_[i], 0, nullptr);
       ASSERT_EQ(err, AMDSMI_STATUS_INVAL);
     }
   }

projects/amdsmi/tests/amd_smi_test/functional/mutual_exclusion.cc

@@ -223,7 +223,7 @@ void TestMutualExclusion::Run(void) {
     CHECK_RET(ret, AMDSMI_STATUS_BUSY);
     ret =  amdsmi_set_gpu_pci_bandwidth(processor_handles_[0], 0);
     CHECK_RET(ret, AMDSMI_STATUS_BUSY);
-    ret = amdsmi_dev_get_fan_rpms(processor_handles_[0], dmy_ui32, &dmy_i64);
+    ret = amdsmi_get_gpu_fan_rpms(processor_handles_[0], dmy_ui32, &dmy_i64);
     CHECK_RET(ret, AMDSMI_STATUS_BUSY);
     ret = amdsmi_dev_get_fan_speed(processor_handles_[0], 0, &dmy_i64);
     CHECK_RET(ret, AMDSMI_STATUS_BUSY);
@@ -275,7 +275,7 @@ void TestMutualExclusion::Run(void) {
      amdsmi_dev_get_temp_metric
      amdsmi_dev_get_volt_metric
     amdsmi_dev_get_fan_speed
-    amdsmi_dev_get_fan_rpms
+    amdsmi_get_gpu_fan_rpms
     amdsmi_dev_reset_fan
     amdsmi_dev_set_fan_speed
     amdsmi_dev_get_fan_speed_max