Skip to content

Commit 1e41ec8

Browse files
gudehgudeh
committed
Merge remote-tracking branch 'private/master' into gpl-extend-max-iter-by-routability
2 parents e370b4e + 3821007 commit 1e41ec8

File tree

15 files changed

+76
-213
lines changed

15 files changed

+76
-213
lines changed

‎src/gui/src/dbDescriptors.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1621,9 +1621,9 @@ void DbNetDescriptor::highlight(std::any object, Painter& painter) const
16211621
}
16221622
}
16231623

1624-
bool draw_flywires = painter.getOptions()->isFlywireHighlightOnly();
1624+
bool draw_flywires = true;
16251625

1626-
if (!draw_flywires) {
1626+
if (!painter.getOptions()->isFlywireHighlightOnly()) {
16271627
odb::dbWire* wire = net->getWire();
16281628
if (wire) {
16291629
draw_flywires = false;

‎src/odb/src/codeGenerator/templates/serializer_out.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,7 @@
1414
stream << {{field.name}}bit_field;
1515
{% else %}
1616
{% if 'no-serial' not in field.flags %}
17-
{% if 'schema' in field %}
18-
if (obj.getDatabase()->isSchema({{field.schema}})) {
19-
{% endif %}
2017
stream << {% if field.table %}*{% endif %}obj.{{field.name}};
21-
{% if 'schema' in field %}
22-
}
23-
{% endif %}
2418
{% endif %}
2519
{% endif %}
2620
{% endfor %}

‎src/odb/src/db/dbBTerm.cpp‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ bool _dbBTerm::operator==(const _dbBTerm& rhs) const
156156

157157
dbOStream& operator<<(dbOStream& stream, const _dbBTerm& bterm)
158158
{
159-
dbBlock* block = (dbBlock*) (bterm.getOwner());
160-
_dbDatabase* db = (_dbDatabase*) (block->getDataBase());
161159
uint* bit_field = (uint*) &bterm._flags;
162160
stream << *bit_field;
163161
stream << bterm._ext_id;
@@ -166,25 +164,17 @@ dbOStream& operator<<(dbOStream& stream, const _dbBTerm& bterm)
166164
stream << bterm._net;
167165
stream << bterm._next_bterm;
168166
stream << bterm._prev_bterm;
169-
if (db->isSchema(db_schema_update_hierarchy)) {
170-
stream << bterm._mnet;
171-
stream << bterm._next_modnet_bterm;
172-
stream << bterm._prev_modnet_bterm;
173-
}
167+
stream << bterm._mnet;
168+
stream << bterm._next_modnet_bterm;
169+
stream << bterm._prev_modnet_bterm;
174170
stream << bterm._parent_block;
175171
stream << bterm._parent_iterm;
176172
stream << bterm._bpins;
177173
stream << bterm._ground_pin;
178174
stream << bterm._supply_pin;
179-
if (bterm.getDatabase()->isSchema(db_schema_bterm_constraint_region)) {
180-
stream << bterm._constraint_region;
181-
}
182-
if (bterm.getDatabase()->isSchema(db_schema_bterm_mirrored_pin)) {
183-
stream << bterm._mirrored_bterm;
184-
}
185-
if (bterm.getDatabase()->isSchema(db_schema_bterm_is_mirrored)) {
186-
stream << bterm._is_mirrored;
187-
}
175+
stream << bterm._constraint_region;
176+
stream << bterm._mirrored_bterm;
177+
stream << bterm._is_mirrored;
188178

189179
return stream;
190180
}

‎src/odb/src/db/dbBlock.cpp‎

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbBlock& block)
738738
(**cbitr)().inDbBlockStreamOutBefore(
739739
(dbBlock*) &block); // client ECO initialization - payam
740740
}
741-
_dbDatabase* db = block.getImpl()->getDatabase();
742741
dbOStreamScope scope(stream, "dbBlock");
743742
stream << block._def_units;
744743
stream << block._dbu_per_micron;
@@ -750,9 +749,7 @@ dbOStream& operator<<(dbOStream& stream, const _dbBlock& block)
750749
stream << block._corner_name_list;
751750
stream << block._name;
752751
stream << block._die_area;
753-
if (db->isSchema(db_schema_dbblock_blocked_regions_for_pins)) {
754-
stream << block._blocked_regions_for_pins;
755-
}
752+
stream << block._blocked_regions_for_pins;
756753
stream << block._tech;
757754
stream << block._chip;
758755
stream << block._bbox;
@@ -786,22 +783,13 @@ dbOStream& operator<<(dbOStream& stream, const _dbBlock& block)
786783
stream << *block._iterm_tbl;
787784
stream << *block._net_tbl;
788785
stream << *block._inst_hdr_tbl;
789-
if (db->isSchema(db_schema_db_remove_hash)) {
790-
stream << *block._module_tbl;
791-
stream << *block._inst_tbl;
792-
} else {
793-
stream << *block._inst_tbl;
794-
stream << *block._module_tbl;
795-
}
786+
stream << *block._module_tbl;
787+
stream << *block._inst_tbl;
796788
stream << *block._modinst_tbl;
797-
if (db->isSchema(db_schema_update_hierarchy)) {
798-
stream << *block._modbterm_tbl;
799-
if (db->isSchema(db_schema_db_remove_hash)) {
800-
stream << *block._busport_tbl;
801-
}
802-
stream << *block._moditerm_tbl;
803-
stream << *block._modnet_tbl;
804-
}
789+
stream << *block._modbterm_tbl;
790+
stream << *block._busport_tbl;
791+
stream << *block._moditerm_tbl;
792+
stream << *block._modnet_tbl;
805793
stream << *block._powerdomain_tbl;
806794
stream << *block._logicport_tbl;
807795
stream << *block._powerswitch_tbl;
@@ -842,18 +830,12 @@ dbOStream& operator<<(dbOStream& stream, const _dbBlock& block)
842830
stream << *block._dft_tbl;
843831
stream << *block._marker_categories_tbl;
844832
stream << block._marker_category_hash;
845-
if (block.getDatabase()->isSchema(db_schema_dbblock_layers_ranges)) {
846-
stream << block._min_routing_layer;
847-
stream << block._max_routing_layer;
848-
stream << block._min_layer_for_clock;
849-
stream << block._max_layer_for_clock;
850-
}
851-
if (db->isSchema(db_schema_block_pin_groups)) {
852-
stream << block._bterm_groups;
853-
}
854-
if (db->isSchema(db_schema_bterm_top_layer_grid)) {
855-
stream << block._bterm_top_layer_grid;
856-
}
833+
stream << block._min_routing_layer;
834+
stream << block._max_routing_layer;
835+
stream << block._min_layer_for_clock;
836+
stream << block._max_layer_for_clock;
837+
stream << block._bterm_groups;
838+
stream << block._bterm_top_layer_grid;
857839

858840
//---------------------------------------------------------- stream out
859841
// properties

‎src/odb/src/db/dbBusPort.cpp‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -86,27 +86,13 @@ dbIStream& operator>>(dbIStream& stream, _dbBusPort& obj)
8686

8787
dbOStream& operator<<(dbOStream& stream, const _dbBusPort& obj)
8888
{
89-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
90-
stream << obj._flags;
91-
}
92-
if (obj.getDatabase()->isSchema(db_schema_odb_busport)) {
93-
stream << obj._from;
94-
}
95-
if (obj.getDatabase()->isSchema(db_schema_odb_busport)) {
96-
stream << obj._to;
97-
}
98-
if (obj.getDatabase()->isSchema(db_schema_odb_busport)) {
99-
stream << obj._port;
100-
}
101-
if (obj.getDatabase()->isSchema(db_schema_odb_busport)) {
102-
stream << obj._members;
103-
}
104-
if (obj.getDatabase()->isSchema(db_schema_odb_busport)) {
105-
stream << obj._last;
106-
}
107-
if (obj.getDatabase()->isSchema(db_schema_odb_busport)) {
108-
stream << obj._parent;
109-
}
89+
stream << obj._flags;
90+
stream << obj._from;
91+
stream << obj._to;
92+
stream << obj._port;
93+
stream << obj._members;
94+
stream << obj._last;
95+
stream << obj._parent;
11096
return stream;
11197
}
11298

‎src/odb/src/db/dbGuide.cpp‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,11 @@ dbOStream& operator<<(dbOStream& stream, const _dbGuide& obj)
8585
stream << obj.net_;
8686
stream << obj.box_;
8787
stream << obj.layer_;
88-
if (obj.getDatabase()->isSchema(db_schema_db_guide_via_layer)) {
89-
stream << obj.via_layer_;
90-
}
88+
stream << obj.via_layer_;
9189
stream << obj.guide_next_;
92-
if (obj.getDatabase()->isSchema(db_schema_db_guide_congested)) {
93-
stream << obj.is_congested_;
94-
}
95-
if (obj.getDatabase()->isSchema(db_schema_has_jumpers)) {
96-
stream << obj.is_jumper_;
97-
}
98-
if (obj.getDatabase()->isSchema(db_schema_guide_connected_to_term)) {
99-
stream << obj.is_connect_to_term_;
100-
}
90+
stream << obj.is_congested_;
91+
stream << obj.is_jumper_;
92+
stream << obj.is_connect_to_term_;
10193
return stream;
10294
}
10395

‎src/odb/src/db/dbITerm.h‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,16 @@ inline _dbITerm::_dbITerm(_dbDatabase*, const _dbITerm& i)
9898

9999
inline dbOStream& operator<<(dbOStream& stream, const _dbITerm& iterm)
100100
{
101-
dbBlock* block = (dbBlock*) (iterm.getOwner());
102-
_dbDatabase* db = (_dbDatabase*) (block->getDataBase());
103101
uint* bit_field = (uint*) &iterm._flags;
104102
stream << *bit_field;
105103
stream << iterm._ext_id;
106104
stream << iterm._net;
107105
stream << iterm._inst;
108106
stream << iterm._next_net_iterm;
109107
stream << iterm._prev_net_iterm;
110-
if (db->isSchema(db_schema_update_hierarchy)) {
111-
stream << iterm._mnet;
112-
stream << iterm._next_modnet_iterm;
113-
stream << iterm._prev_modnet_iterm;
114-
}
108+
stream << iterm._mnet;
109+
stream << iterm._next_modnet_iterm;
110+
stream << iterm._prev_modnet_iterm;
115111
stream << iterm.aps_;
116112
return stream;
117113
}

‎src/odb/src/db/dbModBTerm.cpp‎

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -115,36 +115,16 @@ dbIStream& operator>>(dbIStream& stream, _dbModBTerm& obj)
115115

116116
dbOStream& operator<<(dbOStream& stream, const _dbModBTerm& obj)
117117
{
118-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
119-
stream << obj._name;
120-
}
121-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
122-
stream << obj._flags;
123-
}
124-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
125-
stream << obj._parent_moditerm;
126-
}
127-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
128-
stream << obj._parent;
129-
}
130-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
131-
stream << obj._modnet;
132-
}
133-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
134-
stream << obj._next_net_modbterm;
135-
}
136-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
137-
stream << obj._prev_net_modbterm;
138-
}
139-
if (obj.getDatabase()->isSchema(db_schema_odb_busport)) {
140-
stream << obj._busPort;
141-
}
142-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
143-
stream << obj._next_entry;
144-
}
145-
if (obj.getDatabase()->isSchema(db_schema_hier_port_removal)) {
146-
stream << obj._prev_entry;
147-
}
118+
stream << obj._name;
119+
stream << obj._flags;
120+
stream << obj._parent_moditerm;
121+
stream << obj._parent;
122+
stream << obj._modnet;
123+
stream << obj._next_net_modbterm;
124+
stream << obj._prev_net_modbterm;
125+
stream << obj._busPort;
126+
stream << obj._next_entry;
127+
stream << obj._prev_entry;
148128
return stream;
149129
}
150130

‎src/odb/src/db/dbModITerm.cpp‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -101,30 +101,14 @@ dbIStream& operator>>(dbIStream& stream, _dbModITerm& obj)
101101

102102
dbOStream& operator<<(dbOStream& stream, const _dbModITerm& obj)
103103
{
104-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
105-
stream << obj._name;
106-
}
107-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
108-
stream << obj._parent;
109-
}
110-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
111-
stream << obj._child_modbterm;
112-
}
113-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
114-
stream << obj._mod_net;
115-
}
116-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
117-
stream << obj._next_net_moditerm;
118-
}
119-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
120-
stream << obj._prev_net_moditerm;
121-
}
122-
if (obj.getDatabase()->isSchema(db_schema_update_hierarchy)) {
123-
stream << obj._next_entry;
124-
}
125-
if (obj.getDatabase()->isSchema(db_schema_hier_port_removal)) {
126-
stream << obj._prev_entry;
127-
}
104+
stream << obj._name;
105+
stream << obj._parent;
106+
stream << obj._child_modbterm;
107+
stream << obj._mod_net;
108+
stream << obj._next_net_moditerm;
109+
stream << obj._prev_net_moditerm;
110+
stream << obj._next_entry;
111+
stream << obj._prev_entry;
128112
return stream;
129113
}
130114

‎src/odb/src/db/dbModInst.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,7 @@ dbOStream& operator<<(dbOStream& stream, const _dbModInst& obj)
118118
stream << obj._group_next;
119119
stream << obj._group;
120120
// User Code Begin <<
121-
dbBlock* block = (dbBlock*) (obj.getOwner());
122-
auto db_ = (_dbDatabase*) (block->getDataBase());
123-
if (db_->isSchema(db_schema_update_hierarchy)) {
124-
stream << obj._moditerms;
125-
}
121+
stream << obj._moditerms;
126122
// User Code End <<
127123
return stream;
128124
}

0 commit comments

Comments
 (0)