Alexander_KS/SAPFOR
4
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix reordering

Browse Source
This commit is contained in:
Egor Mayorov
2026-05-06 12:14:32 +03:00
parent 583fe7775e
commit e5fa184fe0
1 changed files with 37 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/Transformations/MoveOperators/move_operators.cpp
View File

@@ -522,71 +522,53 @@ static bool reorderOperatorsInBasicBlockUsingDeps(
return false; return false;
} }
map<SgStatement*, int> originalIndex; map<SgStatement*, int> newIndex;
map<SgStatement*, int> movesCount;
vector<SgStatement*> order = ops;
for (int i = 0; i < (int)ops.size(); ++i) for (int i = 0; i < (int)ops.size(); ++i)
originalIndex[ops[i]] = i; {
newIndex[ops[i]] = i;
map<SgStatement*, vector<SgStatement*>> moveAfter; movesCount[ops[i]] = 0;
set<SgStatement*> moved; }
for (SgStatement* st : ops) for (SgStatement* st : ops)
{ {
auto itDeps = operatorsDependencies.find(st); auto itDeps = operatorsDependencies.find(st);
if (itDeps == operatorsDependencies.end() || itDeps->second.empty()) if (itDeps != operatorsDependencies.end() && !itDeps->second.empty())
continue; {
SgStatement* lastDep = nullptr; SgStatement* lastDep = nullptr;
int lastDepIdx = -1; int lastDepIdx = -1;
for (SgStatement* dep : itDeps->second) for (SgStatement* dep : itDeps->second)
{ {
auto itIdx = originalIndex.find(dep); auto itIdx = newIndex.find(dep);
if (itIdx != originalIndex.end() && itIdx->second > lastDepIdx) if (itIdx != newIndex.end() && itIdx->second > lastDepIdx)
{ {
lastDep = dep; lastDep = dep;
lastDepIdx = itIdx->second; lastDepIdx = itIdx->second;
} }
} }
if (!lastDep || lastDep == st) if (lastDep && lastDep != st)
continue;
moveAfter[lastDep].push_back(st);
moved.insert(st);
}
vector<SgStatement*> order;
order.reserve(ops.size());
set<SgStatement*> emitted;
set<SgStatement*> active;
bool invalidOrder = false;
function<void(SgStatement*)> emitStatement = [&](SgStatement* st)
{ {
if (!st || invalidOrder || emitted.count(st)) const int stPos = newIndex[st];
return; const int ldPos = newIndex[lastDep];
if (active.count(st)) if (stPos > ldPos)
{ {
invalidOrder = true; auto itSt = find(order.begin(), order.end(), st);
return; auto itLd = find(order.begin(), order.end(), lastDep);
} if (itSt == order.end() || itLd == order.end())
active.insert(st);
emitted.insert(st);
order.push_back(st);
auto itMovedAfter = moveAfter.find(st);
if (itMovedAfter != moveAfter.end())
for (SgStatement* dependent : itMovedAfter->second)
emitStatement(dependent);
active.erase(st);
};
for (SgStatement* st : ops)
if (!moved.count(st))
emitStatement(st);
if (invalidOrder || order.size() != ops.size())
return false; return false;
order.erase(itSt);
itLd = find(order.begin(), order.end(), lastDep);
if (itLd == order.end())
return false;
order.insert(itLd + 1 + movesCount[lastDep], st);
for (int i = 0; i < (int)order.size(); ++i)
newIndex[order[i]] = i;
movesCount[lastDep] += 1;
}
}
}
}
bool changed = false; bool changed = false;
for (size_t i = 0; i < ops.size(); ++i) for (size_t i = 0; i < ops.size(); ++i)