Merge remote-tracking branch 'origin/master' into pad-check-better

Author: gadfort

src/odb/src/db/dbDatabase.cpp

@@ -280,7 +280,17 @@ dbIStream& operator>>(dbIStream& stream, _dbDatabase& obj)
     stream >> *obj.chip_net_tbl_;
   }
   if (obj.isSchema(db_schema_dbu_per_micron)) {
-    stream >> obj.dbu_per_micron_;
+    if (obj.isLessThanSchema(db_schema_remove_dbu_per_micron)) {
+      // Should already have a value from dbTech, so only need to update this if
+      // its been set.
+      uint dbu_per_micron;
+      stream >> dbu_per_micron;
+      if (dbu_per_micron != 0) {
+        obj.dbu_per_micron_ = dbu_per_micron;
+      }
+    } else {
+      stream >> obj.dbu_per_micron_;
+    }
   }
   // Set the _tech on the block & libs now they are loaded
   if (!obj.isSchema(db_schema_block_tech)) {

test/orfs/mock-array/mock-array.bzl

@@ -224,6 +224,10 @@ POWER_TESTS = [
     "path_groups",
 ]
 
+ELEMENT_POWER_TESTS = [
+    "power_modules",
+]
+
 def mock_array(name, config):
     """Defines the mock array build targets for OpenROAD-flow-scripts.
 
@@ -510,3 +514,62 @@ def mock_array(name, config):
                         ),
                     ],
                 )
+
+        for power_test in ELEMENT_POWER_TESTS:
+            if v != "base":
+                continue
+            for stage in POWER_STAGES:
+                orfs_run(
+                    name = "Element_{variant}_{stage}_{power_test}".format(
+                        variant = variant,
+                        power_test = power_test,
+                        stage = stage,
+                    ),
+                    src = ":Element_{variant}_{stage}".format(variant = variant, stage = stage),
+                    outs = [
+                        "{variant}_{power_test}_{stage}.txt".format(
+                            variant = variant,
+                            power_test = power_test,
+                            stage = stage,
+                        ),
+                    ],
+                    arguments = {
+                        "OUTPUT": "$(location :{variant}_{power_test}_{stage}.txt)".format(
+                            variant = variant,
+                            power_test = power_test,
+                            stage = stage,
+                        ),
+                        "POWER_STAGE_NAME": stage,
+                        "POWER_STAGE_STEM": POWER_STAGE_STEM[stage],
+                        "VCD_STIMULI": "$(location :vcd_{variant}_{stage})".format(variant = variant, stage = stage),
+                    },
+                    data = [
+                        ":vcd_{variant}_{stage}".format(variant = variant, stage = stage),
+                    ],
+                    script = ":{power_test}.tcl".format(power_test = power_test),
+                    tags = ["manual"],
+                    visibility = ["//visibility:public"],
+                )
+
+                sh_test(
+                    name = "Element_{variant}_{power_test}_{stage}_test".format(
+                        variant = variant,
+                        power_test = power_test,
+                        stage = stage,
+                    ),
+                    srcs = ["ok.sh"],
+                    args = [
+                        "$(location :Element_{variant}_{stage}_{power_test})".format(
+                            variant = variant,
+                            stage = stage,
+                            power_test = power_test,
+                        ),
+                    ],
+                    data = [
+                        ":Element_{variant}_{stage}_{power_test}".format(
+                            variant = variant,
+                            power_test = power_test,
+                            stage = stage,
+                        ),
+                    ],
+                )

test/orfs/mock-array/power_modules.tcl

@@ -0,0 +1,18 @@
+source $::env(SCRIPTS_DIR)/load.tcl
+load_design $::env(POWER_STAGE_STEM).odb $::env(POWER_STAGE_STEM).sdc
+
+log_cmd report_power
+
+# FIXME add check that all pins are annotated and that parasitics are
+# estimated or read from SPEF
+
+set instances {io_outs_down_mult io_outs_left_mult io_outs_up_mult io_outs_right_mult}
+report_power -instances $instances
+
+# FIXME
+# log_cmd report_parasitic_annotation
+#log_cmd report_activity_annotation -report_unannotated
+
+set f [open $::env(OUTPUT) w]
+puts $f OK
+close $f