74 Commits

Author SHA1 Message Date
2af6d9c140 WIP change logic of inductive variables 2025-06-19 23:01:10 +03:00
375070f959 Merge branch 'master' into analyze_loops_with_IR 2025-06-18 23:22:33 +03:00
31715a46d0 WIP: merge with master 2025-06-18 23:21:55 +03:00
ALEXks
ef6d7fb70f fixed code style 2025-05-30 18:11:18 +03:00
ALEXks
c7c46cd159 fixed code style 2025-05-30 18:09:14 +03:00
ALEXks
c842630ec2 fixed code style 2025-05-30 18:03:01 +03:00
ALEXks
2969f92013 moved code, fixed style 2025-05-30 17:33:57 +03:00
ALEXks
b13b0a0f57 Merge branch 'analyze_loops_with_IR' of http://192.168.0.176:30008/Alexander_KS/SAPFOR into analyze_loops_with_IR 2025-05-30 17:06:26 +03:00
ALEXks
06dd8848be improved CFG functions style 2025-05-30 17:06:21 +03:00
bed098b345 fixed cmake style 2025-05-30 13:02:27 +03:00
f322306344 Merge branch 'master' into analyze_loops_with_IR 2025-05-30 13:01:26 +03:00
f7c66f537d merged master 2025-05-30 12:54:18 +03:00
267f85ae27 Merge branch 'master' into analyze_loops_with_IR 2025-05-28 16:23:11 +03:00
b137ea5ef3 WIP: testing on big data 2025-05-27 23:34:45 +03:00
6a84171382 finish inductive variables 2025-04-22 16:14:29 +03:00
cd209a587a WIP: merge master 2025-03-25 21:53:01 +03:00
ALEXks
0b0d7d373b fixed removeDvmSpfDirectives 2025-03-25 21:09:34 +03:00
ALEXks
781a892497 fixed removeDvmSpfDirectives 2025-03-25 21:09:34 +03:00
ALEXks
a55440c071 fixed module analysis 2025-03-25 21:09:34 +03:00
ALEXks
996f7ead1b fixed 2025-03-25 21:09:34 +03:00
ALEXks
5231eeacd8 fixed module symbols analysis 2025-03-25 21:09:34 +03:00
ALEXks
7460cf6e59 added REMOVE_SPF pass 2025-03-25 21:09:34 +03:00
ALEXks
5596b57021 version updated 2025-03-25 21:09:34 +03:00
3ad972c188 Обновить README.md 2025-03-25 21:09:34 +03:00
dde0bcdee5 Обновить README.md 2025-03-25 21:09:34 +03:00
65cdbef201 added forgotten files 2025-03-25 21:09:34 +03:00
2ad239d1e3 moved dvm to submodule 2025-03-25 21:09:34 +03:00
12f311077b added dvm as submodule 2025-03-25 21:09:34 +03:00
ALEXks
a2e0a99891 added Server project 2025-03-25 21:09:34 +03:00
27a350dac0 fixed cmakes 2025-03-25 21:09:33 +03:00
3c1032bfd0 moved to dvm_svn 2025-03-25 21:09:33 +03:00
189374274e finalyze moving 2025-03-25 21:09:12 +03:00
de4690513b fixed paths 2025-03-25 20:43:08 +03:00
86ab34e7f3 fixed paths 2025-03-25 20:43:01 +03:00
06cfe83666 removed unnecessary 2025-03-25 20:39:36 +03:00
a3c1e1e5d1 fixed paths 2025-03-25 20:39:36 +03:00
75e89ab868 fixed paths 2025-03-25 20:39:35 +03:00
d4fb323f86 moved 2025-03-25 20:39:29 +03:00
ALEXks
0c9f0664fd added module symbols initiazliation 2025-03-25 20:35:21 +03:00
ALEXks
90a608230c version updated 2025-03-25 20:35:21 +03:00
ALEXks
d6df2f6b5f fdvm updated 2025-03-25 20:35:21 +03:00
ALEXks
90894a4723 fixed module analysis 2025-03-25 20:35:21 +03:00
ALEXks
26fe1d3f61 first step of shadow fixing 2025-03-25 20:35:21 +03:00
ALEXks
68d2f3253c improved module analysis 2025-03-25 20:35:21 +03:00
ALEXks
09401376c7 improved module analysis 2025-03-25 20:35:21 +03:00
ALEXks
a0c8f78868 fixed implicit 2025-03-25 20:35:21 +03:00
ALEXks
2aa9e569f4 refactoring module analysis 2025-03-25 20:35:20 +03:00
ALEXks
9e5ee78b80 fixed module symbol analysis 2025-03-25 20:35:20 +03:00
ALEXks
d5d5514e17 fixed function analysis 2025-03-25 20:35:20 +03:00
ALEXks
68c779790d fixed dead flag for functions 2025-03-25 20:35:20 +03:00
ALEXks
c6b09ad285 fixed distribution, fixed routine, fixed null program unparsing 2025-03-25 20:35:20 +03:00
ALEXks
fd402b6ab0 added optimized version of CG on GPU 2025-03-25 20:35:20 +03:00
ALEXks
b76753c285 removed logging from SAPFOR and SERVER, updated NPB and fdvm 2025-03-25 20:35:20 +03:00
ALEXks
44600a50c1 updated dvm 2025-03-25 20:35:20 +03:00
ALEXks
d2f5e5fcc1 fixed DECLARE 2025-03-25 20:35:20 +03:00
ALEXks
18ac0ae47c fixed DECLARE 2025-03-25 20:35:20 +03:00
ALEXks
00b6026761 fixed 2025-03-25 20:35:20 +03:00
ALEXks
2036fab86f added dvm declare 2025-03-25 20:35:20 +03:00
ALEXks
da4e992926 fixed routine convertation 2025-03-25 20:35:20 +03:00
ALEXks
8e4a4c78ad improved ROUTINE insertion 2025-03-25 20:35:20 +03:00
b4038b532f WIP try to fix renaming 2025-03-25 20:35:20 +03:00
dec1a853db Merge branch 'master' into analyze_loops_with_IR 2024-12-31 16:41:12 +03:00
7df02737c7 WIP: finishing SSA renaming 2024-12-26 01:58:15 +03:00
d267dc047a WIP: add fi functions and rename vars 2024-12-19 15:37:34 +03:00
12a810ad35 WIP fix russian coments 2024-11-22 00:28:12 +03:00
1522dc7f27 Merge branch 'master' into analyze_loops_with_IR 2024-11-21 21:27:58 +03:00
bd52d5c6ec Remove debug files 2024-11-17 22:34:53 +03:00
4ba2bb4c94 Merge branch 'master' into analyze_loops_with_IR 2024-11-17 22:27:14 +03:00
60544ea4d6 WIP: add dominators logic 2024-11-14 15:28:51 +03:00
ALEXks
b40e969d02 Merge branch 'analyze_loops_with_IR' of http://alex-freenas.ddns.net:3000/Alexander_KS/SAPFOR into analyze_loops_with_IR 2024-05-26 20:49:46 +03:00
d062e52dd6 WIP add afterLoopLine 2024-05-26 20:49:14 +03:00
392ad97738 WIP add analizing IR loop 2024-05-26 20:49:14 +03:00
c2c111586c WIP add afterLoopLine 2024-05-26 13:53:47 +03:00
172eedfef1 WIP add analizing IR loop 2024-05-26 12:32:53 +03:00
16 changed files with 1124 additions and 15 deletions

View File

@@ -225,7 +225,7 @@ set(TRANSFORMS
${TR_EXPR_TRANSFORM} ${TR_EXPR_TRANSFORM}
${TR_INLINER} ${TR_INLINER}
${TR_RENAME_SYMBOLS}) ${TR_RENAME_SYMBOLS})
set(CFG src/CFGraph/IR.cpp set(CFG src/CFGraph/IR.cpp
src/CFGraph/IR.h src/CFGraph/IR.h
src/CFGraph/IR_domTree.cpp src/CFGraph/IR_domTree.cpp
@@ -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

View File

@@ -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)
{ {
instructions.push_back(item); if (pushFront)
instructions.insert(instructions.begin(), item);
else
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();

View File

@@ -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; }

View File

@@ -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; }

678
src/CFGraph/IR_SSAForm.cpp Normal file
View File

@@ -0,0 +1,678 @@
#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;
typedef SAPFOR::BasicBlock BBlock;
typedef SAPFOR::Argument BArgument;
static void printBlock(BBlock* block)
{
cout << "block - " << block->getNumber() << endl;
cout << "next -";
for (auto i : block->getNext())
cout << " " << i->getNumber();
cout << endl << "prev -";
for (auto i : block->getPrev())
cout << " " << i->getNumber();
cout << endl;
for (auto i : block->getInstructions())
{
string resValue = "";
string arg1Value = "";
string arg2Value = "";
if (i->getInstruction()->getResult() != NULL && i->getInstruction()->getResult()->getType() == CFG_ARG_TYPE::VAR)
{
resValue = i->getInstruction()->getResult()->getValue();
i->getInstruction()->getResult()->setValue(i->getInstruction()->getResult()->getValue() + to_string(i->getInstruction()->getResult()->getNumber()));
}
if (i->getInstruction()->getArg1() != NULL && i->getInstruction()->getArg1()->getType() == CFG_ARG_TYPE::VAR)
{
arg1Value = i->getInstruction()->getArg1()->getValue();
i->getInstruction()->getArg1()->setValue(i->getInstruction()->getArg1()->getValue() + to_string(i->getInstruction()->getArg1()->getNumber()));
}
if (i->getInstruction()->getArg2() != NULL && i->getInstruction()->getArg2()->getType() == CFG_ARG_TYPE::VAR)
{
arg2Value = i->getInstruction()->getArg2()->getValue();
i->getInstruction()->getArg2()->setValue(i->getInstruction()->getArg2()->getValue() + to_string(i->getInstruction()->getArg2()->getNumber()));
}
cout << i->getNumber() << " " << i->getInstruction()->dump() << endl;
if (i->getInstruction()->getResult() != NULL && i->getInstruction()->getResult()->getType() == CFG_ARG_TYPE::VAR)
i->getInstruction()->getResult()->setValue(resValue);
if (i->getInstruction()->getArg1() != NULL && i->getInstruction()->getArg1()->getType() == CFG_ARG_TYPE::VAR)
i->getInstruction()->getArg1()->setValue(arg1Value);
if (i->getInstruction()->getArg2() != NULL && i->getInstruction()->getArg2()->getType() == CFG_ARG_TYPE::VAR)
i->getInstruction()->getArg2()->setValue(arg2Value);
}
cout << endl;
}
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>(); // Return an empty vector if input is null or empty
// Start with the first vector
vector<T>* commonElements = new vector<T>((*vectors)[0]);
for (size_t i = 1; i < vectors->size(); ++i)
{
vector<T> tempCommon;
// Sort the current vector and common result for intersection
vector<T> sortedVec = (*vectors)[i];
sort(commonElements->begin(), commonElements->end());
sort(sortedVec.begin(), sortedVec.end());
// Find the intersection
set_intersection(
commonElements->begin(), commonElements->end(),
sortedVec.begin(), sortedVec.end(),
back_inserter(tempCommon)
);
// Update common result
*commonElements = tempCommon;
// If no common elements left, break early
if (commonElements->empty())
break;
}
return commonElements;
}
static map<BBlock*, vector<BBlock*>> findDominators(const vector<BBlock*>& blocks)
{
map<BBlock*, vector<BBlock*>> result;
bool changed = true;
while (changed)
{
changed = false;
for (auto& currentBlock : blocks)
{
auto pred = currentBlock->getPrev();
auto prevDominators = new vector<vector<BBlock*>>();
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 void renumberBlocks(BBlock* current, int* n, map<int, int>* res, set<BBlock*>* visited) {
if (visited->find(current) != visited->end())
return;
visited->insert(current);
vector<BBlock*> nextBlocks = current->getNext();
sort(nextBlocks.begin(), nextBlocks.end(), [](BBlock* a, BBlock* b) {
return a->getInstructions()[0]->getInstruction()->getOperator()->lineNumber() > b->getInstructions()[0]->getInstruction()->getOperator()->lineNumber();
});
for (auto& i : nextBlocks)
renumberBlocks(i, n, res, visited);
(*res)[current->getNumber()] = *n;
*n -= 1;
}
static map<BBlock*, vector<BBlock*>> findDominatorBorders(const vector<BBlock*>& blocks, map<BBlock*, BBlock*>& iDominators) {
map<BBlock*, vector<BBlock*>> result;
for (auto& block : blocks)
result[block] = *(new vector<BBlock*>());
for (auto& block : blocks)
{
if (block->getPrev().size() > 1)
{
for (auto prev : block->getPrev())
{
auto tmpBlock = prev;
auto test = iDominators[block];
auto test2 = iDominators[prev];
while (tmpBlock != iDominators[block])
{
result[tmpBlock].push_back(block);
tmpBlock = iDominators[tmpBlock];
}
}
}
}
return result;
}
static BBlock* findImmediateDominatorsDfsHelper(BBlock* block, BBlock* currentBlock, BBlock* currentImmediateDominator, vector<BBlock*> &visited, map<BBlock*, vector<BBlock*>>& dominators)
{
if (block == currentBlock)
return currentImmediateDominator;
if (find(visited.begin(), visited.end(), currentBlock) != visited.end())
return NULL;
visited.push_back(currentBlock);
if (find(dominators[block].begin(), dominators[block].end(), currentBlock) != dominators[block].end())
currentImmediateDominator = currentBlock;
for (auto& nextBlock : currentBlock->getNext())
{
auto result = findImmediateDominatorsDfsHelper(block, nextBlock, currentImmediateDominator, visited, dominators);
if (result)
return result;
}
return NULL;
}
bool checkoDom(vector<BBlock*> a, vector<BBlock*> b, BBlock* c) {
if (a.size() != b.size() + 1) {
return false;
}
for (auto i : a)
{
if (i != c && find(b.begin(), b.end(), i) == b.end()) {
return false;
}
}
return true;
}
static map<BBlock*, BBlock*> findImmediateDominators1(const map<BBlock*, vector<BBlock*>>& dominators, BBlock* entry)
{
map<BBlock*, BBlock*> iDom;
for (const auto& pair : dominators) {
BBlock* b = pair.first;
if (b == entry) continue;
const auto& doms = pair.second;
// candidates = all dominators of b except itself
bool found = false;
for (auto& d : doms) {
if (d == b) continue;
if (checkoDom(doms, dominators.at(d), b)) {
iDom[b] = d;
found = true;
break;
}
}
if (!found) {
cout << "ERRORERRORERROR " << b->getNumber() << endl;
}
}
return iDom;
}
static map<BBlock*, BBlock*> findImmediateDominators(map<BBlock*, vector<BBlock*>>& dominators, BBlock* fistBlock)
{
map<BBlock*, BBlock*> iDominators;
for (const auto& [block, domBlocks] : dominators) {
vector<BBlock*> visited;
if (block == fistBlock)
continue;
iDominators[block] = findImmediateDominatorsDfsHelper(block, fistBlock, fistBlock, visited, dominators);
}
return iDominators;
}
static vector<BArgument*> getDefForBlock(const BBlock& block)
{
vector<BArgument*> def;
const auto& instructions = block.getInstructions();
for (const auto& irBlock : instructions)
{
if (irBlock)
{
Instruction* instr = irBlock->getInstruction();
if (instr)
{
BArgument* result = instr->getResult();
if (result)
def.push_back(result);
}
}
}
return def;
}
static pair<set<BArgument*>, map<BArgument*, set<BBlock*>>> getGlobalsAndVarBlocks(const vector<BBlock*>& blocks) {
set<BArgument*> globals;
map<BArgument*, set<BBlock*>> varBlocks;
for (auto& block : blocks)
{
set<BArgument*> 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<BBlock*> blocks, set<BArgument*>& globals,
map<BArgument*, set<BBlock*>>& varBlocks,
map<BBlock*, vector<BBlock*>>& dominatorBorders)
{
vector<BBlock*> blocksWithFiFunctions;
auto fiFunc = new BArgument(CFG_ARG_TYPE::FUNC, CFG_MEM_TYPE::NONE_, "FI_FUNCTION");
auto paramCount = new BArgument(CFG_ARG_TYPE::CONST, CFG_MEM_TYPE::LOCAL_, "0");
for (auto& var : globals)
{
auto worklist = varBlocks[var];
set<BBlock*> 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 BArgument(*fiFunc), new BArgument(*paramCount), var, dfBlock->getInstructions()[0]->getInstruction()->getOperator());
IR_Block* phiBlock = new IR_Block(phiInstruction);
dfBlock->addInstruction(phiBlock, true);
//blocksWithFiFunctions.push_back(dfBlock);
}
}
}
}
//return blocksWithFiFunctions;
}
static string ToString(CFG_ARG_TYPE type)
{
switch (type) {
case CFG_ARG_TYPE::NONE: return "NONE";
case CFG_ARG_TYPE::REG: return "REG";
case CFG_ARG_TYPE::VAR: return "VAR";
case CFG_ARG_TYPE::ARRAY: return "ARRAY";
case CFG_ARG_TYPE::CONST: return "CONST";
case CFG_ARG_TYPE::FUNC: return "FUNC";
case CFG_ARG_TYPE::LAB: return "LAB";
case CFG_ARG_TYPE::INSTR: return "INSTR";
case CFG_ARG_TYPE::CONST_STR: return "CONST_STR";
case CFG_ARG_TYPE::RECORD: return "RECORD";
case CFG_ARG_TYPE::CONSTR_REF: return "CONSTR_REF";
default: return "UNKNOWN";
}
}
static void restoreConnections(const vector<BBlock*>& originalBlocks, vector<BBlock*>& copiedBlocks)
{
// Создаем отображение оригинальных блоков в их копии
map<BBlock*, BBlock*> blockMapping;
for (size_t i = 0; i < originalBlocks.size(); ++i)
blockMapping[originalBlocks[i]] = copiedBlocks[i];
// Восстанавливаем связи между копиями
for (size_t i = 0; i < originalBlocks.size(); ++i)
{
BBlock* originalBlock = originalBlocks[i];
BBlock* copiedBlock = copiedBlocks[i];
auto prevCopy = copiedBlock->getPrev();
for (auto j : prevCopy)
copiedBlock->removePrev(j);
// Копируем, затем удаляем next связи
auto nextCopy = copiedBlock->getNext();
for (auto j : nextCopy)
copiedBlock->removeNext(j);
// Восстанавливаем связи succ (следующих блоков)
for (auto* succ : originalBlock->getNext())
copiedBlock->addNext(blockMapping[succ]);
// Восстанавливаем связи prev (предыдущих блоков)
for (auto* prev : originalBlock->getPrev())
copiedBlock->addPrev(blockMapping[prev]);
}
}
static BArgument* newName(BArgument* var, map<string, int>& counter, map<string, stack<BArgument*>>& stack, int number) {
//int index = counter[var->getValue()];
counter[var->getValue()]++;
BArgument* newName = new BArgument(var->getType(), var->getMemType(), var->getValue(), number);
stack[var->getValue()].push(newName);
return newName;
}
static void renameFiFunctionResultVar(BBlock* block, map<string, int>& counter, map<string, stack<BArgument*>>& 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(BBlock* block, map<string, int>& counter, map<string, stack<BArgument*>>& 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(BBlock* block, map<string, stack<BArgument*>>& stack)
{
auto size = block->getInstructions().size();
auto& instructions = block->getInstructions();
//cout << "try to insert Phi to block - " << block->getNumber() << endl;
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)
{
//cout << "Insert Phi to block - " << block->getNumber() << endl;
Instruction* paramInstruction;
if (stack[instruction->getResult()->getValue()].size() > 0)
{
BArgument* tmp = new BArgument(CFG_ARG_TYPE::CONST, CFG_MEM_TYPE::COMMON_, to_string(stack[instruction->getResult()->getValue()].top()->getNumber()));
paramInstruction = new Instruction(CFG_OP::PARAM, tmp);
}
else
{
BArgument* tmp = new BArgument(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<BBlock*> findBlocksWithValue(map<BBlock*, BBlock*>& iDominators, BBlock* x)
{
vector<BBlock*> result;
// Проходим по всем элементам map
for (auto& pair : iDominators)
if (pair.second == x) // Если значение равно x, добавляем ключ в результат
result.push_back(pair.first);
return result;
}
static void renameIR(BBlock* block, map<BBlock*, BBlock*>& iDominators, map<string, int>& counter, map<string, stack<BArgument*>>& stack) {
//cout << "renameIR for block " << block->getNumber() << endl;
renameFiFunctionResultVar(block, counter, stack);
renameInstructionVars(block, counter, stack);
for (auto& successor : block->getNext())
renameFiFunctionArgsVar(successor, stack);
for (auto& child : findBlocksWithValue(iDominators, block))
renameIR(child, iDominators, 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();
}
}
}
bool isEqual1(const char* cstr, const std::string& str) {
return str == cstr;
}
void buildIRSSAForm(const map<FuncInfo*, vector<BBlock*>>& fullIR,
map<FuncInfo*, vector<BBlock*>>& result) {
for (auto& [funcinfo, funcIRConst]: fullIR) {
if (isEqual1("csol.for", funcinfo->fileName) || isEqual1("reblns.for", funcinfo->fileName) || isEqual1("adjont.for", funcinfo->fileName)
|| isEqual1("beginf.for", funcinfo->fileName) || isEqual1("dsnp1.for", funcinfo->fileName) || isEqual1("dsnpnm.for", funcinfo->fileName)
|| isEqual1("decod3.for", funcinfo->fileName))
continue;
cout << "Testing " << funcinfo->funcName << endl;
vector<BBlock*> funcIR;
/* for (auto& i : funcIRConst) {
printBlock(i);
}*/
for (auto& i : funcIRConst)
funcIR.push_back(new BBlock(*i));
restoreConnections(funcIRConst, funcIR);
/*for (auto& i : funcIR) {
printBlock(i);
}*/
for (auto& [func, bblocks] : result)
SAPFOR::buildDominatorTree(bblocks);
auto dominators = findDominators(funcIR);
/*cout << endl << endl << endl << "DOMINATORS" << endl << endl << endl;
for (auto i : dominators) {
cout << "block - " << i.first->getNumber() << endl;
for (auto j : i.second) {
cout << "dominators - " << j->getNumber() << endl;
}
cout << endl;
}*/
auto iDominators = findImmediateDominators1(dominators, funcIR[0]);
/*for (auto i : iDominators) {
cout << "block - " << i.first->getNumber() << endl;
cout << "Idominators - " << i.second->getNumber() << endl;
cout << endl;
}
*/
auto dominatorBorders = findDominatorBorders(funcIR, iDominators);
/*for (auto i : dominatorBorders) {
cout << "block - " << i.first->getNumber() << endl;
for (auto j : i.second) {
cout << "border - " << j->getNumber() << endl;
}
cout << endl;
}*/
auto globalsAndVarBlocks = getGlobalsAndVarBlocks(funcIR);
auto globals = globalsAndVarBlocks.first;
auto varBlocks = globalsAndVarBlocks.second;
/*for (auto i : globals) {
cout << i->getValue() << " " << ToString(i->getType()) << " " << i->getNumber() << endl;
}
cout << endl;
for (auto i : varBlocks) {
cout << i.first->getValue() << " - ";
for (auto j : i.second) {
cout << j->getNumber() << ", ";
}
cout << endl;
}
cout << endl;
*/
getBlocksWithFiFunctions(funcIR, globals, varBlocks, dominatorBorders);
map<string, int> count;
map<string, stack<BArgument*>> varStack;
for (auto& var : globals)
{
count[var->getValue()] = 0;
stack<BArgument*> tmp;
BArgument* tmpArgument = new BArgument(CFG_ARG_TYPE::CONST, CFG_MEM_TYPE::COMMON_, "-1");
tmp.push(tmpArgument);
varStack[var->getValue()] = tmp;
}
/*for (auto& i : funcIR) {
printBlock(i);
}*/
renameIR(funcIR[0], iDominators, count, varStack);
//cout << endl << endl << "___________________" << endl << endl;
/*for (auto& i : funcIR) {
printBlock(i);
}*/
//cout << endl << endl << endl << endl << endl;
//for (auto i : funcIRConst) {
// printBlock(i);
//}
result[funcinfo] = funcIR;
}
}

6
src/CFGraph/IR_SSAForm.h Normal file
View File

@@ -0,0 +1,6 @@
#pragma once
#include "CFGraph.h"
#include "IR.h"
void buildIRSSAForm(const std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& fullIR, std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& result);

View File

@@ -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 {

View File

@@ -0,0 +1,370 @@
#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);
//std::cout << "Back edge detected: " << prev->getNumber() << " -> " << id << std::endl;
return;
}
if (visit[id] == VISITED) {
return;
}
visit[id] = VISITING;
for (auto next : block->getNext()) {
dfs(next, visit, startAndEnd, block);
}
visit[id] = VISITED;
}
static void printBlock(SAPFOR::BasicBlock* block) {
cout << "block - " << block->getNumber() << endl;
cout << "next -";
for (auto i : block->getNext())
{
cout << " " << i->getNumber();
}
cout << endl << "prev -";
for (auto i : block->getPrev())
{
cout << " " << i->getNumber();
}
cout << endl;
for (auto i : block->getInstructions())
{
string resValue = "";
string arg1Value = "";
string arg2Value = "";
if (i->getInstruction()->getResult() != nullptr && i->getInstruction()->getResult()->getType() == CFG_ARG_TYPE::VAR) {
resValue = i->getInstruction()->getResult()->getValue();
i->getInstruction()->getResult()->setValue(i->getInstruction()->getResult()->getValue() + to_string(i->getInstruction()->getResult()->getNumber()));
}
if (i->getInstruction()->getArg1() != nullptr && i->getInstruction()->getArg1()->getType() == CFG_ARG_TYPE::VAR) {
arg1Value = i->getInstruction()->getArg1()->getValue();
i->getInstruction()->getArg1()->setValue(i->getInstruction()->getArg1()->getValue() + to_string(i->getInstruction()->getArg1()->getNumber()));
}
if (i->getInstruction()->getArg2() != nullptr && i->getInstruction()->getArg2()->getType() == CFG_ARG_TYPE::VAR) {
arg2Value = i->getInstruction()->getArg2()->getValue();
i->getInstruction()->getArg2()->setValue(i->getInstruction()->getArg2()->getValue() + to_string(i->getInstruction()->getArg2()->getNumber()));
}
cout << i->getNumber() << " " << i->getInstruction()->dump() << endl;
if (i->getInstruction()->getResult() != nullptr && i->getInstruction()->getResult()->getType() == CFG_ARG_TYPE::VAR) {
i->getInstruction()->getResult()->setValue(resValue);
}
if (i->getInstruction()->getArg1() != nullptr && i->getInstruction()->getArg1()->getType() == CFG_ARG_TYPE::VAR) {
i->getInstruction()->getArg1()->setValue(arg1Value);
}
if (i->getInstruction()->getArg2() != nullptr && i->getInstruction()->getArg2()->getType() == CFG_ARG_TYPE::VAR) {
i->getInstruction()->getArg2()->setValue(arg2Value);
}
}
cout << endl;
}
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;
}
bool isEqual(const char* cstr, const std::string& str) {
return str == cstr;
}
void findImplicitLoops(const std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& fullIR_SSA, const char* fileName) {
for (auto& i : fullIR_SSA)
{
//for (auto j : i.second)
// printblock(j);
if (!isEqual(fileName, i.first->fileName))
continue;
if (isEqual("csol.for", i.first->fileName) || isEqual("reblns.for", i.first->fileName) || isEqual("adjont.for", i.first->fileName)
|| isEqual("beginf.for", i.first->fileName) || isEqual("dsnp1.for", i.first->fileName) || isEqual("dsnpnm.for", i.first->fileName)
|| isEqual("decod3.for", i.first->fileName))
continue;
//if (!isEqual("iter3.for", i.first->fileName))
// continue;
map<int, int> visited;
for (auto i : i.second)
visited[i->getNumber()] = UNVISITED;
//for (auto j : i.second)
// printBlock(j);
//continue;
//vector<int> visited(i.second.size(), UNVISITED);
vector<pair<SAPFOR::BasicBlock*, SAPFOR::BasicBlock*>> startAndEnd;
dfs(i.second[0], visited, startAndEnd, NULL);
//continue;
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);
//cout << "LOOP DETECTED:" << endl;
//cout << " Header: " << header->getNumber() << endl;
//cout << " Tail: " << tail->getNumber() << endl;
//cout << " Body blocks: ";
//for (auto block : loopBody) {
// cout << block->getNumber() << " ";
//}
//cout << endl;
findInductiveVars(loopBody, i.second);
continue;
Instruction* instructionAfterLoop = findInstructionAfterLoop(loopBody);
if (instructionAfterLoop == NULL) {
cout << "Warning: instruction after loop not found!" << endl;
cout << i.first->fileName << endl;
continue;
}
auto firstInstruction = header->getInstructions()[0]->getInstruction();
auto lastInstruction = tail->getInstructions().back()->getInstruction();
//cout << "first - " << firstInstruction->getNumber() << " last - " << lastInstruction->getNumber() << " after - " << instructionAfterLoop->getNumber() << endl;
//auto x = firstInstruction->getOperator();
auto tmpLoop = new LoopGraph();
tmpLoop->isFor = true;
tmpLoop->lineNum = firstInstruction->getOperator()->lineNumber();
tmpLoop->lineNumAfterLoop = instructionAfterLoop->getOperator()->lineNumber();
//continue;
if (firstInstruction->getOperator()->variant() == FOR_NODE) {
SgForStmt* stmt = isSgForStmt(firstInstruction->getOperator());
cout << "for loop" << endl;// << stmt->sunparse() << endl;
}
else if (firstInstruction->getOperator()->variant() == WHILE_NODE) {
SgWhileStmt* stmt = isSgWhileStmt(firstInstruction->getOperator());
cout << (stmt->conditional() == NULL ? "infinit" : "") << "while loop" << endl;//<< stmt->sunparse() << endl;
}
else if (firstInstruction->getOperator()->variant() == DO_WHILE_NODE) {
SgWhileStmt* stmt = isSgDoWhileStmt(firstInstruction->getOperator());
cout << "do while loop" << endl;// << stmt->sunparse() << endl;
}
else if (firstInstruction->getOperator()->variant() == LOOP_NODE) {
cout << "not known loop" << endl;// << firstInstruction->getOperator()->sunparse() << endl;
}
else {
cout << "goto loop" << endl;// firstInstruction->getOperator()->sunparse() << endl;
}
cout << "loop start line " << tmpLoop->lineNum << endl;
cout << "after loop line " << tmpLoop->lineNumAfterLoop << endl << endl;
loops.push_back(tmpLoop);
}
}
}

View File

@@ -0,0 +1,7 @@
#pragma once
#include <map>
#include "../CFGraph/CFGraph.h"
#include "../GraphCall/graph_calls.h"
void findImplicitLoops(const std::map<FuncInfo*, std::vector<SAPFOR::BasicBlock*>>& fullIR_SSA, const char* fileName);

View File

@@ -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)

View File

@@ -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);

View File

@@ -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,15 @@ 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)
{
if (fullIR_SSA.size() == 0)
buildIRSSAForm(fullIR, fullIR_SSA);
}
else if (curr_regime == FIND_IMPLICIT_LOOPS)
findImplicitLoops(fullIR_SSA, file_name);
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

View File

@@ -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";

View File

@@ -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;
//

View File

@@ -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,