fix FIND_PRIVATE_ARRAYS
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include<unordered_map>
|
||||
#include<string>
|
||||
#include <numeric>
|
||||
#include <iostream>
|
||||
|
||||
#include "range_structures.h"
|
||||
#include "region.h"
|
||||
@@ -108,11 +109,7 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
|
||||
{
|
||||
vector<SAPFOR::Argument*> index_vars;
|
||||
vector<int> refPos;
|
||||
string array_name;
|
||||
if (operation == SAPFOR::CFG_OP::STORE)
|
||||
array_name = instruction->getInstruction()->getArg1()->getValue();
|
||||
else
|
||||
array_name = instruction->getInstruction()->getArg2()->getValue();
|
||||
string array_name = instruction->getInstruction()->getArg1()->getValue();
|
||||
|
||||
int j = i - 1;
|
||||
while (j >= 0 && instructions[j]->getInstruction()->getOperation() == SAPFOR::CFG_OP::REF)
|
||||
@@ -128,6 +125,7 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
|
||||
|
||||
auto* ref = isSgArrayRefExp(instruction->getInstruction()->getExpression());
|
||||
vector<pair<int, int>> coefsForDims;
|
||||
int subs = ref->numberOfSubscripts();
|
||||
for (int i = 0; ref && i < ref->numberOfSubscripts(); ++i)
|
||||
{
|
||||
const vector<int*>& coefs = getAttributes<SgExpression*, int*>(ref->subscript(i), set<int>{ INT_VAL });
|
||||
@@ -174,13 +172,17 @@ static int GetDefUseArray(SAPFOR::BasicBlock* block, LoopGraph* loop, ArrayAcces
|
||||
return -1;
|
||||
}
|
||||
|
||||
uint64_t start = currentLoop->startVal * currentCoefs.first + currentCoefs.second;
|
||||
uint64_t step = currentCoefs.first;
|
||||
current_dim = { start, step, (uint64_t)currentLoop->calculatedCountOfIters, ref };
|
||||
uint64_t start = currentLoop->startVal;
|
||||
uint64_t step = currentLoop->stepVal;
|
||||
uint64_t iters = currentLoop->calculatedCountOfIters;
|
||||
current_dim = { start, step, iters, ref };
|
||||
}
|
||||
|
||||
accessPoint[n - index_vars.size()] = current_dim;
|
||||
fillCount++;
|
||||
if (current_dim.start != 0 && current_dim.step != 0 && current_dim.tripCount != 0)
|
||||
{
|
||||
accessPoint[n - index_vars.size()] = current_dim;
|
||||
fillCount++;
|
||||
}
|
||||
index_vars.pop_back();
|
||||
refPos.pop_back();
|
||||
coefsForDims.pop_back();
|
||||
@@ -230,8 +232,11 @@ static Region* CreateSubRegion(LoopGraph* loop, const vector<SAPFOR::BasicBlock*
|
||||
region->addBasickBlocks(bbToRegion.at(block));
|
||||
|
||||
for (LoopGraph* childLoop : loop->children)
|
||||
{
|
||||
if (!childLoop->isFor())
|
||||
continue;
|
||||
region->addSubRegions(CreateSubRegion(childLoop, Blocks, bbToRegion));
|
||||
|
||||
}
|
||||
return region;
|
||||
}
|
||||
|
||||
@@ -250,5 +255,9 @@ Region::Region(LoopGraph* loop, const vector<SAPFOR::BasicBlock*>& Blocks)
|
||||
SetConnections(bbToRegion, blockSet);
|
||||
//create subRegions
|
||||
for (LoopGraph* childLoop : loop->children)
|
||||
{
|
||||
if (!childLoop->isFor())
|
||||
continue;
|
||||
subRegions.insert(CreateSubRegion(childLoop, Blocks, bbToRegion));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user