luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed caching implementation of complex DRC ops.

This commit is contained in:
Matthias Koefferlein 2021-01-16 20:34:15 +01:00
parent c66a19ba42
commit 9a55bdc687
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/db/db/dbCompoundOperation.cc
View File

@ -366,6 +366,7 @@ CompoundRegionMultiInputOperationNode::~CompoundRegionMultiInputOperationNode ()
void void
CompoundRegionMultiInputOperationNode::invalidate_cache () const CompoundRegionMultiInputOperationNode::invalidate_cache () const
{ {
CompoundRegionOperationNode::invalidate_cache ();
for (tl::shared_collection<CompoundRegionOperationNode>::const_iterator i = m_children.begin (); i != m_children.end (); ++i) { for (tl::shared_collection<CompoundRegionOperationNode>::const_iterator i = m_children.begin (); i != m_children.end (); ++i) {
i->invalidate_cache (); i->invalidate_cache ();
} }

29
src/db/db/dbCompoundOperation.h
View File

@ -222,6 +222,11 @@ public:
m_cache_edge_pair_valid = false; m_cache_edge_pair_valid = false;
} }
void setup_cache () const
{
invalidate_cache ();
}
protected: protected:
// the different computation slots // the different computation slots
virtual void do_compute_local (db::Layout * /*layout*/, const shape_interactions<db::Polygon, db::Polygon> & /*interactions*/, std::vector<std::unordered_set<db::Polygon> > & /*results*/, size_t /*max_vertex_count*/, double /*area_ratio*/) const { } virtual void do_compute_local (db::Layout * /*layout*/, const shape_interactions<db::Polygon, db::Polygon> & /*interactions*/, std::vector<std::unordered_set<db::Polygon> > & /*results*/, size_t /*max_vertex_count*/, double /*area_ratio*/) const { }
@ -255,14 +260,27 @@ private:
template <class TS, class TI, class TR> template <class TS, class TI, class TR>
void implement_compute_local (db::Layout *layout, const shape_interactions<TS, TI> &interactions, std::vector<std::unordered_set<TR> > &results, size_t max_vertex_count, double area_ratio) const void implement_compute_local (db::Layout *layout, const shape_interactions<TS, TI> &interactions, std::vector<std::unordered_set<TR> > &results, size_t max_vertex_count, double area_ratio) const
{ {
// TODO: confine caching to those nodes which need it.
std::vector<std::unordered_set<TR> > *cache = 0; std::vector<std::unordered_set<TR> > *cache = 0;
bool *valid = 0; bool *valid = 0;
get_cache (cache, valid); get_cache (cache, valid);
if (*valid) {
results = *cache; if (! *valid) {
} else {
do_compute_local (layout, interactions, results, max_vertex_count, area_ratio); std::vector<std::unordered_set<TR> > uncached_results;
*cache = results; uncached_results.resize (results.size ());
do_compute_local (layout, interactions, uncached_results, max_vertex_count, area_ratio);
cache->swap (uncached_results);
*valid = true;
}
tl_assert (results.size () == cache->size ());
for (size_t r = 0; r < results.size (); ++r) {
results[r].insert ((*cache)[r].begin (), (*cache)[r].end ());
} }
} }
}; };
@ -1569,6 +1587,7 @@ public:
protected: protected:
virtual void do_compute_local (db::Layout *layout, const shape_interactions<TS, TI> &interactions, std::vector<std::unordered_set<TR> > &results, size_t max_vertex_count, double area_ratio) const virtual void do_compute_local (db::Layout *layout, const shape_interactions<TS, TI> &interactions, std::vector<std::unordered_set<TR> > &results, size_t max_vertex_count, double area_ratio) const
{ {
mp_node->setup_cache ();
mp_node->compute_local (layout, interactions, results, max_vertex_count, area_ratio); mp_node->compute_local (layout, interactions, results, max_vertex_count, area_ratio);
} }