Skip to content

Bugfix/issue 1907 #1910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
klayoutmatthias merged 10 commits into from
Nov 26, 2024
Merged

Bugfix/issue 1907 #1910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c1757c4
First steps towards fix: locking layout while recursive shape iterato…
Oct 24, 2024
bea707a
Releasing the lock when the iterator is at end - otherwise a finished…
Oct 24, 2024
049c0b7
Debugging, added tests for new recursive shape iterator.
Oct 25, 2024
a83e58b
Solving potential thread collision issues upon Layout::update.
Oct 26, 2024
0c0baed
Avoiding a layout lock on Region::empty.
Oct 26, 2024
57e98d1
Fixed some Ruby tests - as RecursiveShapeIterator lifelime may be lon…
Oct 26, 2024
1407ae1
Also provide layout locking for recursive instance iterator
Oct 26, 2024
946729f
Adding forced update to Layout writer to ensure proper files. A warni…
Oct 26, 2024
cdd7058
Mitigating the effect of a locked layout: plain iteration of instance…
Oct 27, 2024
ac1126f
update documentation
Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 85 additions & 12 deletions src/db/db/dbInstances.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,12 +280,18 @@ void
instance_iterator<Traits>::release_iter ()
{
if (m_type == TInstance) {
if (m_stable) {
if (m_stable && ! m_unsorted) {
if (m_with_props) {
basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()).~stable_iter_wp_type ();
} else {
basic_iter (cell_inst_array_type::tag (), InstancesEditableTag ()).~stable_iter_type ();
}
} else if (m_stable) {
if (m_with_props) {
basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()).~stable_unsorted_iter_wp_type ();
} else {
basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ()).~stable_unsorted_iter_type ();
}
} else {
if (m_with_props) {
basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ()).~iter_wp_type ();
Expand All @@ -301,12 +307,18 @@ void
instance_iterator<Traits>::make_iter ()
{
if (m_type == TInstance) {
if (m_stable) {
if (m_stable && ! m_unsorted) {
if (m_with_props) {
new (&basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ())) stable_iter_wp_type ();
} else {
new (&basic_iter (cell_inst_array_type::tag (), InstancesEditableTag ())) stable_iter_type ();
}
} else if (m_stable) {
if (m_with_props) {
new (&basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ())) stable_unsorted_iter_wp_type ();
} else {
new (&basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ())) stable_unsorted_iter_type ();
}
} else {
if (m_with_props) {
new (&basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ())) iter_wp_type ();
Expand All @@ -322,18 +334,24 @@ template <class Traits>
bool
instance_iterator<Traits>::operator== (const instance_iterator<Traits> &d) const
{
if (! (m_type == d.m_type && m_stable == d.m_stable && m_with_props == d.m_with_props)) {
if (! (m_type == d.m_type && m_stable == d.m_stable && m_with_props == d.m_with_props && m_unsorted == d.m_unsorted)) {
return false;
}
if (m_type == TNull) {
return true;
} else {
if (m_stable) {
if (m_with_props) {
if (m_with_props && ! m_unsorted) {
return (basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()) == d.basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
return (basic_iter (cell_inst_array_type::tag (), InstancesEditableTag ()) == d.basic_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else if (m_stable) {
if (m_with_props) {
return (basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()) == d.basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
return (basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ()) == d.basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else {
if (m_with_props) {
return (basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ()) == d.basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ()));
Expand All @@ -355,16 +373,23 @@ instance_iterator<Traits>::operator= (const instance_iterator<Traits> &iter)
m_type = iter.m_type;
m_stable = iter.m_stable;
m_with_props = iter.m_with_props;
m_unsorted = iter.m_unsorted;
m_traits = iter.m_traits;

if (m_type == TInstance) {

if (m_stable) {
if (m_stable && ! m_unsorted) {
if (m_with_props) {
new (&basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ())) stable_iter_wp_type (iter.basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
new (&basic_iter (cell_inst_array_type::tag (), InstancesEditableTag ())) stable_iter_type (iter.basic_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else if (m_stable) {
if (m_with_props) {
new (&basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ())) stable_unsorted_iter_wp_type (iter.basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
new (&basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ())) stable_unsorted_iter_type (iter.basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else {
if (m_with_props) {
new (&basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ())) iter_wp_type (iter.basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ()));
Expand All @@ -387,12 +412,18 @@ db::Box
instance_iterator<Traits>::quad_box () const
{
if (m_type == TInstance) {
if (m_stable) {
if (m_stable && ! m_unsorted) {
if (m_with_props) {
return m_traits.quad_box (basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
return m_traits.quad_box (basic_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else if (m_stable) {
if (m_with_props) {
return m_traits.quad_box (basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
return m_traits.quad_box (basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else {
if (m_with_props) {
return m_traits.quad_box (basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ()));
Expand All @@ -409,12 +440,18 @@ size_t
instance_iterator<Traits>::quad_id () const
{
if (m_type == TInstance) {
if (m_stable) {
if (m_stable && ! m_unsorted) {
if (m_with_props) {
return m_traits.quad_id (basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
return m_traits.quad_id (basic_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else if (m_stable) {
if (m_with_props) {
return m_traits.quad_id (basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
return m_traits.quad_id (basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else {
if (m_with_props) {
return m_traits.quad_id (basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ()));
Expand All @@ -431,12 +468,18 @@ void
instance_iterator<Traits>::skip_quad ()
{
if (m_type == TInstance) {
if (m_stable) {
if (m_stable && ! m_unsorted) {
if (m_with_props) {
m_traits.skip_quad (basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
m_traits.skip_quad (basic_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else if (m_stable) {
if (m_with_props) {
m_traits.skip_quad (basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
m_traits.skip_quad (basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else {
if (m_with_props) {
m_traits.skip_quad (basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ()));
Expand All @@ -454,12 +497,18 @@ instance_iterator<Traits> &
instance_iterator<Traits>::operator++()
{
if (m_type == TInstance) {
if (m_stable) {
if (m_stable && ! m_unsorted) {
if (m_with_props) {
++basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ());
} else {
++basic_iter (cell_inst_array_type::tag (), InstancesEditableTag ());
}
} else if (m_stable) {
if (m_with_props) {
++basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ());
} else {
++basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ());
}
} else {
if (m_with_props) {
++basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ());
Expand All @@ -478,7 +527,7 @@ void
instance_iterator<Traits>::make_next ()
{
while (true) {
if (m_stable) {
if (m_stable && ! m_unsorted) {
if (m_with_props) {
if (! basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()).at_end ()) {
return;
Expand All @@ -488,6 +537,16 @@ instance_iterator<Traits>::make_next ()
return;
}
}
} else if (m_stable) {
if (m_with_props) {
if (! basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()).at_end ()) {
return;
}
} else {
if (! basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ()).at_end ()) {
return;
}
}
} else {
if (m_with_props) {
if (! basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ()).at_end ()) {
Expand All @@ -514,12 +573,18 @@ void
instance_iterator<Traits>::update_ref ()
{
if (m_type == TInstance) {
if (m_stable) {
if (m_stable && ! m_unsorted) {
if (m_with_props) {
m_ref = m_traits.instance_from_stable_iter (basic_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
m_ref = m_traits.instance_from_stable_iter (basic_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else if (m_stable) {
if (m_with_props) {
m_ref = m_traits.instance_from_stable_iter (basic_unsorted_iter (cell_inst_wp_array_type::tag (), InstancesEditableTag ()));
} else {
m_ref = m_traits.instance_from_stable_iter (basic_unsorted_iter (cell_inst_array_type::tag (), InstancesEditableTag ()));
}
} else {
if (m_with_props) {
m_ref = value_type (m_traits.instances (), *basic_iter (cell_inst_wp_array_type::tag (), InstancesNonEditableTag ()));
Expand Down Expand Up @@ -551,14 +616,22 @@ void
NormalInstanceIteratorTraits::init (instance_iterator<NormalInstanceIteratorTraits> *iter) const
{
tl_assert (mp_insts != 0);
if (iter->m_stable) {
if (iter->m_stable && ! iter->m_unsorted) {
if (iter->m_with_props) {
cell_inst_wp_array_type::tag tag = cell_inst_wp_array_type::tag ();
iter->basic_iter (tag, InstancesEditableTag ()) = mp_insts->inst_tree (tag, InstancesEditableTag ()).begin_flat ();
} else {
cell_inst_array_type::tag tag = cell_inst_array_type::tag ();
iter->basic_iter (tag, InstancesEditableTag ()) = mp_insts->inst_tree (tag, InstancesEditableTag ()).begin_flat ();
}
} else if (iter->m_stable) {
if (iter->m_with_props) {
cell_inst_wp_array_type::tag tag = cell_inst_wp_array_type::tag ();
iter->basic_unsorted_iter (tag, InstancesEditableTag ()) = stable_unsorted_iter_wp_type (mp_insts->inst_tree (tag, InstancesEditableTag ()).begin (), mp_insts->inst_tree (tag, InstancesEditableTag ()).end ());
} else {
cell_inst_array_type::tag tag = cell_inst_array_type::tag ();
iter->basic_unsorted_iter (tag, InstancesEditableTag ()) = stable_unsorted_iter_type (mp_insts->inst_tree (tag, InstancesEditableTag ()).begin (), mp_insts->inst_tree (tag, InstancesEditableTag ()).end ());
}
} else {
if (iter->m_with_props) {
cell_inst_wp_array_type::tag tag = cell_inst_wp_array_type::tag ();
Expand Down
Loading