Merge remote-tracking branch 'private/master' into secure-gpl-fix-revert-if-diverge

Author: gudeh

flake.lock

@@ -0,0 +1,42 @@
+{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    openroad = {
+      type = "git";
+      url = "https://github.com/The-OpenROAD-Project/OpenROAD";
+      submodules = true;
+      rev = "ec1bf1a13902813b722f8341c432cd09714d9e55";
+    };
+    yosys = {
+      type = "git";
+      url = "https://github.com/The-OpenROAD-Project/yosys";
+      submodules = true;
+      rev = "c4b5190229616f7ebf8197f43990b4429de3e420";
+    };
+  };
+  outputs = { self, nixpkgs, flake-utils, openroad, yosys }: flake-utils.lib.eachDefaultSystem (
+    system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in {
+      devShells.default = pkgs.mkShell {
+        buildInputs = [
+          openroad.packages.${system}.default
+          yosys.packages.${system}.default
+          pkgs.time
+          pkgs.klayout
+          pkgs.verilator
+          pkgs.perl
+          pkgs.python3
+          pkgs.python3Packages.pandas
+          pkgs.python3Packages.numpy
+          pkgs.python3Packages.firebase-admin
+          pkgs.python3Packages.click
+          pkgs.python3Packages.pyyaml
+          pkgs.python3Packages.yamlfix
+        ];
+      };
+    }
+  );
+}

flake.nix

@@ -1,3 +1,7 @@
+# settings.mk is not under source control. Put variables into this
+# file to avoid having to adding the to the make command line.
+-include settings.mk
+
 # ==============================================================================
 # Uncomment or add the design to run
 # ==============================================================================
@@ -184,10 +188,6 @@ ifneq ($(BLOCKS),)
   endif
 endif
 
-export RTLMP_RPT_DIR ?= $(OBJECTS_DIR)/rtlmp
-export RTLMP_RPT_FILE ?= partition.txt
-export RTLMP_BLOCKAGE_FILE ?= $(OBJECTS_DIR)/rtlmp/partition.txt.blockage
-
 #-------------------------------------------------------------------------------
 ifeq (,$(strip $(NUM_CORES)))
   # Linux (utility program)
@@ -223,15 +223,27 @@ endif
 # Priority is given to
 #       1 user explicit set with variable in Makefile or command line, for instance setting OPENROAD_EXE
 #       2 ORFS compiled tools: openroad, yosys
-export OPENROAD_EXE      ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/openroad)
-export OPENSTA_EXE       ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/sta)
+ifneq (${IN_NIX_SHELL},)
+  export OPENROAD_EXE := $(shell command -v openroad)
+else
+  export OPENROAD_EXE ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/openroad)
+endif
+ifneq (${IN_NIX_SHELL},)
+  export OPENSTA_EXE := $(shell command -v sta)
+else
+  export OPENSTA_EXE ?= $(abspath $(FLOW_HOME)/../tools/install/OpenROAD/bin/sta)
+endif
 
 OPENROAD_ARGS            = -no_init -threads $(NUM_CORES) $(OR_ARGS)
 OPENROAD_CMD             = $(OPENROAD_EXE) -exit $(OPENROAD_ARGS)
 OPENROAD_NO_EXIT_CMD     = $(OPENROAD_EXE) $(OPENROAD_ARGS)
 OPENROAD_GUI_CMD         = $(OPENROAD_EXE) -gui $(OR_ARGS)
 
-YOSYS_EXE               ?= $(abspath $(FLOW_HOME)/../tools/install/yosys/bin/yosys)
+ifneq (${IN_NIX_SHELL},)
+  YOSYS_EXE := $(shell command -v yosys)
+else
+  YOSYS_EXE ?= $(abspath $(FLOW_HOME)/../tools/install/yosys/bin/yosys)
+endif
 
 # Use locally installed and built klayout if it exists, otherwise use klayout in path
 KLAYOUT_DIR = $(abspath $(FLOW_HOME)/../tools/install/klayout/)
@@ -436,8 +448,7 @@ yosys-dependencies: $(YOSYS_DEPENDENCIES)
 .PHONY: do-yosys
 do-yosys: $(DONT_USE_SC_LIB)
 	mkdir -p $(RESULTS_DIR) $(LOG_DIR) $(REPORTS_DIR) $(OBJECTS_DIR)
-	(export VERILOG_FILES=$(RESULTS_DIR)/1_synth.rtlil; \
-	$(TIME_CMD) $(YOSYS_EXE) $(YOSYS_FLAGS) -c $(SYNTH_SCRIPT)) 2>&1 | tee $(abspath $(LOG_DIR)/1_1_yosys.log)
+	($(TIME_CMD) $(YOSYS_EXE) $(YOSYS_FLAGS) -c $(SYNTH_SCRIPT)) 2>&1 | tee $(abspath $(LOG_DIR)/1_1_yosys.log)
 
 .PHONY: do-yosys-canonicalize
 do-yosys-canonicalize: yosys-dependencies $(DONT_USE_SC_LIB)

flow/Makefile

@@ -56,7 +56,7 @@
         "compare": "<="
     },
     "finish__timing__drv__setup_violation_count": {
-        "value": 544,
+        "value": 692,
         "compare": "<="
     },
     "finish__timing__drv__hold_violation_count": {

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

@@ -48,7 +48,7 @@ export DIE_AREA    = 0 0 1400 1400
 export CORE_AREA   = 10 10 1390 1390 
 export PLACE_DENSITY_LB_ADDON = 0.05
 
-export IO_CONSTRAINTS     = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NAME)/io.tcl
+export IO_CONSTRAINTS     = $(DESIGN_HOME)/$(PLATFORM)/ca53/io.tcl
 
 export MACRO_PLACE_HALO = 7 7
 

flow/designs/gf12/ca53/config.mk

@@ -60,7 +60,7 @@
         "compare": "<="
     },
     "finish__timing__drv__hold_violation_count": {
-        "value": 205,
+        "value": 359,
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {

flow/designs/nangate45/ariane136/rules-base.json

@@ -48,7 +48,7 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -0.55,
+        "value": -0.52,
         "compare": ">="
     },
     "finish__design__instance__area": {
@@ -60,11 +60,11 @@
         "compare": "<="
     },
     "finish__timing__drv__hold_violation_count": {
-        "value": 228,
+        "value": 444,
         "compare": "<="
     },
     "finish__timing__wns_percent_delay": {
-        "value": -28.24,
+        "value": -27.05,
         "compare": ">="
     }
 }

flow/designs/nangate45/swerv_wrapper/rules-base.json

@@ -1,6 +1,15 @@
 if {[find_macros] != ""} {
-# If wrappers defined replace macros with their wrapped version
-# # ----------------------------------------------------------------------------
+  if {![env_var_exists_and_non_empty RTLMP_RPT_DIR]} {
+    set ::env(RTLMP_RPT_DIR) "$::env(OBJECTS_DIR)/rtlmp"
+  }
+  if {![env_var_exists_and_non_empty RTLMP_RPT_FILE]} {
+    set ::env(RTLMP_RPT_FILE) "partition.txt"
+  }
+  if {![env_var_exists_and_non_empty RTLMP_BLOCKAGE_FILE]} {
+    set ::env(RTLMP_BLOCKAGE_FILE) "$::env(OBJECTS_DIR)/rtlmp/partition.txt.blockage"
+  }
+
+  # If wrappers defined replace macros with their wrapped version
   if {[env_var_exists_and_non_empty MACRO_WRAPPERS]} {
     source $::env(MACRO_WRAPPERS)
 

flow/scripts/macro_place_util.tcl

@@ -1,3 +1,5 @@
+set ::env(VERILOG_FILES) $::env(RESULTS_DIR)/1_synth.rtlil
+
 source $::env(SCRIPTS_DIR)/synth_preamble.tcl
 
 hierarchy -check -top $::env(DESIGN_NAME)