diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c7f47af5e..2fb5ef6db2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -135,6 +135,9 @@ GPU: 0 ### Changed +- **Corrected CLI CPU argument name**. + - `--cpu-pwr-svi-telemtry-rails` to `--cpu-pwr-svi-telemetry-rails` + - **Added amdgpu driver version and amd_hsmp driver version to `amd-smi version` command**. - The `amd-smi version` command can now also display the amdgpu driver version using the `-g` flag. - The amd_hsmp driver version can also be displayed using the `-c` flag. diff --git a/amdsmi_cli/amdsmi_commands.py b/amdsmi_cli/amdsmi_commands.py index 5347e99750..d5a03ab4b1 100644 --- a/amdsmi_cli/amdsmi_commands.py +++ b/amdsmi_cli/amdsmi_commands.py @@ -2427,7 +2427,7 @@ class AMDSMICommands(): cpu_freq_metrics (bool, optional): Value override for args.cpu_freq_metrics. Defaults to None. cpu_c0_res (bool, optional): Value override for args.cpu_c0_res. Defaults to None cpu_lclk_dpm_level (list, optional): Value override for args.cpu_lclk_dpm_level. Defaults to None - cpu_pwr_svi_telemtry_rails (list, optional): value override for args.cpu_pwr_svi_telemtry_rails. Defaults to None + cpu_pwr_svi_telemetry_rails (list, optional): value override for args.cpu_pwr_svi_telemetry_rails. Defaults to None cpu_io_bandwidth (list, optional): value override for args.cpu_io_bandwidth. Defaults to None cpu_xgmi_bandwidth (list, optional): value override for args.cpu_xgmi_bandwidth. Defaults to None cpu_metrics_ver (bool, optional): Value override for args.cpu_metrics_ver. Defaults to None @@ -2456,7 +2456,7 @@ class AMDSMICommands(): if cpu_lclk_dpm_level: args.cpu_lclk_dpm_level = cpu_lclk_dpm_level if cpu_pwr_svi_telemetry_rails: - args.cpu_pwr_svi_telemtry_rails = cpu_pwr_svi_telemetry_rails + args.cpu_pwr_svi_telemetry_rails = cpu_pwr_svi_telemetry_rails if cpu_io_bandwidth: args.cpu_io_bandwidth = cpu_io_bandwidth if cpu_xgmi_bandwidth: @@ -2480,13 +2480,13 @@ class AMDSMICommands(): #store cpu args that are applicable to the current platform curr_platform_cpu_args = ["cpu_power_metrics", "cpu_prochot", "cpu_freq_metrics", - "cpu_c0_res", "cpu_lclk_dpm_level", "cpu_pwr_svi_telemtry_rails", + "cpu_c0_res", "cpu_lclk_dpm_level", "cpu_pwr_svi_telemetry_rails", "cpu_io_bandwidth", "cpu_xgmi_bandwidth", "cpu_metrics_ver", "cpu_metrics_table", "cpu_socket_energy", "cpu_ddr_bandwidth", "cpu_temp", "cpu_dimm_temp_range_rate", "cpu_dimm_pow_consumption", "cpu_dimm_thermal_sensor"] curr_platform_cpu_values = [args.cpu_power_metrics, args.cpu_prochot, args.cpu_freq_metrics, - args.cpu_c0_res, args.cpu_lclk_dpm_level, args.cpu_pwr_svi_telemtry_rails, + args.cpu_c0_res, args.cpu_lclk_dpm_level, args.cpu_pwr_svi_telemetry_rails, args.cpu_io_bandwidth, args.cpu_xgmi_bandwidth, args.cpu_metrics_ver, args.cpu_metrics_table, args.cpu_socket_energy, args.cpu_ddr_bandwidth, args.cpu_temp, args.cpu_dimm_temp_range_rate, args.cpu_dimm_pow_consumption, @@ -2790,7 +2790,7 @@ class AMDSMICommands(): xgmi_err=None, energy=None, mem_usage=None, schedule=None, guard=None, guest_data=None, fb_usage=None, xgmi=None, cpu=None, cpu_power_metrics=None, cpu_prochot=None, cpu_freq_metrics=None, - cpu_c0_res=None, cpu_lclk_dpm_level=None, cpu_pwr_svi_telemtry_rails=None, + cpu_c0_res=None, cpu_lclk_dpm_level=None, cpu_pwr_svi_telemetry_rails=None, cpu_io_bandwidth=None, cpu_xgmi_bandwidth=None, cpu_metrics_ver=None, cpu_metrics_table=None, cpu_socket_energy=None, cpu_ddr_bandwidth=None, cpu_temp=None, cpu_dimm_temp_range_rate=None, cpu_dimm_pow_consumption=None, @@ -2833,7 +2833,7 @@ class AMDSMICommands(): cpu_freq_metrics (bool, optional): Value override for args.cpu_freq_metrics. Defaults to None. cpu_c0_res (bool, optional): Value override for args.cpu_c0_res. Defaults to None cpu_lclk_dpm_level (list, optional): Value override for args.cpu_lclk_dpm_level. Defaults to None - cpu_pwr_svi_telemtry_rails (list, optional): value override for args.cpu_pwr_svi_telemtry_rails. Defaults to None + cpu_pwr_svi_telemetry_rails (list, optional): value override for args.cpu_pwr_svi_telemetry_rails. Defaults to None cpu_io_bandwidth (list, optional): value override for args.cpu_io_bandwidth. Defaults to None cpu_xgmi_bandwidth (list, optional): value override for args.cpu_xgmi_bandwidth. Defaults to None cpu_metrics_ver (bool, optional): Value override for args.cpu_metrics_ver. Defaults to None @@ -2880,7 +2880,7 @@ class AMDSMICommands(): # Check if a CPU argument has been set cpu_args_enabled = False cpu_attributes = ["cpu_power_metrics", "cpu_prochot", "cpu_freq_metrics", "cpu_c0_res", - "cpu_lclk_dpm_level", "cpu_pwr_svi_telemtry_rails", "cpu_io_bandwidth", + "cpu_lclk_dpm_level", "cpu_pwr_svi_telemetry_rails", "cpu_io_bandwidth", "cpu_xgmi_bandwidth", "cpu_metrics_ver", "cpu_metrics_table", "cpu_socket_energy", "cpu_ddr_bandwidth", "cpu_temp", "cpu_dimm_temp_range_rate", "cpu_dimm_pow_consumption", "cpu_dimm_thermal_sensor"] @@ -2926,7 +2926,7 @@ class AMDSMICommands(): if args.cpu: self.metric_cpu(args, multiple_devices, cpu, cpu_power_metrics, cpu_prochot, cpu_freq_metrics, cpu_c0_res, cpu_lclk_dpm_level, - cpu_pwr_svi_telemtry_rails, cpu_io_bandwidth, cpu_xgmi_bandwidth, + cpu_pwr_svi_telemetry_rails, cpu_io_bandwidth, cpu_xgmi_bandwidth, cpu_metrics_ver, cpu_metrics_table, cpu_socket_energy, cpu_ddr_bandwidth, cpu_temp, cpu_dimm_temp_range_rate, cpu_dimm_pow_consumption, cpu_dimm_thermal_sensor) @@ -2960,7 +2960,7 @@ class AMDSMICommands(): if args.cpu: self.metric_cpu(args, multiple_devices, cpu, cpu_power_metrics, cpu_prochot, cpu_freq_metrics, cpu_c0_res, cpu_lclk_dpm_level, - cpu_pwr_svi_telemtry_rails, cpu_io_bandwidth, cpu_xgmi_bandwidth, + cpu_pwr_svi_telemetry_rails, cpu_io_bandwidth, cpu_xgmi_bandwidth, cpu_metrics_ver, cpu_metrics_table, cpu_socket_energy, cpu_ddr_bandwidth, cpu_temp, cpu_dimm_temp_range_rate, cpu_dimm_pow_consumption, cpu_dimm_thermal_sensor) diff --git a/amdsmi_cli/amdsmi_parser.py b/amdsmi_cli/amdsmi_parser.py index 5566b5ea97..4307a5f6f4 100644 --- a/amdsmi_cli/amdsmi_parser.py +++ b/amdsmi_cli/amdsmi_parser.py @@ -832,7 +832,7 @@ class AMDSMIParser(argparse.ArgumentParser): cpu_freq_help = "Displays currentFclkMemclk frequencies and cclk frequency limit" cpu_c0_res_help = "Displays C0 residency" cpu_lclk_dpm_help = "Displays lclk dpm level range. Requires socket ID and NBOID as inputs" - cpu_pwr_svi_telemtry_rails_help = "Displays svi based telemetry for all rails" + cpu_pwr_svi_telemetry_rails_help = "Displays svi based telemetry for all rails" cpu_io_bandwidth_help = "Displays current IO bandwidth for the selected CPU.\ \n input parameters are bandwidth type(1) and link ID encodings\ \n i.e. P2, P3, G0 - G7" @@ -912,8 +912,8 @@ class AMDSMIParser(argparse.ArgumentParser): cpu_group.add_argument('--cpu-c0-res', action='store_true', required=False, help=cpu_c0_res_help) cpu_group.add_argument('--cpu-lclk-dpm-level', action='append', required=False, type=self._not_negative_int, nargs=1, metavar=("NBIOID"), help=cpu_lclk_dpm_help) - cpu_group.add_argument('--cpu-pwr-svi-telemtry-rails', action='store_true', required=False, - help=cpu_pwr_svi_telemtry_rails_help) + cpu_group.add_argument('--cpu-pwr-svi-telemetry-rails', action='store_true', required=False, + help=cpu_pwr_svi_telemetry_rails_help) cpu_group.add_argument('--cpu-io-bandwidth', action='append', required=False, nargs=2, metavar=("IO_BW", "LINKID_NAME"), help=cpu_io_bandwidth_help) cpu_group.add_argument('--cpu-xgmi-bandwidth', action='append', required=False, nargs=2, diff --git a/docs/how-to/amdsmi-cli-tool.md b/docs/how-to/amdsmi-cli-tool.md index 36c35fd23d..2b42464253 100644 --- a/docs/how-to/amdsmi-cli-tool.md +++ b/docs/how-to/amdsmi-cli-tool.md @@ -270,7 +270,7 @@ usage: amd-smi metric [-h] [-g GPU [GPU ...] | -U CPU [CPU ...] | -O CORE [CORE [-w INTERVAL] [-W TIME] [-i ITERATIONS] [-m] [-u] [-p] [-c] [-t] [-P] [-e] [-k] [-f] [-C] [-o] [-l] [-x] [-E] [--cpu-power-metrics] [--cpu-prochot] [--cpu-freq-metrics] [--cpu-c0-res] - [--cpu-lclk-dpm-level NBIOID] [--cpu-pwr-svi-telemtry-rails] + [--cpu-lclk-dpm-level NBIOID] [--cpu-pwr-svi-telemetry-rails] [--cpu-io-bandwidth IO_BW LINKID_NAME] [--cpu-xgmi-bandwidth XGMI_BW LINKID_NAME] [--cpu-metrics-ver] [--cpu-metrics-table] [--cpu-socket-energy] [--cpu-ddr-bandwidth] @@ -325,7 +325,7 @@ CPU Arguments: --cpu-freq-metrics Displays currentFclkMemclk frequencies and cclk frequency limit --cpu-c0-res Displays C0 residency --cpu-lclk-dpm-level NBIOID Displays lclk dpm level range. Requires socket ID and NBOID as inputs - --cpu-pwr-svi-telemtry-rails Displays svi based telemetry for all rails + --cpu-pwr-svi-telemetry-rails Displays svi based telemetry for all rails --cpu-io-bandwidth IO_BW LINKID_NAME Displays current IO bandwidth for the selected CPU. input parameters are bandwidth type(1) and link ID encodings i.e. P2, P3, G0 - G7