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: only use live reports for dedupe assignment

Browse Source
This commit is contained in:
Justin Viiret 2017-03-28 11:26:40 +11:00 committed by Matthew Barr
parent a1bc69f3dd
commit 0a163b5535
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/rose/rose_build_misc.cpp
View File

@ -590,6 +590,8 @@ private:
map<ReportID, set<suffix_id>> suffix_map; map<ReportID, set<suffix_id>> suffix_map;
map<ReportID, set<const OutfixInfo *>> outfix_map; map<ReportID, set<const OutfixInfo *>> outfix_map;
map<ReportID, set<const raw_puff *>> puff_map; map<ReportID, set<const raw_puff *>> puff_map;
unordered_set<ReportID> live_reports; //!< all live internal reports.
}; };
unique_ptr<RoseDedupeAux> RoseBuildImpl::generateDedupeAux() const { unique_ptr<RoseDedupeAux> RoseBuildImpl::generateDedupeAux() const {
@ -606,6 +608,8 @@ RoseDedupeAuxImpl::RoseDedupeAuxImpl(const RoseBuildImpl &tbi_in)
set<suffix_id> suffixes; set<suffix_id> suffixes;
for (auto v : vertices_range(g)) { for (auto v : vertices_range(g)) {
insert(&live_reports, g[v].reports);
// Literals in the small block table are "shadow" copies of literals in // Literals in the small block table are "shadow" copies of literals in
// the other tables that do not run in the same runtime invocation. // the other tables that do not run in the same runtime invocation.
// Dedupe key assignment will be taken care of by the real literals. // Dedupe key assignment will be taken care of by the real literals.
@ -629,12 +633,14 @@ RoseDedupeAuxImpl::RoseDedupeAuxImpl(const RoseBuildImpl &tbi_in)
for (const auto &suffix : suffixes) { for (const auto &suffix : suffixes) {
for (const auto &report_id : all_reports(suffix)) { for (const auto &report_id : all_reports(suffix)) {
suffix_map[report_id].insert(suffix); suffix_map[report_id].insert(suffix);
live_reports.insert(report_id);
} }
} }
for (const auto &outfix : tbi.outfixes) { for (const auto &outfix : tbi.outfixes) {
for (const auto &report_id : all_reports(outfix)) { for (const auto &report_id : all_reports(outfix)) {
outfix_map[report_id].insert(&outfix); outfix_map[report_id].insert(&outfix);
live_reports.insert(report_id);
} }
} }
@ -642,11 +648,21 @@ RoseDedupeAuxImpl::RoseDedupeAuxImpl(const RoseBuildImpl &tbi_in)
auto *mpv = tbi.mpv_outfix->mpv(); auto *mpv = tbi.mpv_outfix->mpv();
for (const auto &puff : mpv->puffettes) { for (const auto &puff : mpv->puffettes) {
puff_map[puff.report].insert(&puff); puff_map[puff.report].insert(&puff);
live_reports.insert(puff.report);
} }
for (const auto &puff : mpv->triggered_puffettes) { for (const auto &puff : mpv->triggered_puffettes) {
puff_map[puff.report].insert(&puff); puff_map[puff.report].insert(&puff);
live_reports.insert(puff.report);
} }
} }
// Collect live reports from boundary reports.
insert(&live_reports, tbi.boundary.report_at_0);
insert(&live_reports, tbi.boundary.report_at_0_eod);
insert(&live_reports, tbi.boundary.report_at_eod);
DEBUG_PRINTF("%zu of %zu reports are live\n", live_reports.size(),
tbi.rm.numReports());
} }
static static
@ -716,11 +732,20 @@ bool RoseDedupeAuxImpl::hasSafeMultiReports(
} }
bool RoseDedupeAuxImpl::requiresDedupeSupport( bool RoseDedupeAuxImpl::requiresDedupeSupport(
const ue2::flat_set<ReportID> &reports) const { const flat_set<ReportID> &reports_in) const {
/* TODO: this could be expanded to check for offset or character /* TODO: this could be expanded to check for offset or character
constraints */ constraints */
DEBUG_PRINTF("reports: %s\n", as_string_list(reports).c_str()); // We don't want to consider dead reports (tracked by ReportManager but no
// longer used) for the purposes of assigning dupe keys.
flat_set<ReportID> reports;
for (auto id : reports_in) {
if (contains(live_reports, id)) {
reports.insert(id);
}
}
DEBUG_PRINTF("live reports: %s\n", as_string_list(reports).c_str());
const RoseGraph &g = tbi.g; const RoseGraph &g = tbi.g;