Compare commits
77 Commits
cad0a0b217
...
analyze_lo
| Author | SHA1 | Date | |
|---|---|---|---|
| 37ebeee97a | |||
| 2d47b8533b | |||
| 2fd08e79f1 | |||
| 2af6d9c140 | |||
| 375070f959 | |||
| 31715a46d0 | |||
|
|
ef6d7fb70f | ||
|
|
c7c46cd159 | ||
|
|
c842630ec2 | ||
|
|
2969f92013 | ||
|
|
b13b0a0f57 | ||
|
|
06dd8848be | ||
| bed098b345 | |||
| f322306344 | |||
| f7c66f537d | |||
| 267f85ae27 | |||
| b137ea5ef3 | |||
| 6a84171382 | |||
| cd209a587a | |||
|
|
0b0d7d373b | ||
|
|
781a892497 | ||
|
|
a55440c071 | ||
|
|
996f7ead1b | ||
|
|
5231eeacd8 | ||
|
|
7460cf6e59 | ||
|
|
5596b57021 | ||
| 3ad972c188 | |||
| dde0bcdee5 | |||
| 65cdbef201 | |||
| 2ad239d1e3 | |||
| 12f311077b | |||
|
|
a2e0a99891 | ||
| 27a350dac0 | |||
| 3c1032bfd0 | |||
| 189374274e | |||
| de4690513b | |||
| 86ab34e7f3 | |||
| 06cfe83666 | |||
| a3c1e1e5d1 | |||
| 75e89ab868 | |||
| d4fb323f86 | |||
|
|
0c9f0664fd | ||
|
|
90a608230c | ||
|
|
d6df2f6b5f | ||
|
|
90894a4723 | ||
|
|
26fe1d3f61 | ||
|
|
68d2f3253c | ||
|
|
09401376c7 | ||
|
|
a0c8f78868 | ||
|
|
2aa9e569f4 | ||
|
|
9e5ee78b80 | ||
|
|
d5d5514e17 | ||
|
|
68c779790d | ||
|
|
c6b09ad285 | ||
|
|
fd402b6ab0 | ||
|
|
b76753c285 | ||
|
|
44600a50c1 | ||
|
|
d2f5e5fcc1 | ||
|
|
18ac0ae47c | ||
|
|
00b6026761 | ||
|
|
2036fab86f | ||
|
|
da4e992926 | ||
|
|
8e4a4c78ad | ||
| b4038b532f | |||
| dec1a853db | |||
| 7df02737c7 | |||
| d267dc047a | |||
| 12a810ad35 | |||
| 1522dc7f27 | |||
| bd52d5c6ec | |||
| 4ba2bb4c94 | |||
| 60544ea4d6 | |||
|
|
b40e969d02 | ||
| d062e52dd6 | |||
| 392ad97738 | |||
| c2c111586c | |||
| 172eedfef1 |
@@ -238,14 +238,14 @@ set(CFG src/CFGraph/IR.cpp
|
|||||||
src/CFGraph/live_variable_analysis.h
|
src/CFGraph/live_variable_analysis.h
|
||||||
src/CFGraph/private_variables_analysis.cpp
|
src/CFGraph/private_variables_analysis.cpp
|
||||||
src/CFGraph/private_variables_analysis.h
|
src/CFGraph/private_variables_analysis.h
|
||||||
)
|
src/CFGraph/IR_SSAForm.cpp
|
||||||
|
src/CFGraph/IR_SSAForm.h)
|
||||||
|
|
||||||
set(DATA_FLOW
|
set(DATA_FLOW
|
||||||
src/CFGraph/DataFlow/data_flow.h
|
src/CFGraph/DataFlow/data_flow.h
|
||||||
src/CFGraph/DataFlow/data_flow_impl.h
|
src/CFGraph/DataFlow/data_flow_impl.h
|
||||||
src/CFGraph/DataFlow/backward_data_flow.h
|
src/CFGraph/DataFlow/backward_data_flow.h
|
||||||
src/CFGraph/DataFlow/backward_data_flow_impl.h
|
src/CFGraph/DataFlow/backward_data_flow_impl.h)
|
||||||
)
|
|
||||||
|
|
||||||
set(CREATE_INTER_T src/CreateInterTree/CreateInterTree.cpp
|
set(CREATE_INTER_T src/CreateInterTree/CreateInterTree.cpp
|
||||||
src/CreateInterTree/CreateInterTree.h)
|
src/CreateInterTree/CreateInterTree.h)
|
||||||
@@ -321,7 +321,9 @@ set(GR_LOOP src/GraphLoop/graph_loops_base.cpp
|
|||||||
set(LOOP_ANALYZER src/LoopAnalyzer/allocations_prepoc.cpp
|
set(LOOP_ANALYZER src/LoopAnalyzer/allocations_prepoc.cpp
|
||||||
src/LoopAnalyzer/dep_analyzer.cpp
|
src/LoopAnalyzer/dep_analyzer.cpp
|
||||||
src/LoopAnalyzer/loop_analyzer.cpp
|
src/LoopAnalyzer/loop_analyzer.cpp
|
||||||
src/LoopAnalyzer/loop_analyzer.h)
|
src/LoopAnalyzer/loop_analyzer.h
|
||||||
|
src/LoopAnalyzer/implicit_loops_analyzer.cpp
|
||||||
|
src/LoopAnalyzer/implicit_loops_analyzer.h)
|
||||||
|
|
||||||
set(MAIN src/Sapfor.cpp
|
set(MAIN src/Sapfor.cpp
|
||||||
src/Sapfor.h
|
src/Sapfor.h
|
||||||
|
|||||||
Submodule projects/dvm updated: 3a567d7582...c550423b8e
@@ -50,12 +50,30 @@ BBlock::BasicBlock(const BBlock& copyFrom)
|
|||||||
prev = copyFrom.prev;
|
prev = copyFrom.prev;
|
||||||
}
|
}
|
||||||
|
|
||||||
void BBlock::addInstruction(IR_Block* item)
|
void BBlock::addInstruction(IR_Block* item, bool pushFront)
|
||||||
{
|
{
|
||||||
|
if (pushFront)
|
||||||
|
instructions.insert(instructions.begin(), item);
|
||||||
|
else
|
||||||
instructions.push_back(item);
|
instructions.push_back(item);
|
||||||
item->setBasicBlock(this);
|
item->setBasicBlock(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void BBlock::addInstructionBefore(IR_Block* item, Instruction* before)
|
||||||
|
{
|
||||||
|
checkNull(before, convertFileName(__FILE__).c_str(), __LINE__);
|
||||||
|
checkNull(item, convertFileName(__FILE__).c_str(), __LINE__);
|
||||||
|
|
||||||
|
for (auto it = instructions.begin(); it != instructions.end(); ++it) {
|
||||||
|
if ((*it)->getInstruction() == before) {
|
||||||
|
instructions.insert(it, item);
|
||||||
|
item->setBasicBlock(this);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
|
||||||
|
}
|
||||||
|
|
||||||
int BBlock::removePrev(BBlock* removed)
|
int BBlock::removePrev(BBlock* removed)
|
||||||
{
|
{
|
||||||
auto it = std::remove(prev.begin(), prev.end(), removed);
|
auto it = std::remove(prev.begin(), prev.end(), removed);
|
||||||
@@ -512,7 +530,7 @@ static int buildReachingDefs(const vector<BBlock*>& CFG, const FuncInfo* currF,
|
|||||||
return iter;
|
return iter;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Kosaraju<EFBFBD>Sharir algorithm
|
//Kosaraju-Sharir algorithm
|
||||||
static vector<int> getStronglyConnectedComps(vector<vector<int>>& g) {
|
static vector<int> getStronglyConnectedComps(vector<vector<int>>& g) {
|
||||||
// 1. For each vertex u of the graph, mark u as unvisited. Let l be empty.
|
// 1. For each vertex u of the graph, mark u as unvisited. Let l be empty.
|
||||||
auto size = g.size();
|
auto size = g.size();
|
||||||
|
|||||||
@@ -6,6 +6,10 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "IR.h"
|
#include "IR.h"
|
||||||
|
#include "../Utils/errors.h"
|
||||||
|
#include "../Utils/utils.h"
|
||||||
|
#include "../Utils/CommonBlock.h"
|
||||||
|
#include "../GraphCall/graph_calls.h"
|
||||||
#include "IR_domTree.h"
|
#include "IR_domTree.h"
|
||||||
|
|
||||||
namespace SAPFOR
|
namespace SAPFOR
|
||||||
@@ -41,7 +45,8 @@ namespace SAPFOR
|
|||||||
BasicBlock(IR_Block* item);
|
BasicBlock(IR_Block* item);
|
||||||
BasicBlock(const BasicBlock& copyFrom);
|
BasicBlock(const BasicBlock& copyFrom);
|
||||||
|
|
||||||
void addInstruction(IR_Block* item);
|
void addInstructionBefore(IR_Block* item, Instruction* istruction);
|
||||||
|
void addInstruction(IR_Block* item, bool pushFront = false);
|
||||||
void addPrev(BasicBlock* prev_) { prev.push_back(prev_); }
|
void addPrev(BasicBlock* prev_) { prev.push_back(prev_); }
|
||||||
void addNext(BasicBlock* next_) { next.push_back(next_); }
|
void addNext(BasicBlock* next_) { next.push_back(next_); }
|
||||||
void setDom(BasicBlock* dom) { directDominator = dom; }
|
void setDom(BasicBlock* dom) { directDominator = dom; }
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ namespace SAPFOR
|
|||||||
Argument() : number(lastNumArg++), type(CFG_ARG_TYPE::NONE), value(""), mType(CFG_MEM_TYPE::NONE_) { }
|
Argument() : number(lastNumArg++), type(CFG_ARG_TYPE::NONE), value(""), mType(CFG_MEM_TYPE::NONE_) { }
|
||||||
Argument(CFG_ARG_TYPE type, CFG_MEM_TYPE mType) : number(lastNumArg++), type(type), mType(mType), value("") { }
|
Argument(CFG_ARG_TYPE type, CFG_MEM_TYPE mType) : number(lastNumArg++), type(type), mType(mType), value("") { }
|
||||||
Argument(CFG_ARG_TYPE type, CFG_MEM_TYPE mType, const std::string& value) : number(lastNumArg++), type(type), mType(mType), value(value) { }
|
Argument(CFG_ARG_TYPE type, CFG_MEM_TYPE mType, const std::string& value) : number(lastNumArg++), type(type), mType(mType), value(value) { }
|
||||||
|
Argument(CFG_ARG_TYPE type, CFG_MEM_TYPE mType, const std::string& value, int num) : number(num), type(type), mType(mType), value(value) { }
|
||||||
Argument(CFG_ARG_TYPE type, const std::string& value) : number(lastNumArg++), type(type), mType(CFG_MEM_TYPE::NONE_), value(value)
|
Argument(CFG_ARG_TYPE type, const std::string& value) : number(lastNumArg++), type(type), mType(CFG_MEM_TYPE::NONE_), value(value)
|
||||||
{
|
{
|
||||||
if (type != CFG_ARG_TYPE::INSTR && type == CFG_ARG_TYPE::LAB &&
|
if (type != CFG_ARG_TYPE::INSTR && type == CFG_ARG_TYPE::LAB &&
|
||||||
@@ -50,6 +51,9 @@ namespace SAPFOR
|
|||||||
printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
|
printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Argument(const Argument& other)
|
||||||
|
: number(other.number), type(other.type), mType(other.mType), value(other.value)
|
||||||
|
{ }
|
||||||
|
|
||||||
void setType(CFG_ARG_TYPE newType) { type = newType; }
|
void setType(CFG_ARG_TYPE newType) { type = newType; }
|
||||||
CFG_ARG_TYPE getType() const { return type; }
|
CFG_ARG_TYPE getType() const { return type; }
|
||||||
|
|||||||
386
src/CFGraph/IR_SSAForm.cpp
Normal file
386
src/CFGraph/IR_SSAForm.cpp
Normal file
@@ -0,0 +1,386 @@
|
|||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <vector>
|
||||||
|
#include <set>
|
||||||
|
|
||||||
|
#include "../Utils/SgUtils.h"
|
||||||
|
#include "../Utils/CommonBlock.h"
|
||||||
|
#include "../GraphCall/graph_calls.h"
|
||||||
|
|
||||||
|
#include "dvm.h"
|
||||||
|
#include "IR.h"
|
||||||
|
#include "CFGraph.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
using namespace SAPFOR;
|
||||||
|
|
||||||
|
static const SAPFOR::Argument CONST_UNDEFINED_ARG(CFG_ARG_TYPE::CONST, CFG_MEM_TYPE::COMMON_, "-1");
|
||||||
|
|
||||||
|
template <typename T> static bool compareVectors(const vector<T>* vec1, const vector<T>* vec2)
|
||||||
|
{
|
||||||
|
if (vec1 == vec2)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (!vec1 || !vec2)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
vector<T> sortedVec1 = *vec1;
|
||||||
|
vector<T> sortedVec2 = *vec2;
|
||||||
|
|
||||||
|
sort(sortedVec1.begin(), sortedVec1.end());
|
||||||
|
sort(sortedVec2.begin(), sortedVec2.end());
|
||||||
|
|
||||||
|
return sortedVec1 == sortedVec2;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T> static vector<T>* getCommonElements(const vector<vector<T>>* vectors)
|
||||||
|
{
|
||||||
|
if (!vectors || vectors->empty())
|
||||||
|
return new vector<T>();
|
||||||
|
|
||||||
|
vector<T>* commonElements = new vector<T>((*vectors)[0]);
|
||||||
|
|
||||||
|
for (size_t i = 1; i < vectors->size(); ++i)
|
||||||
|
{
|
||||||
|
vector<T> tempCommon;
|
||||||
|
|
||||||
|
vector<T> sortedVec = (*vectors)[i];
|
||||||
|
sort(commonElements->begin(), commonElements->end());
|
||||||
|
sort(sortedVec.begin(), sortedVec.end());
|
||||||
|
|
||||||
|
set_intersection(
|
||||||
|
commonElements->begin(), commonElements->end(),
|
||||||
|
sortedVec.begin(), sortedVec.end(),
|
||||||
|
back_inserter(tempCommon)
|
||||||
|
);
|
||||||
|
|
||||||
|
*commonElements = tempCommon;
|
||||||
|
|
||||||
|
if (commonElements->empty())
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return commonElements;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static map<SAPFOR::BasicBlock*, vector<SAPFOR::BasicBlock*>> findDominators(const vector<SAPFOR::BasicBlock*>& blocks)
|
||||||
|
{
|
||||||
|
map<SAPFOR::BasicBlock*, vector<SAPFOR::BasicBlock*>> result;
|
||||||
|
|
||||||
|
bool changed = true;
|
||||||
|
while (changed)
|
||||||
|
{
|
||||||
|
changed = false;
|
||||||
|
|
||||||
|
for (auto& currentBlock : blocks)
|
||||||
|
{
|
||||||
|
auto pred = currentBlock->getPrev();
|
||||||
|
auto prevDominators = new vector<vector<SAPFOR::BasicBlock*>>();
|
||||||
|
|
||||||
|
for (auto predBlock : pred)
|
||||||
|
prevDominators->push_back(result.find(predBlock) != result.end() ? result[predBlock] : blocks);
|
||||||
|
|
||||||
|
auto currentBlockResult = getCommonElements(prevDominators);
|
||||||
|
currentBlockResult->push_back(currentBlock);
|
||||||
|
|
||||||
|
if (result.find(currentBlock) == result.end() || !compareVectors(currentBlockResult, &result[currentBlock]))
|
||||||
|
{
|
||||||
|
result[currentBlock] = *currentBlockResult;
|
||||||
|
changed = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
static map<SAPFOR::BasicBlock*, vector<SAPFOR::BasicBlock*>> findDominatorBorders(const vector<SAPFOR::BasicBlock*>& blocks)
|
||||||
|
{
|
||||||
|
map<SAPFOR::BasicBlock*, vector<SAPFOR::BasicBlock*>> result;
|
||||||
|
|
||||||
|
for (auto& block : blocks)
|
||||||
|
result[block] = *(new vector<SAPFOR::BasicBlock*>());
|
||||||
|
|
||||||
|
for (auto& block : blocks)
|
||||||
|
{
|
||||||
|
if (block->getPrev().size() > 1)
|
||||||
|
{
|
||||||
|
for (auto prev : block->getPrev())
|
||||||
|
{
|
||||||
|
auto tmpBlock = prev;
|
||||||
|
|
||||||
|
while (tmpBlock != block->getDom())
|
||||||
|
{
|
||||||
|
result[tmpBlock].push_back(block);
|
||||||
|
tmpBlock = tmpBlock->getDom();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
static pair<set<SAPFOR::Argument*>, map<SAPFOR::Argument*, set<SAPFOR::BasicBlock*>>> getGlobalsAndVarBlocks(const vector<SAPFOR::BasicBlock*>& blocks)
|
||||||
|
{
|
||||||
|
set<SAPFOR::Argument*> globals;
|
||||||
|
map<SAPFOR::Argument*, set<SAPFOR::BasicBlock*>> varBlocks;
|
||||||
|
|
||||||
|
for (auto& block : blocks)
|
||||||
|
{
|
||||||
|
set<SAPFOR::Argument*> def;
|
||||||
|
const auto& instructions = block->getInstructions();
|
||||||
|
|
||||||
|
for (const auto& irBlock : instructions)
|
||||||
|
{
|
||||||
|
if (irBlock)
|
||||||
|
{
|
||||||
|
Instruction* instr = irBlock->getInstruction();
|
||||||
|
|
||||||
|
if (instr)
|
||||||
|
{
|
||||||
|
auto arg1 = instr->getArg1();
|
||||||
|
auto arg2 = instr->getArg2();
|
||||||
|
auto res = instr->getResult();
|
||||||
|
|
||||||
|
if (arg1 && arg1->getType() == CFG_ARG_TYPE::VAR && find(def.begin(), def.end(), arg1) == def.end())
|
||||||
|
globals.insert(arg1);
|
||||||
|
|
||||||
|
if (arg2 && arg2->getType() == CFG_ARG_TYPE::VAR && find(def.begin(), def.end(), arg2) == def.end())
|
||||||
|
globals.insert(arg2);
|
||||||
|
|
||||||
|
if (res && res->getType() == CFG_ARG_TYPE::VAR)
|
||||||
|
{
|
||||||
|
def.insert(res);
|
||||||
|
varBlocks[res].insert(block);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return make_pair(globals, varBlocks);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void getBlocksWithFiFunctions(const vector<SAPFOR::BasicBlock*> blocks, set<SAPFOR::Argument*>& globals,
|
||||||
|
map<SAPFOR::Argument*, set<SAPFOR::BasicBlock*>>& varBlocks,
|
||||||
|
map<SAPFOR::BasicBlock*, vector<SAPFOR::BasicBlock*>>& dominatorBorders)
|
||||||
|
{
|
||||||
|
vector<SAPFOR::BasicBlock*> blocksWithFiFunctions;
|
||||||
|
auto fiFunc = new SAPFOR::Argument(CFG_ARG_TYPE::FUNC, CFG_MEM_TYPE::NONE_, "FI_FUNCTION");
|
||||||
|
auto paramCount = new SAPFOR::Argument(CFG_ARG_TYPE::CONST, CFG_MEM_TYPE::LOCAL_, "0");
|
||||||
|
|
||||||
|
for (auto& var : globals)
|
||||||
|
{
|
||||||
|
auto worklist = varBlocks[var];
|
||||||
|
set<SAPFOR::BasicBlock*> hasFiFunction;
|
||||||
|
|
||||||
|
while (!worklist.empty())
|
||||||
|
{
|
||||||
|
auto block = *worklist.begin();
|
||||||
|
worklist.erase(block);
|
||||||
|
|
||||||
|
for (auto& dfBlock : dominatorBorders[block])
|
||||||
|
{
|
||||||
|
if (hasFiFunction.find(dfBlock) == hasFiFunction.end())
|
||||||
|
{
|
||||||
|
hasFiFunction.insert(dfBlock);
|
||||||
|
Instruction* phiInstruction = new Instruction(CFG_OP::F_CALL, new SAPFOR::Argument(*fiFunc), new SAPFOR::Argument(*paramCount), var, dfBlock->getInstructions()[0]->getInstruction()->getOperator());
|
||||||
|
|
||||||
|
IR_Block* phiBlock = new IR_Block(phiInstruction);
|
||||||
|
dfBlock->addInstruction(phiBlock, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void restoreConnections(const vector<SAPFOR::BasicBlock*>& originalBlocks, vector<SAPFOR::BasicBlock*>& copiedBlocks)
|
||||||
|
{
|
||||||
|
map<SAPFOR::BasicBlock*, SAPFOR::BasicBlock*> blockMapping;
|
||||||
|
for (size_t i = 0; i < originalBlocks.size(); ++i)
|
||||||
|
blockMapping[originalBlocks[i]] = copiedBlocks[i];
|
||||||
|
|
||||||
|
for (size_t i = 0; i < originalBlocks.size(); ++i)
|
||||||
|
{
|
||||||
|
SAPFOR::BasicBlock* originalBlock = originalBlocks[i];
|
||||||
|
SAPFOR::BasicBlock* copiedBlock = copiedBlocks[i];
|
||||||
|
|
||||||
|
auto prevCopy = copiedBlock->getPrev();
|
||||||
|
for (auto j : prevCopy)
|
||||||
|
copiedBlock->removePrev(j);
|
||||||
|
|
||||||
|
auto nextCopy = copiedBlock->getNext();
|
||||||
|
for (auto j : nextCopy)
|
||||||
|
copiedBlock->removeNext(j);
|
||||||
|
|
||||||
|
for (auto* succ : originalBlock->getNext())
|
||||||
|
copiedBlock->addNext(blockMapping[succ]);
|
||||||
|
|
||||||
|
for (auto* prev : originalBlock->getPrev())
|
||||||
|
copiedBlock->addPrev(blockMapping[prev]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
static SAPFOR::Argument* newName(SAPFOR::Argument* var, map<string, int>& counter, map<string, stack<SAPFOR::Argument*>>& stack, int number) {
|
||||||
|
counter[var->getValue()]++;
|
||||||
|
|
||||||
|
SAPFOR::Argument* newName = new SAPFOR::Argument(var->getType(), var->getMemType(), var->getValue(), number);
|
||||||
|
stack[var->getValue()].push(newName);
|
||||||
|
return newName;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void renameFiFunctionResultVar(SAPFOR::BasicBlock* block, map<string, int>& counter, map<string, stack<SAPFOR::Argument*>>& stack) {
|
||||||
|
for (auto& irBlock : block->getInstructions())
|
||||||
|
{
|
||||||
|
auto instruction = irBlock->getInstruction();
|
||||||
|
if (instruction->getOperation() == CFG_OP::F_CALL && instruction->getArg1() != NULL &&
|
||||||
|
instruction->getArg1()->getValue() == "FI_FUNCTION" && instruction->getResult() != NULL)
|
||||||
|
{
|
||||||
|
instruction->setResult(newName(instruction->getResult(), counter, stack, instruction->getNumber()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void renameInstructionVars(SAPFOR::BasicBlock* block, map<string, int>& counter, map<string, stack<SAPFOR::Argument*>>& stack)
|
||||||
|
{
|
||||||
|
for (auto& irBlock : block->getInstructions())
|
||||||
|
{
|
||||||
|
auto instruction = irBlock->getInstruction();
|
||||||
|
|
||||||
|
if (instruction->getArg1() != NULL && instruction->getArg1()->getType() == CFG_ARG_TYPE::VAR)
|
||||||
|
instruction->setArg1(stack[instruction->getArg1()->getValue()].top());
|
||||||
|
|
||||||
|
if (instruction->getArg2() != NULL && instruction->getArg2()->getType() == CFG_ARG_TYPE::VAR)
|
||||||
|
instruction->setArg2(stack[instruction->getArg2()->getValue()].top());
|
||||||
|
|
||||||
|
if (instruction->getResult() != NULL && instruction->getResult()->getType() == CFG_ARG_TYPE::VAR)
|
||||||
|
instruction->setResult(newName(instruction->getResult(), counter, stack, instruction->getNumber()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void renameFiFunctionArgsVar(SAPFOR::BasicBlock* block, map<string, stack<SAPFOR::Argument*>>& stack)
|
||||||
|
{
|
||||||
|
auto size = block->getInstructions().size();
|
||||||
|
auto& instructions = block->getInstructions();
|
||||||
|
|
||||||
|
for (size_t i = 0; i < size; ++i)
|
||||||
|
{
|
||||||
|
auto irBlock = instructions[i];
|
||||||
|
auto instruction = irBlock->getInstruction();
|
||||||
|
if (instruction->getOperation() == CFG_OP::F_CALL && instruction->getArg1() != NULL &&
|
||||||
|
instruction->getArg1()->getValue() == "FI_FUNCTION" && instruction->getResult() != NULL &&
|
||||||
|
instruction->getArg2() != NULL)
|
||||||
|
{
|
||||||
|
Instruction* paramInstruction;
|
||||||
|
|
||||||
|
if (stack[instruction->getResult()->getValue()].size() > 0)
|
||||||
|
{
|
||||||
|
SAPFOR::Argument* tmp = new SAPFOR::Argument(CFG_ARG_TYPE::CONST, CFG_MEM_TYPE::COMMON_, to_string(stack[instruction->getResult()->getValue()].top()->getNumber()));
|
||||||
|
paramInstruction = new Instruction(CFG_OP::PARAM, tmp);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SAPFOR::Argument* tmp = new SAPFOR::Argument(CFG_ARG_TYPE::CONST, CFG_MEM_TYPE::COMMON_, "-1");
|
||||||
|
paramInstruction = new Instruction(CFG_OP::PARAM, tmp);
|
||||||
|
}
|
||||||
|
|
||||||
|
paramInstruction->setOperator(block->getInstructions()[0]->getInstruction()->getOperator());
|
||||||
|
block->addInstructionBefore(new IR_Block(paramInstruction), instruction);
|
||||||
|
|
||||||
|
instruction->getArg2()->setValue(to_string(stoi(instruction->getArg2()->getValue()) + 1));
|
||||||
|
i++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static vector<SAPFOR::BasicBlock*> findBlocksWithValue(vector<SAPFOR::BasicBlock*>& blocks, SAPFOR::BasicBlock* x)
|
||||||
|
{
|
||||||
|
vector<SAPFOR::BasicBlock*> result;
|
||||||
|
|
||||||
|
for (auto& block : blocks)
|
||||||
|
if (block->getDom() == x)
|
||||||
|
result.push_back(block);
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void renameIR(SAPFOR::BasicBlock* block, vector<SAPFOR::BasicBlock*>& blocks, map<string, int>& counter, map<string, stack<SAPFOR::Argument*>>& stack)
|
||||||
|
{
|
||||||
|
renameFiFunctionResultVar(block, counter, stack);
|
||||||
|
renameInstructionVars(block, counter, stack);
|
||||||
|
|
||||||
|
for (auto& successor : block->getNext())
|
||||||
|
renameFiFunctionArgsVar(successor, stack);
|
||||||
|
|
||||||
|
for (auto& child : findBlocksWithValue(blocks, block))
|
||||||
|
renameIR(child, blocks, counter, stack);
|
||||||
|
|
||||||
|
for (auto& irBlock : block->getInstructions())
|
||||||
|
{
|
||||||
|
auto instruction = irBlock->getInstruction();
|
||||||
|
if (instruction->getResult() != NULL && instruction->getResult()->getType() == CFG_ARG_TYPE::VAR)
|
||||||
|
{
|
||||||
|
string varName = instruction->getResult()->getValue();
|
||||||
|
stack[varName].pop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (auto& irBlock : block->getInstructions())
|
||||||
|
{
|
||||||
|
auto instruction = irBlock->getInstruction();
|
||||||
|
if (instruction->getOperation() == CFG_OP::F_CALL && instruction->getArg1() != NULL &&
|
||||||
|
instruction->getArg1()->getValue() == "FI_FUNCTION" && instruction->getResult() != NULL)
|
||||||
|
{
|
||||||
|
string varName = instruction->getResult()->getValue();
|
||||||
|
stack[varName].pop();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void buildFuncIRSSAForm(FuncInfo* funcInfo, const std::vector<SAPFOR::BasicBlock*>& funcIRConst, std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& result)
|
||||||
|
{
|
||||||
|
vector<SAPFOR::BasicBlock*> funcIR;
|
||||||
|
|
||||||
|
for (auto& i : funcIRConst)
|
||||||
|
funcIR.push_back(new SAPFOR::BasicBlock(*i));
|
||||||
|
|
||||||
|
restoreConnections(funcIRConst, funcIR);
|
||||||
|
|
||||||
|
SAPFOR::buildDominatorTree(funcIR);
|
||||||
|
|
||||||
|
auto dominatorBorders = findDominatorBorders(funcIR);
|
||||||
|
|
||||||
|
auto globalsAndVarBlocks = getGlobalsAndVarBlocks(funcIR);
|
||||||
|
auto globals = globalsAndVarBlocks.first;
|
||||||
|
auto varBlocks = globalsAndVarBlocks.second;
|
||||||
|
|
||||||
|
getBlocksWithFiFunctions(funcIR, globals, varBlocks, dominatorBorders);
|
||||||
|
|
||||||
|
map<string, int> count;
|
||||||
|
map<string, stack<SAPFOR::Argument*>> varStack;
|
||||||
|
|
||||||
|
for (auto& var : globals)
|
||||||
|
{
|
||||||
|
count[var->getValue()] = 0;
|
||||||
|
|
||||||
|
stack<SAPFOR::Argument*> tmp;
|
||||||
|
tmp.push(new SAPFOR::Argument(CONST_UNDEFINED_ARG));
|
||||||
|
varStack[var->getValue()] = tmp;
|
||||||
|
}
|
||||||
|
|
||||||
|
renameIR(funcIR[0], funcIR, count, varStack);
|
||||||
|
|
||||||
|
result[funcInfo] = funcIR;
|
||||||
|
}
|
||||||
|
|
||||||
|
FuncInfo* getIRByFilename(const std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& fullIR, const char* filename)
|
||||||
|
{
|
||||||
|
for (auto ir : fullIR)
|
||||||
|
if (ir.first->fileName == filename)
|
||||||
|
return ir.first;
|
||||||
|
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
8
src/CFGraph/IR_SSAForm.h
Normal file
8
src/CFGraph/IR_SSAForm.h
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "CFGraph.h"
|
||||||
|
#include "IR.h"
|
||||||
|
|
||||||
|
void buildFuncIRSSAForm(FuncInfo* funcInfo, const std::vector<SAPFOR::BasicBlock*>& fullIR, std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& result);
|
||||||
|
|
||||||
|
FuncInfo* getIRByFilename(const std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& fullIR, const char* filename);
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
#include "CFGraph.h"
|
#include "CFGraph.h"
|
||||||
|
|
||||||
// Lengauer, Thomas. A fast algorithm for finding dominators in a flowgraph / Thomas Lengauer, Robert Endre Tarjan
|
// Lengauer, Thomas. A fast algorithm for finding dominators in a flowgraph / Thomas Lengauer, Robert Endre Tarjan
|
||||||
// ACM Transactions on Programming Languages and Systems (TOPLAS). <20> 1979. <20> Vol. 1, no. 1. <20> Pp. 121<32>141.
|
// ACM Transactions on Programming Languages and Systems (TOPLAS). <20> 1979. <20> Vol. 1, no. 1. <20> Pp. 121<32>141.
|
||||||
|
|
||||||
namespace SAPFOR {
|
namespace SAPFOR {
|
||||||
|
|
||||||
|
|||||||
281
src/LoopAnalyzer/implicit_loops_analyzer.cpp
Normal file
281
src/LoopAnalyzer/implicit_loops_analyzer.cpp
Normal file
@@ -0,0 +1,281 @@
|
|||||||
|
#include <map>
|
||||||
|
#include <set>
|
||||||
|
#include <vector>
|
||||||
|
#include <string>
|
||||||
|
#include <iostream>
|
||||||
|
#include <stack>
|
||||||
|
|
||||||
|
#include "../CFGraph/IR.h"
|
||||||
|
#include "GraphCall/graph_calls.h"
|
||||||
|
#include "implicit_loops_analyzer.h"
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
using namespace SAPFOR;
|
||||||
|
|
||||||
|
using std::map;
|
||||||
|
using std::set;
|
||||||
|
using std::vector;
|
||||||
|
using std::pair;
|
||||||
|
using std::string;
|
||||||
|
using std::cout;
|
||||||
|
using std::endl;
|
||||||
|
using std::make_pair;
|
||||||
|
using std::to_string;
|
||||||
|
|
||||||
|
enum VisitState { UNVISITED = 0, VISITING = 1, VISITED = 2 };
|
||||||
|
|
||||||
|
void dfs(SAPFOR::BasicBlock* block,
|
||||||
|
std::map<int, int>& visit,
|
||||||
|
std::vector<std::pair<SAPFOR::BasicBlock*, SAPFOR::BasicBlock*>>& startAndEnd,
|
||||||
|
SAPFOR::BasicBlock* prev)
|
||||||
|
{
|
||||||
|
if (!block)
|
||||||
|
return;
|
||||||
|
|
||||||
|
int id = block->getNumber();
|
||||||
|
|
||||||
|
if (visit[id] == VISITING) {
|
||||||
|
startAndEnd.emplace_back(prev, block);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (visit[id] == VISITED)
|
||||||
|
return;
|
||||||
|
|
||||||
|
visit[id] = VISITING;
|
||||||
|
|
||||||
|
for (auto next : block->getNext())
|
||||||
|
dfs(next, visit, startAndEnd, block);
|
||||||
|
|
||||||
|
visit[id] = VISITED;
|
||||||
|
}
|
||||||
|
|
||||||
|
void getLoopBody(SAPFOR::BasicBlock* loopHeader, const std::set<SAPFOR::BasicBlock*>& loopExits, std::vector<SAPFOR::BasicBlock*>& loopBody)
|
||||||
|
{
|
||||||
|
std::set<SAPFOR::BasicBlock*> visited;
|
||||||
|
std::stack<SAPFOR::BasicBlock*> stack;
|
||||||
|
|
||||||
|
stack.push(loopHeader);
|
||||||
|
|
||||||
|
while (!stack.empty())
|
||||||
|
{
|
||||||
|
auto block = stack.top();
|
||||||
|
stack.pop();
|
||||||
|
|
||||||
|
if (visited.count(block))
|
||||||
|
continue;
|
||||||
|
visited.insert(block);
|
||||||
|
|
||||||
|
for (auto succ : block->getNext())
|
||||||
|
{
|
||||||
|
if (loopExits.count(succ))
|
||||||
|
continue;
|
||||||
|
if (!visited.count(succ))
|
||||||
|
stack.push(succ);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::set<SAPFOR::BasicBlock*> backReachable;
|
||||||
|
std::stack<SAPFOR::BasicBlock*> reverseStack;
|
||||||
|
reverseStack.push(loopHeader);
|
||||||
|
|
||||||
|
while (!reverseStack.empty())
|
||||||
|
{
|
||||||
|
auto block = reverseStack.top();
|
||||||
|
reverseStack.pop();
|
||||||
|
|
||||||
|
if (backReachable.count(block))
|
||||||
|
continue;
|
||||||
|
backReachable.insert(block);
|
||||||
|
|
||||||
|
for (auto pred : block->getPrev())
|
||||||
|
if (visited.count(pred) && !backReachable.count(pred))
|
||||||
|
reverseStack.push(pred);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (auto block : visited)
|
||||||
|
if (backReachable.count(block))
|
||||||
|
loopBody.push_back(block);
|
||||||
|
}
|
||||||
|
|
||||||
|
SAPFOR::Instruction* findDef(const SAPFOR::Argument* arg,
|
||||||
|
const std::vector<SAPFOR::BasicBlock*>& blocks)
|
||||||
|
{
|
||||||
|
if (!arg)
|
||||||
|
return nullptr;
|
||||||
|
std::string argName = arg->getValue();
|
||||||
|
|
||||||
|
for (auto block : blocks) {
|
||||||
|
for (auto instrWrapper : block->getInstructions()) {
|
||||||
|
auto instr = instrWrapper->getInstruction();
|
||||||
|
if (!instr)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
auto res = instr->getResult();
|
||||||
|
if (!res)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (res->getValue() == argName)
|
||||||
|
return instr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
const SAPFOR::Argument* getBaseSource(const SAPFOR::Argument* arg, const std::vector<SAPFOR::BasicBlock*>& blocks)
|
||||||
|
{
|
||||||
|
while (arg && arg->getType() == CFG_ARG_TYPE::REG)
|
||||||
|
{
|
||||||
|
auto defInstr = findDef(arg, blocks);
|
||||||
|
if (!defInstr)
|
||||||
|
break;
|
||||||
|
auto defOp = defInstr->getOperation();
|
||||||
|
|
||||||
|
if (defOp == CFG_OP::ASSIGN)
|
||||||
|
arg = defInstr->getArg1();
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
return arg;
|
||||||
|
}
|
||||||
|
|
||||||
|
void findInductiveVars(const std::vector<SAPFOR::BasicBlock*>& Loopblocks, const std::vector<SAPFOR::BasicBlock*>& blocks)
|
||||||
|
{
|
||||||
|
std::set<std::string> inductiveVars;
|
||||||
|
|
||||||
|
for (auto block : Loopblocks)
|
||||||
|
{
|
||||||
|
for (auto instrWrapper : block->getInstructions())
|
||||||
|
{
|
||||||
|
auto instr = instrWrapper->getInstruction();
|
||||||
|
if (!instr)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
auto res = instr->getResult();
|
||||||
|
if (!res || res->getType() != SAPFOR::CFG_ARG_TYPE::VAR)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
while (instr && instr->getOperation() == CFG_OP::ASSIGN)
|
||||||
|
instr = findDef(instr->getArg1(), blocks);
|
||||||
|
|
||||||
|
if (!instr || instr->getOperation() != CFG_OP::ADD && instr->getOperation() != CFG_OP::SUBT)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
auto arg1 = getBaseSource(instr->getArg1(), blocks);
|
||||||
|
auto arg2 = getBaseSource(instr->getArg2(), blocks);
|
||||||
|
|
||||||
|
bool ok = false;
|
||||||
|
if (res->getValue() == arg1->getValue() && arg2->getType() == CFG_ARG_TYPE::CONST)
|
||||||
|
ok = true;
|
||||||
|
else if (res->getValue() == arg2->getValue() && arg1->getType() == CFG_ARG_TYPE::CONST)
|
||||||
|
ok = true;
|
||||||
|
|
||||||
|
if (ok)
|
||||||
|
inductiveVars.insert(res->getValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (inductiveVars.empty())
|
||||||
|
std::cout << "No inductive variables found." << std::endl;
|
||||||
|
else
|
||||||
|
for (const auto& var : inductiveVars)
|
||||||
|
std::cout << "Inductive variable: " << var << std::endl;
|
||||||
|
}
|
||||||
|
|
||||||
|
Instruction* findInstructionAfterLoop(const std::vector<SAPFOR::BasicBlock*>& loopBody)
|
||||||
|
{
|
||||||
|
std::set<SAPFOR::BasicBlock*> loopSet(loopBody.begin(), loopBody.end());
|
||||||
|
|
||||||
|
for (auto block : loopBody)
|
||||||
|
{
|
||||||
|
for (auto succ : block->getNext())
|
||||||
|
{
|
||||||
|
if (!loopSet.count(succ))
|
||||||
|
{
|
||||||
|
auto instructions = succ->getInstructions();
|
||||||
|
if (instructions.empty())
|
||||||
|
std::cout << "Exit block has no instructions." << std::endl;
|
||||||
|
|
||||||
|
for (auto wrapper : instructions)
|
||||||
|
if (auto instr = wrapper->getInstruction())
|
||||||
|
return instr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
void findImplicitLoops(const std::vector<SAPFOR::BasicBlock*>& irSSA, const std::vector<LoopGraph*> loopGraph)
|
||||||
|
{
|
||||||
|
map<int, int> visited;
|
||||||
|
for (auto i : irSSA)
|
||||||
|
visited[i->getNumber()] = UNVISITED;
|
||||||
|
|
||||||
|
vector<pair<SAPFOR::BasicBlock*, SAPFOR::BasicBlock*>> startAndEnd;
|
||||||
|
dfs(irSSA[0], visited, startAndEnd, NULL);
|
||||||
|
|
||||||
|
vector<LoopGraph*> loops;
|
||||||
|
|
||||||
|
for (auto& [tail, header] : startAndEnd)
|
||||||
|
{
|
||||||
|
set<SAPFOR::BasicBlock*> loopExits;
|
||||||
|
|
||||||
|
for (auto succ : tail->getNext())
|
||||||
|
if (succ != header)
|
||||||
|
loopExits.insert(succ);
|
||||||
|
|
||||||
|
vector<SAPFOR::BasicBlock*> loopBody;
|
||||||
|
getLoopBody(header, loopExits, loopBody);
|
||||||
|
|
||||||
|
findInductiveVars(loopBody, irSSA);
|
||||||
|
|
||||||
|
Instruction* instructionAfterLoop = findInstructionAfterLoop(loopBody);
|
||||||
|
|
||||||
|
if (instructionAfterLoop == NULL)
|
||||||
|
{
|
||||||
|
cout << "Warning: instruction after loop not found!" << endl;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto firstInstruction = header->getInstructions()[0]->getInstruction();
|
||||||
|
auto lastInstruction = tail->getInstructions().back()->getInstruction();
|
||||||
|
auto tmpLoop = new LoopGraph();
|
||||||
|
tmpLoop->lineNum = firstInstruction->getOperator()->lineNumber();
|
||||||
|
tmpLoop->lineNumAfterLoop = instructionAfterLoop->getOperator()->lineNumber();
|
||||||
|
|
||||||
|
|
||||||
|
if (firstInstruction->getOperator()->variant() == FOR_NODE)
|
||||||
|
{
|
||||||
|
SgForStmt* stmt = isSgForStmt(firstInstruction->getOperator());
|
||||||
|
|
||||||
|
cout << "for loop" << endl;
|
||||||
|
}
|
||||||
|
else if (firstInstruction->getOperator()->variant() == WHILE_NODE)
|
||||||
|
{
|
||||||
|
SgWhileStmt* stmt = isSgWhileStmt(firstInstruction->getOperator());
|
||||||
|
|
||||||
|
cout << (stmt->conditional() == NULL ? "infinit" : "") << "while loop" << endl;
|
||||||
|
}
|
||||||
|
else if (firstInstruction->getOperator()->variant() == DO_WHILE_NODE)
|
||||||
|
{
|
||||||
|
SgWhileStmt* stmt = isSgDoWhileStmt(firstInstruction->getOperator());
|
||||||
|
|
||||||
|
cout << "do while loop" << endl;
|
||||||
|
}
|
||||||
|
else if (firstInstruction->getOperator()->variant() == LOOP_NODE)
|
||||||
|
{
|
||||||
|
cout << "not known loop" << endl;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cout << "goto loop" << endl;
|
||||||
|
}
|
||||||
|
|
||||||
|
cout << "loop start line " << tmpLoop->lineNum << endl;
|
||||||
|
cout << "after loop line " << tmpLoop->lineNumAfterLoop << endl << endl;
|
||||||
|
|
||||||
|
loops.push_back(tmpLoop);
|
||||||
|
}
|
||||||
|
}
|
||||||
7
src/LoopAnalyzer/implicit_loops_analyzer.h
Normal file
7
src/LoopAnalyzer/implicit_loops_analyzer.h
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <map>
|
||||||
|
#include "../CFGraph/CFGraph.h"
|
||||||
|
#include "../GraphCall/graph_calls.h"
|
||||||
|
|
||||||
|
void findImplicitLoops(const std::vector<SAPFOR::BasicBlock*>& fullIR_SSA, const std::vector<LoopGraph*> loopGraph);
|
||||||
@@ -121,7 +121,7 @@ static void SolveDataFlow(Region* DFG)
|
|||||||
Collapse(DFG);
|
Collapse(DFG);
|
||||||
}
|
}
|
||||||
|
|
||||||
map<LoopGraph*, ArrayAccessingIndexes> FindPrivateArrays(map<string, vector<LoopGraph*>> &loopGraph, map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR)
|
map<LoopGraph*, ArrayAccessingIndexes> findPrivateArrays(map<string, vector<LoopGraph*>> &loopGraph, map<FuncInfo*, vector<SAPFOR::BasicBlock*>>& FullIR)
|
||||||
{
|
{
|
||||||
map<LoopGraph*, ArrayAccessingIndexes> result;
|
map<LoopGraph*, ArrayAccessingIndexes> result;
|
||||||
for (const auto& [loopName, loops] : loopGraph)
|
for (const auto& [loopName, loops] : loopGraph)
|
||||||
|
|||||||
@@ -10,5 +10,5 @@
|
|||||||
#include "../CFGraph/CFGraph.h"
|
#include "../CFGraph/CFGraph.h"
|
||||||
|
|
||||||
void Collapse(Region* region);
|
void Collapse(Region* region);
|
||||||
std::map<LoopGraph*, ArrayAccessingIndexes> FindPrivateArrays(std::map<std::string, std::vector<LoopGraph*>>& loopGraph, std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& FullIR);
|
std::map<LoopGraph*, ArrayAccessingIndexes> findPrivateArrays(std::map<std::string, std::vector<LoopGraph*>>& loopGraph, std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& FullIR);
|
||||||
std::pair<SAPFOR::BasicBlock*, std::unordered_set<SAPFOR::BasicBlock*>> GetBasicBlocksForLoop(const LoopGraph* loop, const std::vector<SAPFOR::BasicBlock*> blocks);
|
std::pair<SAPFOR::BasicBlock*, std::unordered_set<SAPFOR::BasicBlock*>> GetBasicBlocksForLoop(const LoopGraph* loop, const std::vector<SAPFOR::BasicBlock*> blocks);
|
||||||
|
|||||||
@@ -40,6 +40,7 @@
|
|||||||
#include "ProjectManipulation/ConvertFiles.h"
|
#include "ProjectManipulation/ConvertFiles.h"
|
||||||
|
|
||||||
#include "LoopAnalyzer/loop_analyzer.h"
|
#include "LoopAnalyzer/loop_analyzer.h"
|
||||||
|
#include "LoopAnalyzer/implicit_loops_analyzer.h"
|
||||||
|
|
||||||
#include "GraphCall/graph_calls_func.h"
|
#include "GraphCall/graph_calls_func.h"
|
||||||
#include "GraphLoop/graph_loops_func.h"
|
#include "GraphLoop/graph_loops_func.h"
|
||||||
@@ -95,6 +96,7 @@
|
|||||||
#include "CFGraph/IR.h"
|
#include "CFGraph/IR.h"
|
||||||
#include "CFGraph/RD_subst.h"
|
#include "CFGraph/RD_subst.h"
|
||||||
#include "CFGraph/CFGraph.h"
|
#include "CFGraph/CFGraph.h"
|
||||||
|
#include "CFGraph/IR_SSAForm.h"
|
||||||
|
|
||||||
#include "CFGraph/live_variable_analysis.h"
|
#include "CFGraph/live_variable_analysis.h"
|
||||||
#include "CFGraph/private_variables_analysis.h"
|
#include "CFGraph/private_variables_analysis.h"
|
||||||
@@ -1019,8 +1021,19 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
|
|||||||
if(func->funcPointer->variant() != ENTRY_STAT)
|
if(func->funcPointer->variant() != ENTRY_STAT)
|
||||||
countOfTransform += removeDeadCode(func->funcPointer, allFuncInfo, commonBlocks);
|
countOfTransform += removeDeadCode(func->funcPointer, allFuncInfo, commonBlocks);
|
||||||
}
|
}
|
||||||
|
else if (curr_regime == BUILD_IR_SSA_FORM)
|
||||||
|
{
|
||||||
|
auto irFound = getIRByFilename(fullIR, file_name);
|
||||||
|
buildFuncIRSSAForm(irFound, fullIR[irFound], fullIR_SSA);
|
||||||
|
}
|
||||||
|
else if (curr_regime == FIND_IMPLICIT_LOOPS)
|
||||||
|
{
|
||||||
|
auto itFound = loopGraph.find(file_name);
|
||||||
|
auto irFound = getIRByFilename(fullIR_SSA, file_name);
|
||||||
|
findImplicitLoops(fullIR_SSA[irFound], itFound->second);
|
||||||
|
}
|
||||||
else if (curr_regime == FIND_PRIVATE_ARRAYS)
|
else if (curr_regime == FIND_PRIVATE_ARRAYS)
|
||||||
FindPrivateArrays(loopGraph, fullIR);
|
findPrivateArrays(loopGraph, fullIR);
|
||||||
else if (curr_regime == TEST_PASS)
|
else if (curr_regime == TEST_PASS)
|
||||||
{
|
{
|
||||||
//test pass
|
//test pass
|
||||||
|
|||||||
@@ -182,6 +182,8 @@ enum passes {
|
|||||||
|
|
||||||
SET_IMPLICIT_NONE,
|
SET_IMPLICIT_NONE,
|
||||||
RENAME_INLCUDES,
|
RENAME_INLCUDES,
|
||||||
|
FIND_IMPLICIT_LOOPS,
|
||||||
|
BUILD_IR_SSA_FORM,
|
||||||
|
|
||||||
FIND_PRIVATE_ARRAYS,
|
FIND_PRIVATE_ARRAYS,
|
||||||
|
|
||||||
@@ -369,6 +371,8 @@ static void setPassValues()
|
|||||||
passNames[SET_IMPLICIT_NONE] = "SET_IMPLICIT_NONE";
|
passNames[SET_IMPLICIT_NONE] = "SET_IMPLICIT_NONE";
|
||||||
passNames[RENAME_INLCUDES] = "RENAME_INLCUDES";
|
passNames[RENAME_INLCUDES] = "RENAME_INLCUDES";
|
||||||
passNames[INSERT_NO_DISTR_FLAGS_FROM_GUI] = "INSERT_NO_DISTR_FLAGS_FROM_GUI";
|
passNames[INSERT_NO_DISTR_FLAGS_FROM_GUI] = "INSERT_NO_DISTR_FLAGS_FROM_GUI";
|
||||||
|
passNames[FIND_IMPLICIT_LOOPS] = "FIND_IMPLICIT_LOOPS";
|
||||||
|
passNames[BUILD_IR_SSA_FORM] = "BUILD_IR_SSA_FORM";
|
||||||
passNames[FIND_PRIVATE_ARRAYS] = "FIND_PRIVATE_ARRAYS";
|
passNames[FIND_PRIVATE_ARRAYS] = "FIND_PRIVATE_ARRAYS";
|
||||||
|
|
||||||
passNames[TEST_PASS] = "TEST_PASS";
|
passNames[TEST_PASS] = "TEST_PASS";
|
||||||
|
|||||||
@@ -181,3 +181,7 @@ bool passNamesWasInit = false;
|
|||||||
|
|
||||||
std::map<PTR_BFND, std::pair<std::string, int>> sgStats;
|
std::map<PTR_BFND, std::pair<std::string, int>> sgStats;
|
||||||
std::map<PTR_LLND, std::pair<std::string, int>> sgExprs;
|
std::map<PTR_LLND, std::pair<std::string, int>> sgExprs;
|
||||||
|
|
||||||
|
//for FIND_IMPLICIT_LOOPS and BUILD_IR_SSA_FORM
|
||||||
|
map<FuncInfo*, vector<SAPFOR::BasicBlock*>> fullIR_SSA;
|
||||||
|
//
|
||||||
|
|||||||
@@ -316,7 +316,9 @@ void InitPassesDependencies(map<passes, vector<passes>> &passDepsIn, set<passes>
|
|||||||
|
|
||||||
list({ VERIFY_INCLUDES, CORRECT_VAR_DECL }) <= Pass(SET_IMPLICIT_NONE);
|
list({ VERIFY_INCLUDES, CORRECT_VAR_DECL }) <= Pass(SET_IMPLICIT_NONE);
|
||||||
|
|
||||||
list({ CALL_GRAPH2, CALL_GRAPH, BUILD_IR, LOOP_GRAPH, LOOP_ANALYZER_DATA_DIST_S2 }) <= Pass(FIND_PRIVATE_ARRAYS);
|
list({ CALL_GRAPH, LOOP_GRAPH, CALL_GRAPH2, BUILD_IR }) <= Pass(BUILD_IR_SSA_FORM) <= Pass(FIND_IMPLICIT_LOOPS);
|
||||||
|
|
||||||
|
list({ CALL_GRAPH, LOOP_GRAPH, CALL_GRAPH2, BUILD_IR, LOOP_ANALYZER_DATA_DIST_S2 }) <= Pass(FIND_PRIVATE_ARRAYS);
|
||||||
|
|
||||||
passesIgnoreStateDone.insert({ CREATE_PARALLEL_DIRS, INSERT_PARALLEL_DIRS, INSERT_SHADOW_DIRS, EXTRACT_PARALLEL_DIRS,
|
passesIgnoreStateDone.insert({ CREATE_PARALLEL_DIRS, INSERT_PARALLEL_DIRS, INSERT_SHADOW_DIRS, EXTRACT_PARALLEL_DIRS,
|
||||||
EXTRACT_SHADOW_DIRS, CREATE_REMOTES, UNPARSE_FILE, REMOVE_AND_CALC_SHADOW,
|
EXTRACT_SHADOW_DIRS, CREATE_REMOTES, UNPARSE_FILE, REMOVE_AND_CALC_SHADOW,
|
||||||
|
|||||||
Reference in New Issue
Block a user