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

Merge branch 'master' of https://github.com/GPUOpen-ProfessionalCompute-Tools/HIP-hipify

Browse Source
This commit is contained in:
dfukalov
2016-03-02 18:03:20 +03:00
parent dcdcd5450b b96797dcd9
commit 217f64bbc3
1 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hipamd/src/Cuda2Hip.cpp
+27 -33
View File
@@ -221,6 +221,31 @@ namespace {
DenseMap<StringRef, StringRef> cuda2hipRename; DenseMap<StringRef, StringRef> cuda2hipRename;
}; };
StringRef unquoteStr(StringRef s) {
if (s.size() > 1 && s.front() == '"' && s.back() == '"')
return s.substr(1, s.size()-2);
return s;
}
void processString(StringRef s, struct hipName & map,
Replacements * Replace, SourceManager & SM, SourceLocation start)
{
size_t begin = 0;
while ((begin = s.find("cuda", begin)) != StringRef::npos) {
const size_t end = s.find_first_of(" ", begin + 4);
StringRef name = s.slice(begin, end);
StringRef repName = map.cuda2hipRename[name];
if (!repName.empty()) {
SourceLocation sl = start.getLocWithOffset(begin + 1);
Replacement Rep(SM, sl, name.size(), repName);
Replace->insert(Rep);
}
if (end == StringRef::npos) break;
begin = end + 1;
}
}
struct HipifyPPCallbacks : public PPCallbacks, public SourceFileCallbacks { struct HipifyPPCallbacks : public PPCallbacks, public SourceFileCallbacks {
HipifyPPCallbacks(Replacements * R) HipifyPPCallbacks(Replacements * R)
: SeenEnd(false), _sm(nullptr), _pp(nullptr), Replace(R) : SeenEnd(false), _sm(nullptr), _pp(nullptr), Replace(R)
@@ -335,22 +360,7 @@ namespace {
if (tok.is(tok::string_literal)) if (tok.is(tok::string_literal))
{ {
StringRef s(tok.getLiteralData(), tok.getLength()); StringRef s(tok.getLiteralData(), tok.getLength());
size_t begin = 0; processString(unquoteStr(s), N, Replace, *_sm, tok.getLocation());
while ((begin = s.find("cuda", begin)) != StringRef::npos) {
const size_t end = s.find_first_of(" ", begin + 4);
StringRef name = s.slice(begin, end);
llvm::outs() << "\nToken: <" << name << "> found in string literal '"
<< s << "' as argument in expansion of macro '" << macroName << "'\n";
StringRef repName = N.cuda2hipRename[name];
if (!repName.empty()) {
llvm::outs() << "\nWill be replaced with: <" << repName << "\n";
SourceLocation sl = tok.getLocation().getLocWithOffset(begin);
Replacement Rep(*_sm, sl, name.size(), repName);
Replace->insert(Rep);
}
if (end == StringRef::npos) break;
begin = end + 1;
}
} }
} }
} }
@@ -560,23 +570,7 @@ class Cuda2HipCallback : public MatchFinder::MatchCallback {
if (const StringLiteral * stringLiteral = Result.Nodes.getNodeAs<clang::StringLiteral>("stringLiteral")) if (const StringLiteral * stringLiteral = Result.Nodes.getNodeAs<clang::StringLiteral>("stringLiteral"))
{ {
StringRef s = stringLiteral->getString(); StringRef s = stringLiteral->getString();
size_t begin = 0; processString(s, N, Replace, *SM, stringLiteral->getLocStart());
while ((begin = s.find("cuda", begin)) != StringRef::npos) {
const size_t end = s.find_first_of(" ", begin + 4);
StringRef name = s.slice(begin, end);
llvm::outs() << "\nToken: <" << name << "> found in string literal " << s << "\n";
StringRef repName = N.cuda2hipRename[name];
if (!repName.empty()) {
llvm::outs() << "\nWill be replaced with: <" << repName << "\n";
SourceLocation sl = stringLiteral->getLocationOfByte(begin, *SM,
Result.Context->getLangOpts(), Result.Context->getTargetInfo());
Replacement Rep(*SM, SM->isMacroArgExpansion(sl) ?
SM->getImmediateSpellingLoc(sl) : sl, name.size(), repName);
Replace->insert(Rep);
}
if (end == StringRef::npos) break;
begin = end + 1;
}
} }
if (const UnaryExprOrTypeTraitExpr * expr = Result.Nodes.getNodeAs<clang::UnaryExprOrTypeTraitExpr>("cudaStructSizeOf")) if (const UnaryExprOrTypeTraitExpr * expr = Result.Nodes.getNodeAs<clang::UnaryExprOrTypeTraitExpr>("cudaStructSizeOf"))