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

SWDEV-344154 - infrastructure to skip tests for different archs (#2850)

Browse Source 
Change-Id: Id3bda440c4cd920ce18c14d06e2f2c6ab6346de3
This commit is contained in:
agunashe
2022-08-17 17:10:52 -07:00
committed by GitHub
parent 46246c205c
commit d154b4cd6b
5 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/catch/hipTestMain/hip_test_context.cc
+56 -58
View File
@@ -42,12 +42,16 @@ std::string TestContext::getMatchingConfigFile(std::string config_dir) {
std::string arch = substringFound(amd_arch_list_, filename.filename().string());
std::string platform = substringFound(platform_list_, filename.filename().string());
std::string os = substringFound(os_list_, filename.filename().string());
std::string common_arch = "common";
std::vector<std::string> default_arch_vec {common_arch};
std::string common = substringFound(default_arch_vec, filename.filename().string());
// if arch found then use that exit from loop
if (arch == cur_arch) {
configFileToUse = filename.string();
break;
// match the platform/os and continue to look
} else if ((platform == config_.platform) && (os == config_.os || os == "all")) {
} else if ((platform == config_.platform) && (os == config_.os || os == "all") &&
common == common_arch) { // ensures only common file is returned
configFileToUse = filename.string();
}
}
@@ -55,7 +59,7 @@ std::string TestContext::getMatchingConfigFile(std::string config_dir) {
}
std::string& TestContext::getJsonFile() {
std::string& TestContext::getCommonJsonFile() {
fs::path config_dir = exe_path;
config_dir = config_dir.parent_path();
int levels = 0;
@@ -85,7 +89,7 @@ std::string& TestContext::getJsonFile() {
}
void TestContext::fillConfig() {
void TestContext::getConfigFiles() {
config_.platform = (amd ? "amd" : (nvidia ? "nvidia" : "unknown"));
config_.os = (p_windows ? "windows" : (p_linux ? "linux" : "unknown"));
@@ -94,36 +98,30 @@ void TestContext::fillConfig() {
abort();
}
const char* env_config = std::getenv("HT_CONFIG_FILE");
const char* env_config = std::getenv("HIP_CATCH_EXCLUDE_FILE");
LogPrintf("Env Config file: %s",
(env_config != nullptr) ? env_config : "Not found, using default config");
// Check if path has been provided
std::string def_config_json = "config.json";
std::string config_str;
(env_config != nullptr) ? env_config : "Not found, using common config");
// HIP_CATCH_EXCLUDE_FILE is set for custom file path
if (env_config != nullptr) {
config_str = env_config;
if(fs::exists(env_config)) {
config_.json_files.push_back(env_config);
}
} else {
config_str = def_config_json;
// get common json file
config_.json_files.push_back(getCommonJsonFile());
}
fs::path config_path = config_str;
if (config_path.has_parent_path() && config_path.has_filename()) {
config_.json_file = config_str;
} else if (config_path.has_parent_path()) {
config_.json_file = config_path.string() + def_config_json;
} else {
config_.json_file = getJsonFile();
for (const auto& fl : config_.json_files) {
LogPrintf("Config file path: %s", fl.c_str());
}
LogPrintf("Config file path: %s", config_.json_file.c_str());
}
TestContext::TestContext(int argc, char** argv) {
detectOS();
detectPlatform();
setExePath(argc, argv);
fillConfig();
parseJsonFile();
getConfigFiles();
parseJsonFiles();
parseOptions(argc, argv);
}
@@ -161,52 +159,52 @@ bool TestContext::skipTest() const {
std::string TestContext::currentPath() const { return fs::current_path().string(); }
bool TestContext::parseJsonFile() {
bool TestContext::parseJsonFiles() {
// Check if file exists
if (!fs::exists(config_.json_file)) {
LogPrintf("Unable to find the file: %s", config_.json_file.c_str());
return true;
}
for (const auto& fl : config_.json_files) {
if (!fs::exists(fl)) {
LogPrintf("Unable to find the file: %s", fl.c_str());
return true;
}
// Open the file
std::ifstream js_file(fl);
std::string json_str((std::istreambuf_iterator<char>(js_file)), std::istreambuf_iterator<char>());
LogPrintf("Json contents:: %s", json_str.data());
// Open the file
std::ifstream js_file(config_.json_file);
std::string json_str((std::istreambuf_iterator<char>(js_file)), std::istreambuf_iterator<char>());
LogPrintf("Json contents:: %s", json_str.data());
picojson::value v;
std::string err = picojson::parse(v, json_str);
if (err.size() > 1) {
LogPrintf("Error from PicoJson: %s", err.data());
return false;
}
picojson::value v;
std::string err = picojson::parse(v, json_str);
if (err.size() > 1) {
LogPrintf("Error from PicoJson: %s", err.data());
return false;
}
if (!v.is<picojson::object>()) {
LogPrintf("%s", "Data in json is not in correct format, it should be an object");
return false;
}
if (!v.is<picojson::object>()) {
LogPrintf("%s", "Data in json is not in correct format, it should be an object");
return false;
}
const picojson::object& o = v.get<picojson::object>();
for (picojson::object::const_iterator i = o.begin(); i != o.end(); ++i) {
// Processing for DisabledTests
if (i->first == "DisabledTests") {
// Value should contain list of values
if (!i->second.is<picojson::array>()) return false;
const picojson::object& o = v.get<picojson::object>();
for (picojson::object::const_iterator i = o.begin(); i != o.end(); ++i) {
// Processing for DisabledTests
if (i->first == "DisabledTests") {
// Value should contain list of values
if (!i->second.is<picojson::array>()) return false;
auto& val = i->second.get<picojson::array>();
for (auto ai = val.begin(); ai != val.end(); ai++) {
std::string tmp = ai->get<std::string>();
std::string newRegexName;
for (const auto& c : tmp) {
if (c == '*')
newRegexName += ".*";
else
newRegexName += c;
auto& val = i->second.get<picojson::array>();
for (auto ai = val.begin(); ai != val.end(); ai++) {
std::string tmp = ai->get<std::string>();
std::string newRegexName;
for (const auto& c : tmp) {
if (c == '*')
newRegexName += ".*";
else
newRegexName += c;
}
skip_test.insert(newRegexName);
}
skip_test.insert(newRegexName);
}
}
}
return true;
}