fixed shared memory parallelization
This commit is contained in:
@@ -11,9 +11,9 @@
|
||||
#include "DvmhRegionInserter.h"
|
||||
#include "DvmhRegions/RegionsMerger.h"
|
||||
#include "../VerificationCode/verifications.h"
|
||||
#include "../Transformations/FunctionPurifying/function_purifying.h"
|
||||
#include "../LoopAnalyzer/loop_analyzer.h"
|
||||
#include "../DirectiveProcessing/directive_parser.h"
|
||||
#include "FunctionPurifying/function_purifying.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -794,154 +794,6 @@ ArraySet DvmhRegionInserter::get_used_arrs_for_block(SgStatement* st, int usage_
|
||||
return usages;
|
||||
}
|
||||
|
||||
static bool filterFromList(SgStatement* st, const set<string>& idents, bool exclude = false)
|
||||
{
|
||||
bool empty = false;
|
||||
SgExpression* list = st->expr(0);
|
||||
vector<SgExpression*> newList;
|
||||
|
||||
int total = 0;
|
||||
while (list)
|
||||
{
|
||||
if (exclude)
|
||||
{
|
||||
if (idents.find(list->lhs()->symbol()->identifier()) == idents.end())
|
||||
newList.push_back(list->lhs());
|
||||
}
|
||||
else
|
||||
{
|
||||
if (idents.find(list->lhs()->symbol()->identifier()) != idents.end())
|
||||
newList.push_back(list->lhs());
|
||||
}
|
||||
total++;
|
||||
list = list->rhs();
|
||||
}
|
||||
|
||||
if (newList.size() == 0)
|
||||
empty = true;
|
||||
else if (total != newList.size())
|
||||
st->setExpression(0, makeExprList(newList));
|
||||
|
||||
return empty;
|
||||
}
|
||||
|
||||
static string getInterfaceBlock(SgStatement* func, const FuncParam& pars)
|
||||
{
|
||||
string oldFile = current_file->filename();
|
||||
if (!func->switchToFile())
|
||||
printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
|
||||
|
||||
auto copy = duplicateProcedure(func, NULL, false, false, false, true);
|
||||
const set<string> idents(pars.identificators.begin(), pars.identificators.end());
|
||||
|
||||
bool need = (func->symbol()->identifier() == string("bl182"));
|
||||
|
||||
//remove all exec
|
||||
SgStatement* st = copy->lexNext();
|
||||
SgStatement* last = copy->lastNodeOfStmt();
|
||||
vector<SgStatement*> toExtract;
|
||||
|
||||
while (st != last)
|
||||
{
|
||||
if (isDVM_stat(st) || isSPF_stat(st))
|
||||
{
|
||||
if (st->variant() != ACC_ROUTINE_DIR)
|
||||
{
|
||||
toExtract.push_back(st);
|
||||
st = st->lexNext();
|
||||
}
|
||||
else
|
||||
st = st->lexNext();
|
||||
}
|
||||
else if (isSgExecutableStatement(st))
|
||||
{
|
||||
SgStatement* next = st->lastNodeOfStmt();
|
||||
if (next != last)
|
||||
next = next->lexNext();
|
||||
toExtract.push_back(st);
|
||||
st = next;
|
||||
}
|
||||
else
|
||||
st = st->lexNext();
|
||||
}
|
||||
|
||||
//remove unused declarations
|
||||
st = copy->lexNext();
|
||||
while (st != last)
|
||||
{
|
||||
const int var = st->variant();
|
||||
|
||||
if (var == VAR_DECL
|
||||
|| var == VAR_DECL_90
|
||||
|| var == DIM_STAT
|
||||
|| var == INTENT_STMT
|
||||
|| var == EXTERN_STAT)
|
||||
{
|
||||
bool empty = filterFromList(st, idents);
|
||||
if (empty)
|
||||
{
|
||||
toExtract.push_back(st);
|
||||
st = st->lexNext();
|
||||
continue;
|
||||
}
|
||||
}
|
||||
else if (!isDVM_stat(st) && !isSPF_stat(st))
|
||||
toExtract.push_back(st);
|
||||
|
||||
if (st->variant() == CONTAINS_STMT)
|
||||
break;
|
||||
st = st->lexNext();
|
||||
}
|
||||
|
||||
for (auto& elem : toExtract)
|
||||
elem->extractStmt();
|
||||
|
||||
string retVal = copy->unparse();
|
||||
|
||||
if (SgFile::switchToFile(oldFile) == -1)
|
||||
printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
|
||||
|
||||
return retVal;
|
||||
}
|
||||
|
||||
static void insertInterface(SgStatement* func, const string& iface, const string& fName)
|
||||
{
|
||||
string oldFile = current_file->filename();
|
||||
if (!func->switchToFile())
|
||||
printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
|
||||
|
||||
SgStatement* st = func->lexNext();
|
||||
SgStatement* last = func->lastNodeOfStmt();
|
||||
while (st != last)
|
||||
{
|
||||
if (st->variant() == VAR_DECL || st->variant() == VAR_DECL_90)
|
||||
{
|
||||
bool empty = filterFromList(st, { fName }, true);
|
||||
if (empty)
|
||||
{
|
||||
SgStatement* next = st->lexNext();
|
||||
st->extractStmt();
|
||||
st = next;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (isSgExecutableStatement(st))
|
||||
break;
|
||||
st = st->lexNext();
|
||||
}
|
||||
SgStatement* ifaceBlock = new SgStatement(INTERFACE_STMT);
|
||||
addControlEndToStmt(ifaceBlock->thebif);
|
||||
|
||||
ifaceBlock->setlineNumber(getNextNegativeLineNumber()); // st->lineNumber()
|
||||
ifaceBlock->setFileName(st->fileName());
|
||||
st->insertStmtBefore(*ifaceBlock, *st->controlParent());
|
||||
ifaceBlock->lastNodeOfStmt()->addComment(iface.c_str());
|
||||
|
||||
if (SgFile::switchToFile(oldFile) == -1)
|
||||
printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
|
||||
}
|
||||
|
||||
static LoopGraph* getParallelLoop(LoopGraph* loop)
|
||||
{
|
||||
auto prev_st = loop->loop->lexPrev();
|
||||
@@ -1172,7 +1024,7 @@ static bool isPure(SgStatement* func)
|
||||
|
||||
void DvmhRegionInserter::createInterfaceBlockForOutCall(FuncInfo* func, FuncInfo* callFrom)
|
||||
{
|
||||
insertInterface(func->funcPointer, getInterfaceBlock(callFrom->funcPointer->GetOriginal(), callFrom->funcParams), callFrom->funcName);
|
||||
insertInterface(func->funcPointer, callFrom);
|
||||
}
|
||||
|
||||
void DvmhRegionInserter::createInterfaceBlockForParallelFunctions(bool onlyRoutine)
|
||||
|
||||
Reference in New Issue
Block a user