Merge remote-tracking branch 'private/master' into secure-gpl-binSize-float

Author: gudeh

docs/user/FlowVariables.md

@@ -75,9 +75,10 @@ configuration file.
 | <a name="CORNER"></a>CORNER| PVT corner library selection. Only available for ASAP7 and GF180 PDKs.| | |
 | <a name="CTS_ARGS"></a>CTS_ARGS| Override `clock_tree_synthesis` arguments.| | |
 | <a name="CTS_BUF_DISTANCE"></a>CTS_BUF_DISTANCE| Distance (in microns) between buffers.| | |
-| <a name="CTS_BUF_LIST"></a>CTS_BUF_LIST| List of cells used to construct the clock tree.| | |
+| <a name="CTS_BUF_LIST"></a>CTS_BUF_LIST| List of cells used to construct the clock tree. Overrides buffer inference.| | |
 | <a name="CTS_CLUSTER_DIAMETER"></a>CTS_CLUSTER_DIAMETER| Maximum diameter (in microns) of sink cluster.| 20| |
 | <a name="CTS_CLUSTER_SIZE"></a>CTS_CLUSTER_SIZE| Maximum number of sinks per cluster.| 50| |
+| <a name="CTS_LIB_NAME"></a>CTS_LIB_NAME| Name of the Liberty library to use in selecting the clock buffers.| | |
 | <a name="CTS_SNAPSHOT"></a>CTS_SNAPSHOT| Creates ODB/SDC files prior to clock net and setup/hold repair.| | |
 | <a name="DESIGN_NAME"></a>DESIGN_NAME| The name of the top-level module of the design.| | |
 | <a name="DESIGN_NICKNAME"></a>DESIGN_NICKNAME| DESIGN_NICKNAME just changes the directory name that ORFS outputs to be DESIGN_NICKNAME instead of DESIGN_NAME in case DESIGN_NAME is unwieldy or conflicts with a different design.| | |
@@ -309,6 +310,7 @@ configuration file.
 - [CTS_BUF_LIST](#CTS_BUF_LIST)
 - [CTS_CLUSTER_DIAMETER](#CTS_CLUSTER_DIAMETER)
 - [CTS_CLUSTER_SIZE](#CTS_CLUSTER_SIZE)
+- [CTS_LIB_NAME](#CTS_LIB_NAME)
 - [CTS_SNAPSHOT](#CTS_SNAPSHOT)
 - [DETAILED_METRICS](#DETAILED_METRICS)
 - [EQUIVALENCE_CHECK](#EQUIVALENCE_CHECK)

etc/DockerHelper.sh

@@ -33,6 +33,7 @@ usage: $0 [CMD] [OPTIONS]
   -password=PASSWORD            Password to loging at the docker registry.
   -ci                           Install CI tools in image
   -dry-run                      Do not push images to the repository
+  -push-latest                  Push the latest image to the repository
   -no-constant-build-dir        Do not use constant build directory
   -h -help                      Show this message and exits
 
@@ -136,10 +137,22 @@ _push() {
         orfsTag=${org}/orfs:${tag}
         echo "Renaming docker image: ${builderTag} -> ${orfsTag}"
         ${DOCKER_CMD} tag ${builderTag} ${orfsTag}
+
         if [[ "${dryRun}" == 1 ]]; then
             echo "[DRY-RUN] ${DOCKER_CMD} push ${orfsTag}"
+            if [[ "${pushLatest}" == 1 ]]; then
+                echo "[DRY-RUN] ${DOCKER_CMD} tag ${orfsTag} \"${org}/orfs:latest\""
+                echo "[DRY-RUN] ${DOCKER_CMD} push \"${org}/orfs:latest\""
+            fi
         else
             ${DOCKER_CMD} push ${orfsTag}
+
+            # Only tag and push as latest if requested
+            if [[ "${pushLatest}" == 1 ]]; then
+                ${DOCKER_CMD} tag ${orfsTag} "${org}/orfs:latest"
+                ${DOCKER_CMD} push "${org}/orfs:latest"
+                echo "Tagged and pushed ${org}/orfs:latest"
+            fi
         fi
     fi
 }
@@ -174,6 +187,7 @@ numThreads="-1"
 tag=""
 options=""
 dryRun=0
+pushLatest=0
 
 while [ "$#" -gt 0 ]; do
     case "${1}" in
@@ -186,6 +200,9 @@ while [ "$#" -gt 0 ]; do
         -dry-run )
             dryRun=1
             ;;
+        -push-latest )
+            pushLatest=1
+            ;;
         -os=* )
             os="${1#*=}"
             ;;

flow/scripts/cts.tcl

@@ -24,6 +24,8 @@ append_env_var cts_args CTS_BUF_DISTANCE -distance_between_buffers 1
 append_env_var cts_args -sink_clustering_size CTS_CLUSTER_SIZE 1
 append_env_var cts_args -sink_clustering_max_diameter CTS_CLUSTER_DIAMETER 1
 append_env_var cts_args CTS_BUF_LIST -buf_list 1
+append_env_var cts_args CTS_LIB_NAME -library 1
+
 
 if {[env_var_exists_and_non_empty CTS_ARGS]} {
   set cts_args $::env(CTS_ARGS)

flow/scripts/variables.yaml

@@ -720,7 +720,7 @@ CTS_BUF_DISTANCE:
     - cts
 CTS_BUF_LIST:
   description: |
-    List of cells used to construct the clock tree.
+    List of cells used to construct the clock tree. Overrides buffer inference.
   stages:
     - cts
 CTS_CLUSTER_DIAMETER:
@@ -737,6 +737,11 @@ CTS_CLUSTER_SIZE:
   stages:
     - cts
   tunable: 1
+CTS_LIB_NAME:
+  description: |
+    Name of the Liberty library to use in selecting the clock buffers.
+  stages:
+    - cts
 CTS_SNAPSHOT:
   description: |
     Creates ODB/SDC files prior to clock net and setup/hold repair.

jenkins/public_tests_all.Jenkinsfile

@@ -1,8 +1,22 @@
 @Library('[email protected]') _
 
 node {
+    
+    def isDefaultBranch = (env.BRANCH_NAME == 'master') 
+    def daysToKeep = '20';
+    def numToKeep = (isDefaultBranch ? '-1' : '10');
 
-    properties([copyArtifactPermission('${JOB_NAME},'+env.BRANCH_NAME)]);
+    properties([
+        copyArtifactPermission('${JOB_NAME},'+env.BRANCH_NAME),
+
+        buildDiscarder(logRotator(
+            daysToKeepStr:         daysToKeep,
+            artifactDaysToKeepStr: daysToKeep, 
+
+            numToKeepStr:          numToKeep,
+            artifactNumToKeepStr:  numToKeep 
+        ))
+    ]);
 
     stage('Checkout') {
         if (env.BRANCH_NAME && env.BRANCH_NAME == 'master') {

tools/AutoTuner/src/autotuner/distributed.py

@@ -565,9 +565,7 @@ def sweep():
         temp = dict()
         for value in parameter:
             temp.update(value)
-        queue.put(
-            [args, repo_dir, temp, LOCAL_DIR, SDC_ORIGINAL, FR_ORIGINAL, INSTALL_PATH]
-        )
+        queue.put([args, repo_dir, temp, SDC_ORIGINAL, FR_ORIGINAL, INSTALL_PATH])
     workers = [consumer.remote(queue) for _ in range(args.jobs)]
     print("[INFO TUN-0009] Waiting for results.")
     ray.get(workers)

tools/AutoTuner/src/autotuner/utils.py

@@ -40,10 +40,10 @@
 import yaml
 import subprocess
 import sys
+import uuid
+import time
 from multiprocessing import cpu_count
 from datetime import datetime
-from uuid import uuid4 as uuid
-from time import time
 
 import numpy as np
 import ray
@@ -624,15 +624,15 @@ def openroad_distributed(
     )
     if variant is None:
         variant = config.replace(" ", "_").replace("=", "_")
-    t = time()
+    t = time.time()
     metric_file = openroad(
         args=args,
         base_dir=repo_dir,
         parameters=config,
-        flow_variant=f"{uuid()}-{variant}",
+        flow_variant=f"{uuid.uuid4()}-{variant}" if variant else f"{uuid.uuid4()}",
         install_path=install_path,
     )
-    duration = time() - t
+    duration = time.time() - t
     return metric_file, duration