Skip to content

Commit 8b70147

Browse files
gudehgudeh
committed
Merge remote-tracking branch 'private/master' into secure-gpl-fix-incremental
2 parents 2e57e7f + 62c4739 commit 8b70147

File tree

27 files changed

+123
-123
lines changed

27 files changed

+123
-123
lines changed

‎flow/designs/asap7/aes-block/rules-base.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"compare": ">="
3333
},
3434
"cts__timing__setup__tns": {
35-
"value": -5150.0,
35+
"value": -5150,
3636
"compare": ">="
3737
},
3838
"cts__timing__hold__ws": {
@@ -52,7 +52,7 @@
5252
"compare": ">="
5353
},
5454
"globalroute__timing__setup__tns": {
55-
"value": -4295.0,
55+
"value": -4295,
5656
"compare": ">="
5757
},
5858
"globalroute__timing__hold__ws": {
@@ -99,4 +99,4 @@
9999
"value": 7206,
100100
"compare": "<="
101101
}
102-
}
102+
}

‎flow/designs/nangate45/bp_fe_top/rules-base.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@
8888
"compare": ">="
8989
},
9090
"finish__timing__hold__ws": {
91-
"value": 0.0,
91+
"value": -0.002,
9292
"compare": ">="
9393
},
9494
"finish__timing__hold__tns": {
95-
"value": 0.0,
95+
"value": -0.003,
9696
"compare": ">="
9797
},
9898
"finish__design__instance__area": {
9999
"value": 247483,
100100
"compare": "<="
101101
}
102-
}
102+
}

‎flow/designs/nangate45/bp_multi_top/rules-base.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"synth__design__instance__area__stdcell": {
3-
"value": 568000.0,
3+
"value": 570000.0,
44
"compare": "<="
55
},
66
"constraints__clocks__count": {
77
"value": 1,
88
"compare": "=="
99
},
1010
"placeopt__design__instance__area": {
11-
"value": 580168,
11+
"value": 580304,
1212
"compare": "<="
1313
},
1414
"placeopt__design__instance__count__stdcell": {
@@ -96,7 +96,7 @@
9696
"compare": ">="
9797
},
9898
"finish__design__instance__area": {
99-
"value": 586999,
99+
"value": 587157,
100100
"compare": "<="
101101
}
102-
}
102+
}

‎flow/designs/nangate45/tinyRocket/rules-base.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@
9999
"value": 62486,
100100
"compare": "<="
101101
}
102-
}
102+
}

‎flow/designs/rapidus2hp/cva6/config.mk‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,31 +94,31 @@ export ADDITIONAL_LIBS += $(PLATFORM_DIR)/ram/lib/sacrls0g0d1p64x128m2b1w0c1p0d0
9494
$(PLATFORM_DIR)/ram/lib/sacrls0g0d1p64x25m2b1w0c1p0d0i0s0cr0rr0rm4rw00ms0.lib
9595

9696

97-
DEFAULT_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint.sdc
98-
_0P2A_6T_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint_0.2a_6T.sdc
99-
_0P2A_8T_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint_0.2a_8T.sdc
100-
_0P15_8T_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint_0.15_8T.sdc
101-
_0P3_6T_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint_0.3_6T.sdc
102-
_0P3_8T_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint_0.3_8T.sdc
97+
.DEFAULT_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint.sdc
98+
._0P2A_6T_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint_0.2a_6T.sdc
99+
._0P2A_8T_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint_0.2a_8T.sdc
100+
._0P15_8T_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint_0.15_8T.sdc
101+
._0P3S_6T_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint_0.3s_6T.sdc
102+
._0P3S_8T_SDC_FILE = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/constraint_0.3s_8T.sdc
103103

104104
# Use $(if) to defer conditional eval until all makefiles are read
105105
export SDC_FILE = $(strip \
106106
$(if $(filter 0.2a,$(RAPIDUS_PDK_VERSION)), \
107107
$(if $(filter ra02h138_DST_45CPP,$(PLACE_SITE)), \
108-
$(_0P2A_6T_SDC_FILE), \
109-
$(_0P2A_8T_SDC_FILE) \
108+
$(._0P2A_6T_SDC_FILE), \
109+
$(._0P2A_8T_SDC_FILE) \
110110
), \
111111
$(if $(filter 0.15,$(RAPIDUS_PDK_VERSION)), \
112112
$(if $(filter ra02h184_HST_45CPP,$(PLACE_SITE)), \
113-
$(_0P15_8T_SDC_FILE), \
114-
$(DEFAULT_SDC_FILE) \
113+
$(._0P15_8T_SDC_FILE), \
114+
$(.DEFAULT_SDC_FILE) \
115115
), \
116-
$(if $(filter 0.3,$(RAPIDUS_PDK_VERSION)), \
116+
$(if $(filter 0.3s,$(RAPIDUS_PDK_VERSION)), \
117117
$(if $(filter ra02h138_DST_45CPP,$(PLACE_SITE)), \
118-
$(_0P3_6T_SDC_FILE), \
119-
$(_0P3_8T_SDC_FILE) \
118+
$(._0P3S_6T_SDC_FILE), \
119+
$(._0P3S_8T_SDC_FILE) \
120120
), \
121-
$(DEFAULT_SDC_FILE) \
121+
$(.DEFAULT_SDC_FILE) \
122122
) \
123123
) \
124124
))

flow/designs/rapidus2hp/cva6/constraint_0.3_6T.sdc renamed to flow/designs/rapidus2hp/cva6/constraint_0.3s_6T.sdc

File renamed without changes.

flow/designs/rapidus2hp/cva6/constraint_0.3_8T.sdc renamed to flow/designs/rapidus2hp/cva6/constraint_0.3s_8T.sdc

File renamed without changes.

‎flow/designs/rapidus2hp/cva6/rules-base.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"compare": ">="
5353
},
5454
"globalroute__timing__setup__tns": {
55-
"value": -575.0,
55+
"value": -584.0,
5656
"compare": ">="
5757
},
5858
"globalroute__timing__hold__ws": {
@@ -68,7 +68,7 @@
6868
"compare": ">="
6969
},
7070
"finish__timing__setup__tns": {
71-
"value": -575.0,
71+
"value": -584.0,
7272
"compare": ">="
7373
},
7474
"finish__timing__hold__ws": {

‎flow/designs/rapidus2hp/cva6/test/test_params.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ def setUp(self):
2424
def get_exp_sdc(self, place_site, pdk_version):
2525
"""Returns the expected SDC file path"""
2626

27-
if pdk_version in ["", "0.2a", "0.3"]:
27+
if pdk_version in ["", "0.2a", "0.3s"]:
2828
if pdk_version == "":
29-
pdk_version = "0.3"
29+
pdk_version = "0.3s"
3030
if place_site == "ra02h138_DST_45CPP":
3131
return os.path.join(
3232
self._design_full_dir, f"constraint_{pdk_version}_6T.sdc"
@@ -41,9 +41,9 @@ def get_exp_sdc(self, place_site, pdk_version):
4141

4242
return os.path.join(self._design_full_dir, "constraint.sdc")
4343

44-
def test_pdk_0p3_default(self):
44+
def test_pdk_0p3s_default(self):
4545
"""
46-
Tests PDK 0.3
46+
Tests PDK 0.3s
4747
"""
4848

4949
pdk_version = ""
@@ -109,12 +109,12 @@ def test_pdk_0p15(self):
109109
front_end=front_end,
110110
)
111111

112-
def test_pdk_0p3(self):
112+
def test_pdk_0p3s(self):
113113
"""
114-
Tests PDK 0.3
114+
Tests PDK 0.3s
115115
"""
116116

117-
pdk_version = "0.3"
117+
pdk_version = "0.3s"
118118
for front_end in self._front_end_list:
119119
for place_site in self._synopsys_site_list:
120120
exp_sdc = self.get_exp_sdc(place_site, pdk_version)

‎flow/designs/rapidus2hp/ethmac/config.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export CORE_UTILIZATION = $(strip \
1717
$(if $(filter ra02h138_DST_45CPP,$(PLACE_SITE)), \
1818
63, \
1919
65), \
20-
$(if $(filter 0.3,$(RAPIDUS_PDK_VERSION)), \
20+
$(if $(filter 0.3s,$(RAPIDUS_PDK_VERSION)), \
2121
65, \
2222
70) \
2323
))

0 commit comments

Comments
 (0)