gaspersic/triton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix in ptxas path. (#487)

Browse Source 
Bug: "ret" value is destroyed when a failing "ptxas --version" is run
overwriting the previous valid "ret" value.

Fix: keep rets only for those runs which are successful. Pick the first
one
This commit is contained in:
apd10
2022-03-30 22:45:41 -05:00
committed by GitHub
parent bace26143d
commit e85c7a7fc7
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/driver/llvm.cc
View File

@@ -94,6 +94,7 @@ static bool find_and_replace(std::string& str, const std::string& begin, const s
} }
std::string path_to_ptxas(int& version) { std::string path_to_ptxas(int& version) {
std::vector<std::string> rets;
std::string ret; std::string ret;
// search pathes for ptxas // search pathes for ptxas
std::vector<std::string> ptxas_prefixes = {"", "/usr/local/cuda/bin/"}; std::vector<std::string> ptxas_prefixes = {"", "/usr/local/cuda/bin/"};
@@ -105,8 +106,10 @@ std::string path_to_ptxas(int& version) {
for(std::string prefix: ptxas_prefixes){ for(std::string prefix: ptxas_prefixes){
std::string ptxas = prefix + "ptxas"; std::string ptxas = prefix + "ptxas";
bool works = tools::exec(ptxas + " --version 2>&1", ret) == 0; bool works = tools::exec(ptxas + " --version 2>&1", ret) == 0;
if(works) if(works) {
working_ptxas.push_back(ptxas); working_ptxas.push_back(ptxas);
rets.push_back(ret);
}
} }
// error if no working ptxas was found // error if no working ptxas was found
if(working_ptxas.empty()) if(working_ptxas.empty())
@@ -116,13 +119,20 @@ std::string path_to_ptxas(int& version) {
// parse version // parse version
std::regex version_regex("release (\\d+)\\.(\\d+)"); std::regex version_regex("release (\\d+)\\.(\\d+)");
std::smatch match; std::smatch match;
bool found = false;
// currently choosing the first ptxas. Other logics can be implemented in future
for(std::string ret : rets) {
if(std::regex_search(ret, match, version_regex)){ if(std::regex_search(ret, match, version_regex)){
int major = std::stoi(match[1]); int major = std::stoi(match[1]);
int minor = std::stoi(match[2]); int minor = std::stoi(match[2]);
version = major*1000 + minor*10; version = major*1000 + minor*10;
found = true;
break;
}
}
if ( not found) {
throw std::runtime_error("Error in parsing version");
} }
else
throw std::runtime_error("couldn't parse ptxas version: " + ret);
return ptxas; return ptxas;
} }