Merge remote-tracking branch 'private/master' into secure-easy-use-negotiation

Author: gudeh

.gitattributes

@@ -1,2 +1,3 @@
 # Make Github ignore the designs folder when determining repo language
 flow/designs/src/* linguist-vendored
+flow/scripts/variables.json linguist-generated=true

.github/workflows/github-actions-yaml-test.yml

@@ -15,22 +15,29 @@ jobs:
         fetch-depth: 1
         sparse-checkout: |
           flow/scripts/generate-variables-docs.py
+          flow/scripts/yaml_to_json.py
+          flow/scripts/variables.yaml
+          flow/scripts/variables.json
           docs/user/FlowVariables.md
           yamlfix.toml
+    - name: Install dependencies
+      run: |
+        python3 -m venv venv
+        venv/bin/pip install --quiet pyyaml yamlfix==1.19.1
     - name: Run generate-variables-docs.py
       run: |
-        python3 flow/scripts/generate-variables-docs.py
+        venv/bin/python3 flow/scripts/generate-variables-docs.py
     - name: Check if FlowVariables.md is up to date
       run: |
         git diff --exit-code docs/user/FlowVariables.md
-    - name: Install dependencies
+    - name: Check variables.json is up to date
       run: |
-        python3 -m venv venv
-        venv/bin/pip install --quiet yamlfix==1.17.0
+        venv/bin/python3 flow/scripts/yaml_to_json.py
+        git diff --exit-code flow/scripts/variables.json
     - name: Run yamlfix check
       run: |
         source venv/bin/activate
         yamlfix --version
         set -x
         yamlfix -c yamlfix.toml flow/scripts/variables.yaml
-        git diff flow/scripts/variables.yaml
+        git diff --exit-code flow/scripts/variables.yaml

docs/user/FlowVariables.md

@@ -305,7 +305,7 @@ configuration file.
 | <a name="SYNTH_OPERATIONS_ARGS"></a>SYNTH_OPERATIONS_ARGS| Extra arguments appended to the Yosys synth command operations list. When set, replaces the default Kogge-Stone adder extra-map.| |
 | <a name="SYNTH_OPT_HIER"></a>SYNTH_OPT_HIER| Optimize constants across hierarchical boundaries.| |
 | <a name="SYNTH_REPEATABLE_BUILD"></a>SYNTH_REPEATABLE_BUILD| License to prune anything that makes builds less repeatable, typically used with Bazel to ensure that builds are bit-for-bit identical so that caching works optimally. Removes debug information that encodes paths, timestamps, etc.| 0|
-| <a name="SYNTH_RETIME_MODULES"></a>SYNTH_RETIME_MODULES| *This is an experimental option and may cause adverse effects.* *No effort has been made to check if the retimed RTL is logically equivalent to the non-retimed RTL.* List of modules to apply automatic retiming to. These modules must not get dissolved and as such they should either be the top module or be included in SYNTH_KEEP_MODULES. The main use case is to quickly identify if performance can be improved by manually retiming the input RTL. Retiming will treat module ports like register endpoints/startpoints. The objective function of retiming isn't informed by SDC, even the clock period is ignored. As such, retiming will optimize for best delay at potentially high register number cost. Automatic retiming can produce suboptimal results as its timing model is crude and it doesn't find the optimal distribution of registers on long pipelines. See OR discussion #8080.| |
+| <a name="SYNTH_RETIME_MODULES"></a>SYNTH_RETIME_MODULES| *This is an experimental option and may cause adverse effects.* *No effort has been made to check if the retimed RTL is logically equivalent to the non-retimed RTL.* List of modules to apply automatic retiming to. These modules must not get dissolved and as such they should either be the top module or be included in SYNTH_KEEP_MODULES. The main use case is to quickly identify if performance can be improved by manually retiming the input RTL. Retiming will treat module ports like register endpoints/startpoints. The objective function of retiming isn't informed by SDC, even the clock period is ignored. As such, retiming will optimize for best delay at potentially high register number cost. Automatic retiming can produce suboptimal results as its timing model is crude and it doesn't find the optimal distribution of registers on long pipelines. See OR discussion  # 8080.| |
 | <a name="SYNTH_SLANG_ARGS"></a>SYNTH_SLANG_ARGS| Additional arguments passed to the slang frontend during synthesis.| |
 | <a name="SYNTH_WRAPPED_ADDERS"></a>SYNTH_WRAPPED_ADDERS| Specify the adder modules that can be used for synthesis, separated by commas. The default adder module is determined by the first element of this variable.| |
 | <a name="SYNTH_WRAPPED_MULTIPLIERS"></a>SYNTH_WRAPPED_MULTIPLIERS| Specify the multiplier modules that can be used for synthesis, separated by commas. The default multiplier module is determined by the first element of this variable.| |

flow/BUILD.bazel

@@ -7,6 +7,7 @@ exports_files(
 
 # files shared between scripts/synth.sh and scripts/flow.sh steps
 MAKEFILE_SHARED = [
+    "scripts/variables.json",
     "scripts/*.py",
     "scripts/*.sh",
     "scripts/*.yaml",

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

@@ -32,27 +32,27 @@
         "compare": ">="
     },
     "cts__timing__setup__tns": {
-        "value": -2890.0,
+        "value": -4840.0,
         "compare": ">="
     },
     "cts__timing__hold__ws": {
         "value": -52.3,
         "compare": ">="
     },
     "cts__timing__hold__tns": {
-        "value": -5670.0,
+        "value": -6310.0,
         "compare": ">="
     },
     "globalroute__antenna_diodes_count": {
         "value": 100,
         "compare": "<="
     },
     "globalroute__timing__setup__ws": {
-        "value": -77.7,
+        "value": -125.0,
         "compare": ">="
     },
     "globalroute__timing__setup__tns": {
-        "value": -3020.0,
+        "value": -3660.0,
         "compare": ">="
     },
     "globalroute__timing__hold__ws": {
@@ -80,11 +80,11 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -58.1,
+        "value": -94.0,
         "compare": ">="
     },
     "finish__timing__setup__tns": {
-        "value": -897.0,
+        "value": -1470.0,
         "compare": ">="
     },
     "finish__timing__hold__ws": {

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

@@ -32,7 +32,7 @@
         "compare": ">="
     },
     "cts__timing__setup__tns": {
-        "value": -1360.0,
+        "value": -1530.0,
         "compare": ">="
     },
     "cts__timing__hold__ws": {

flow/designs/asap7/gcd-ccs/rules-base.json

@@ -8,11 +8,11 @@
         "compare": "=="
     },
     "placeopt__design__instance__area": {
-        "value": 51,
+        "value": 61,
         "compare": "<="
     },
     "placeopt__design__instance__count__stdcell": {
-        "value": 489,
+        "value": 606,
         "compare": "<="
     },
     "detailedplace__design__violations": {
@@ -28,11 +28,11 @@
         "compare": "<="
     },
     "cts__timing__setup__ws": {
-        "value": -21.3,
+        "value": -63.5,
         "compare": ">="
     },
     "cts__timing__setup__tns": {
-        "value": -67.8,
+        "value": -773.0,
         "compare": ">="
     },
     "cts__timing__hold__ws": {
@@ -48,11 +48,11 @@
         "compare": "<="
     },
     "globalroute__timing__setup__ws": {
-        "value": -15.5,
+        "value": -63.5,
         "compare": ">="
     },
     "globalroute__timing__setup__tns": {
-        "value": -62.0,
+        "value": -771.0,
         "compare": ">="
     },
     "globalroute__timing__hold__ws": {
@@ -64,7 +64,7 @@
         "compare": ">="
     },
     "detailedroute__route__wirelength": {
-        "value": 925,
+        "value": 1165,
         "compare": "<="
     },
     "detailedroute__route__drc_errors": {
@@ -80,11 +80,11 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -37.9,
+        "value": -86.7,
         "compare": ">="
     },
     "finish__timing__setup__tns": {
-        "value": -180.0,
+        "value": -1270.0,
         "compare": ">="
     },
     "finish__timing__hold__ws": {
@@ -96,7 +96,7 @@
         "compare": ">="
     },
     "finish__design__instance__area": {
-        "value": 53,
+        "value": 63,
         "compare": "<="
     }
 }

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

@@ -8,11 +8,11 @@
         "compare": "=="
     },
     "placeopt__design__instance__area": {
-        "value": 50,
+        "value": 61,
         "compare": "<="
     },
     "placeopt__design__instance__count__stdcell": {
-        "value": 473,
+        "value": 611,
         "compare": "<="
     },
     "detailedplace__design__violations": {
@@ -28,11 +28,11 @@
         "compare": "<="
     },
     "cts__timing__setup__ws": {
-        "value": -29.6,
+        "value": -85.9,
         "compare": ">="
     },
     "cts__timing__setup__tns": {
-        "value": -119.0,
+        "value": -1290.0,
         "compare": ">="
     },
     "cts__timing__hold__ws": {
@@ -48,11 +48,11 @@
         "compare": "<="
     },
     "globalroute__timing__setup__ws": {
-        "value": -39.7,
+        "value": -112.0,
         "compare": ">="
     },
     "globalroute__timing__setup__tns": {
-        "value": -225.0,
+        "value": -1790.0,
         "compare": ">="
     },
     "globalroute__timing__hold__ws": {
@@ -64,7 +64,7 @@
         "compare": ">="
     },
     "detailedroute__route__wirelength": {
-        "value": 1006,
+        "value": 1324,
         "compare": "<="
     },
     "detailedroute__route__drc_errors": {
@@ -80,11 +80,11 @@
         "compare": "<="
     },
     "finish__timing__setup__ws": {
-        "value": -32.2,
+        "value": -104.0,
         "compare": ">="
     },
     "finish__timing__setup__tns": {
-        "value": -141.0,
+        "value": -1570.0,
         "compare": ">="
     },
     "finish__timing__hold__ws": {
@@ -96,7 +96,7 @@
         "compare": ">="
     },
     "finish__design__instance__area": {
-        "value": 55,
+        "value": 66,
         "compare": "<="
     }
 }

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

@@ -32,7 +32,7 @@
         "compare": ">="
     },
     "cts__timing__setup__tns": {
-        "value": -442.0,
+        "value": -1160.0,
         "compare": ">="
     },
     "cts__timing__hold__ws": {
@@ -52,7 +52,7 @@
         "compare": ">="
     },
     "globalroute__timing__setup__tns": {
-        "value": -592.0,
+        "value": -9030.0,
         "compare": ">="
     },
     "globalroute__timing__hold__ws": {
@@ -84,7 +84,7 @@
         "compare": ">="
     },
     "finish__timing__setup__tns": {
-        "value": -286.0,
+        "value": -722.0,
         "compare": ">="
     },
     "finish__timing__hold__ws": {

flow/designs/asap7/mock-alu/rules-base.json

@@ -32,7 +32,7 @@
         "compare": ">="
     },
     "cts__timing__setup__tns": {
-        "value": -13200.0,
+        "value": -14100.0,
         "compare": ">="
     },
     "cts__timing__hold__ws": {
@@ -52,7 +52,7 @@
         "compare": ">="
     },
     "globalroute__timing__setup__tns": {
-        "value": -15100.0,
+        "value": -18100.0,
         "compare": ">="
     },
     "globalroute__timing__hold__ws": {
@@ -84,7 +84,7 @@
         "compare": ">="
     },
     "finish__timing__setup__tns": {
-        "value": -13000.0,
+        "value": -15700.0,
         "compare": ">="
     },
     "finish__timing__hold__ws": {