Merge branch 'master' into mb@update

Signed-off-by: louiic <[email protected]>

Author: louiic

etc/DependencyInstaller.sh

@@ -82,25 +82,28 @@ _installUbuntuPackages() {
         libqt5multimediawidgets5 \
         libqt5svg5-dev
 
-    lastDir="$(pwd)"
-
-    # temp dir to download and compile
-    baseDir=/tmp/installers
-    mkdir -p "${baseDir}"
-    cd ${baseDir}
 
     # install KLayout
-    if [[ $1 == 20.04 ]]; then
-        klayoutChecksum=15a26f74cf396d8a10b7985ed70ab135
+    if _versionCompare $1 -ge 23.04; then
+        apt-get install klayout python3-pandas
     else
-        klayoutChecksum=db751264399706a23d20455bb7624264
+        if [[ $1 == 20.04 ]]; then
+            klayoutChecksum=15a26f74cf396d8a10b7985ed70ab135
+        else
+            klayoutChecksum=db751264399706a23d20455bb7624264
+        fi
+        lastDir="$(pwd)"
+        # temp dir to download and compile
+        baseDir=/tmp/installers
+        mkdir -p "${baseDir}"
+        cd ${baseDir}
+
+        wget https://www.klayout.org/downloads/Ubuntu-${1%.*}/klayout_${klayoutVersion}-1_amd64.deb
+        md5sum -c <(echo "${klayoutChecksum} klayout_${klayoutVersion}-1_amd64.deb") || exit 1
+        dpkg -i klayout_${klayoutVersion}-1_amd64.deb
+        cd ${lastDir}
+        rm -rf "${baseDir}"
     fi
-    wget https://www.klayout.org/downloads/Ubuntu-${1%.*}/klayout_${klayoutVersion}-1_amd64.deb
-    md5sum -c <(echo "${klayoutChecksum} klayout_${klayoutVersion}-1_amd64.deb") || exit 1
-    dpkg -i klayout_${klayoutVersion}-1_amd64.deb
-
-    cd ${lastDir}
-    rm -rf "${baseDir}"
 }
 
 _installDarwinPackages() {
@@ -221,7 +224,9 @@ case "${os}" in
             _installUbuntuCleanUp
         fi
         if [[ "${option}" == "common" || "${option}" == "all" ]]; then
-            _installCommon
+            if _versionCompare ${version} -lt 23.04 ; then
+                _installCommon
+            fi
         fi
         ;;
     "Darwin" )

flow/Makefile

@@ -80,7 +80,6 @@
 # DESIGN_CONFIG=./designs/asap7/riscv32i/config.mk
 # DESIGN_CONFIG=./designs/asap7/sha3/config.mk
 # DESIGN_CONFIG=./designs/asap7/swerv_wrapper/config.mk
-# DESIGN_CONFIG=./designs/asap7/uart-blocks/config.mk
 # DESIGN_CONFIG=./designs/asap7/uart/config.mk
 
 # DESIGN_CONFIG=./designs/intel16/aes/config.mk
@@ -350,11 +349,11 @@ $(OBJECTS_DIR)/klayout_tech.lef: $(TECH_LEF)
 	@mkdir -p $(OBJECTS_DIR)
 	sed '/OR_DEFAULT/d' $< > $@
 
- $(OBJECTS_DIR)/klayout.lyt: $(KLAYOUT_TECH_FILE) $(OBJECTS_DIR)/klayout_tech.lef
-	sed 's,<lef-files>.*</lef-files>,$(foreach file, $(OBJECTS_DIR)/klayout_tech.lef $(SC_LEF) $(ADDITIONAL_LEFS),<lef-files>$(abspath $(file))</lef-files>),g' $< > $@
+$(OBJECTS_DIR)/klayout.lyt: $(KLAYOUT_TECH_FILE) $(OBJECTS_DIR)/klayout_tech.lef
+	sed 's,<lef-files>.*</lef-files>,$(foreach file, $(OBJECTS_DIR)/klayout_tech.lef $(SC_LEF) $(ADDITIONAL_LEFS),<lef-files>$(shell realpath --relative-to=$(RESULTS_DIR) $(file))</lef-files>),g' $< > $@
 
 $(OBJECTS_DIR)/klayout_wrap.lyt: $(KLAYOUT_TECH_FILE) $(OBJECTS_DIR)/klayout_tech.lef
-	sed 's,<lef-files>.*</lef-files>,$(foreach file, $(OBJECTS_DIR)/klayout_tech.lef $(WRAP_LEFS),<lef-files>$(abspath $(file))</lef-files>),g' $< > $@
+	sed 's,<lef-files>.*</lef-files>,$(foreach file, $(OBJECTS_DIR)/klayout_tech.lef $(WRAP_LEFS),<lef-files>$(shell realpath --relative-to=$(OBJECTS_DIR)/def $(file))</lef-files>),g' $< > $@
 # Create Macro wrappers (if necessary)
 # ==============================================================================
 WRAP_CFG = $(PLATFORM_DIR)/wrapper.cfg
@@ -406,7 +405,7 @@ ifeq ($(SYNTH_HIERARCHICAL), 1)
 $(RESULTS_DIR)/1_1_yosys.v: $(SYNTH_STOP_MODULE_SCRIPT)
 endif
 
-$(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)
+$(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)
 	mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR)
 	($(TIME_CMD) $(YOSYS_CMD) $(YOSYS_FLAGS) -c $(SYNTH_SCRIPT)) 2>&1 | tee $(LOG_DIR)/1_1_yosys.log
 	cp $(SDC_FILE) $(RESULTS_DIR)/1_synth.sdc
@@ -722,7 +721,7 @@ elapsed:
 # ==============================================================================
 
 ifneq ($(USE_FILL),)
-$(eval $(call do-step,6_1_fill,$(RESULTS_DIR)/5_route.odb $(FILL_CONFIG),density_fill))
+$(eval $(call do-step,6_1_fill,$(RESULTS_DIR)/5_route.odb $(RESULTS_DIR)/5_route.sdc $(FILL_CONFIG),density_fill))
 else
 $(eval $(call do-copy,6_1_fill,5_route.odb))
 endif