added inductive variables and loop type to LoopGraph
This commit is contained in:
@@ -25,6 +25,33 @@ namespace DIST = Distribution;
|
||||
void getRealArrayRefs(DIST::Array* addTo, DIST::Array* curr, std::set<DIST::Array*>& realArrayRefs, const std::map<DIST::Array*, std::set<DIST::Array*>>& arrayLinksByFuncCalls);
|
||||
void getAllArrayRefs(DIST::Array* addTo, DIST::Array* curr, std::set<DIST::Array*>& realArrayRefs, const std::map<DIST::Array*, std::set<DIST::Array*>>& arrayLinksByFuncCalls);
|
||||
|
||||
enum class LoopType { NONE, FOR, WHILE, IMPLICIT };
|
||||
|
||||
struct InductiveVariables
|
||||
{
|
||||
private:
|
||||
std::string mainVar;
|
||||
std::set<std::string> allVars;
|
||||
|
||||
public:
|
||||
InductiveVariables() { }
|
||||
|
||||
explicit InductiveVariables(const std::string& mainVar, const std::set<std::string>& allVars) : mainVar(mainVar), allVars(allVars) { };
|
||||
|
||||
std::string getMainVar() const { return mainVar; }
|
||||
std::set<std::string> getAllVars() const { return allVars; }
|
||||
|
||||
void addVar(const std::string& var) { allVars.insert(var); }
|
||||
void addMainVar(const std::string& var) { mainVar = var; allVars.insert(var); }
|
||||
|
||||
void replaceMainVar(const std::string& var)
|
||||
{
|
||||
allVars.erase(mainVar);
|
||||
|
||||
addMainVar(var);
|
||||
}
|
||||
};
|
||||
|
||||
struct LoopGraph
|
||||
{
|
||||
private:
|
||||
@@ -70,7 +97,7 @@ public:
|
||||
calculatedCountOfIters = 0;
|
||||
executionTimeInSec = -1.0;
|
||||
inDvmhRegion = 0;
|
||||
isFor = false;
|
||||
loopType = LoopType::NONE;
|
||||
inCanonicalFrom = false;
|
||||
hasAccessToSubArray = false;
|
||||
hasSubstringRefs = false;
|
||||
@@ -113,21 +140,24 @@ public:
|
||||
{
|
||||
return hasUnknownArrayDep || hasUnknownScalarDep || hasGoto || hasPrints || (hasConflicts.size() != 0) || hasStops || hasNonPureProcedures ||
|
||||
hasUnknownArrayAssigns || hasNonRectangularBounds || hasIndirectAccess || hasWritesToNonDistribute || hasDifferentAlignRules || hasDvmIntervals ||
|
||||
!isFor || lastprivateScalars.size() || hasAccessToSubArray || hasSubstringRefs;
|
||||
!isFor() || lastprivateScalars.size() || hasAccessToSubArray || hasSubstringRefs;
|
||||
}
|
||||
|
||||
bool hasLimitsToSplit() const
|
||||
{
|
||||
return hasGoto || hasStops || !isFor || hasPrints;
|
||||
return hasGoto || hasStops || !isFor() || hasPrints;
|
||||
}
|
||||
|
||||
bool hasLimitsToCombine() const
|
||||
{
|
||||
return hasGoto || hasStops || !isFor || hasPrints || linesOfCycle.size();
|
||||
return hasGoto || hasStops || !isFor() || hasPrints || linesOfCycle.size();
|
||||
}
|
||||
|
||||
void addConflictMessages(std::vector<Messages> *messages)
|
||||
{
|
||||
if (messages == NULL)
|
||||
return;
|
||||
|
||||
const int line = altLineNum > 0 ? altLineNum : lineNum;
|
||||
if (hasUnknownArrayDep)
|
||||
messages->push_back(Messages(NOTE, line, R113, L"unknown array dependency prevents parallelization of this loop", 3006));
|
||||
@@ -168,7 +198,7 @@ public:
|
||||
if (hasDvmIntervals)
|
||||
messages->push_back(Messages(NOTE, line, R145, L"DVM intervals prevent parallelization of this loop", 3006));
|
||||
|
||||
if (!isFor || !inCanonicalFrom)
|
||||
if (!isFor() || !inCanonicalFrom)
|
||||
messages->push_back(Messages(NOTE, line, R178, L"This type of loop is not supported by the system", 3006));
|
||||
|
||||
if (lastprivateScalars.size())
|
||||
@@ -393,6 +423,14 @@ public:
|
||||
|
||||
void* getRealStat(const char* file) const;
|
||||
|
||||
bool isFor() const { return loopType == LoopType::FOR; }
|
||||
|
||||
bool isWhile() const { return loopType == LoopType::WHILE; }
|
||||
|
||||
bool isImplicit() const { return loopType == LoopType::IMPLICIT; }
|
||||
|
||||
std::string loopSymbol() const { return loopSymbols.getMainVar(); }
|
||||
|
||||
public:
|
||||
int lineNum;
|
||||
int altLineNum;
|
||||
@@ -407,7 +445,7 @@ public:
|
||||
int startVal, endVal, stepVal;
|
||||
std::tuple<Expression*, Expression*, Expression*> startEndStepVals;
|
||||
|
||||
std::string loopSymbol;
|
||||
InductiveVariables loopSymbols;
|
||||
std::pair<Expression*, Expression*> startEndExpr;
|
||||
|
||||
bool hasGoto;
|
||||
@@ -448,7 +486,7 @@ public:
|
||||
|
||||
bool hasSubstringRefs;
|
||||
|
||||
bool isFor;
|
||||
LoopType loopType;
|
||||
|
||||
bool inCanonicalFrom;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user