AI/rocm-systems
2
0
Fork 0
Koodi Ongelmat Pull-pyynnöt Actions Paketit Projektit Julkaisut Wiki Toiminta

[HIPIFY] Minor refactoring

Selaa lähdekoodia 
+ insertHipHeaders function is added to Cuda2Hip class;
+ fix replacement ending for hip header.


[ROCm/hip commit: c3ab4d5c5e]
This commit is contained in:
Evgeny Mankov
2017-02-13 18:13:49 +03:00
vanhempi 9f5ab73c4e
commit 31dfd8bb1f
1 muutettua tiedostoa jossa 13 lisäystä ja 21 poistoa
Download Patch File Download Diff File Expand all files Collapse all files
projects/hip/hipify-clang/src/Cuda2Hip.cpp
+13 -21
Näytä tiedosto
@@ -1711,6 +1711,17 @@ protected:
// llvm::outs() << " [HIPIFY] expansion line num: " << fullSL.getExpansionLineNumber() << " for replacement '" << rep.getReplacementText() << "'\n"; // llvm::outs() << " [HIPIFY] expansion line num: " << fullSL.getExpansionLineNumber() << " for replacement '" << rep.getReplacementText() << "'\n";
} }
} }
void insertHipHeaders(Cuda2Hip *owner, const SourceManager &SM) {
if (owner->countReps[CONV_INCLUDE_CUDA_MAIN_H] == 0 && countReps[CONV_INCLUDE_CUDA_MAIN_H] == 0 && Replace->size() > 0) {
std::string repName = "#include <hip/hip_runtime.h>";
hipCounter counter = { repName, CONV_INCLUDE_CUDA_MAIN_H, API_RUNTIME };
updateCounters(counter, repName);
SourceLocation sl = SM.getLocForStartOfFile(SM.getMainFileID());
FullSourceLoc fullSL(sl, SM);
Replacement Rep(SM, sl, 0, repName + "\n");
insertReplacement(Rep, fullSL);
}
}
void updateCountersExt(const hipCounter &counter, const std::string &cudaName) { void updateCountersExt(const hipCounter &counter, const std::string &cudaName) {
std::map<std::string, uint64_t> *map = &cuda2hipConverted; std::map<std::string, uint64_t> *map = &cuda2hipConverted;
@@ -2464,17 +2475,7 @@ public:
if (unresolvedTemplateName(Result)) break; if (unresolvedTemplateName(Result)) break;
break; break;
} while (false); } while (false);
if (PP->countReps[CONV_INCLUDE_CUDA_MAIN_H] == 0 && insertHipHeaders(PP, *Result.SourceManager);
countReps[CONV_INCLUDE_CUDA_MAIN_H] == 0 && Replace->size() > 0) {
StringRef repName = "#include <hip/hip_runtime.h>\n";
SourceManager *SM = Result.SourceManager;
SourceLocation sl = SM->getLocForStartOfFile(SM->getMainFileID());
Replacement Rep(*SM, sl, 0, repName);
FullSourceLoc fullSL(sl, *SM);
insertReplacement(Rep, fullSL);
hipCounter counter = { repName, CONV_INCLUDE_CUDA_MAIN_H, API_RUNTIME };
updateCounters(counter, repName);
}
} }
private: private:
@@ -2483,16 +2484,7 @@ private:
}; };
void HipifyPPCallbacks::handleEndSource() { void HipifyPPCallbacks::handleEndSource() {
if (Match->countReps[CONV_INCLUDE_CUDA_MAIN_H] == 0 && insertHipHeaders(Match, *_sm);
countReps[CONV_INCLUDE_CUDA_MAIN_H] == 0 && Replace->size() > 0) {
StringRef repName = "#include <hip/hip_runtime.h>\n";
SourceLocation sl = _sm->getLocForStartOfFile(_sm->getMainFileID());
Replacement Rep(*_sm, sl, 0, repName);
FullSourceLoc fullSL(sl, *_sm);
insertReplacement(Rep, fullSL);
hipCounter counter = { repName, CONV_INCLUDE_CUDA_MAIN_H, API_RUNTIME };
updateCounters(counter, repName);
}
} }
} // end anonymous namespace } // end anonymous namespace