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

rose_build_bytecode: clean up

Browse Source
This commit is contained in:
Justin Viiret 2016-06-14 11:47:02 +10:00 committed by Matthew Barr
parent ae157034e9
commit 426bfc9cfb
1 changed files with 78 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
src/rose/rose_build_bytecode.cpp
View File

@ -4017,7 +4017,7 @@ bool hasEodMatcher(const RoseBuildImpl &build) {
static static
void addEodAnchorProgram(RoseBuildImpl &build, build_context &bc, void addEodAnchorProgram(RoseBuildImpl &build, build_context &bc,
vector<RoseInstruction> &program) { bool in_etable, vector<RoseInstruction> &program) {
const RoseGraph &g = build.g; const RoseGraph &g = build.g;
// pred state id -> list of programs // pred state id -> list of programs
@ -4034,8 +4034,9 @@ void addEodAnchorProgram(RoseBuildImpl &build, build_context &bc,
vector<RoseEdge> edge_list; vector<RoseEdge> edge_list;
for (const auto &e : in_edges_range(v, g)) { for (const auto &e : in_edges_range(v, g)) {
RoseVertex u = source(e, g); RoseVertex u = source(e, g);
if (!build.isInETable(u)) { if (build.isInETable(u) != in_etable) {
DEBUG_PRINTF("pred %zu is not in etable\n", g[u].idx); DEBUG_PRINTF("pred %zu %s in etable\n", g[u].idx,
in_etable ? "is not" : "is");
continue; continue;
} }
if (canEagerlyReportAtEod(build, e)) { if (canEagerlyReportAtEod(build, e)) {
@ -4056,91 +4057,25 @@ void addEodAnchorProgram(RoseBuildImpl &build, build_context &bc,
} }
} }
addPredBlocks(bc, predProgramLists, program); if (predProgramLists.empty()) {
return;
if (hasEodAnchoredSuffix(build)) { }
if (!program.empty()) { if (!program.empty()) {
assert(program.back().code() == ROSE_INSTR_END); assert(program.back().code() == ROSE_INSTR_END);
program.pop_back(); program.pop_back();
} }
program.emplace_back(ROSE_INSTR_SUFFIXES_EOD); addPredBlocks(bc, predProgramLists, program);
program.emplace_back(ROSE_INSTR_END);
}
} }
static static
void addGeneralEodAnchorProgram(RoseBuildImpl &build, build_context &bc, void addEodEventProgram(RoseBuildImpl &build, build_context &bc,
vector<RoseInstruction> &program) { vector<RoseInstruction> &program) {
if (build.eod_event_literal_id == MO_INVALID_IDX) {
return;
}
const RoseGraph &g = build.g; const RoseGraph &g = build.g;
const auto &lit_info = build.literal_info.at(build.eod_event_literal_id);
// pred state id -> list of programs
map<u32, vector<vector<RoseInstruction>>> predProgramLists;
for (auto v : vertices_range(g)) {
if (!g[v].eod_accept) {
continue;
}
DEBUG_PRINTF("vertex %zu (with %zu preds) fires on EOD\n", g[v].idx,
in_degree(v, g));
vector<RoseEdge> edge_list;
for (const auto &e : in_edges_range(v, g)) {
RoseVertex u = source(e, g);
if (build.isInETable(u)) {
DEBUG_PRINTF("pred %zu is in etable\n", g[u].idx);
continue;
}
if (canEagerlyReportAtEod(build, e)) {
DEBUG_PRINTF("already done report for vertex %zu\n", g[u].idx);
continue;
}
edge_list.push_back(e);
}
const bool multiple_preds = edge_list.size() > 1;
for (const auto &e : edge_list) {
RoseVertex u = source(e, g);
assert(contains(bc.roleStateIndices, u));
u32 predStateIdx = bc.roleStateIndices.at(u);
auto program = makeEodAnchorProgram(build, bc, e, multiple_preds);
predProgramLists[predStateIdx].push_back(program);
}
}
if (!predProgramLists.empty()) {
if (!program.empty()) {
assert(program.back().code() == ROSE_INSTR_END);
program.pop_back();
}
addPredBlocks(bc, predProgramLists, program);
}
if (hasEodMatcher(build)) {
if (!program.empty()) {
assert(program.back().code() == ROSE_INSTR_END);
program.pop_back();
}
program.emplace_back(ROSE_INSTR_MATCHER_EOD);
program.emplace_back(ROSE_INSTR_END);
}
if (!program.empty()) {
assert(program.back().code() == ROSE_INSTR_END);
program.pop_back();
}
}
static
u32 writeEodProgram(RoseBuildImpl &build, build_context &bc,
u32 eodNfaIterOffset) {
vector<RoseInstruction> program;
if (build.eod_event_literal_id != MO_INVALID_IDX) {
const RoseGraph &g = build.g;
const auto &lit_info =
build.literal_info.at(build.eod_event_literal_id);
assert(lit_info.delayed_ids.empty()); assert(lit_info.delayed_ids.empty());
assert(!lit_info.squash_group); assert(!lit_info.squash_group);
assert(!lit_info.requires_benefits); assert(!lit_info.requires_benefits);
@ -4160,10 +4095,17 @@ u32 writeEodProgram(RoseBuildImpl &build, build_context &bc,
tie(g[source(b, g)].idx, g[target(b, g)].idx); tie(g[source(b, g)].idx, g[target(b, g)].idx);
}); });
program = buildLiteralProgram(build, bc, MO_INVALID_IDX, edge_list); auto prog = buildLiteralProgram(build, bc, MO_INVALID_IDX, edge_list);
program.insert(end(program), begin(prog), end(prog));
}
static
void addEnginesEodProgram(u32 eodNfaIterOffset,
vector<RoseInstruction> &program) {
if (!eodNfaIterOffset) {
return;
} }
if (eodNfaIterOffset) {
auto ri = RoseInstruction(ROSE_INSTR_ENGINES_EOD); auto ri = RoseInstruction(ROSE_INSTR_ENGINES_EOD);
ri.u.enginesEod.iter_offset = eodNfaIterOffset; ri.u.enginesEod.iter_offset = eodNfaIterOffset;
if (!program.empty()) { if (!program.empty()) {
@ -4171,11 +4113,50 @@ u32 writeEodProgram(RoseBuildImpl &build, build_context &bc,
program.pop_back(); program.pop_back();
} }
program.push_back(move(ri)); program.push_back(move(ri));
program = flattenProgram({program}); program.emplace_back(ROSE_INSTR_END);
}
static
void addSuffixesEodProgram(const RoseBuildImpl &build,
vector<RoseInstruction> &program) {
if (!hasEodAnchoredSuffix(build)) {
return;
} }
addGeneralEodAnchorProgram(build, bc, program); if (!program.empty()) {
addEodAnchorProgram(build, bc, program); assert(program.back().code() == ROSE_INSTR_END);
program.pop_back();
}
program.emplace_back(ROSE_INSTR_SUFFIXES_EOD);
program.emplace_back(ROSE_INSTR_END);
}
static
void addMatcherEodProgram(const RoseBuildImpl &build,
vector<RoseInstruction> &program) {
if (!hasEodMatcher(build)) {
return;
}
if (!program.empty()) {
assert(program.back().code() == ROSE_INSTR_END);
program.pop_back();
}
program.emplace_back(ROSE_INSTR_MATCHER_EOD);
program.emplace_back(ROSE_INSTR_END);
}
static
u32 writeEodProgram(RoseBuildImpl &build, build_context &bc,
u32 eodNfaIterOffset) {
vector<RoseInstruction> program;
addEodEventProgram(build, bc, program);
addEnginesEodProgram(eodNfaIterOffset, program);
addEodAnchorProgram(build, bc, false, program);
addMatcherEodProgram(build, program);
addEodAnchorProgram(build, bc, true, program);
addSuffixesEodProgram(build, program);
if (program.size() == 1) { if (program.size() == 1) {
assert(program.back().code() == ROSE_INSTR_END); assert(program.back().code() == ROSE_INSTR_END);
@ -4186,7 +4167,6 @@ u32 writeEodProgram(RoseBuildImpl &build, build_context &bc,
return 0; return 0;
} }
applyFinalSpecialisation(program); applyFinalSpecialisation(program);
return writeProgram(bc, program); return writeProgram(bc, program);
} }