Skip to content

Commit 22368d9

Browse files
malibertymaliberty
authored
Merge pull request #8948 from The-OpenROAD-Project-staging/odb-refactor4
Odb refactor4
2 parents a48f738 + e1a454a commit 22368d9

File tree

188 files changed

+3754
-3748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+3754
-3748
lines changed

‎src/odb/src/codeGenerator/gen.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ def add_bitfield_flags(klass, flag_num_bits, flags_struct):
221221
total_num_bits = flag_num_bits
222222
if flag_num_bits > 0 and flag_num_bits % 32 != 0:
223223
spare_bits_field = {
224-
"name": "spare_bits_",
224+
"name": "spare_bits",
225225
"type": "uint",
226226
"bits": 32 - (flag_num_bits % 32),
227227
"flags": ["no-cmp", "no-set", "no-get", "no-serial"],

‎src/odb/src/codeGenerator/helper.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def get_class(schema, name):
128128
def get_table_name(name):
129129
if len(name) > 2 and name[:2] == "db":
130130
name = name[2:]
131-
return f"_{name.lower()}_tbl"
131+
return f"{name.lower()}_tbl_"
132132

133133

134134
def is_ref(type_name):

‎src/odb/src/codeGenerator/schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@
415415
"child":"dbProperty",
416416
"type":"1_n",
417417
"flags": ["no-serial", "private"],
418-
"tbl_name":"_prop_tbl"
418+
"tbl_name":"prop_tbl_"
419419
},
420420
{
421421
"parent":"dbChip",

‎src/odb/src/codeGenerator/schema/chip/dbBusPort.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,40 @@
1010
"schema":"db_schema_update_hierarchy"
1111
},
1212
{
13-
"name": "_from",
13+
"name": "from_",
1414
"type": "int",
1515
"flags":["no-set"],
1616
"default":"0",
1717
"schema":"db_schema_odb_busport"
1818
},
1919
{
20-
"name":"_to",
20+
"name":"to_",
2121
"type":"int",
2222
"flags":["no-set"],
2323
"default":"0",
2424
"schema":"db_schema_odb_busport"
2525
},
2626
{
27-
"name":"_port",
27+
"name":"port_",
2828
"type":"dbId<_dbModBTerm>",
2929
"flags":["no-set"],
3030
"schema":"db_schema_odb_busport",
3131
"parent":"dbBlock"
3232
},
3333
{
34-
"name":"_members",
34+
"name":"members_",
3535
"type":"dbId<_dbModBTerm>",
3636
"schema":"db_schema_odb_busport",
3737
"parent":"dbBlock"
3838
},
3939
{
40-
"name":"_last",
40+
"name":"last_",
4141
"type":"dbId<_dbModBTerm>",
4242
"schema":"db_schema_odb_busport",
4343
"parent":"dbBlock"
4444
},
4545
{
46-
"name":"_parent",
46+
"name":"parent_",
4747
"type":"dbId<_dbModule>",
4848
"flags":["no-set"],
4949
"schema":"db_schema_odb_busport",

‎src/odb/src/codeGenerator/schema/chip/dbChip.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,28 +118,28 @@
118118
"schema": "db_schema_chip_extended"
119119
},
120120
{
121-
"name": "_top",
121+
"name": "top_",
122122
"type": "dbId<_dbBlock>",
123123
"flags": ["private", "cmpgt"],
124124
"parent": "dbBlock"
125125
},
126126
{
127-
"name": "_block_tbl",
127+
"name": "block_tbl_",
128128
"type": "dbTable<_dbBlock>*",
129129
"flags": ["private", "no-serial"]
130130
},
131131
{
132-
"name": "_name_cache",
132+
"name": "name_cache_",
133133
"type": "_dbNameCache*",
134134
"flags": ["private", "no-cmp", "no-serial"]
135135
},
136136
{
137-
"name": "_block_itr",
137+
"name": "block_itr_",
138138
"type": "dbBlockItr*",
139139
"flags": ["private", "no-cmp", "no-serial"]
140140
},
141141
{
142-
"name": "_prop_itr",
142+
"name": "prop_itr_",
143143
"type": "dbPropertyItr*",
144144
"flags": ["private", "no-cmp", "no-serial"]
145145
},

‎src/odb/src/codeGenerator/schema/chip/dbGCellGrid.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@
5858
]
5959
},
6060
{
61-
"name": "x_grid_valid_",
61+
"name": "x_grid_valid",
6262
"flags": [
6363
"private"
6464
],
6565
"type": "bit"
6666
},
6767
{
68-
"name": "y_grid_valid_",
68+
"name": "y_grid_valid",
6969
"flags": [
7070
"private"
7171
],

‎src/odb/src/codeGenerator/schema/dbDatabase.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@
55
"hash" : "0x0",
66
"fields": [
77
{
8-
"name": "_magic1",
8+
"name": "magic1_",
99
"type": "uint",
1010
"flags": ["private", "no-cmp", "no-serial"]
1111
},
1212
{
13-
"name": "_magic2",
13+
"name": "magic2_",
1414
"type": "uint",
1515
"flags": ["private", "no-cmp", "no-serial"]
1616
},
1717
{
18-
"name": "_schema_major",
18+
"name": "schema_major_",
1919
"type": "uint",
2020
"flags": ["private", "no-cmp", "no-serial"]
2121
},
2222
{
23-
"name": "_schema_minor",
23+
"name": "schema_minor_",
2424
"type": "uint",
2525
"flags": ["private", "no-cmp", "no-serial"]
2626
},
2727
{
28-
"name": "_master_id",
28+
"name": "master_id_",
2929
"type": "uint",
3030
"flags": ["private", "no-serial"]
3131
},
3232
{
33-
"name": "_chip",
33+
"name": "chip_",
3434
"type": "dbId<_dbChip>",
3535
"flags": ["private", "no-serial"]
3636
},

‎src/odb/src/codeGenerator/schema/gds/dbGDSARef.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,39 @@
22
"name":"dbGDSARef",
33
"fields":[
44
{
5-
"name":"_origin",
5+
"name":"origin_",
66
"type":"Point"
77
},
88
{
9-
"name":"_lr",
9+
"name":"lr_",
1010
"type":"Point"
1111
},
1212
{
13-
"name":"_ul",
13+
"name":"ul_",
1414
"type":"Point"
1515
},
1616
{
17-
"name":"_propattr",
17+
"name":"propattr_",
1818
"type":"std::vector<std::pair<std::int16_t, std::string>>",
1919
"flags":["no-template", "no-get", "no-set"]
2020
},
2121
{
22-
"name":"_transform",
22+
"name":"transform_",
2323
"type":"dbGDSSTrans",
2424
"flags":[]
2525
},
2626
{
27-
"name":"_num_rows",
27+
"name":"num_rows_",
2828
"type":"int16_t",
2929
"default":"1"
3030
},
3131
{
32-
"name":"_num_columns",
32+
"name":"num_columns_",
3333
"type":"int16_t",
3434
"default":"1"
3535
},
3636
{
37-
"name":"_structure",
37+
"name":"structure_",
3838
"type":"dbId<_dbGDSStructure>",
3939
"parent":"dbGDSStructure",
4040
"flags":["no-get", "no-set"]

‎src/odb/src/codeGenerator/schema/gds/dbGDSBoundary.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
"name":"dbGDSBoundary",
33
"fields":[
44
{
5-
"name":"_layer",
5+
"name":"layer_",
66
"type":"int16_t",
77
"default":"0",
88
"flags":[]
99
},
1010
{
11-
"name":"_datatype",
11+
"name":"datatype_",
1212
"type":"int16_t",
1313
"default":"0",
1414
"flags":[]
1515
},
1616
{
17-
"name":"_xy",
17+
"name":"xy_",
1818
"type":"std::vector<Point>",
1919
"flags":["no-template"]
2020
},
2121
{
22-
"name":"_propattr",
22+
"name":"propattr_",
2323
"type":"std::vector<std::pair<std::int16_t, std::string>>",
2424
"flags":["no-template", "no-get", "no-set"]
2525
}

‎src/odb/src/codeGenerator/schema/gds/dbGDSBox.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
"name":"dbGDSBox",
33
"fields":[
44
{
5-
"name":"_layer",
5+
"name":"layer_",
66
"type":"int16_t",
77
"default":"0",
88
"flags":[]
99
},
1010
{
11-
"name":"_datatype",
11+
"name":"datatype_",
1212
"type":"int16_t",
1313
"default":"0",
1414
"flags":[]
1515
},
1616
{
17-
"name":"_bounds",
17+
"name":"bounds_",
1818
"type":"Rect",
1919
"flags":["no-template"]
2020
},
2121
{
22-
"name":"_propattr",
22+
"name":"propattr_",
2323
"type":"std::vector<std::pair<std::int16_t, std::string>>",
2424
"flags":["no-template", "no-get", "no-set"]
2525
}

0 commit comments

Comments
 (0)