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_find_matches: speed up gather...ByDepth

Browse Source
This commit is contained in:
Justin Viiret 2017-03-09 10:55:22 +11:00 committed by Matthew Barr
parent 749e3e64b9
commit bae8ebc62d
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
util/ng_find_matches.cpp
View File

@ -60,8 +60,9 @@ static constexpr size_t STATE_COUNT_MAX = 15000;
static static
vector<flat_set<NFAVertex>> vector<flat_set<NFAVertex>>
gatherSuccessorsByDepth(const NGHolder &g, const NFAVertex &src, u32 depth) { gatherSuccessorsByDepth(const NGHolder &g, const NFAVertex &src, u32 depth) {
assert(depth > 0);
vector<flat_set<NFAVertex>> result(depth); vector<flat_set<NFAVertex>> result(depth);
flat_set<NFAVertex> cur, next;
// populate current set of successors // populate current set of successors
for (auto v : adjacent_vertices_range(src, g)) { for (auto v : adjacent_vertices_range(src, g)) {
@ -70,31 +71,28 @@ gatherSuccessorsByDepth(const NGHolder &g, const NFAVertex &src, u32 depth) {
continue; continue;
} }
DEBUG_PRINTF("Node %zu depth 1\n", g[v].index); DEBUG_PRINTF("Node %zu depth 1\n", g[v].index);
result[0].insert(v);
cur.insert(v);
} }
result[0] = cur;
for (u32 d = 1; d < depth; d++) { for (u32 d = 1; d < depth; d++) {
// collect all successors for all current level vertices // collect all successors for all current level vertices
for (auto v : cur) { const auto &cur = result[d - 1];
auto &next = result[d];
for (auto u : cur) {
// don't go past special nodes // don't go past special nodes
if (is_special(v, g)) { if (is_special(u, g)) {
continue; continue;
} }
for (auto succ : adjacent_vertices_range(v, g)) { for (auto v : adjacent_vertices_range(u, g)) {
// ignore self-loops // ignore self-loops
if (v == succ) { if (u == v) {
continue; continue;
} }
DEBUG_PRINTF("Node %zu depth %u\n", g[succ].index, d + 1); DEBUG_PRINTF("Node %zu depth %u\n", g[v].index, d + 1);
next.insert(succ); next.insert(v);
} }
} }
result[d] = next;
next.swap(cur);
next.clear();
} }
return result; return result;
@ -103,13 +101,12 @@ gatherSuccessorsByDepth(const NGHolder &g, const NFAVertex &src, u32 depth) {
// returns all predecessors up to a given depth in a vector of sets, indexed by // returns all predecessors up to a given depth in a vector of sets, indexed by
// zero-based depth from source vertex // zero-based depth from source vertex
static static
vector<flat_set<NFAVertex>> gatherPredecessorsByDepth(const NGHolder &g, vector<flat_set<NFAVertex>>
NFAVertex src, u32 depth) { gatherPredecessorsByDepth(const NGHolder &g, NFAVertex src, u32 depth) {
vector<flat_set<NFAVertex>> result(depth);
flat_set<NFAVertex> cur, next;
assert(depth > 0); assert(depth > 0);
vector<flat_set<NFAVertex>> result(depth);
// populate current set of successors // populate current set of successors
for (auto v : inv_adjacent_vertices_range(src, g)) { for (auto v : inv_adjacent_vertices_range(src, g)) {
// ignore self-loops // ignore self-loops
@ -117,25 +114,23 @@ vector<flat_set<NFAVertex>> gatherPredecessorsByDepth(const NGHolder &g,
continue; continue;
} }
DEBUG_PRINTF("Node %zu depth 1\n", g[v].index); DEBUG_PRINTF("Node %zu depth 1\n", g[v].index);
cur.insert(v); result[0].insert(v);
} }
result[0] = cur;
for (u32 d = 1; d < depth; d++) { for (u32 d = 1; d < depth; d++) {
// collect all successors for all current level vertices // collect all successors for all current level vertices
const auto &cur = result[d - 1];
auto &next = result[d];
for (auto v : cur) { for (auto v : cur) {
for (auto pred : inv_adjacent_vertices_range(v, g)) { for (auto u : inv_adjacent_vertices_range(v, g)) {
// ignore self-loops // ignore self-loops
if (v == pred) { if (v == u) {
continue; continue;
} }
DEBUG_PRINTF("Node %zu depth %u\n", g[pred].index, d + 1); DEBUG_PRINTF("Node %zu depth %u\n", g[u].index, d + 1);
next.insert(pred); next.insert(u);
} }
} }
result[d] = next;
next.swap(cur);
next.clear();
} }
return result; return result;