Skip to content

Commit 15f799d

Browse files
committed
Merge remote-tracking branch 'origin/master' into secure-yosys0.41
Signed-off-by: Eder Monteiro <[email protected]>
2 parents b071bd6 + 26998c0 commit 15f799d

File tree

29 files changed

+354
-378
lines changed

29 files changed

+354
-378
lines changed

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@ core*
3131
# git
3232
.git
3333
.gitignore
34+
35+
# local dependencies
36+
dependencies/

docs/user/BuildWithPrebuilt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Please ensure the Klayout version (denoted with `klayoutVersion` variable) is co
55

66
Instructions for installing:
77
- [Klayout>=0.28.8](https://www.klayout.de/build.html)
8-
- [Yosys>=0.21](https://github.com/YosysHQ/oss-cad-suite-build/blob/master/README.md#installation)
8+
- [Yosys>=0.39](https://github.com/YosysHQ/oss-cad-suite-build/blob/master/README.md#installation)
99

1010
```{tip} Unfortunately KLayout maintainers do not provide Debian 10/11 compatible packages. You can follow the build-from-sources instruction (Version >=0.25) and Ubuntu 22 instructions [here](https://www.klayout.de/build.html#:~:text=Building%20KLayout%20on%20Linux%20(Version%20%3E%3D%200.25)).
1111
```

flow/Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,11 @@ export RESYNTH_AREA_RECOVER ?= 0
189189
export RESYNTH_TIMING_RECOVER ?= 0
190190
export ABC_AREA ?= 0
191191

192-
# Global setting for Synthesis
193-
export SYNTH_ARGS ?= -flatten -extra-map $(FLOW_HOME)/platforms/common/lcu_kogge_stone.v
192+
# User adjustable synthesis arguments
193+
export SYNTH_ARGS ?= -flatten
194+
# Not normally adjusted by user
195+
export SYNTH_OPERATIONS_ARGS ?= -extra-map $(FLOW_HOME)/platforms/common/lcu_kogge_stone.v
196+
export SYNTH_FULL_ARGS ?= $(SYNTH_ARGS) $(SYNTH_OPERATIONS_ARGS)
194197

195198
# Global setting for Floorplan
196199
export PLACE_PINS_ARGS
@@ -210,6 +213,7 @@ export DPO_MAX_DISPLACEMENT ?= 5 1
210213
# Setup working directories
211214
export DESIGN_NICKNAME ?= $(DESIGN_NAME)
212215

216+
export DESIGN_CONFIG
213217
export DESIGN_DIR = $(dir $(DESIGN_CONFIG))
214218
export LOG_DIR = $(WORK_HOME)/logs/$(PLATFORM)/$(DESIGN_NICKNAME)/$(FLOW_VARIANT)
215219
export OBJECTS_DIR = $(WORK_HOME)/objects/$(PLATFORM)/$(DESIGN_NICKNAME)/$(FLOW_VARIANT)
@@ -465,7 +469,7 @@ do-synth-report:
465469
($(TIME_CMD) $(OPENROAD_CMD) $(SCRIPTS_DIR)/synth_metrics.tcl) 2>&1 | tee -a $(LOG_DIR)/1_1_yosys.log
466470

467471
.PHONY: memory
468-
memory: $(RESULTS_DIR)/mem.json
472+
memory:
469473
python3 $(SCRIPTS_DIR)/mem_dump.py $(RESULTS_DIR)/mem.json
470474

471475
# ==============================================================================

flow/designs/asap7/aes-block/autotuner.json

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"CORE_UTILIZATION": {
1212
"type": "int",
1313
"minmax": [
14-
30,
15-
100
14+
0,
15+
20
1616
],
1717
"step": 1
1818
},
@@ -52,10 +52,10 @@
5252
"type": "float",
5353
"minmax": [
5454
0.1,
55-
0.7
55+
0.3
5656
],
5757
"step": 0
58-
},
58+
},
5959
"PLACE_DENSITY_LB_ADDON": {
6060
"type": "float",
6161
"minmax": [
@@ -64,14 +64,6 @@
6464
],
6565
"step": 0
6666
},
67-
"_PINS_DISTANCE": {
68-
"type": "int",
69-
"minmax": [
70-
1,
71-
4
72-
],
73-
"step": 1
74-
},
7567
"CTS_CLUSTER_SIZE": {
7668
"type": "int",
7769
"minmax": [
@@ -88,13 +80,5 @@
8880
],
8981
"step": 1
9082
},
91-
"_FR_FILE_PATH": "",
92-
"_FR_GR_OVERFLOW": {
93-
"type": "int",
94-
"minmax": [
95-
1,
96-
1
97-
],
98-
"step": 0
99-
}
83+
"_FR_FILE_PATH": ""
10084
}

0 commit comments

Comments
 (0)