Skip to content

Commit 5d81bae

Browse files
committed
Merge branch 'master' of https://github.com/habibayassin/OpenROAD-flow-scripts into update-OR
2 parents cd5b508 + cfab1f3 commit 5d81bae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2099
-2053
lines changed

.github/workflows/github-actions-cron-test-installer.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,24 +58,3 @@ jobs:
5858
cmd="source /opt/rh/rh-python38/enable; ${cmd}"
5959
fi
6060
docker run openroad/flow-${{ matrix.os }}-builder /bin/bash -c "${cmd}"
61-
testInstaller-macos:
62-
strategy:
63-
fail-fast: false
64-
runs-on: macos-latest
65-
steps:
66-
- name: Setup xcode
67-
uses: maxim-lobanov/setup-xcode@v1
68-
with:
69-
xcode-version: latest-stable
70-
- name: Check out repository code
71-
uses: actions/checkout@v3
72-
with:
73-
submodules: 'recursive'
74-
- name: Run installer
75-
shell: bash
76-
run: |
77-
./etc/DependencyInstaller.sh
78-
- name: Build project
79-
shell: bash
80-
run: |
81-
./build_openroad.sh --local

flow/Makefile

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,11 @@ export OBJECTS_DIR = $(WORK_HOME)/objects/$(PLATFORM)/$(DESIGN_NICKNAME)/$(FLOW_
212212
export REPORTS_DIR = $(WORK_HOME)/reports/$(PLATFORM)/$(DESIGN_NICKNAME)/$(FLOW_VARIANT)
213213
export RESULTS_DIR = $(WORK_HOME)/results/$(PLATFORM)/$(DESIGN_NICKNAME)/$(FLOW_VARIANT)
214214

215+
# BLOCKS is ORFS specific and is used to trigger hierarchical flow,
216+
# MACROS is a space separated list of macros used in the design,
217+
# but not necessarily built by ORFS using the BLOCKS mechanism.
218+
export MACROS ?= $(BLOCKS)
219+
215220
ifdef BLOCKS
216221
ifeq ($(MAKELEVEL),0)
217222
$(info [INFO][FLOW] Invoked hierarchical flow.)
@@ -442,8 +447,7 @@ $(WRAPPED_LIBS):
442447
# |____/ |_| |_| \_| |_| |_| |_|_____|____/___|____/
443448
#
444449
.PHONY: synth
445-
synth: versions.txt \
446-
$(RESULTS_DIR)/1_synth.v \
450+
synth: $(RESULTS_DIR)/1_synth.v \
447451
$(RESULTS_DIR)/1_synth.sdc
448452

449453
.PHONY: synth-report
@@ -466,24 +470,45 @@ $(SYNTH_STOP_MODULE_SCRIPT):
466470
($(TIME_CMD) $(YOSYS_CMD) $(YOSYS_FLAGS) -c $(HIER_REPORT_SCRIPT)) 2>&1 | tee $(LOG_DIR)/1_1_yosys_hier_report.log
467471

468472
ifeq ($(SYNTH_HIERARCHICAL), 1)
469-
$(RESULTS_DIR)/1_1_yosys.v: $(SYNTH_STOP_MODULE_SCRIPT)
473+
do-yosys: $(SYNTH_STOP_MODULE_SCRIPT)
470474
endif
471475

472-
$(RESULTS_DIR)/1_1_yosys.v $(RESULTS_DIR)/1_synth.sdc &: $(DONT_USE_LIBS) $(WRAPPED_LIBS) $(DONT_USE_SC_LIB) $(DFF_LIB_FILE) $(VERILOG_FILES) $(CACHED_NETLIST) $(LATCH_MAP_FILE) $(ADDER_MAP_FILE) $(SDC_FILE)
476+
export SDC_FILE_CLOCK_PERIOD = $(RESULTS_DIR)/clock_period.txt
477+
478+
$(SDC_FILE_CLOCK_PERIOD): $(SDC_FILE)
479+
mkdir -p $(dir $@)
480+
echo $(ABC_CLOCK_PERIOD_IN_PS) > $@
481+
482+
.PHONY: yosys-dependencies
483+
yosys-dependencies: $(DONT_USE_LIBS) $(WRAPPED_LIBS) $(DONT_USE_SC_LIB) $(DFF_LIB_FILE) $(VERILOG_FILES) $(CACHED_NETLIST) $(LATCH_MAP_FILE) $(ADDER_MAP_FILE)
484+
485+
.PHONY: do-yosys
486+
do-yosys: yosys-dependencies
473487
mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR)
474488
($(TIME_CMD) $(YOSYS_CMD) $(YOSYS_FLAGS) -c $(SYNTH_SCRIPT)) 2>&1 | tee $(LOG_DIR)/1_1_yosys.log
489+
490+
$(RESULTS_DIR)/1_1_yosys.v: $(SDC_FILE_CLOCK_PERIOD)
491+
$(UNSET_AND_MAKE) do-yosys
492+
493+
$(RESULTS_DIR)/1_synth.sdc: $(SDC_FILE)
494+
mkdir -p $(REPORTS_DIR)
475495
cp $(SDC_FILE) $(RESULTS_DIR)/1_synth.sdc
476496

477-
$(RESULTS_DIR)/1_synth.v: $(RESULTS_DIR)/1_1_yosys.v
497+
.PHONY: do-synth
498+
do-synth:
478499
mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR)
479-
cp $< $@
500+
cp $(RESULTS_DIR)/1_1_yosys.v $(RESULTS_DIR)/1_synth.v
501+
502+
$(RESULTS_DIR)/1_synth.v: $(RESULTS_DIR)/1_1_yosys.v
503+
$(UNSET_AND_MAKE) do-synth
480504

481505
.PHONY: clean_synth
482506
clean_synth:
483-
rm -f $(RESULTS_DIR)/1_*.v $(RESULTS_DIR)/1_synth.sdc
484-
rm -f $(REPORTS_DIR)/synth_*
485-
rm -f $(LOG_DIR)/1_*
486-
rm -f $(SYNTH_STOP_MODULE_SCRIPT)
507+
rm -f $(RESULTS_DIR)/1_*.v $(RESULTS_DIR)/1_synth.sdc
508+
rm -f $(REPORTS_DIR)/synth_*
509+
rm -f $(LOG_DIR)/1_*
510+
rm -f $(SYNTH_STOP_MODULE_SCRIPT)
511+
rm -f $(SDC_FILE_CLOCK_PERIOD)
487512
rm -rf _tmp_yosys-abc-*
488513

489514

@@ -1064,7 +1089,7 @@ yosys:
10641089
# Drop into a bash shell with all environment variables, useful for debugging
10651090
.PHONY: bash
10661091
bash:
1067-
bash
1092+
bash --init-file <(echo "PS1='\[\e[32m\]Makefile Environment \[\e[0m\] \w $ '")
10681093

10691094
.PHONY: all_defs
10701095
all_defs : $(foreach file,$(RESULTS_ODB),$(file).def)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"compare": "<="
4949
},
5050
"finish__timing__drv__hold_violation_count": {
51-
"value": 106,
51+
"value": 100,
5252
"compare": "<="
5353
},
5454
"finish__timing__wns_percent_delay": {

0 commit comments

Comments
 (0)