github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

ng_region: don't realloc exits

Browse Source
This commit is contained in:
Justin Viiret 2017-03-21 17:19:56 +11:00 committed by Matthew Barr
parent d63fdcd860
commit ca22edc9d3
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/nfagraph/ng_region.cpp
View File

@ -104,15 +104,12 @@ void checkAndAddExitCandidate(const AcyclicGraph &g,
} }
static static
vector<exit_info> findExits(const AcyclicGraph &g, void findExits(const AcyclicGraph &g, const ue2::unordered_set<NFAVertex> &r,
const ue2::unordered_set<NFAVertex> &r) { vector<exit_info> &exits) {
vector<exit_info> exits; exits.clear();
for (auto v : r) { for (auto v : r) {
checkAndAddExitCandidate(g, r, v, exits); checkAndAddExitCandidate(g, r, v, exits);
} }
return exits;
} }
static static
@ -179,26 +176,26 @@ void buildInitialCandidate(const AcyclicGraph &g,
ue2::unordered_set<NFAVertex> *candidate, ue2::unordered_set<NFAVertex> *candidate,
/* in exits of prev region; /* in exits of prev region;
* out exits from candidate */ * out exits from candidate */
vector<exit_info> *exits, vector<exit_info> &exits,
flat_set<NFAVertex> *open_jumps) { flat_set<NFAVertex> *open_jumps) {
if (it == ite) { if (it == ite) {
candidate->clear(); candidate->clear();
exits->clear(); exits.clear();
return; return;
} }
if (exits->empty()) { if (exits.empty()) {
DEBUG_PRINTF("odd\n"); DEBUG_PRINTF("odd\n");
candidate->clear(); candidate->clear();
DEBUG_PRINTF("adding %zu to initial\n", g[*it].index); DEBUG_PRINTF("adding %zu to initial\n", g[*it].index);
candidate->insert(*it); candidate->insert(*it);
open_jumps->erase(*it); open_jumps->erase(*it);
checkAndAddExitCandidate(g, *candidate, *it, *exits); checkAndAddExitCandidate(g, *candidate, *it, exits);
++it; ++it;
return; return;
} }
auto enters = (*exits)[0].open; // copy auto enters = exits.front().open; // copy
candidate->clear(); candidate->clear();
for (; it != ite; ++it) { for (; it != ite; ++it) {
@ -218,7 +215,7 @@ void buildInitialCandidate(const AcyclicGraph &g,
open_jumps->clear(); open_jumps->clear();
} }
*exits = findExits(g, *candidate); findExits(g, *candidate, exits);
} }
static static
@ -237,7 +234,8 @@ void findDagLeaders(const NGHolder &h, const AcyclicGraph &g,
assert(t_it != topo.rend()); assert(t_it != topo.rend());
candidate.insert(*t_it++); candidate.insert(*t_it++);
auto exits = findExits(g, candidate); vector<exit_info> exits;
findExits(g, candidate, exits);
while (t_it != topo.rend()) { while (t_it != topo.rend()) {
assert(!candidate.empty()); assert(!candidate.empty());
@ -253,7 +251,7 @@ void findDagLeaders(const NGHolder &h, const AcyclicGraph &g,
DEBUG_PRINTF("setting region %u\n", curr_id); DEBUG_PRINTF("setting region %u\n", curr_id);
} }
setRegion(candidate, curr_id++, regions); setRegion(candidate, curr_id++, regions);
buildInitialCandidate(g, t_it, topo.rend(), &candidate, &exits, buildInitialCandidate(g, t_it, topo.rend(), &candidate, exits,
&open_jumps); &open_jumps);
} else { } else {
NFAVertex curr = *t_it; NFAVertex curr = *t_it;