Merge branch 'master' into secure-yosys0.49

Signed-off-by: Eder Monteiro <[email protected]>

Author: eder-matheus

docs/user/FlowVariables.md

@@ -116,7 +116,6 @@ configuration file.
 | <a name="MACRO_HALO_Y"></a>MACRO_HALO_Y| Set macro halo for y-direction. Only available for ASAP7 PDK.| | |
 | <a name="MACRO_PLACEMENT"></a>MACRO_PLACEMENT| Specifies the path of a file on how to place certain macros manually using read_macro_placement.| | |
 | <a name="MACRO_PLACEMENT_TCL"></a>MACRO_PLACEMENT_TCL| Specifies the path of a TCL file on how to place certain macros manually.| | |
-| <a name="MACRO_PLACE_CHANNEL"></a>MACRO_PLACE_CHANNEL| Horizontal/vertical channel width between macros (microns). Used by automatic macro placement. Imagine channel=10 and halo=5. Then macros must be 10 apart but standard cells must be 5 away from a macro.| | |
 | <a name="MACRO_PLACE_HALO"></a>MACRO_PLACE_HALO| Horizontal/vertical halo around macros (microns). Used by automatic macro placement.| | |
 | <a name="MACRO_WRAPPERS"></a>MACRO_WRAPPERS| The wrapper file that replaces existing macros with their wrapped version.| | |
 | <a name="MAKE_TRACKS"></a>MAKE_TRACKS| Tcl file that defines add routing tracks to a floorplan.| | |
@@ -230,7 +229,6 @@ configuration file.
 - [MACRO_HALO_Y](#MACRO_HALO_Y)
 - [MACRO_PLACEMENT](#MACRO_PLACEMENT)
 - [MACRO_PLACEMENT_TCL](#MACRO_PLACEMENT_TCL)
-- [MACRO_PLACE_CHANNEL](#MACRO_PLACE_CHANNEL)
 - [MACRO_PLACE_HALO](#MACRO_PLACE_HALO)
 - [MACRO_WRAPPERS](#MACRO_WRAPPERS)
 - [MAKE_TRACKS](#MAKE_TRACKS)

docs/user/InstructionsForAutoTuner.md

@@ -27,10 +27,6 @@ We have provided two convenience scripts, `./installer.sh` and `./setup.sh`
 that works in Python3.8 for installation and configuration of AutoTuner,
 as shown below:
 
-```{note}
-Make sure you run the following commands in the ORFS root directory.
-```
-
 ```shell
 # Install prerequisites
 ./tools/AutoTuner/installer.sh
@@ -104,7 +100,7 @@ For Global Routing parameters that are set on `fastroute.tcl` you can use:
 
 ### General Information
 
-The `distributed.py` script located in `./tools/AutoTuner/src/autotuner` uses [Ray's](https://docs.ray.io/en/latest/index.html) job scheduling and management to
+The `autotuner.distributed` module uses [Ray's](https://docs.ray.io/en/latest/index.html) job scheduling and management to
 fully utilize available hardware resources from a single server 
 configuration, on-premise or over the cloud with multiple CPUs.
 
@@ -115,35 +111,37 @@ The two modes of operation:
 The `sweep` mode is useful when we want to isolate or test a single or very few
 parameters. On the other hand, `tune` is more suitable for finding
 the best combination of a complex and large number of flow 
-parameters. Both modes rely on user-specified search space that is 
-defined by a `.json` file, they use the same syntax and format, 
-though some features may not be available for sweeping.
+parameters.
 
 ```{note}
 The order of the parameters matter. Arguments `--design`, `--platform` and
 `--config` are always required and should precede *mode*.
 ```
 
+```{note}
+The following commands should be run from `./tools/AutoTuner`.
+```
+
 #### Tune only 
 
-* AutoTuner: `python3 distributed.py tune -h`
+* AutoTuner: `python3 -m autotuner.distributed tune -h`
 
 Example:
 
 ```shell
-python3 distributed.py --design gcd --platform sky130hd \
-                       --config ../../../../flow/designs/sky130hd/gcd/autotuner.json \
+python3 -m autotuner.distributed --design gcd --platform sky130hd \
+                       --config ../../flow/designs/sky130hd/gcd/autotuner.json \
                        tune --samples 5
 ```
 #### Sweep only 
 
-* Parameter sweeping: `python3 distributed.py sweep -h`
+* Parameter sweeping: `python3 -m autotuner.distributed sweep -h`
 
 Example:
 
 ```shell
-python3 distributed.py --design gcd --platform sky130hd \
-                       --config distributed-sweep-example.json \
+python3 -m autotuner.distributed --design gcd --platform sky130hd \
+                       --config src/autotuner/distributed-sweep-example.json \
                        sweep
 ```
 

flow/designs/asap7/riscv32i/config.mk

@@ -25,7 +25,6 @@ export CORE_AREA = 5 5 75 85
 export PLACE_DENSITY_LB_ADDON = 0.10
 
 export PLACE_PINS_ARGS    = -exclude left:* -exclude right:* -exclude top:*
-export MACRO_PLACE_HALO    = 1 1
-export MACRO_PLACE_CHANNEL = 6 6
-#
+export MACRO_PLACE_HALO    = 2 2
+
 export TNS_END_PERCENT   = 100

flow/designs/gf12/ariane/config.mk

@@ -25,8 +25,6 @@ export PLACE_DENSITY ?= 0.50
 export PLACE_PINS_ARGS = -exclude left:0-150 -exclude left:450-600 -exclude right:* -exclude top:* -exclude bottom:*
 
 export MACRO_PLACE_HALO = 7 7 
-export MACRO_PLACE_CHANNEL = 14 14
-
 export MACRO_WRAPPERS = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/wrappers.tcl
 
 ifeq ($(USE_FILL),1)

flow/designs/gf12/ariane133/config.mk

@@ -4,8 +4,6 @@ export PLATFORM    = gf12
 
 export SYNTH_HIERARCHICAL = 1
 export MAX_UNGROUP_SIZE ?= 10000
-#
-# RTL_MP Settings
 
 export VERILOG_FILES = $(PLATFORM_DIR)/ariane133/ariane.v
 
@@ -22,7 +20,6 @@ export CORE_AREA   = 5 5 895 745
 export PLACE_PINS_ARGS = -exclude left:0-200 -exclude left:500-700 -exclude right:* -exclude top:* -exclude bottom:*
 
 export MACRO_PLACE_HALO = 7 7
-export MACRO_PLACE_CHANNEL = 14 14
 
 export PLACE_DENSITY_LB_ADDON = 0.05
 

flow/designs/gf12/bp_dual/config.mk

@@ -65,6 +65,4 @@ export MACRO_WRAPPERS = $(PLATFORM_DIR)/bp/wrappers/wrappers.tcl
 
 export PDN_TCL = $(PLATFORM_DIR)/cfg/pdn_grid_strategy_13m_9T.top.tcl
 
-# Define macro halo and channel spacings
-export MACRO_PLACE_HALO = 7 7
-export MACRO_PLACE_CHANNEL = 14 14
+export MACRO_PLACE_HALO = 7 7

flow/designs/gf12/bp_quad/config.mk

@@ -47,6 +47,4 @@ export MACRO_WRAPPERS = $(PLATFORM_DIR)/bp/wrappers/wrappers.tcl
 
 export PDN_TCL = $(PLATFORM_DIR)/cfg/pdn_grid_strategy_13m_9T.top.tcl
 
-# Define macro halo and channel spacings
 export MACRO_PLACE_HALO = 5 5 
-export MACRO_PLACE_CHANNEL = 10 10

flow/designs/gf12/ca53/config.mk

@@ -51,7 +51,6 @@ export PLACE_DENSITY_LB_ADDON = 0.05
 export PLACE_PINS_ARGS = -exclude left:0-600 -exclude left:1350-1400 -exclude right:* -exclude top:* -exclude bottom:*
 
 export MACRO_PLACE_HALO = 7 7
-export MACRO_PLACE_CHANNEL = 14 14
 
 export MACRO_WRAPPERS = $(dir $(DESIGN_CONFIG))/wrappers.tcl
 

flow/designs/gf12/swerv_wrapper/config.mk

@@ -35,7 +35,6 @@ export PLACE_DENSITY_LB_ADDON = 0.05
 export MACRO_WRAPPERS = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/wrappers.tcl
 #
 export MACRO_PLACE_HALO = 7 7
-export MACRO_PLACE_CHANNEL = 14 14
 
 ifeq ($(USE_FILL),1)
 export DESIGN_TYPE = CELL

flow/designs/gf180/uart-blocks/config.mk

@@ -15,7 +15,6 @@ export CORE_AREA = 10 10 420 420
 export PLACE_PINS_ARGS    = -exclude bottom:* -exclude top:* -exclude right:*
 
 export MACRO_PLACE_HALO = 20 20
-export MACRO_PLACE_CHANNEL = 20 20
 
 export PDN_TCL = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/BLOCKS_grid_strategy.tcl
 export PLACE_DENSITY          = 0.60