Skip to content

Commit 88a8f4c

Browse files
malibertymaliberty
authored
Merge pull request #9111 from The-OpenROAD-Project-staging/odb-constexpr-naming
odb: use Google style naming for constexpr values
2 parents fecb042 + 23e3359 commit 88a8f4c

Some content is hidden

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

49 files changed

+394
-404
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
"child":"dbTechLayerMaxSpacingRule",
290290
"type":"1_n",
291291
"tbl_name":"max_spacing_rules_tbl_",
292-
"schema":"db_schema_max_spacing"
292+
"schema":"kSchemaMaxSpacing"
293293
},
294294
{
295295
"parent":"dbTechLayer",
@@ -314,28 +314,28 @@
314314
"child":"dbTechLayerForbiddenSpacingRule",
315315
"type":"1_n",
316316
"tbl_name":"forbidden_spacing_rules_tbl_",
317-
"schema":"db_schema_lef58_forbidden_spacing"
317+
"schema":"kSchemaLef58ForbiddenSpacing"
318318
},
319319
{
320320
"parent":"dbTechLayer",
321321
"child":"dbTechLayerKeepOutZoneRule",
322322
"type":"1_n",
323323
"tbl_name":"keepout_zone_rules_tbl_",
324-
"schema":"db_schema_keepout_zone"
324+
"schema":"kSchemaKeepoutZone"
325325
},
326326
{
327327
"parent":"dbTechLayer",
328328
"child":"dbTechLayerWrongDirSpacingRule",
329329
"type":"1_n",
330330
"tbl_name":"wrongdir_spacing_rules_tbl_",
331-
"schema":"db_schema_wrongdir_spacing"
331+
"schema":"kSchemaWrongdirSpacing"
332332
},
333333
{
334334
"parent":"dbTechLayer",
335335
"child":"dbTechLayerTwoWiresForbiddenSpcRule",
336336
"type":"1_n",
337337
"tbl_name":"two_wires_forbidden_spc_rules_tbl_",
338-
"schema":"db_schema_lef58_two_wires_forbidden_spacing"
338+
"schema":"kSchemaLef58TwoWiresForbiddenSpacing"
339339
},
340340
{
341341
"parent": "dbDft",
@@ -423,7 +423,7 @@
423423
"child":"dbChipRegion",
424424
"type":"1_n",
425425
"flags": [],
426-
"schema":"db_schema_chip_region",
426+
"schema":"kSchemaChipRegion",
427427
"tbl_name":"chip_region_tbl_"
428428
},
429429
{
@@ -432,14 +432,14 @@
432432
"type":"1_n",
433433
"flags": [],
434434
"tbl_name":"marker_categories_tbl_",
435-
"schema":"db_schema_chip_marker_categories"
435+
"schema":"kSchemaChipMarkerCategories"
436436
},
437437
{
438438
"parent":"dbChipRegion",
439439
"child":"dbChipBump",
440440
"type":"1_n",
441441
"flags": [],
442-
"schema":"db_schema_chip_bump",
442+
"schema":"kSchemaChipBump",
443443
"tbl_name":"chip_bump_tbl_"
444444
},
445445
{
@@ -463,39 +463,39 @@
463463
"child":"dbChipInst",
464464
"type":"1_n",
465465
"tbl_name":"chip_inst_tbl_",
466-
"schema":"db_schema_chip_inst",
466+
"schema":"kSchemaChipInst",
467467
"flags": ["no-serial"]
468468
},
469469
{
470470
"parent":"dbDatabase",
471471
"child":"dbChipRegionInst",
472472
"type":"1_n",
473473
"tbl_name":"chip_region_inst_tbl_",
474-
"schema":"db_schema_chip_region",
474+
"schema":"kSchemaChipRegion",
475475
"flags": ["no-serial"]
476476
},
477477
{
478478
"parent":"dbDatabase",
479479
"child":"dbChipConn",
480480
"type":"1_n",
481481
"tbl_name":"chip_conn_tbl_",
482-
"schema":"db_schema_chip_region",
482+
"schema":"kSchemaChipRegion",
483483
"flags": ["no-serial"]
484484
},
485485
{
486486
"parent":"dbDatabase",
487487
"child":"dbChipBumpInst",
488488
"type":"1_n",
489489
"tbl_name":"chip_bump_inst_tbl_",
490-
"schema":"db_schema_chip_bump",
490+
"schema":"kSchemaChipBump",
491491
"flags": ["no-serial"]
492492
},
493493
{
494494
"parent":"dbDatabase",
495495
"child":"dbChipNet",
496496
"type":"1_n",
497497
"tbl_name":"chip_net_tbl_",
498-
"schema":"db_schema_chip_region",
498+
"schema":"kSchemaChipRegion",
499499
"flags": ["no-serial"]
500500
}
501501
]

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,46 +7,46 @@
77
"type":"uint",
88
"flags":["private"],
99
"default":"0",
10-
"schema":"db_schema_update_hierarchy"
10+
"schema":"kSchemaUpdateHierarchy"
1111
},
1212
{
1313
"name": "from_",
1414
"type": "int",
1515
"flags":["no-set"],
1616
"default":"0",
17-
"schema":"db_schema_odb_busport"
17+
"schema":"kSchemaOdbBusport"
1818
},
1919
{
2020
"name":"to_",
2121
"type":"int",
2222
"flags":["no-set"],
2323
"default":"0",
24-
"schema":"db_schema_odb_busport"
24+
"schema":"kSchemaOdbBusport"
2525
},
2626
{
2727
"name":"port_",
2828
"type":"dbId<_dbModBTerm>",
2929
"flags":["no-set"],
30-
"schema":"db_schema_odb_busport",
30+
"schema":"kSchemaOdbBusport",
3131
"parent":"dbBlock"
3232
},
3333
{
3434
"name":"members_",
3535
"type":"dbId<_dbModBTerm>",
36-
"schema":"db_schema_odb_busport",
36+
"schema":"kSchemaOdbBusport",
3737
"parent":"dbBlock"
3838
},
3939
{
4040
"name":"last_",
4141
"type":"dbId<_dbModBTerm>",
42-
"schema":"db_schema_odb_busport",
42+
"schema":"kSchemaOdbBusport",
4343
"parent":"dbBlock"
4444
},
4545
{
4646
"name":"parent_",
4747
"type":"dbId<_dbModule>",
4848
"flags":["no-set"],
49-
"schema":"db_schema_odb_busport",
49+
"schema":"kSchemaOdbBusport",
5050
"parent":"dbBlock"
5151
}
5252
],

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,101 +21,101 @@
2121
{
2222
"name": "name_",
2323
"type": "char *",
24-
"schema": "db_schema_chip_extended",
24+
"schema": "kSchemaChipExtended",
2525
"default": "nullptr",
2626
"flags": ["no-set"]
2727
},
2828
{
2929
"name": "type_",
3030
"type": "uint",
3131
"default": 0,
32-
"schema": "db_schema_chip_extended",
32+
"schema": "kSchemaChipExtended",
3333
"flags": ["private"]
3434
},
3535
{
3636
"name": "offset_",
3737
"type": "Point",
3838
"default": "{}",
39-
"schema": "db_schema_chip_extended"
39+
"schema": "kSchemaChipExtended"
4040
},
4141
{
4242
"name": "width_",
4343
"type": "int",
4444
"default": "0",
45-
"schema": "db_schema_chip_extended"
45+
"schema": "kSchemaChipExtended"
4646
},
4747
{
4848
"name": "height_",
4949
"type": "int",
5050
"default": "0",
51-
"schema": "db_schema_chip_extended"
51+
"schema": "kSchemaChipExtended"
5252
},
5353
{
5454
"name": "thickness_",
5555
"type": "int",
5656
"default": "0",
57-
"schema": "db_schema_chip_extended"
57+
"schema": "kSchemaChipExtended"
5858
},
5959
{
6060
"name": "shrink_",
6161
"type": "float",
6262
"default": "0.0",
6363
"comment": "// range (0, 1]",
64-
"schema": "db_schema_chip_extended"
64+
"schema": "kSchemaChipExtended"
6565
},
6666
{
6767
"name": "seal_ring_east_",
6868
"type": "int",
6969
"default": "0",
70-
"schema": "db_schema_chip_extended"
70+
"schema": "kSchemaChipExtended"
7171
},
7272
{
7373
"name": "seal_ring_west_",
7474
"type": "int",
7575
"default": "0",
76-
"schema": "db_schema_chip_extended"
76+
"schema": "kSchemaChipExtended"
7777
},
7878
{
7979
"name": "seal_ring_north_",
8080
"type": "int",
8181
"default": "0",
82-
"schema": "db_schema_chip_extended"
82+
"schema": "kSchemaChipExtended"
8383
},
8484
{
8585
"name": "seal_ring_south_",
8686
"type": "int",
8787
"default": "0",
88-
"schema": "db_schema_chip_extended"
88+
"schema": "kSchemaChipExtended"
8989
},
9090
{
9191
"name": "scribe_line_east_",
9292
"type": "int",
9393
"default": "0",
94-
"schema": "db_schema_chip_extended"
94+
"schema": "kSchemaChipExtended"
9595
},
9696
{
9797
"name": "scribe_line_west_",
9898
"type": "int",
9999
"default": "0",
100-
"schema": "db_schema_chip_extended"
100+
"schema": "kSchemaChipExtended"
101101
},
102102
{
103103
"name": "scribe_line_north_",
104104
"type": "int",
105105
"default": "0",
106-
"schema": "db_schema_chip_extended"
106+
"schema": "kSchemaChipExtended"
107107
},
108108
{
109109
"name": "scribe_line_south_",
110110
"type": "int",
111111
"default": "0",
112-
"schema": "db_schema_chip_extended"
112+
"schema": "kSchemaChipExtended"
113113
},
114114
{
115115
"name": "tsv_",
116116
"type": "bool",
117117
"default": "false",
118-
"schema": "db_schema_chip_extended"
118+
"schema": "kSchemaChipExtended"
119119
},
120120
{
121121
"name": "top_",
@@ -147,19 +147,19 @@
147147
"name": "chipinsts_",
148148
"type": "dbId<_dbChipInst>",
149149
"flags": ["private"],
150-
"schema":"db_schema_chip_inst"
150+
"schema":"kSchemaChipInst"
151151
},
152152
{
153153
"name": "conns_",
154154
"type": "dbId<_dbChipConn>",
155155
"flags": ["private"],
156-
"schema": "db_schema_chip_region"
156+
"schema": "kSchemaChipRegion"
157157
},
158158
{
159159
"name": "nets_",
160160
"type": "dbId<_dbChipNet>",
161161
"flags": ["private"],
162-
"schema": "db_schema_chip_bump"
162+
"schema": "kSchemaChipBump"
163163
},
164164
{
165165
"name": "chipinsts_map_",
@@ -175,7 +175,7 @@
175175
"name": "tech_",
176176
"type": "dbId<_dbTech>",
177177
"flags": ["private"],
178-
"schema": "db_schema_chip_tech"
178+
"schema": "kSchemaChipTech"
179179
},
180180
{
181181
"name": "marker_categories_map_",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"name":"chip_region_insts_",
3939
"type":"dbId<_dbChipRegionInst>",
4040
"flags":["private"],
41-
"schema":"db_schema_chip_region"
41+
"schema":"kSchemaChipRegion"
4242
},
4343
{
4444
"name":"region_insts_map_",
@@ -51,4 +51,4 @@
5151
"odb/dbTypes.h"
5252
],
5353
"cpp_includes": []
54-
}
54+
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{
2626
"name": "via_layer_",
2727
"type": "dbId<_dbTechLayer>",
28-
"schema":"db_schema_db_guide_via_layer",
28+
"schema":"kSchemaDbGuideViaLayer",
2929
"flags": [
3030
"private"
3131
]
@@ -39,7 +39,7 @@
3939
{
4040
"name":"is_congested_",
4141
"type":"bool",
42-
"schema":"db_schema_db_guide_congested",
42+
"schema":"kSchemaDbGuideCongested",
4343
"default":"false",
4444
"flags": [
4545
"private"
@@ -48,7 +48,7 @@
4848
{
4949
"name":"is_jumper_",
5050
"type":"bool",
51-
"schema":"db_schema_has_jumpers",
51+
"schema":"kSchemaHasJumpers",
5252
"default":"false",
5353
"flags": [
5454
"private"
@@ -57,7 +57,7 @@
5757
{
5858
"name":"is_connect_to_term_",
5959
"type":"bool",
60-
"schema":"db_schema_guide_connected_to_term",
60+
"schema":"kSchemaGuideConnectedToTerm",
6161
"default":"false",
6262
"flags": [
6363
"private"

0 commit comments

Comments
 (0)