Skip to content

Commit 62c4739

Browse files
malibertymaliberty
authored
Merge pull request #3963 from The-OpenROAD-Project-staging/pdk-0.3s-config-changes
Changes to Rapidus design configs for PDK 0.3s
2 parents 1bce7d9 + 784cee9 commit 62c4739

File tree

17 files changed

+85
-85
lines changed

17 files changed

+85
-85
lines changed

‎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/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
))

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ def get_exp_util(self, place_site, pdk_version):
2828
if place_site == "ra02h138_DST_45CPP":
2929
return 63
3030
return 65
31-
if pdk_version in ["", "0.3"]:
31+
if pdk_version in ["", "0.3s"]:
3232
return 65
3333
return 70
3434

35-
def test_pdk_0p3_default(self):
36-
"""Tests PDK 0.3 Utilization"""
35+
def test_pdk_0p3s_default(self):
36+
"""Tests PDK 0.3s Utilization"""
3737

3838
pdk_version = ""
3939
for front_end in self._front_end_list:
@@ -92,10 +92,10 @@ def test_pdk_0p15(self):
9292
front_end=front_end,
9393
)
9494

95-
def test_pdk_0p3(self):
96-
"""Tests PDK 0.3 Utilization"""
95+
def test_pdk_0p3s(self):
96+
"""Tests PDK 0.3s Utilization"""
9797

98-
pdk_version = "0.3"
98+
pdk_version = "0.3s"
9999
for front_end in self._front_end_list:
100100
for place_site in self._synopsys_site_list:
101101
exp_util = self.get_exp_util(place_site, pdk_version)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ def get_exp_util(self, place_site, pdk_version):
3232
return 43
3333
return 45
3434

35-
def test_pdk_0p3_default(self):
35+
def test_pdk_0p3s_default(self):
3636
"""
37-
Tests PDK 0.3 utilization
37+
Tests PDK 0.3s utilization
3838
"""
3939

4040
pdk_version = ""
@@ -100,12 +100,12 @@ def test_pdk_0p15(self):
100100
front_end=front_end,
101101
)
102102

103-
def test_pdk_0p3(self):
103+
def test_pdk_0p3s(self):
104104
"""
105-
Tests PDK 0.3 utilization
105+
Tests PDK 0.3s utilization
106106
"""
107107

108-
pdk_version = "0.3"
108+
pdk_version = "0.3s"
109109
for front_end in self._front_end_list:
110110
for place_site in self._synopsys_site_list:
111111
exp_util = self.get_exp_util(place_site, pdk_version)

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ def get_exp_util(self, place_site, pdk_version, front_end):
3535
return 44
3636
return 50
3737

38-
def test_pdk_0p3_default(self):
38+
def test_pdk_0p3s_default(self):
3939
"""
40-
Tests PDK 0.3 utilization
40+
Tests PDK 0.3s utilization
4141
"""
4242

4343
pdk_version = ""
@@ -103,12 +103,12 @@ def test_pdk_0p15(self):
103103
front_end=front_end,
104104
)
105105

106-
def test_pdk_0p3(self):
106+
def test_pdk_0p3s(self):
107107
"""
108-
Tests PDK 0.3 utilization
108+
Tests PDK 0.3s utilization
109109
"""
110110

111-
pdk_version = "0.3"
111+
pdk_version = "0.3s"
112112
for front_end in self._front_end_list:
113113
for place_site in self._synopsys_site_list:
114114
exp_util = self.get_exp_util(place_site, pdk_version, front_end)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export SYNTH_HIERARCHICAL ?= 0
2828

2929
# Use $(if) to defer conditional eval until all makefiles are read
3030
export CORE_UTILIZATION = $(strip \
31-
$(if $(filter 0.3,$(RAPIDUS_PDK_VERSION)), \
31+
$(if $(filter 0.3s,$(RAPIDUS_PDK_VERSION)), \
3232
$(if $(filter ra02h138_DST_45CPP,$(PLACE_SITE)), \
3333
$(if $(filter slang,$(SYNTH_HDL_FRONTEND)), \
3434
$(if $(filter 14LM,$(LAYER_STACK_OPTION)), \

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def setUp(self):
2424
def get_exp_util(self, place_site, front_end, pdk_version, layer_stack):
2525
"""Returns the expected value"""
2626

27-
if pdk_version in ["", "0.3"]:
27+
if pdk_version in ["", "0.3s"]:
2828
if place_site == "ra02h138_DST_45CPP":
2929
if front_end in ["", "slang"]:
3030
if layer_stack == "14LM":
@@ -48,9 +48,9 @@ def get_exp_util(self, place_site, front_end, pdk_version, layer_stack):
4848
return 30
4949
return 52
5050

51-
def test_pdk_0p3_default(self):
51+
def test_pdk_0p3s_default(self):
5252
"""
53-
Tests PDK 0.3 utilization
53+
Tests PDK 0.3s utilization
5454
"""
5555

5656
pdk_version = ""
@@ -131,12 +131,12 @@ def test_pdk_0p15(self):
131131
layer_stack=layer_stack,
132132
)
133133

134-
def test_pdk_0p3(self):
134+
def test_pdk_0p3s(self):
135135
"""
136-
Tests PDK 0.3 utilization
136+
Tests PDK 0.3s utilization
137137
"""
138138

139-
pdk_version = "0.3"
139+
pdk_version = "0.3s"
140140
for front_end in self._front_end_list:
141141
for place_site in self._synopsys_site_list:
142142
for layer_stack in self._layer_stack_list:

0 commit comments

Comments
 (0)