Skip to content

Commit bb644b7

Browse files
jeffng-orjeffng-or
committed
Switched to use source_env_var_if_exists
fixed tcl issue with i2c-gpio-expander pad.tcl tclfmt fixes Signed-off-by: Jeff Ng <[email protected]>
1 parent acbfa78 commit bb644b7

File tree

4 files changed

+27
-47
lines changed

4 files changed

+27
-47
lines changed

‎flow/designs/ihp-sg13g2/i2c-gpio-expander/pad.tcl‎

Lines changed: 22 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@ set BONDPAD_SIZE 70
44
set SEALRING_OFFSET 70
55
set IO_OFFSET [expr { $BONDPAD_SIZE + $SEALRING_OFFSET }]
66

7-
proc calc_horizontal_pad_location { index total } {
8-
global IO_LENGTH
9-
global IO_WIDTH
10-
global BONDPAD_SIZE
11-
global SEALRING_OFFSET
12-
7+
proc calc_horizontal_pad_location { index total IO_LENGTH IO_WIDTH BONDPAD_SIZE SEALRING_OFFSET } {
138
set DIE_WIDTH [expr { [lindex $::env(DIE_AREA) 2] - [lindex $::env(DIE_AREA) 0] }]
149
set PAD_OFFSET [expr { $IO_LENGTH + $BONDPAD_SIZE + $SEALRING_OFFSET }]
1510
set PAD_AREA_WIDTH [expr { $DIE_WIDTH - ($PAD_OFFSET * 2) }]
@@ -21,12 +16,7 @@ proc calc_horizontal_pad_location { index total } {
2116
}]
2217
}
2318

24-
proc calc_vertical_pad_location { index total } {
25-
global IO_LENGTH
26-
global IO_WIDTH
27-
global BONDPAD_SIZE
28-
global SEALRING_OFFSET
29-
19+
proc calc_vertical_pad_location { index total IO_LENGTH IO_WIDTH BONDPAD_SIZE SEALRING_OFFSET } {
3020
set DIE_HEIGHT [expr { [lindex $::env(DIE_AREA) 3] - [lindex $::env(DIE_AREA) 1] }]
3121
set PAD_OFFSET [expr { $IO_LENGTH + $BONDPAD_SIZE + $SEALRING_OFFSET }]
3222
set PAD_AREA_HEIGHT [expr { $DIE_HEIGHT - ($PAD_OFFSET * 2) }]
@@ -51,60 +41,60 @@ make_io_sites \
5141

5242
# Place Pads
5343
# IO pin io_clock
54-
place_pad -row IO_SOUTH -location [calc_horizontal_pad_location 0 5] \
44+
place_pad -row IO_SOUTH -location [calc_horizontal_pad_location 0 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
5545
{sg13g2_IOPad_io_clock} -master sg13g2_IOPadIn
5646
# IO pin io_reset
57-
place_pad -row IO_SOUTH -location [calc_horizontal_pad_location 1 5] \
47+
place_pad -row IO_SOUTH -location [calc_horizontal_pad_location 1 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
5848
{sg13g2_IOPad_io_reset} -master sg13g2_IOPadIn
5949
# IO pin io_i2c_scl
60-
place_pad -row IO_SOUTH -location [calc_horizontal_pad_location 2 5] \
50+
place_pad -row IO_SOUTH -location [calc_horizontal_pad_location 2 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
6151
{sg13g2_IOPad_io_i2c_scl} -master sg13g2_IOPadInOut4mA
6252
# IO pin io_i2c_sda
63-
place_pad -row IO_SOUTH -location [calc_horizontal_pad_location 3 5] \
53+
place_pad -row IO_SOUTH -location [calc_horizontal_pad_location 3 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
6454
{sg13g2_IOPad_io_i2c_sda} -master sg13g2_IOPadInOut4mA
6555
# IO pin io_i2c_interrupt
66-
place_pad -row IO_SOUTH -location [calc_horizontal_pad_location 4 5] \
56+
place_pad -row IO_SOUTH -location [calc_horizontal_pad_location 4 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
6757
{sg13g2_IOPad_io_i2c_interrupt} -master sg13g2_IOPadOut4mA
68-
place_pad -row IO_EAST -location [calc_vertical_pad_location 0 5] \
58+
place_pad -row IO_EAST -location [calc_vertical_pad_location 0 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
6959
{sg13g2_IOPadVdd_east_0} -master sg13g2_IOPadVdd
70-
place_pad -row IO_EAST -location [calc_vertical_pad_location 1 5] \
60+
place_pad -row IO_EAST -location [calc_vertical_pad_location 1 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
7161
{sg13g2_IOPadVss_east_1} -master sg13g2_IOPadVss
7262
# IO pin io_address_0
73-
place_pad -row IO_EAST -location [calc_vertical_pad_location 2 5] \
63+
place_pad -row IO_EAST -location [calc_vertical_pad_location 2 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
7464
{sg13g2_IOPad_io_address_0} -master sg13g2_IOPadIn
7565
# IO pin io_address_1
76-
place_pad -row IO_EAST -location [calc_vertical_pad_location 3 5] \
66+
place_pad -row IO_EAST -location [calc_vertical_pad_location 3 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
7767
{sg13g2_IOPad_io_address_1} -master sg13g2_IOPadIn
7868
# IO pin io_address_2
79-
place_pad -row IO_EAST -location [calc_vertical_pad_location 4 5] \
69+
place_pad -row IO_EAST -location [calc_vertical_pad_location 4 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
8070
{sg13g2_IOPad_io_address_2} -master sg13g2_IOPadIn
8171
# IO pin io_gpio_0
82-
place_pad -row IO_NORTH -location [calc_horizontal_pad_location 0 5] \
72+
place_pad -row IO_NORTH -location [calc_horizontal_pad_location 0 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
8373
{sg13g2_IOPad_io_gpio_0} -master sg13g2_IOPadInOut16mA
8474
# IO pin io_gpio_1
85-
place_pad -row IO_NORTH -location [calc_horizontal_pad_location 1 5] \
75+
place_pad -row IO_NORTH -location [calc_horizontal_pad_location 1 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
8676
{sg13g2_IOPad_io_gpio_1} -master sg13g2_IOPadInOut16mA
8777
# IO pin io_gpio_2
88-
place_pad -row IO_NORTH -location [calc_horizontal_pad_location 2 5] \
78+
place_pad -row IO_NORTH -location [calc_horizontal_pad_location 2 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
8979
{sg13g2_IOPad_io_gpio_2} -master sg13g2_IOPadInOut16mA
9080
# IO pin io_gpio_3
91-
place_pad -row IO_NORTH -location [calc_horizontal_pad_location 3 5] \
81+
place_pad -row IO_NORTH -location [calc_horizontal_pad_location 3 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
9282
{sg13g2_IOPad_io_gpio_3} -master sg13g2_IOPadInOut16mA
9383
# IO pin io_gpio_4
94-
place_pad -row IO_NORTH -location [calc_horizontal_pad_location 4 5] \
84+
place_pad -row IO_NORTH -location [calc_horizontal_pad_location 4 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
9585
{sg13g2_IOPad_io_gpio_4} -master sg13g2_IOPadInOut16mA
9686
# IO pin io_gpio_5
97-
place_pad -row IO_WEST -location [calc_vertical_pad_location 0 5] \
87+
place_pad -row IO_WEST -location [calc_vertical_pad_location 0 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
9888
{sg13g2_IOPad_io_gpio_5} -master sg13g2_IOPadInOut16mA
9989
# IO pin io_gpio_6
100-
place_pad -row IO_WEST -location [calc_vertical_pad_location 1 5] \
90+
place_pad -row IO_WEST -location [calc_vertical_pad_location 1 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
10191
{sg13g2_IOPad_io_gpio_6} -master sg13g2_IOPadInOut16mA
10292
# IO pin io_gpio_7
103-
place_pad -row IO_WEST -location [calc_vertical_pad_location 2 5] \
93+
place_pad -row IO_WEST -location [calc_vertical_pad_location 2 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
10494
{sg13g2_IOPad_io_gpio_7} -master sg13g2_IOPadInOut16mA
105-
place_pad -row IO_WEST -location [calc_vertical_pad_location 3 5] \
95+
place_pad -row IO_WEST -location [calc_vertical_pad_location 3 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
10696
{sg13g2_IOPadIOVss_west_3} -master sg13g2_IOPadIOVss
107-
place_pad -row IO_WEST -location [calc_vertical_pad_location 4 5] \
97+
place_pad -row IO_WEST -location [calc_vertical_pad_location 4 5 $IO_LENGTH $IO_WIDTH $BONDPAD_SIZE $SEALRING_OFFSET] \
10898
{sg13g2_IOPadIOVdd_west_4} -master sg13g2_IOPadIOVdd
10999
# Place Corner Cells and Filler
110100
place_corners sg13g2_Corner

‎flow/scripts/floorplan.tcl‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ if { [env_var_exists_and_non_empty MAKE_TRACKS] } {
9393
make_tracks
9494
}
9595

96-
if { [env_var_exists_and_non_empty FOOTPRINT_TCL] } {
97-
log_cmd source $::env(FOOTPRINT_TCL)
98-
}
96+
source_env_var_if_exists FOOTPRINT_TCL
9997

10098
# This needs to come before any call to remove_buffers. You could have one
10199
# tie driving multiple buffers that drive multiple outputs.
@@ -121,14 +119,8 @@ report_units
121119
report_units_metric
122120
report_metrics 2 "floorplan final" false false
123121

124-
if { [env_var_exists_and_non_empty POST_FLOORPLAN_TCL] } {
125-
log_cmd source $::env(POST_FLOORPLAN_TCL)
126-
}
127-
128-
129-
if { [env_var_exists_and_non_empty IO_CONSTRAINTS] } {
130-
log_cmd source $::env(IO_CONSTRAINTS)
131-
}
122+
source_env_var_if_exists POST_FLOORPLAN_TCL
123+
source_env_var_if_exists IO_CONSTRAINTS
132124

133125
write_db $::env(RESULTS_DIR)/2_1_floorplan.odb
134126
write_sdc -no_timestamp $::env(RESULTS_DIR)/2_1_floorplan.sdc

‎flow/scripts/synth_canonicalize.tcl‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ dict for {key value} [env_var_or_empty VERILOG_TOP_PARAMS] {
88

99
hierarchy -check -top $::env(DESIGN_NAME)
1010

11-
if { [env_var_exists_and_non_empty SYNTH_CANONICALIZE_TCL] } {
12-
log_cmd source $::env(SYNTH_CANONICALIZE_TCL)
13-
}
11+
source_env_var_if_exists SYNTH_CANONICALIZE_TCL
1412

1513
# Get rid of unused modules
1614
opt_clean -purge

‎flow/scripts/util.tcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,6 @@ proc place_density_with_lb_addon { } {
216216

217217
proc source_env_var_if_exists { env_var } {
218218
if { [env_var_exists_and_non_empty $env_var] } {
219-
source $::env($env_var)
219+
log_cmd source $::env($env_var)
220220
}
221221
}

0 commit comments

Comments
 (0)