AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement the gRPC APIs for the job stats

Browse Source 
Add the job stats APIs in the rdc_api_service at the server side rdcd
Add the job stats APIs for the RdcStandaloneHandler at the client side
Make the load librdc.so and librdc_client.so thread safe.
Impelement async update all fields in RdcEmbeddedHandler.

Change-Id: I659d91efb32d1094d3b7f0f2cec39518cd7336ce
This commit is contained in:
Bill(Shuzhou) Liu
2020-04-15 12:20:22 -04:00
committed by Chris Freehill
parent a547dc7efd
commit fe3e75edfa
13 changed files with 495 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rdc_libs/CMakeLists.txt
+2
View File
@@ -116,10 +116,12 @@ set(BOOTSTRAP_LIB "rdc_bootstrap")
set(BOOTSTRAP_LIB_COMPONENT "lib${BOOTSTRAP_LIB}")
set(BOOTSTRAP_LIB_SRC_LIST "${SRC_DIR}/bootstrap/src/RdcBootStrap.cc")
set(BOOTSTRAP_LIB_SRC_LIST ${BOOTSTRAP_LIB_SRC_LIST} "${SRC_DIR}/bootstrap/src/RdcLogger.cc")
set(BOOTSTRAP_LIB_SRC_LIST ${BOOTSTRAP_LIB_SRC_LIST} "${SRC_DIR}/bootstrap/src/RdcLibraryLoader.cc")
set(BOOTSTRAP_LIB_INC_LIST "${RDC_LIB_INC_DIR}/rdc/rdc.h")
set(BOOTSTRAP_LIB_INC_LIST ${BOOTSTRAP_LIB_INC_LIST} "${RDC_LIB_INC_DIR}/rdc_lib/rdc_common.h")
set(BOOTSTRAP_LIB_INC_LIST ${BOOTSTRAP_LIB_INC_LIST} "${RDC_LIB_INC_DIR}/rdc_lib/RdcLogger.h")
set(BOOTSTRAP_LIB_INC_LIST ${BOOTSTRAP_LIB_INC_LIST} "${RDC_LIB_INC_DIR}/rdc_lib/RdcHandler.h")
set(BOOTSTRAP_LIB_INC_LIST ${BOOTSTRAP_LIB_INC_LIST} "${RDC_LIB_INC_DIR}/rdc_lib/RdcLibraryLoader.h")
message("BOOTSTRAP_LIB_INC_LIST=${BOOTSTRAP_LIB_INC_LIST}")
rdc_libs/bootstrap/src/RdcBootStrap.cc
+17 -40
View File
@@ -26,19 +26,17 @@ THE SOFTWARE.
#include "rdc_lib/RdcHandler.h"
#include "rdc_lib/RdcLogger.h"
#include "rdc_lib/rdc_common.h"
#include "rdc_lib/RdcLibraryLoader.h"
static void* libHandler = nullptr;
static amd::rdc::RdcLibraryLoader rdc_lib_loader;
rdc_status_t rdc_init(uint64_t) {
return RDC_ST_OK;
}
rdc_status_t rdc_shutdown() {
if (libHandler) {
dlclose(libHandler);
libHandler = nullptr;
}
return RDC_ST_OK;
return rdc_lib_loader.unload();
}
rdc_status_t rdc_connect(const char* ipAddress,
@@ -46,24 +44,17 @@ rdc_status_t rdc_connect(const char* ipAddress,
const char* root_ca, const char* client_cert,
const char* client_key ) {
amd::rdc::RdcHandler* (*func_make_handler)(const char*,
const char*, const char*, const char*);
const char*, const char*, const char*) = nullptr;
if (!ipAddress || !p_rdc_handle) {
return RDC_ST_FAIL_LOAD_MODULE;
}
if (!libHandler) {
libHandler = dlopen("librdc_client.so", RTLD_LAZY);
}
if (!libHandler) {
return RDC_ST_FAIL_LOAD_MODULE;
}
*reinterpret_cast<void**>(&func_make_handler) =
dlsym(libHandler, "make_handler");
if (!func_make_handler) {
return RDC_ST_FAIL_LOAD_MODULE;
rdc_status_t status = rdc_lib_loader.load("librdc_client.so",
&func_make_handler);
if (status != RDC_ST_OK) {
*p_rdc_handle = nullptr;
return status;
}
*p_rdc_handle = static_cast<rdc_handle_t>
@@ -83,31 +74,17 @@ rdc_status_t rdc_disconnect(rdc_handle_t p_rdc_handle) {
rdc_status_t rdc_start_embedded(rdc_operation_mode_t op_mode,
rdc_handle_t* p_rdc_handle ) {
amd::rdc::RdcHandler* (*func_make_handler)(rdc_operation_mode_t);
char *error;
amd::rdc::RdcHandler* (*func_make_handler)(rdc_operation_mode_t)
= nullptr;
if (!p_rdc_handle) {
return RDC_ST_FAIL_LOAD_MODULE;
}
dlerror();
if (!libHandler) {
libHandler = dlopen("librdc.so", RTLD_LAZY);
}
if (!libHandler) {
error = dlerror();
RDC_LOG(RDC_ERROR, "Fail to open librdc.so: " << error);
return RDC_ST_FAIL_LOAD_MODULE;
}
*reinterpret_cast<void**>(&func_make_handler) =
dlsym(libHandler, "make_handler");
if (!func_make_handler) {
error = dlerror();
RDC_LOG(RDC_ERROR,
"Fail to find function make_handler:" << error);
return RDC_ST_FAIL_LOAD_MODULE;
rdc_status_t status = rdc_lib_loader.load("librdc.so",
&func_make_handler);
if (status != RDC_ST_OK) {
*p_rdc_handle = nullptr;
return status;
}
*p_rdc_handle = static_cast<rdc_handle_t>
rdc_libs/bootstrap/src/RdcLibraryLoader.cc
+45
View File
@@ -0,0 +1,45 @@
/*
Copyright (c) 2020 - 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 "rdc_lib/RdcLibraryLoader.h"
namespace amd {
namespace rdc {
RdcLibraryLoader::RdcLibraryLoader(): libHandler_(nullptr) {
}
rdc_status_t RdcLibraryLoader::unload() {
std::lock_guard<std::mutex> guard(library_mutex_);
if (libHandler_) {
dlclose(libHandler_);
libHandler_ = nullptr;
}
return RDC_ST_OK;
}
RdcLibraryLoader::~RdcLibraryLoader() {
unload();
}
} // namespace rdc
} // namespace amd
rdc_libs/rdc/src/RdcEmbeddedHandler.cc
+10 -3
View File
@@ -341,9 +341,16 @@ rdc_status_t RdcEmbeddedHandler::rdc_field_unwatch(rdc_gpu_group_t group_id,
// Control API
rdc_status_t RdcEmbeddedHandler::rdc_field_update_all(
uint32_t wait_for_update) {
// TODO(bill_liu): implement the case wait_for_update==0
(void)(wait_for_update);
return watch_table_->rdc_field_update_all();
if (wait_for_update == 1) {
return watch_table_->rdc_field_update_all();
}
// Async update the field and return immediately.
updater_ = std::async(std::launch::async, [this](){
watch_table_->rdc_field_update_all();
});
return RDC_ST_OK;
}
} // namespace rdc
rdc_libs/rdc_client/src/RdcStandaloneHandler.cc
+90 -18
View File
@@ -63,40 +63,112 @@ rdc_status_t RdcStandaloneHandler::error_handle(::grpc::Status status,
// JOB RdcAPI
rdc_status_t RdcStandaloneHandler::rdc_job_start_stats(rdc_gpu_group_t groupId,
char job_id[64], uint64_t update_freq) {
// TODO(bill_liu): implement
(void)(groupId);
(void)(job_id);
(void)(update_freq);
::rdc::StartJobStatsRequest request;
::rdc::StartJobStatsResponse reply;
::grpc::ClientContext context;
return RDC_ST_OK;
request.set_group_id(groupId);
request.set_job_id(job_id);
request.set_update_freq(update_freq);
::grpc::Status status = stub_->StartJobStats(&context, request, &reply);
rdc_status_t err_status = error_handle(status, reply.status());
return err_status;
}
bool RdcStandaloneHandler::copy_gpu_usage_info(
const ::rdc::GpuUsageInfo& src,
rdc_gpu_usage_info_t* target) {
if (target == nullptr) {
return false;
}
target->gpu_id = src.gpu_id();
target->start_time = src.start_time();
target->end_time = src.end_time();
target->energy_consumed = src.energy_consumed();
target->max_gpu_memory_used = src.max_gpu_memory_used();
const ::rdc::JobStatsSummary& pstats = src.power_usage();
target->power_usage.max_value = pstats.max_value();
target->power_usage.min_value = pstats.min_value();
target->power_usage.average = pstats.average();
const ::rdc::JobStatsSummary& cstats = src.gpu_clock();
target->gpu_clock.max_value = cstats.max_value();
target->gpu_clock.min_value = cstats.min_value();
target->gpu_clock.average = cstats.average();
const ::rdc::JobStatsSummary& ustats = src.gpu_utilization();
target->gpu_utilization.max_value = ustats.max_value();
target->gpu_utilization.min_value = ustats.min_value();
target->gpu_utilization.average = ustats.average();
const ::rdc::JobStatsSummary& mstats = src.memory_utilization();
target->memory_utilization.max_value = mstats.max_value();
target->memory_utilization.min_value = mstats.min_value();
target->memory_utilization.average = mstats.average();
return true;
}
rdc_status_t RdcStandaloneHandler::rdc_job_get_stats(char job_id[64],
rdc_job_info_t* p_job_info) {
// TODO(bill_liu): implement
(void)(job_id);
(void)(p_job_info);
if (!p_job_info) {
return RDC_ST_BAD_PARAMETER;
}
::rdc::GetJobStatsRequest request;
::rdc::GetJobStatsResponse reply;
::grpc::ClientContext context;
request.set_job_id(job_id);
::grpc::Status status = stub_->GetJobStats(&context, request, &reply);
rdc_status_t err_status = error_handle(status, reply.status());
if (err_status != RDC_ST_OK) return err_status;
p_job_info->num_gpus = reply.num_gpus();
copy_gpu_usage_info(reply.summary(), &(p_job_info->summary));
for (int i = 0; i < reply.gpus_size(); i++) {
copy_gpu_usage_info(reply.gpus(i), &(p_job_info->gpus[i]));
}
return RDC_ST_OK;
}
rdc_status_t RdcStandaloneHandler::rdc_job_stop_stats(char job_id[64]) {
// TODO(bill_liu): implement
(void)(job_id);
return RDC_ST_OK;
::rdc::StopJobStatsRequest request;
::rdc::StopJobStatsResponse reply;
::grpc::ClientContext context;
request.set_job_id(job_id);
::grpc::Status status = stub_->StopJobStats(&context, request, &reply);
rdc_status_t err_status = error_handle(status, reply.status());
return err_status;
}
rdc_status_t RdcStandaloneHandler::rdc_job_remove(char job_id[64]) {
// TODO(bill_liu): implement
(void)(job_id);
return RDC_ST_OK;
::rdc::RemoveJobRequest request;
::rdc::RemoveJobResponse reply;
::grpc::ClientContext context;
request.set_job_id(job_id);
::grpc::Status status = stub_->RemoveJob(&context, request, &reply);
rdc_status_t err_status = error_handle(status, reply.status());
return err_status;
}
rdc_status_t RdcStandaloneHandler::rdc_job_remove_all() {
// TODO(bill_liu): implement
return RDC_ST_OK;
}
::rdc::Empty request;
::rdc::RemoveAllJobResponse reply;
::grpc::ClientContext context;
::grpc::Status status = stub_->RemoveAllJob(&context, request, &reply);
rdc_status_t err_status = error_handle(status, reply.status());
return err_status;
}
// Discovery RdcAPI
rdc_status_t RdcStandaloneHandler::rdc_device_get_all(