AI/rocm-systems
2
0
Bifurcation 0
Code Tickets Demandes d'ajout Actions Paquets Projets Publications Wiki Activité

Implementation for SWDEV-479728:[RDC] - Clock Speed/Power Cap Control

Parcourir la source 
Change-Id: I767a71325527aa3c691e9607953ceafebacfb4d5
Signed-off-by: adapryor <Adam.pryor@amd.com>
Cette révision appartient à :
Adam Pryor
2024-10-31 09:48:09 -05:00
révisé par Pryor, Adam
Parent 7c91a07a43
révision df170c8801
20 fichiers modifiés avec 1549 ajouts et 117 suppressions
Télécharger le Fichier Patch Télécharger le Fichier des Différences Développer tous les fichiers Réduire tous les fichiers
rdci/src/RdciConfigSubSystem.cc
+391
Voir le fichier
@@ -0,0 +1,391 @@
/*
Copyright (c) 2024 - present Advanced Micro Devices, Inc. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include "RdciConfigSubSystem.h"
#include <getopt.h>
#include <unistd.h>
#include <algorithm>
#include <iomanip>
#include <sstream>
#include <unordered_map>
#include <vector>
#include "common/rdc_utils.h"
#include "rdc/rdc.h"
#include "rdc_lib/RdcException.h"
#include "rdc_lib/rdc_common.h"
static constexpr uint32_t TABLE_COLUMN_WIDTH = 20;
namespace amd {
namespace rdc {
RdciConfigSubSystem::RdciConfigSubSystem()
: config_cmd_(CONFIG_COMMAND_NONE),
power_limit_(0),
gfx_max_clock_(0),
memory_max_clock_(0),
fgid_(0) {}
RdciConfigSubSystem::~RdciConfigSubSystem() {
if (fgid_ != JOB_FIELD_ID) {
rdc_field_unwatch(rdc_handle_, group_id_, fgid_);
rdc_group_field_destroy(rdc_handle_, fgid_);
fgid_ = JOB_FIELD_ID;
}
}
void RdciConfigSubSystem::parse_cmd_opts(int argc, char** argv) {
const int JSON_OPTIONS = 1001;
const struct option long_options[] = {{"set", no_argument, nullptr, 's'},
{"get", no_argument, nullptr, 't'},
{"clear", no_argument, nullptr, 'c'},
{"unauth", optional_argument, nullptr, 'u'},
{"group", required_argument, nullptr, 'g'},
{"powerlimit", required_argument, nullptr, 'p'},
{"gfxmaxclk", required_argument, nullptr, 'x'},
{"memmaxclk", required_argument, nullptr, 'm'},
{"help", optional_argument, nullptr, 'h'},
{"json", optional_argument, nullptr, JSON_OPTIONS},
{nullptr, 0, nullptr, 0}};
int option_index = 0;
int opt = 0;
config_cmd_ = CONFIG_COMMAND_NONE;
bool group_id_set = false; // ensure set, get, and clear have a group associated with them
while ((opt = getopt_long(argc, argv, "stcuhg:p:x:m", long_options, &option_index)) != -1) {
switch (opt) {
case 's':
config_cmd_ = CONFIG_COMMAND_SET;
break;
case 't':
config_cmd_ = CONFIG_COMMAND_GET;
break;
case 'c':
config_cmd_ = CONFIG_COMMAND_CLEAR;
break;
case 'u':
use_auth_ = false;
break;
case 'h':
config_cmd_ = CONFIG_COMMAND_HELP;
break;
case 'g':
group_id_ = std::stoi(optarg);
group_id_set = true;
break;
case 'p':
power_limit_ = std::stoul(optarg);
break;
case 'x':
gfx_max_clock_ = std::stoul(optarg);
break;
case 'm':
memory_max_clock_ = std::stoul(optarg);
break;
case JSON_OPTIONS:
set_json_output(true);
break;
default:
show_help();
throw RdcException(RDC_ST_BAD_PARAMETER, "Unknown command line options");
}
}
if (config_cmd_ == CONFIG_COMMAND_NONE) {
show_help();
throw RdcException(RDC_ST_BAD_PARAMETER, "Must specify a valid operations");
}
// Enforce a mandatory group id for set, get, and clear
if ((config_cmd_ == CONFIG_COMMAND_SET || config_cmd_ == CONFIG_COMMAND_GET ||
config_cmd_ == CONFIG_COMMAND_CLEAR) &&
!group_id_set) {
show_help();
throw RdcException(
RDC_ST_BAD_PARAMETER,
"Must specify a group ID (-g or --group) for set, get, and clear operations");
}
}
void RdciConfigSubSystem::show_help() const {
if (is_json_output()) return;
std::cout << " config -- Used to configure GPU to have configuration across workloads and across "
"devices.\n\n";
std::cout << "Usage\n";
std::cout << " rdci config --help\n";
std::cout << " rdci config [-g <group id>] --set [--powerlimit <value>] [--gfxmaxclk "
"<value>] [--memmaxclk <value>]\n";
std::cout << " rdci config [-g <group id>] --get\n";
std::cout << " rdci config [-g <group id>] --clear\n";
show_common_usage();
}
void RdciConfigSubSystem::process() {
rdc_status_t result = RDC_ST_UNKNOWN_ERROR;
std::ostringstream json_ss;
switch (config_cmd_) {
case CONFIG_COMMAND_SET: {
rdc_config_setting_t setting;
if (gfx_max_clock_ != 0) {
setting.type = RDC_CFG_GFX_CLOCK_LIMIT;
setting.target_value = gfx_max_clock_;
result = rdc_config_set(rdc_handle_, group_id_, setting);
}
if (power_limit_ != 0) {
setting.type = RDC_CFG_POWER_LIMIT;
setting.target_value = power_limit_;
result = rdc_config_set(rdc_handle_, group_id_, setting);
}
if (memory_max_clock_ != 0) {
setting.type = RDC_CFG_MEMORY_CLOCK_LIMIT;
setting.target_value = memory_max_clock_;
result = rdc_config_set(rdc_handle_, group_id_, setting);
}
if (result == RDC_ST_OK) {
if (is_json_output()) {
json_ss << "{"
<< "\"group_id\": \"" << group_id_ << "\", \"status\": \"ok\""
<< "}";
} else {
std::cout << "Successfully configured GPU Id belongs to group: " << group_id_
<< std::endl;
}
std::cout << json_ss.str() << std::endl;
return;
}
break;
}
case CONFIG_COMMAND_GET: {
// Add the default job stats fields
std::vector<rdc_field_t> job_fields = {RDC_FI_GPU_CLOCK, RDC_FI_MEM_CLOCK,
RDC_FI_POWER_USAGE};
static const char job_field_group[] = "RdciConfigSubSystem";
result = rdc_group_field_create(rdc_handle_, job_fields.size(), job_fields.data(),
job_field_group, &fgid_);
// Start watch
const double max_keep_age = 30060; // Length of time to keep data in field in seconds
const int max_keep_samples = 10;
const int update_frequency = 1000000; // Once per minute
result = rdc_field_watch(rdc_handle_, group_id_, fgid_, update_frequency, max_keep_age,
max_keep_samples);
rdc_config_setting_list_t settings = {0, {}};
result = rdc_config_get(rdc_handle_, group_id_, &settings);
if (result == RDC_ST_OK) {
display_config_settings(settings);
} else if (result == RDC_ST_NOT_FOUND) {
std::cout << "Get config information failed, cache empty " << std::endl;
} else {
std::cout << "Get config information failed " << std::endl;
}
// Stop watching the field group
result = rdc_field_unwatch(rdc_handle_, group_id_, fgid_);
if (result != RDC_ST_OK) {
std::cout << "Error stop watch fields. Return: " << rdc_status_string(result);
}
std::cout << "Stop watch group:" << group_id_ << ", field_group:" << fgid_ << std::endl;
// Delete the field group and GPU group
result = rdc_group_field_destroy(rdc_handle_, fgid_);
if (result != RDC_ST_OK) {
std::cout << "Error delete field group. Return: " << rdc_status_string(result);
}
std::cout << "Deleted the field group " << fgid_ << std::endl;
break;
}
case CONFIG_COMMAND_CLEAR: {
result = rdc_config_clear(rdc_handle_, group_id_);
if (result == RDC_ST_OK) {
if (is_json_output()) {
json_ss << "\"group_id\": \"" << group_id_ << "\", \"status\": \"ok\"";
} else {
std::cout << "Successfully cleared all configurationbelongs for group: " << group_id_
<< std::endl;
}
std::cout << json_ss.str() << std::endl;
return;
}
break;
}
case CONFIG_COMMAND_HELP:
show_help();
result = RDC_ST_OK;
break;
case CONFIG_COMMAND_NONE:
default:
throw RdcException(RDC_ST_BAD_PARAMETER, "Unknown command");
}
if (result != RDC_ST_OK) {
throw RdcException(result, rdc_status_string(result));
}
}
void RdciConfigSubSystem::display_config_settings(rdc_config_setting_list_t& rdc_configs_list) {
rdc_status_t result = RDC_ST_OK;
std::stringstream ss, json_ss;
rdc_group_info_t rdc_group_info = {0, "", {0}};
uint32_t gpu_index = 0;
uint32_t index = 0;
ss << std::setw(TABLE_COLUMN_WIDTH) << std::left << "configure" << std::setw(TABLE_COLUMN_WIDTH)
<< std::left << "gpu_index" << std::setw(TABLE_COLUMN_WIDTH) << std::left << "config_limit"
<< std::setw(TABLE_COLUMN_WIDTH) << std::left << "current_value" << std::endl;
json_ss << "\"group_id\": " << group_id_ << ","
<< "\"config_list\" : [";
result = rdc_group_gpu_get_info(rdc_handle_, group_id_, &rdc_group_info);
if (result == RDC_ST_OK) {
std::vector<uint32_t> group_index_array(rdc_group_info.entity_ids,
rdc_group_info.entity_ids + rdc_group_info.count);
sort(begin(group_index_array), end(group_index_array));
for (uint32_t i = 0; i < rdc_configs_list.total_settings && i < RDC_GROUP_MAX_ENTITIES; ++i) {
auto type = rdc_configs_list.settings[i].type;
auto config_value = rdc_configs_list.settings[i].target_value;
for (gpu_index = 0; gpu_index < rdc_group_info.count && gpu_index < RDC_GROUP_MAX_ENTITIES;
++gpu_index) {
json_ss << "{\"gpu_index\": " << group_index_array[gpu_index] << ",";
rdc_field_value value;
switch (type) {
case RDC_CFG_GFX_CLOCK_LIMIT: {
json_ss << "\"GFX Clock Limit\":" << config_value;
ss << std::setw(TABLE_COLUMN_WIDTH) << std::left << "gfx_clock_limit"
<< std::setw(TABLE_COLUMN_WIDTH) << std::left << group_index_array[gpu_index]
<< std::setw(TABLE_COLUMN_WIDTH) << std::left << config_value
<< std::setw(TABLE_COLUMN_WIDTH) << std::left;
result = rdc_field_get_latest_value(rdc_handle_, group_index_array[gpu_index],
RDC_FI_GPU_CLOCK, &value);
json_ss << ",\"GFX Clock Current Value\":";
if (result != RDC_ST_OK) {
ss << "N/A";
json_ss << "\"N/A\"";
} else {
if (value.type == INTEGER) {
ss << value.value.l_int;
json_ss << value.value.l_int;
} else if (value.type == DOUBLE) {
ss << std::fixed << std::setprecision(3) << value.value.dbl;
json_ss << value.value.dbl;
} else {
ss << value.value.str;
json_ss << value.value.str;
}
}
ss << std::endl;
break;
}
case RDC_CFG_MEMORY_CLOCK_LIMIT:
json_ss << "\"Memory Clock Limit\":" << config_value;
ss << std::setw(TABLE_COLUMN_WIDTH) << std::left << "memory_clock_limit"
<< std::setw(TABLE_COLUMN_WIDTH) << std::left << group_index_array[gpu_index]
<< std::setw(TABLE_COLUMN_WIDTH) << std::left << config_value
<< std::setw(TABLE_COLUMN_WIDTH) << std::left;
result = rdc_field_get_latest_value(rdc_handle_, group_index_array[gpu_index],
RDC_FI_MEM_CLOCK, &value);
json_ss << ",\"Memory Clock Current Value\":";
if (result != RDC_ST_OK) {
ss << "N/A";
json_ss << "\"N/A\"";
} else {
if (value.type == INTEGER) {
ss << value.value.l_int;
json_ss << value.value.l_int;
} else if (value.type == DOUBLE) {
ss << std::fixed << std::setprecision(3) << value.value.dbl;
json_ss << value.value.dbl;
} else {
ss << value.value.str;
json_ss << value.value.str;
}
}
ss << std::endl;
break;
case RDC_CFG_POWER_LIMIT:
json_ss << "\"Power Limit\":" << config_value;
ss << std::setw(TABLE_COLUMN_WIDTH) << std::left << "power_limit"
<< std::setw(TABLE_COLUMN_WIDTH) << std::left << group_index_array[gpu_index]
<< std::setw(TABLE_COLUMN_WIDTH) << std::left << config_value
<< std::setw(TABLE_COLUMN_WIDTH) << std::left;
result = rdc_field_get_latest_value(rdc_handle_, group_index_array[gpu_index],
RDC_FI_POWER_USAGE, &value);
json_ss << ",\"Power Current Value\":";
if (result != RDC_ST_OK) {
ss << "N/A";
json_ss << "\"N/A\"";
} else {
if (value.type == INTEGER) {
double watts = static_cast<double>(value.value.l_int) / 1'000'000;
ss << std::fixed << std::setprecision(3) << watts;
json_ss << watts;
} else if (value.type == DOUBLE) {
double watts = value.value.dbl / 1'000'000;
ss << std::fixed << std::setprecision(3) << watts;
json_ss << watts;
} else {
ss << value.value.str;
json_ss << value.value.str;
}
}
ss << std::endl;
break;
default:
break;
}
// Set the json seperator
json_ss << "}";
if ((gpu_index + 1) != rdc_group_info.count) {
json_ss << ",";
}
}
if (rdc_group_info.count != 0 && i < rdc_configs_list.total_settings - 1 &&
i < RDC_GROUP_MAX_ENTITIES - 1) {
json_ss << ",";
}
}
}
if (index != 0) {
json_ss << "}";
}
json_ss << "]";
if (is_json_output()) {
std::cout << json_ss.str() << std::endl;
} else {
std::cout << ss.str() << std::endl;
}
}
} // namespace rdc
} // namespace amd
rdci/src/rdci.cc
+18 -10
Voir le fichier
@@ -20,19 +20,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
#include <iostream>
#include <string>
#include <string.h>
#include <iostream>
#include <string>
#include "RdciConfigSubSystem.h"
#include "RdciDiagSubSystem.h"
#include "RdciDiscoverySubSystem.h"
#include "RdciDmonSubSystem.h"
#include "RdciFieldGroupSubSystem.h"
#include "RdciGroupSubSystem.h"
#include "RdciStatsSubSystem.h"
#include "RdciPolicySubSystem.h"
#include "RdciHealthSubSystem.h"
#include "RdciTopologyLinkSubSystem.h"
#include "RdciPolicySubSystem.h"
#include "RdciStatsSubSystem.h"
#include "rdc/rdc.h"
#include "rdc_lib/RdcException.h"
#include "rdc_lib/rdc_common.h"
@@ -42,8 +44,11 @@ THE SOFTWARE.
#define RDC_CLIENT_VERSION_RELEASE 0
#define RDC_CLIENT_VERSION_CREATE_STRING(MAJOR, MINOR, RELEASE) (#MAJOR "." #MINOR "." #RELEASE)
#define RDC_CLIENT_VERSION_EXPAND_PARTS(MAJOR_STR, MINOR_STR, RELEASE_STR) RDC_CLIENT_VERSION_CREATE_STRING(MAJOR_STR, MINOR_STR, RELEASE_STR)
#define RDC_CLIENT_VERSION_STRING RDC_CLIENT_VERSION_EXPAND_PARTS(RDC_CLIENT_VERSION_MAJOR, RDC_CLIENT_VERSION_MINOR, RDC_CLIENT_VERSION_RELEASE)
#define RDC_CLIENT_VERSION_EXPAND_PARTS(MAJOR_STR, MINOR_STR, RELEASE_STR) \
RDC_CLIENT_VERSION_CREATE_STRING(MAJOR_STR, MINOR_STR, RELEASE_STR)
#define RDC_CLIENT_VERSION_STRING \
RDC_CLIENT_VERSION_EXPAND_PARTS(RDC_CLIENT_VERSION_MAJOR, RDC_CLIENT_VERSION_MINOR, \
RDC_CLIENT_VERSION_RELEASE)
#define Q(x) #x
#define QUOTE(x) Q(x)
@@ -52,7 +57,7 @@ int main(int argc, char** argv) {
const std::string usage_help =
"Usage:\trdci <subsystem>|<options>\n"
"subsystem: \n"
" discovery, dmon, group, fieldgroup, stats, diag, policy, health, topo\n"
" discovery, dmon, group, fieldgroup, stats, diag, config, policy, health, topo\n"
"options: \n"
" -v(--version) : Print client version information only\n";
@@ -63,11 +68,12 @@ int main(int argc, char** argv) {
if (strcmp(argv[1], "-v") == 0 || strcmp(argv[1], "--version") == 0) {
#ifdef CURRENT_GIT_HASH
std::cout << "RDCI : " << RDC_CLIENT_VERSION_STRING << "+" << QUOTE(CURRENT_GIT_HASH) << std::endl;
std::cout << "RDCI : " << RDC_CLIENT_VERSION_STRING << "+" << QUOTE(CURRENT_GIT_HASH)
<< std::endl;
#else
std::cout << "RDCI : " << RDC_CLIENT_VERSION_STRING << std::endl;
std::cout << "RDCI : " << RDC_CLIENT_VERSION_STRING << std::endl;
#endif
exit(0);
exit(0);
}
amd::rdc::RdciSubSystemPtr subsystem;
@@ -91,6 +97,8 @@ int main(int argc, char** argv) {
subsystem.reset(new amd::rdc::RdciStatsSubSystem());
} else if (subsystem_name == "policy") {
subsystem.reset(new amd::rdc::RdciPolicySubSystem());
} else if (subsystem_name == "config") {
subsystem.reset(new amd::rdc::RdciConfigSubSystem());
} else {
std::cout << usage_help;
exit(0);