Skip to content

Commit 666d241

Browse files
ravi-varadarajanravi-varadarajan
committed
Merge remote-tracking branch 'origin/master' into secure_hier_rtlmp
Signed-off-by: Ravi Varadarajan <[email protected]>
2 parents 5e3c4dc + 7943c16 commit 666d241

File tree

8 files changed

+322
-316
lines changed

8 files changed

+322
-316
lines changed

‎docs/conf.py‎

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -90,54 +90,50 @@
9090
html_theme = "sphinx_symbiflow_theme"
9191

9292
html_theme_options = {
93-
# Specify a list of menu in Header.
94-
# Tuples forms:
95-
# ('Name', 'external url or path of pages in the document', boolean, 'icon name')
96-
#
97-
# Third argument:
98-
# True indicates an external link.
99-
# False indicates path of pages in the document.
100-
#
101-
# Fourth argument:
102-
# Specify the icon name.
103-
# For details see link.
104-
# https://material.io/icons/
105-
'header_links': [
106-
('Home', 'index', False, 'home'),
107-
("The OpenROAD Project", "https://theopenroadproject.org", True, 'launch'),
108-
("GitHub", "https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts", True, 'link')
93+
# Repository integration
94+
# Set the repo url for the link to appear
95+
'github_url': 'https://github.com/The-OpenROAD-Project/OpenROAD-flow-scripts',
96+
# The name of the repo. If must be set if github_url is set
97+
'repo_name': 'OpenROAD Flow',
98+
# Must be one of github, gitlab or bitbucket
99+
'repo_type': 'github',
100+
101+
# Set the name to appear in the left sidebar/header. If not provided, uses
102+
# html_short_title if defined, or html_title
103+
'nav_title': "OpenROAD Flow",
104+
105+
# A list of dictionaries where each has three keys:
106+
# href: The URL or pagename (str)
107+
# title: The title to appear (str)
108+
# internal: Flag indicating to use pathto (bool)
109+
'nav_links': [
110+
{"title": "Home", "href": "index", "internal": True},
111+
{"title": "The OpenROAD Project", "href": "https://theopenroadproject.org", "internal": False},
109112
],
110113

111114
# Customize css colors.
112115
# For details see link.
113116
# https://getmdl.io/customize/index.html
114117
#
115-
# Values: amber, blue, brown, cyan deep_orange, deep_purple, green, grey, indigo, light_blue,
116-
# light_green, lime, orange, pink, purple, red, teal, yellow(Default: indigo)
117-
'primary_color': 'indigo',
118-
# Values: Same as primary_color. (Default: pink)
119-
'accent_color': 'blue',
120-
121-
# Customize layout.
122-
# For details see link.
123-
# https://getmdl.io/components/index.html#layout-section
124-
'fixed_drawer': True,
125-
'fixed_header': True,
126-
'header_waterfall': True,
127-
'header_scroll': False,
128-
129-
# Render title in header.
130-
# Values: True, False (Default: False)
131-
'show_header_title': False,
132-
# Render title in drawer.
133-
# Values: True, False (Default: True)
134-
'show_drawer_title': True,
135-
# Render footer.
136-
# Values: True, False (Default: True)
137-
'show_footer': True,
118+
# Primary colors:
119+
# red, pink, purple, deep-purple, indigo, blue, light-blue, cyan,
120+
# teal, green, light-green, lime, yellow, amber, orange, deep-orange,
121+
# brown, grey, blue-grey, white
122+
# (Default: deep-purple)
123+
'color_primary': 'indigo',
124+
# Values: Same as color_primary.
125+
#(Default: indigo)
126+
'color_accent': 'blue',
138127

139128
# Hide the symbiflow links
140129
'hide_symbiflow_links': True,
130+
131+
"html_minify": False,
132+
"html_prettify": True,
133+
"css_minify": True,
134+
"globaltoc_depth": 2,
135+
"table_classes": ["plain"],
136+
"master_doc": False,
141137
}
142138

143139
# Add any paths that contain custom static files (such as style sheets) here,

‎docs/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
git+https://github.com/SymbiFlow/sphinx_materialdesign_theme.git#egg=sphinx-symbiflow-theme
1+
git+https://github.com/f4pga/sphinx_f4pga_theme.git
22
git+https://github.com/executablebooks/sphinx-external-toc
33
sphinx
44
sphinx-autobuild

‎flow/designs/gf12/swerv_wrapper/metadata-base-ok.json‎

Lines changed: 251 additions & 248 deletions
Large diffs are not rendered by default.

‎flow/designs/gf12/swerv_wrapper/rules-base.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"compare": "=="
99
},
1010
"placeopt__design__instance__area": {
11-
"value": 179021,
11+
"value": 178761,
1212
"compare": "<="
1313
},
1414
"placeopt__design__instance__count__stdcell": {
15-
"value": 118375,
15+
"value": 118062,
1616
"compare": "<="
1717
},
1818
"detailedplace__design__violations": {
@@ -24,27 +24,27 @@
2424
"compare": ">="
2525
},
2626
"cts__timing__setup__ws__pre_repair": {
27-
"value": -464.51,
27+
"value": -375.0,
2828
"compare": ">="
2929
},
3030
"cts__timing__setup__ws__post_repair": {
31-
"value": -410.91,
31+
"value": -375.0,
3232
"compare": ">="
3333
},
3434
"cts__design__instance__count__setup_buffer": {
35-
"value": 5149,
35+
"value": 5133,
3636
"compare": "<="
3737
},
3838
"cts__design__instance__count__hold_buffer": {
39-
"value": 8428,
39+
"value": 14038,
4040
"compare": "<="
4141
},
4242
"globalroute__timing__setup__ws": {
4343
"value": -34.36,
4444
"compare": ">="
4545
},
4646
"detailedroute__route__wirelength": {
47-
"value": 2281983,
47+
"value": 2247155,
4848
"compare": "<="
4949
},
5050
"detailedroute__route__drc_errors": {
@@ -56,7 +56,7 @@
5656
"compare": ">="
5757
},
5858
"finish__design__instance__area": {
59-
"value": 184490,
59+
"value": 181933,
6060
"compare": "<="
6161
},
6262
"finish__timing__drv__max_slew_limit": {
@@ -72,7 +72,7 @@
7272
"compare": ">="
7373
},
7474
"finish__timing__drv__setup_violation_count": {
75-
"value": 11,
75+
"value": 10,
7676
"compare": "<="
7777
},
7878
"finish__timing__drv__hold_violation_count": {

‎flow/platforms/asap7/config.mk‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,14 @@ export CTS_BUF_CELL ?= BUFx4_ASAP7_75t_R
102102
export CTS_BUF_DISTANCE ?= 60
103103

104104
# Fill cells used in fill cell insertion
105-
export FILL_CELLS = "FILLERxp5_ASAP7_75t_R"
105+
export FILL_CELLS = \
106+
FILLERxp5_ASAP7_75t_R \
107+
FILLER_ASAP7_75t_R \
108+
DECAPx1_ASAP7_75t_R \
109+
DECAPx2_ASAP7_75t_R \
110+
DECAPx4_ASAP7_75t_R \
111+
DECAPx6_ASAP7_75t_R \
112+
DECAPx10_ASAP7_75t_R
106113

107114
export TAP_CELL_NAME = TAPCELL_ASAP7_75t_R
108115

‎flow/platforms/asap7/lef/asap7sc7p5t_28_L_1x_220121a.lef‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6063,7 +6063,7 @@ MACRO CKINVDCx9p33_ASAP7_75t_L
60636063
END CKINVDCx9p33_ASAP7_75t_L
60646064

60656065
MACRO DECAPx10_ASAP7_75t_L
6066-
CLASS CORE ;
6066+
CLASS CORE SPACER ;
60676067
ORIGIN 0 0 ;
60686068
FOREIGN DECAPx10_ASAP7_75t_L 0 0 ;
60696069
SIZE 1.188 BY 0.27 ;
@@ -6097,7 +6097,7 @@ MACRO DECAPx10_ASAP7_75t_L
60976097
END DECAPx10_ASAP7_75t_L
60986098

60996099
MACRO DECAPx1_ASAP7_75t_L
6100-
CLASS CORE ;
6100+
CLASS CORE SPACER ;
61016101
ORIGIN 0 0 ;
61026102
FOREIGN DECAPx1_ASAP7_75t_L 0 0 ;
61036103
SIZE 0.216 BY 0.27 ;
@@ -6131,7 +6131,7 @@ MACRO DECAPx1_ASAP7_75t_L
61316131
END DECAPx1_ASAP7_75t_L
61326132

61336133
MACRO DECAPx2_ASAP7_75t_L
6134-
CLASS CORE ;
6134+
CLASS CORE SPACER ;
61356135
ORIGIN 0 0 ;
61366136
FOREIGN DECAPx2_ASAP7_75t_L 0 0 ;
61376137
SIZE 0.324 BY 0.27 ;
@@ -6165,7 +6165,7 @@ MACRO DECAPx2_ASAP7_75t_L
61656165
END DECAPx2_ASAP7_75t_L
61666166

61676167
MACRO DECAPx2b_ASAP7_75t_L
6168-
CLASS CORE ;
6168+
CLASS CORE SPACER ;
61696169
ORIGIN 0 0 ;
61706170
FOREIGN DECAPx2b_ASAP7_75t_L 0 0 ;
61716171
SIZE 0.324 BY 0.27 ;
@@ -6201,7 +6201,7 @@ MACRO DECAPx2b_ASAP7_75t_L
62016201
END DECAPx2b_ASAP7_75t_L
62026202

62036203
MACRO DECAPx4_ASAP7_75t_L
6204-
CLASS CORE ;
6204+
CLASS CORE SPACER ;
62056205
ORIGIN 0 0 ;
62066206
FOREIGN DECAPx4_ASAP7_75t_L 0 0 ;
62076207
SIZE 0.54 BY 0.27 ;
@@ -6235,7 +6235,7 @@ MACRO DECAPx4_ASAP7_75t_L
62356235
END DECAPx4_ASAP7_75t_L
62366236

62376237
MACRO DECAPx6_ASAP7_75t_L
6238-
CLASS CORE ;
6238+
CLASS CORE SPACER ;
62396239
ORIGIN 0 0 ;
62406240
FOREIGN DECAPx6_ASAP7_75t_L 0 0 ;
62416241
SIZE 0.756 BY 0.27 ;

‎flow/platforms/asap7/lef/asap7sc7p5t_28_R_1x_220121a.lef‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6063,7 +6063,7 @@ MACRO CKINVDCx9p33_ASAP7_75t_R
60636063
END CKINVDCx9p33_ASAP7_75t_R
60646064

60656065
MACRO DECAPx10_ASAP7_75t_R
6066-
CLASS CORE ;
6066+
CLASS CORE SPACER ;
60676067
ORIGIN 0 0 ;
60686068
FOREIGN DECAPx10_ASAP7_75t_R 0 0 ;
60696069
SIZE 1.188 BY 0.27 ;
@@ -6097,7 +6097,7 @@ MACRO DECAPx10_ASAP7_75t_R
60976097
END DECAPx10_ASAP7_75t_R
60986098

60996099
MACRO DECAPx1_ASAP7_75t_R
6100-
CLASS CORE ;
6100+
CLASS CORE SPACER ;
61016101
ORIGIN 0 0 ;
61026102
FOREIGN DECAPx1_ASAP7_75t_R 0 0 ;
61036103
SIZE 0.216 BY 0.27 ;
@@ -6131,7 +6131,7 @@ MACRO DECAPx1_ASAP7_75t_R
61316131
END DECAPx1_ASAP7_75t_R
61326132

61336133
MACRO DECAPx2_ASAP7_75t_R
6134-
CLASS CORE ;
6134+
CLASS CORE SPACER ;
61356135
ORIGIN 0 0 ;
61366136
FOREIGN DECAPx2_ASAP7_75t_R 0 0 ;
61376137
SIZE 0.324 BY 0.27 ;
@@ -6165,7 +6165,7 @@ MACRO DECAPx2_ASAP7_75t_R
61656165
END DECAPx2_ASAP7_75t_R
61666166

61676167
MACRO DECAPx2b_ASAP7_75t_R
6168-
CLASS CORE ;
6168+
CLASS CORE SPACER ;
61696169
ORIGIN 0 0 ;
61706170
FOREIGN DECAPx2b_ASAP7_75t_R 0 0 ;
61716171
SIZE 0.324 BY 0.27 ;
@@ -6201,7 +6201,7 @@ MACRO DECAPx2b_ASAP7_75t_R
62016201
END DECAPx2b_ASAP7_75t_R
62026202

62036203
MACRO DECAPx4_ASAP7_75t_R
6204-
CLASS CORE ;
6204+
CLASS CORE SPACER ;
62056205
ORIGIN 0 0 ;
62066206
FOREIGN DECAPx4_ASAP7_75t_R 0 0 ;
62076207
SIZE 0.54 BY 0.27 ;
@@ -6235,7 +6235,7 @@ MACRO DECAPx4_ASAP7_75t_R
62356235
END DECAPx4_ASAP7_75t_R
62366236

62376237
MACRO DECAPx6_ASAP7_75t_R
6238-
CLASS CORE ;
6238+
CLASS CORE SPACER ;
62396239
ORIGIN 0 0 ;
62406240
FOREIGN DECAPx6_ASAP7_75t_R 0 0 ;
62416241
SIZE 0.756 BY 0.27 ;

‎flow/platforms/asap7/lef/asap7sc7p5t_28_SL_1x_220121a.lef‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6063,7 +6063,7 @@ MACRO CKINVDCx9p33_ASAP7_75t_SL
60636063
END CKINVDCx9p33_ASAP7_75t_SL
60646064

60656065
MACRO DECAPx10_ASAP7_75t_SL
6066-
CLASS CORE ;
6066+
CLASS CORE SPACER ;
60676067
ORIGIN 0 0 ;
60686068
FOREIGN DECAPx10_ASAP7_75t_SL 0 0 ;
60696069
SIZE 1.188 BY 0.27 ;
@@ -6097,7 +6097,7 @@ MACRO DECAPx10_ASAP7_75t_SL
60976097
END DECAPx10_ASAP7_75t_SL
60986098

60996099
MACRO DECAPx1_ASAP7_75t_SL
6100-
CLASS CORE ;
6100+
CLASS CORE SPACER ;
61016101
ORIGIN 0 0 ;
61026102
FOREIGN DECAPx1_ASAP7_75t_SL 0 0 ;
61036103
SIZE 0.216 BY 0.27 ;
@@ -6131,7 +6131,7 @@ MACRO DECAPx1_ASAP7_75t_SL
61316131
END DECAPx1_ASAP7_75t_SL
61326132

61336133
MACRO DECAPx2_ASAP7_75t_SL
6134-
CLASS CORE ;
6134+
CLASS CORE SPACER ;
61356135
ORIGIN 0 0 ;
61366136
FOREIGN DECAPx2_ASAP7_75t_SL 0 0 ;
61376137
SIZE 0.324 BY 0.27 ;
@@ -6165,7 +6165,7 @@ MACRO DECAPx2_ASAP7_75t_SL
61656165
END DECAPx2_ASAP7_75t_SL
61666166

61676167
MACRO DECAPx2b_ASAP7_75t_SL
6168-
CLASS CORE ;
6168+
CLASS CORE SPACER ;
61696169
ORIGIN 0 0 ;
61706170
FOREIGN DECAPx2b_ASAP7_75t_SL 0 0 ;
61716171
SIZE 0.324 BY 0.27 ;
@@ -6201,7 +6201,7 @@ MACRO DECAPx2b_ASAP7_75t_SL
62016201
END DECAPx2b_ASAP7_75t_SL
62026202

62036203
MACRO DECAPx4_ASAP7_75t_SL
6204-
CLASS CORE ;
6204+
CLASS CORE SPACER ;
62056205
ORIGIN 0 0 ;
62066206
FOREIGN DECAPx4_ASAP7_75t_SL 0 0 ;
62076207
SIZE 0.54 BY 0.27 ;
@@ -6235,7 +6235,7 @@ MACRO DECAPx4_ASAP7_75t_SL
62356235
END DECAPx4_ASAP7_75t_SL
62366236

62376237
MACRO DECAPx6_ASAP7_75t_SL
6238-
CLASS CORE ;
6238+
CLASS CORE SPACER ;
62396239
ORIGIN 0 0 ;
62406240
FOREIGN DECAPx6_ASAP7_75t_SL 0 0 ;
62416241
SIZE 0.756 BY 0.27 ;

0 commit comments

Comments
 (0)