Merge branch 'The-OpenROAD-Project:master' into at-cts-buf-distance

Author: jeffng-or

flow/MODULE.bazel

@@ -11,7 +11,7 @@ bazel_dep(name = "bazel-orfs")
 # To bump version, run: bazelisk run @bazel-orfs//:bump
 git_override(
     module_name = "bazel-orfs",
-    commit = "9b00feceb3f2d695787c45708131a5e39e30d08e",
+    commit = "126765508161956f8f82ae169084da0235230637",
     remote = "https://github.com/The-OpenROAD-Project/bazel-orfs.git",
 )
 
@@ -61,7 +61,7 @@ orfs.default(
     # and update "image" to point to the local image.
 
     # Official image https://hub.docker.com/r/openroad/orfs/tags
-    image = "docker.io/openroad/orfs:v3.0-2784-g6bb4f353",
+    image = "docker.io/openroad/orfs:v3.0-2883-ge22e4fc7",
     # Use local files instead of docker image
     makefile = "//:makefile",
     makefile_yosys = "//:makefile_yosys",
@@ -79,7 +79,7 @@ orfs.default(
     # bazelisk build -c opt :openroad
     openroad = "//test:openroad",
     pdk = "//:asap7",
-    sha256 = "67535c7e4a1bdf6adc98eebc3a17988c80674760293887447e750dd526fe6427",
+    sha256 = "6ad0b1b7fbf290f33f0050ead4da181c83c6e8a9337b65f5f9cff65d67788424",
 )
 use_repo(orfs, "com_github_nixos_patchelf_download")
 use_repo(orfs, "docker_orfs")

flow/MODULE.bazel.lock

@@ -0,0 +1,21 @@
+load("@bazel-orfs//:openroad.bzl", "orfs_flow")
+
+orfs_flow(
+    name = "gcd",
+    arguments = {
+        # Faster builds
+        "SKIP_INCREMENTAL_REPAIR": "1",
+        "GPL_TIMING_DRIVEN": "0",
+        "SKIP_LAST_GASP": "1",
+        # Various
+        "DIE_AREA": "0 0 16.2 16.2",
+        "CORE_AREA": "1.08 1.08 15.12 15.12",
+        "PLACE_DENSITY": "0.35",
+    },
+    sources = {
+        "RULES_JSON": [":rules-base.json"],
+        "SDC_FILE": [":constraint.sdc"],
+    },
+    verilog_files = ["//designs/src/gcd:verilog"],
+    tags = ["manual"],
+)

flow/designs/asap7/gcd/BUILD

@@ -51,7 +51,7 @@
 args = parser.parse_args()
 
 goldFilename = f"metadata-{args.variant}-ok.json"
-runFilename = f"metadata-{args.variant}.json"
+runFilename = f"metadata.json"
 
 
 def readMetrics(fname, justLoad=False):

flow/designs/asap7/gcd/BUILD.bazel

@@ -31,7 +31,7 @@
 args = parser.parse_args()
 
 
-def upload_data(db, datafile, platform, design, variant, args, rules):
+def upload_data(db, dataFile, platform, design, variant, args, rules):
     # Set the document data
     key = args.commitSHA + "-" + platform + "-" + design + "-" + variant
     doc_ref = db.collection("build_metrics").document(key)
@@ -166,9 +166,7 @@ def upload_data(db, datafile, platform, design, variant, args, rules):
         raise Exception(f"Failed to upload data for {platform} {design} {variant}.")
 
 
-def get_rules(platform, design, variant):
-    runFilename = f"rules-{variant}.json"
-    dataFile = os.path.join("designs", platform, design, runFilename)
+def get_rules(dataFile):
     data = {}
     if os.path.exists(dataFile):
         with open(dataFile) as f:
@@ -182,7 +180,7 @@ def get_rules(platform, design, variant):
 # Initialize Firestore client
 db = firestore.client()
 
-runFilename = f"metadata-{args.variant}.json"
+RUN_FILENAME = "metadata.json"
 
 for reportDir, dirs, files in sorted(os.walk("reports", topdown=False)):
     dirList = reportDir.split(os.sep)
@@ -193,14 +191,14 @@ def get_rules(platform, design, variant):
     platform = dirList[1]
     design = dirList[2]
     variant = dirList[3]
-    dataFile = os.path.join(reportDir, runFilename)
+    dataFile = os.path.join(reportDir, RUN_FILENAME)
     if not os.path.exists(dataFile):
         print(f"[WARN] No data file for {platform} {design} {variant}.")
         continue
     if platform == "sky130hd_fakestack" or platform == "src":
         print(f"[WARN] Skiping upload {platform} {design} {variant}.")
         continue
     print(f"[INFO] Get rules for {platform} {design} {variant}.")
-    rules = get_rules(platform, design, variant)
+    rules = get_rules(os.path.join("designs", platform, design, RUN_FILENAME))
     print(f"[INFO] Upload data for {platform} {design} {variant}.")
     upload_data(db, dataFile, platform, design, variant, args, rules)