Support APPLY_FRAGMENT(WEIGHT(double)) clause: add weights to fragments of parallel regions (and use it in at loopAnalyzer)
This commit is contained in:
@@ -93,8 +93,10 @@ static inline SgStatement* getParentStat(SgStatement *st)
|
||||
return iterator;
|
||||
}
|
||||
|
||||
static void updateRegionInfo(SgStatement *st, map<string, pair<Statement*, Statement*>> &startEnd, map<string, pair<int, int>> &lines_,
|
||||
set<string> &funcCallFromReg, const map<string, FuncInfo*> &mapFuncs)
|
||||
static void updateRegionInfo(SgStatement *st, map<string, pair<Statement*, Statement*>> &startEnd,
|
||||
map<string, pair<int, int>> &lines_,
|
||||
map<string, map<string, set<int>>> &funcCallFromReg,
|
||||
const map<string, FuncInfo*> &mapFuncs)
|
||||
{
|
||||
string containsPrefix = "";
|
||||
SgStatement *st_ps = getParentStat(st);
|
||||
@@ -103,17 +105,26 @@ static void updateRegionInfo(SgStatement *st, map<string, pair<Statement*, State
|
||||
containsPrefix = st_ps->symbol()->identifier() + string(".");
|
||||
|
||||
extendRegionInfo(st, startEnd, lines_);
|
||||
|
||||
set<string> calls_from_statement;
|
||||
|
||||
if (st->variant() == PROC_STAT)
|
||||
{
|
||||
string fullName = st->symbol()->identifier();
|
||||
//check contains
|
||||
if (mapFuncs.find(containsPrefix + fullName) != mapFuncs.end())
|
||||
fullName = containsPrefix + fullName;
|
||||
funcCallFromReg.insert(fullName);
|
||||
calls_from_statement.insert(fullName);
|
||||
}
|
||||
|
||||
for (int z = 0; z < 3; ++z)
|
||||
findFuncCalls(st->expr(z), funcCallFromReg, containsPrefix, mapFuncs);
|
||||
findFuncCalls(st->expr(z), calls_from_statement, containsPrefix, mapFuncs);
|
||||
|
||||
string filename = st->fileName();
|
||||
int line = st->lineNumber();
|
||||
|
||||
for (const auto &func_name : calls_from_statement)
|
||||
funcCallFromReg[func_name][filename].insert(line);
|
||||
}
|
||||
|
||||
static void fillArrayNamesInReg(set<string> &usedArrayInRegion, SgExpression *exp)
|
||||
@@ -283,6 +294,71 @@ static void checkForEmpty(SgStatement *start, SgStatement *end, vector<Messages>
|
||||
}
|
||||
}
|
||||
|
||||
static bool parseFortranDouble(const char* str, double &val)
|
||||
{
|
||||
int base_sign = 1, exp_sign = 1;
|
||||
|
||||
int integer_part = 0, power = 0;
|
||||
double decimal_part = 0;
|
||||
while (*str && *str != '.' && *str != 'd' && *str != 'D')
|
||||
{
|
||||
if (*str >= '0' && *str <= '9')
|
||||
integer_part = integer_part * 10 + (*str - '0');
|
||||
else if (*str == '-')
|
||||
base_sign = -1;
|
||||
else if (*str == '+')
|
||||
base_sign = 1;
|
||||
|
||||
str++;
|
||||
}
|
||||
|
||||
if (*str == '.')
|
||||
{
|
||||
str++;
|
||||
|
||||
int base = 10;
|
||||
while (*str >= '0' && *str <= '9')
|
||||
{
|
||||
decimal_part += double(*str - '0') / base;
|
||||
str++;
|
||||
base *= 10;
|
||||
}
|
||||
}
|
||||
|
||||
if (*str == 'd' || *str == 'D')
|
||||
{
|
||||
str++;
|
||||
|
||||
while (*str == '+' || *str == '-' || *str >= '0' && *str <= '9')
|
||||
{
|
||||
if (*str >= '0' && *str <= '9')
|
||||
power = power * 10 + (*str - '0');
|
||||
else if (*str == '-')
|
||||
exp_sign = -1;
|
||||
else if (*str == '+')
|
||||
exp_sign = 1;
|
||||
|
||||
str++;
|
||||
}
|
||||
}
|
||||
|
||||
double result = integer_part + decimal_part;
|
||||
|
||||
for(int i = 0; i < power; i++)
|
||||
{
|
||||
if (exp_sign > 0)
|
||||
result *= 10;
|
||||
else
|
||||
result /= 10;
|
||||
}
|
||||
|
||||
if (base_sign < 0)
|
||||
result = -result;
|
||||
|
||||
val = result;
|
||||
return true;
|
||||
}
|
||||
|
||||
void fillRegionLines(SgFile *file, vector<ParallelRegion*> ®ions, vector<Messages>& messagesForFile, vector<LoopGraph*> *loops, vector<FuncInfo*> *funcs)
|
||||
{
|
||||
map<string, FuncInfo*> mapFuncs;
|
||||
@@ -318,8 +394,9 @@ void fillRegionLines(SgFile *file, vector<ParallelRegion*> ®ions, vector<Mess
|
||||
string regionName = "";
|
||||
map<string, pair<Statement*, Statement*>> startEnd;
|
||||
map<string, pair<int, int>> lines_;
|
||||
set<string> funcCallFromReg;
|
||||
map<string, map<string, set<int>>> funcCallFromReg;
|
||||
bool regionStarted = false;
|
||||
double fragmentWeight = 1.0;
|
||||
|
||||
vector<SgStatement*> toDel;
|
||||
for (int i = 0; i < funcNum; ++i)
|
||||
@@ -368,6 +445,37 @@ void fillRegionLines(SgFile *file, vector<ParallelRegion*> ®ions, vector<Mess
|
||||
itFunc->second->callRegions.insert(0);
|
||||
}
|
||||
}
|
||||
|
||||
// parse SPF_APPLY_FRAGMENT clause
|
||||
auto *apply_fragment = data->expr(1);
|
||||
fragmentWeight = 1.0;
|
||||
|
||||
while (apply_fragment)
|
||||
{
|
||||
auto *curr = apply_fragment->lhs();
|
||||
|
||||
if (curr)
|
||||
{
|
||||
__spf_print(1, "%s %d\n", curr->unparse(), curr->variant());
|
||||
|
||||
if (curr->variant() == SPF_WEIGHT_OP)
|
||||
{
|
||||
if (curr->lhs() &&
|
||||
isSgValueExp(curr->lhs()) &&
|
||||
isSgValueExp(curr->lhs())->doubleValue() &&
|
||||
parseFortranDouble(isSgValueExp(curr->lhs())->doubleValue(), fragmentWeight))
|
||||
{
|
||||
__spf_print(1, "->> %lf\n", fragmentWeight);
|
||||
}
|
||||
else
|
||||
{
|
||||
__spf_print(1, "WEIGHT clause without double argument\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
apply_fragment = apply_fragment->rhs();
|
||||
}
|
||||
}
|
||||
|
||||
if (next && next->variant() == SPF_END_PARALLEL_REG_DIR)
|
||||
@@ -400,10 +508,12 @@ void fillRegionLines(SgFile *file, vector<ParallelRegion*> ®ions, vector<Mess
|
||||
|
||||
extendRegionInfo(st, startEnd, lines_, true);
|
||||
for (auto itRegInfo = startEnd.begin(); itRegInfo != startEnd.end(); ++itRegInfo)
|
||||
currReg->AddLines(lines_[itRegInfo->first], itRegInfo->first, &itRegInfo->second);
|
||||
currReg->AddLines(lines_[itRegInfo->first], itRegInfo->first, &itRegInfo->second, fragmentWeight);
|
||||
|
||||
for (auto &func : funcCallFromReg)
|
||||
currReg->AddFuncCalls(func);
|
||||
for (auto &by_func : funcCallFromReg)
|
||||
for (auto &by_file : by_func.second)
|
||||
for(auto &by_line : by_file.second)
|
||||
currReg->AddFuncCalls(by_func.first, by_file.first, by_line);
|
||||
|
||||
filterUserDirectives(currReg, usedArrayInRegion, userDvmRedistrDirs, userDvmRealignDirs, userDvmShadowDirs);
|
||||
currReg->AddUserDirectives(userDvmRealignDirs, DVM_REALIGN_DIR);
|
||||
@@ -496,34 +606,48 @@ void fillRegionLinesStep2(vector<ParallelRegion*> ®ions, const map<string, ve
|
||||
{
|
||||
if (regions[i]->GetName() != "DEFAULT")
|
||||
for (auto &func : regions[i]->GetFuncCalls())
|
||||
setExplicitFlag(func, funcMap);
|
||||
setExplicitFlag(func.first, funcMap);
|
||||
}
|
||||
|
||||
for (int i = 0; i < regions.size(); ++i)
|
||||
{
|
||||
if (regions[i]->GetName() != "DEFAULT")
|
||||
{
|
||||
set<string> uniqFuncCalls;
|
||||
for (auto &elem : regions[i]->GetFuncCalls())
|
||||
uniqFuncCalls.insert(elem);
|
||||
map<string, double> uniqFuncCalls;
|
||||
map<string, map<string, set<int>>> callPlaces;
|
||||
|
||||
for (auto &elem : regions[i]->GetFuncCalls())
|
||||
{
|
||||
double max_weight = 0;
|
||||
for (auto* fragment : elem.second)
|
||||
if (fragment->weight > max_weight)
|
||||
max_weight = fragment->weight;
|
||||
|
||||
uniqFuncCalls[elem.first] = max_weight;
|
||||
}
|
||||
|
||||
bool wasChanged = true;
|
||||
auto funcsBefore = uniqFuncCalls;
|
||||
|
||||
bool wasChanged = 1;
|
||||
while (wasChanged)
|
||||
{
|
||||
wasChanged = 0;
|
||||
wasChanged = false;
|
||||
auto updated = uniqFuncCalls;
|
||||
|
||||
for (auto &uniqF : uniqFuncCalls)
|
||||
{
|
||||
auto func = funcMap.find(uniqF);
|
||||
auto func = funcMap.find(uniqF.first);
|
||||
if (func != funcMap.end())
|
||||
{
|
||||
for (auto &calls : func->second->callsFrom)
|
||||
for (auto &call : func->second->callsFromDetailed)
|
||||
{
|
||||
auto it = uniqFuncCalls.find(calls);
|
||||
if (it == uniqFuncCalls.end())
|
||||
{
|
||||
uniqFuncCalls.insert(it, calls);
|
||||
wasChanged = 1;
|
||||
}
|
||||
auto it = updated.find(call.detailCallsFrom.first);
|
||||
if (it == updated.end())
|
||||
updated.insert({call.detailCallsFrom.first, uniqF.second});
|
||||
else
|
||||
it->second = std::max(it->second, uniqF.second);
|
||||
|
||||
callPlaces[call.detailCallsFrom.first][func->second->fileName].insert(call.detailCallsFrom.second);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -532,21 +656,27 @@ void fillRegionLinesStep2(vector<ParallelRegion*> ®ions, const map<string, ve
|
||||
string toPrint = "";
|
||||
for (auto &elem : uniqFuncCalls)
|
||||
{
|
||||
auto it = funcMap.find(elem);
|
||||
auto it = funcMap.find(elem.first);
|
||||
if (it != funcMap.end())
|
||||
{
|
||||
regions[i]->AddLines(it->second->linesNum, it->second->fileName);
|
||||
regions[i]->AddFuncCallsToAllCalls(it->second);
|
||||
regions[i]->AddLines(it->second->linesNum, it->second->fileName, NULL, elem.second);
|
||||
|
||||
if (it->second->inRegion == 0)
|
||||
it->second->inRegion = 2;
|
||||
|
||||
it->second->callRegions.insert(i);
|
||||
|
||||
toPrint += elem + " ";
|
||||
toPrint += elem.first + " ";
|
||||
}
|
||||
}
|
||||
|
||||
for (auto &elem : callPlaces)
|
||||
{
|
||||
for (const auto &byFile : elem.second)
|
||||
for (auto byLine : byFile.second)
|
||||
regions[i]->AddFuncCalls(elem.first, byFile.first, byLine);
|
||||
}
|
||||
|
||||
if (toPrint != "")
|
||||
__spf_print(1, "[%s]: funcs: %s\n", regions[i]->GetName().c_str(), toPrint.c_str());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user