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

rdc_field_t replaces uint32_t; centralize field data

Parcourir la source 
Make the RDC use the new rdc_field_t enum instead of uint32_t.
This will help prevent invalid field types from being passed in.

Also, centralize where data related to fields is kept. This will
reduce the number of places where changes are required each
time a new field is added.

Finally, cleaned up several cpplint issues.

Change-Id: I48e4512e18c164411d8b09ae3d4bed99fba359ec
Cette révision appartient à :
Chris Freehill
2020-07-24 19:40:48 -05:00
Parent e6d910f67a
révision 5950ebadc4
43 fichiers modifiés avec 459 ajouts et 388 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
tests/rdc_tests/functional/rdci_discovery.cc
+13 -16
Voir le fichier
@@ -33,7 +33,8 @@ THE SOFTWARE.
TestRdciDiscovery::TestRdciDiscovery() : TestBase() {
set_title("\tRDC Discovery Test");
set_description("\tThe Discovery tests verifies that the GPUs are discovered and identified .");
set_description("\tThe Discovery tests verifies that the GPUs are "
"discovered and identified .");
}
TestRdciDiscovery::~TestRdciDiscovery(void) {
@@ -58,17 +59,16 @@ void TestRdciDiscovery::DisplayResults(void) const {
void TestRdciDiscovery::Close() {
TestBase::Close();
rdc_status_t result;
if(standalone_){
if (standalone_) {
IF_VERB(STANDARD) {
std::cout << "\t**Disconnecting from host....\n" << std::endl;
}
std::cout << "\t**Disconnecting from host....\n" << std::endl;
}
result = rdc_disconnect(rdc_handle);
ASSERT_EQ(result, RDC_ST_OK);
}
else{
} else {
IF_VERB(STANDARD) {
std::cout << "\t**Stopping Embedded RDC Engine....\n" << std::endl;
}
}
result = rdc_stop_embedded(rdc_handle);
ASSERT_EQ(result, RDC_ST_OK);
}
@@ -77,20 +77,17 @@ void TestRdciDiscovery::Close() {
ASSERT_EQ(result, RDC_ST_OK);
}
void TestRdciDiscovery::Run(void) {
TestBase::Run();
rdc_status_t result;
if(standalone_){
if (standalone_) {
IF_VERB(STANDARD) {
std::cout << "\t**Connecting to host....\n" << std::endl;
}
char hostIpAddress[] = {"localhost:50051"};
result = rdc_connect(hostIpAddress, &rdc_handle, nullptr, nullptr, nullptr);
ASSERT_EQ(result, RDC_ST_OK);
}
else{
} else {
IF_VERB(STANDARD) {
std::cout << "\t**Starting embedded RDC engine....\n" << std::endl;
}
@@ -121,17 +118,17 @@ void TestRdciDiscovery::Run(void) {
rdc_device_attributes_t attribute;
for (uint32_t i = 0; i < count; i++) {
result = rdc_device_get_attributes(0, gpu_index_list[i], &attribute);
ASSERT_EQ(result, RDC_ST_INVALID_HANDLER);
result = rdc_device_get_attributes(rdc_handle, gpu_index_list[i], 0);
ASSERT_EQ(result, RDC_ST_INVALID_HANDLER);
result = rdc_device_get_attributes(rdc_handle,gpu_index_list[i], &attribute);
result = rdc_device_get_attributes(rdc_handle, gpu_index_list[i],
&attribute);
ASSERT_EQ(result, RDC_ST_OK);
std::cout << "\tGPU ID "<< i << " || " << attribute.device_name <<std::endl;
std::cout << "\tGPU ID "<< i << " || " <<
attribute.device_name <<std::endl;
}
}
tests/rdc_tests/functional/rdci_dmon.cc
+16 -18
Voir le fichier
@@ -33,7 +33,8 @@ THE SOFTWARE.
TestRdciDmon::TestRdciDmon() : TestBase() {
set_title("\tRDC Dmon Test");
set_description("\tThe Dmon tests verifies that the GPUs metrics are being monitored. ");
set_description(
"\tThe Dmon tests verifies that the GPUs metrics are being monitored. ");
}
TestRdciDmon::~TestRdciDmon(void) {
@@ -58,39 +59,35 @@ void TestRdciDmon::DisplayResults(void) const {
void TestRdciDmon::Close() {
TestBase::Close();
rdc_status_t result;
if(standalone_){
if (standalone_) {
IF_VERB(STANDARD) {
std::cout << "\t**Disconnecting from host....\n" << std::endl;
}
std::cout << "\t**Disconnecting from host....\n" << std::endl;
}
result = rdc_disconnect(rdc_handle);
ASSERT_EQ(result, RDC_ST_OK);
}
else{
} else {
IF_VERB(STANDARD) {
std::cout << "\t**Stopping Embedded RDC Engine....\n" << std::endl;
}
std::cout << "\t**Stopping Embedded RDC Engine....\n" << std::endl;
}
result = rdc_stop_embedded(rdc_handle);
ASSERT_EQ(result, RDC_ST_OK);
};
}
result = rdc_shutdown();
ASSERT_EQ(result, RDC_ST_OK);
}
void TestRdciDmon::Run(void) {
TestBase::Run();
rdc_status_t result;
if(standalone_){
if (standalone_) {
IF_VERB(STANDARD) {
std::cout << "\t**Connecting to host....\n" << std::endl;
}
char hostIpAddress[] = {"localhost:50051"};
result = rdc_connect(hostIpAddress, &rdc_handle, nullptr, nullptr, nullptr);
ASSERT_EQ(result, RDC_ST_OK);
}
else{
} else {
IF_VERB(STANDARD) {
std::cout << "\t**Starting embedded RDC engine....\n" << std::endl;
}
@@ -102,7 +99,7 @@ void TestRdciDmon::Run(void) {
rdc_gpu_group_t group_id;
rdc_field_grp_t field_group_id;
result = rdc_group_gpu_create(rdc_handle, RDC_GROUP_EMPTY,
"GRP_DMON", &group_id);
"GRP_DMON", &group_id);
ASSERT_EQ(result, RDC_ST_OK);
result = rdc_group_gpu_add(rdc_handle, group_id, 0);
@@ -118,9 +115,11 @@ void TestRdciDmon::Run(void) {
ASSERT_EQ(result, RDC_ST_OK);
ASSERT_GT(group_info.count, 0);
uint32_t field_ids[]= {150,155,203};
rdc_field_t field_ids[]= {RDC_FI_GPU_TEMP, RDC_FI_POWER_USAGE,
RDC_FI_GPU_UTIL};
uint32_t fsize = sizeof(field_ids)/sizeof(field_ids[0]);
result = rdc_group_field_create(rdc_handle, fsize , &field_ids[0], "FIELD_GRP", &field_group_id);
result = rdc_group_field_create(rdc_handle, fsize , &field_ids[0],
"FIELD_GRP", &field_group_id);
ASSERT_EQ(result, RDC_ST_OK);
result = rdc_field_watch(rdc_handle, -1, field_group_id, 0, 60, 10);
@@ -140,5 +139,4 @@ void TestRdciDmon::Run(void) {
result = rdc_group_field_destroy(rdc_handle, field_group_id);
ASSERT_EQ(result, RDC_ST_OK);
}
tests/rdc_tests/functional/rdci_fieldgroup.cc
+24 -23
Voir le fichier
@@ -30,10 +30,10 @@ THE SOFTWARE.
#include "rdc_tests/test_common.h"
#include "rdc/rdc.h"
TestRdciFieldgroup::TestRdciFieldgroup() : TestBase() {
set_title("\tRDC Fieldgroup Test");
set_description("\tThe Fieldgroup tests verifies the creation/deletion of fieldgroups.");
set_description(
"\tThe Fieldgroup tests verifies the creation/deletion of fieldgroups.");
}
TestRdciFieldgroup::~TestRdciFieldgroup(void) {
@@ -58,17 +58,16 @@ void TestRdciFieldgroup::DisplayResults(void) const {
void TestRdciFieldgroup::Close() {
TestBase::Close();
rdc_status_t result;
if(standalone_){
if (standalone_) {
IF_VERB(STANDARD) {
std::cout << "\t**Disconnecting from host....\n" << std::endl;
}
std::cout << "\t**Disconnecting from host....\n" << std::endl;
}
result = rdc_disconnect(rdc_handle);
ASSERT_EQ(result, RDC_ST_OK);
}
else{
} else {
IF_VERB(STANDARD) {
std::cout << "\t**Stopping Embedded RDC Engine....\n" << std::endl;
}
std::cout << "\t**Stopping Embedded RDC Engine....\n" << std::endl;
}
result = rdc_stop_embedded(rdc_handle);
ASSERT_EQ(result, RDC_ST_OK);
}
@@ -77,20 +76,17 @@ void TestRdciFieldgroup::Close() {
ASSERT_EQ(result, RDC_ST_OK);
}
void TestRdciFieldgroup::Run(void) {
TestBase::Run();
rdc_status_t result;
if(standalone_){
if (standalone_) {
IF_VERB(STANDARD) {
std::cout << "\t**Connecting to host....\n" << std::endl;
}
char hostIpAddress[] = {"localhost:50051"};
result = rdc_connect(hostIpAddress, &rdc_handle, nullptr, nullptr, nullptr);
ASSERT_EQ(result, RDC_ST_OK);
}
else{
} else {
IF_VERB(STANDARD) {
std::cout << "\t**Starting embedded RDC engine....\n" << std::endl;
}
@@ -99,25 +95,30 @@ void TestRdciFieldgroup::Run(void) {
}
rdc_field_grp_t field_group_id;
uint32_t field_ids[]= {150,155};
uint32_t invalid_field_ids[]= {10,20};
rdc_field_t field_ids[]= {RDC_FI_GPU_TEMP, RDC_FI_POWER_USAGE};
rdc_field_t invalid_field_ids[]= {RDC_FI_INVALID, RDC_FI_INVALID};
uint32_t fsize = sizeof(field_ids)/sizeof(field_ids[0]);
uint32_t count = 0;
rdc_field_group_info_t group_info;
result = rdc_group_field_create(rdc_handle, fsize, &invalid_field_ids[0], "FIELD_GRP", &field_group_id);
result = rdc_group_field_create(rdc_handle, fsize, &invalid_field_ids[0],
"FIELD_GRP", &field_group_id);
ASSERT_EQ(result, RDC_ST_NOT_SUPPORTED);
result = rdc_group_field_create(NULL, fsize, &field_ids[0], "FIELD_GRP", &field_group_id);
result = rdc_group_field_create(NULL, fsize, &field_ids[0],
"FIELD_GRP", &field_group_id);
ASSERT_EQ(result, RDC_ST_INVALID_HANDLER);
result = rdc_group_field_create(rdc_handle, fsize, &field_ids[0], NULL, NULL);
result = rdc_group_field_create(rdc_handle, fsize, &field_ids[0],
NULL, NULL);
ASSERT_EQ(result, RDC_ST_INVALID_HANDLER);
result = rdc_group_field_create(rdc_handle, (RDC_MAX_FIELD_IDS_PER_FIELD_GROUP+1), &field_ids[0], "FIELD_GRP", NULL);
result = rdc_group_field_create(rdc_handle,
(RDC_MAX_FIELD_IDS_PER_FIELD_GROUP+1), &field_ids[0], "FIELD_GRP", NULL);
ASSERT_EQ(result, RDC_ST_INVALID_HANDLER);
result = rdc_group_field_create(rdc_handle, fsize, &field_ids[0], "FIELD_GRP", &field_group_id);
result = rdc_group_field_create(rdc_handle, fsize, &field_ids[0],
"FIELD_GRP", &field_group_id);
ASSERT_EQ(result, RDC_ST_OK);
rdc_field_grp_t group_id_list[RDC_MAX_NUM_FIELD_GROUPS];
@@ -134,7 +135,8 @@ void TestRdciFieldgroup::Run(void) {
result = rdc_group_field_get_info(rdc_handle, group_id_list[i], 0);
ASSERT_EQ(result, RDC_ST_BAD_PARAMETER);
result = rdc_group_field_get_info(rdc_handle, group_id_list[i], &group_info);
result = rdc_group_field_get_info(rdc_handle, group_id_list[i],
&group_info);
ASSERT_EQ(result, RDC_ST_OK);
}
@@ -143,5 +145,4 @@ void TestRdciFieldgroup::Run(void) {
result = rdc_group_field_destroy(rdc_handle, field_group_id);
ASSERT_EQ(result, RDC_ST_OK);
}
tests/rdc_tests/functional/rdci_group.cc
+17 -30
Voir le fichier
@@ -30,8 +30,6 @@ THE SOFTWARE.
#include "rdc_tests/test_common.h"
#include "rdc/rdc.h"
TestRdciGroup::TestRdciGroup() : TestBase() {
set_title("\tRDC Group Test");
set_description("\tThe Group tests verifies creation/deletion of GPU groups");
@@ -59,39 +57,35 @@ void TestRdciGroup::DisplayResults(void) const {
void TestRdciGroup::Close() {
TestBase::Close();
rdc_status_t result;
if(standalone_){
if (standalone_) {
IF_VERB(STANDARD) {
std::cout << "\t**Disconnecting from host....\n" << std::endl;
}
std::cout << "\t**Disconnecting from host....\n" << std::endl;
}
result = rdc_disconnect(rdc_handle);
ASSERT_EQ(result, RDC_ST_OK);
}
else{
} else {
IF_VERB(STANDARD) {
std::cout << "\t**Stopping Embedded RDC Engine....\n" << std::endl;
}
std::cout << "\t**Stopping Embedded RDC Engine....\n" << std::endl;
}
result = rdc_stop_embedded(rdc_handle);
ASSERT_EQ(result, RDC_ST_OK);
};
}
result = rdc_shutdown();
ASSERT_EQ(result, RDC_ST_OK);
}
void TestRdciGroup::Run(void) {
TestBase::Run();
rdc_status_t result;
if(standalone_){
if (standalone_) {
IF_VERB(STANDARD) {
std::cout << "\t**Connecting to host....\n" << std::endl;
}
char hostIpAddress[] = {"localhost:50051"};
result = rdc_connect(hostIpAddress, &rdc_handle, nullptr, nullptr, nullptr);
ASSERT_EQ(result, RDC_ST_OK);
}
else{
} else {
IF_VERB(STANDARD) {
std::cout << "\t**Starting embedded RDC engine....\n" << std::endl;
}
@@ -103,31 +97,26 @@ void TestRdciGroup::Run(void) {
uint32_t count = 0;
rdc_group_info_t group_info;
uint32_t gpu_index_list[RDC_MAX_NUM_DEVICES];
result = rdc_group_gpu_create(0, RDC_GROUP_EMPTY,
"GRP_NAME", &group_id);
result = rdc_group_gpu_create(0, RDC_GROUP_EMPTY, "GRP_NAME", &group_id);
ASSERT_EQ(result, RDC_ST_INVALID_HANDLER);
result = rdc_group_gpu_create(rdc_handle, RDC_GROUP_EMPTY,
NULL, &group_id);
result = rdc_group_gpu_create(rdc_handle, RDC_GROUP_EMPTY, NULL, &group_id);
ASSERT_EQ(result, RDC_ST_BAD_PARAMETER);
result = rdc_group_gpu_create(rdc_handle, RDC_GROUP_EMPTY, "GRP_NAME", NULL);
ASSERT_EQ(result, RDC_ST_BAD_PARAMETER);
result = rdc_group_gpu_create(rdc_handle, RDC_GROUP_EMPTY,
"GRP_NAME", NULL);
ASSERT_EQ(result, RDC_ST_BAD_PARAMETER);
result = rdc_group_gpu_create(rdc_handle, RDC_GROUP_EMPTY,
"GRP_NAME", &group_id);
"GRP_NAME", &group_id);
ASSERT_EQ(result, RDC_ST_OK);
result = rdc_group_gpu_add(rdc_handle,
group_id, -1);
result = rdc_group_gpu_add(rdc_handle, group_id, -1);
ASSERT_EQ(result, RDC_ST_NOT_FOUND);
result = rdc_device_get_all(rdc_handle, gpu_index_list, &count);
ASSERT_EQ(result, RDC_ST_OK);
for (uint32_t i=0; i < count; i++) {
result = rdc_group_gpu_add(rdc_handle,
group_id, gpu_index_list[i]);
result = rdc_group_gpu_add(rdc_handle, group_id, gpu_index_list[i]);
ASSERT_EQ(result, RDC_ST_OK);
}
@@ -161,6 +150,4 @@ void TestRdciGroup::Run(void) {
result = rdc_group_gpu_destroy(rdc_handle, group_id);
ASSERT_EQ(result, RDC_ST_OK);
}
tests/rdc_tests/functional/rdci_stats.cc
+15 -19
Voir le fichier
@@ -33,7 +33,8 @@ THE SOFTWARE.
TestRdciStats::TestRdciStats() : TestBase() {
set_title("\tRDC Stats Test");
set_description("\tThe Stats tests collects and verifies job statistics running on gpu groups.");
set_description("\tThe Stats tests collects and verifies job "
"statistics running on gpu groups.");
}
TestRdciStats::~TestRdciStats(void) {
@@ -57,18 +58,17 @@ void TestRdciStats::DisplayResults(void) const {
void TestRdciStats::Close() {
TestBase::Close();
rdc_status_t result;
if(standalone_){
rdc_status_t result;
if (standalone_) {
IF_VERB(STANDARD) {
std::cout << "\t**Disconnecting from host....\n" << std::endl;
}
}
result = rdc_disconnect(rdc_handle);
ASSERT_EQ(result, RDC_ST_OK);
}
else{
} else {
IF_VERB(STANDARD) {
std::cout << "\t**Stopping Embedded RDC Engine....\n" << std::endl;
}
}
result = rdc_stop_embedded(rdc_handle);
ASSERT_EQ(result, RDC_ST_OK);
}
@@ -77,20 +77,18 @@ void TestRdciStats::Close() {
ASSERT_EQ(result, RDC_ST_OK);
}
void TestRdciStats::Run(void) {
TestBase::Run();
rdc_status_t result;
if(standalone_){
if (standalone_) {
IF_VERB(STANDARD) {
std::cout << "\t**Connecting to host....\n" << std::endl;
}
char hostIpAddress[] = {"localhost:50051"};
result = rdc_connect(hostIpAddress, &rdc_handle, nullptr, nullptr, nullptr);
result = rdc_connect(hostIpAddress, &rdc_handle, nullptr,
nullptr, nullptr);
ASSERT_EQ(result, RDC_ST_OK);
}
else{
} else {
IF_VERB(STANDARD) {
std::cout << "\t**Starting embedded RDC engine....\n" << std::endl;
}
@@ -100,7 +98,7 @@ void TestRdciStats::Run(void) {
rdc_gpu_group_t group_id;
result = rdc_group_gpu_create(rdc_handle, RDC_GROUP_EMPTY,
"GRP_NAME", &group_id);
"GRP_NAME", &group_id);
ASSERT_EQ(result, RDC_ST_OK);
result = rdc_group_gpu_add(rdc_handle, group_id, 0);
@@ -121,10 +119,9 @@ void TestRdciStats::Run(void) {
rdc_job_info_t job_info;
result = rdc_job_get_stats(rdc_handle, "0", &job_info);
if (result == RDC_ST_NOT_SUPPORTED) {
std::cout <<
"\t** GPU Metric is not supported"
" on this machine" << std::endl;
return;
std::cout << "\t** GPU Metric is not supported"
" on this machine" << std::endl;
return;
}
ASSERT_EQ(result, RDC_ST_OK);
@@ -133,5 +130,4 @@ void TestRdciStats::Run(void) {
result = rdc_job_remove_all(rdc_handle);
ASSERT_EQ(result, RDC_ST_OK);
}