Gather digital tests & report fix:

- batch -> digital/batch - generic_sar -> digital/generic_sar - fix erroneous sim time in "others"
LudwigCRON · Apr 12, 2020 · d1c10e1 · d1c10e1
1 parent 44e712c
commit d1c10e1
Show file tree

Hide file tree

Showing 25 changed files with 174 additions and 20 deletions.
diff --git a/default.config b/default.config
@@ -1,5 +1,6 @@
 DIG_SYNTHESIS_TOOL  = yosys
 DIG_SIMULATOR_TOOL  = iverilog
+DIG_LINTER_TOOL     = iverilog
 DIG_COVERAGE_TOOL   = covered
 DIG_WAVEFORM_VIEWER = gtkwave
 ANA_SIMULATOR_TOOL  = ltspice

diff --git a/envs/bin/run b/envs/bin/run
@@ -199,9 +199,9 @@ if __name__ == "__main__":
             relog.error("cannot lint mixed signal or analog simulations")
             exit(0)
         # load the simulator script
-        tool_path = utils.find_tool(config["DIG_SIMULATOR_TOOL"])
+        tool_path = utils.find_tool(config["DIG_LINTER_TOOL"])
         sys.path.append(os.path.dirname(tool_path))
-        linter = import_module(config["DIG_SIMULATOR_TOOL"])
+        linter = import_module(config["DIG_LINTER_TOOL"])
         # execute
         t_start = time.time() * 1000.0
         stats = linter.main(files, params, lint=True)
@@ -325,23 +325,23 @@ if __name__ == "__main__":
         # read other sims
         db_batch = {"sims": [], "lints": [], "covs": []}
         for stats_path in Path(CURRENT_DIR).rglob("**/*.stats"):
-            if stats_path in read_stat_done:
-                continue
-            type, db_sim = read_sim_stat(stats_path)
-            # aggregate
-            for k, v in db_sim.items():
-                tmp = db_batch[k] if k in db_batch else 0
-                if k != "name":
-                    try:
-                        db_batch[k] = float(v) + tmp
-                    except ValueError:
-                        relog.error("%s values should be number" % stats_path)
-            read_stat_done.append(stats_path)
-            if type != "batch":
-                db_batch["%ss" % type].append(db_sim)
+            if stats_path not in read_stat_done and "batch.stats" not in str(stats_path):
+                type, db_sim = read_sim_stat(stats_path)
+                # aggregate
+                for k, v in db_sim.items():
+                    tmp = db_batch[k] if k in db_batch else 0
+                    if k != "name":
+                        try:
+                            db_batch[k] = float(v) + tmp
+                        except ValueError:
+                            relog.error("%s values should be number" % stats_path)
+                read_stat_done.append(stats_path)
+                if type != "batch":
+                    db_batch["%ss" % type].append(db_sim)
         # add some stats to the db
         add_extra_stats(db_batch)
         db_batch["name"] = "others"
+        print(db_batch)
         db["blocks"].append(db_batch)
         # read the html template
         t = Template(

diff --git a/tests/Batch.list b/tests/Batch.list
@@ -1,4 +1,2 @@
-generic_sar
 analog
-digital/cov/simple
-batch
+digital
diff --git a/tests/main/Sources.list → tests/common/main/Sources.list b/tests/main/Sources.list → tests/common/main/Sources.list
diff --git a/tests/main/tb.sv → tests/common/main/tb.sv b/tests/main/tb.sv → tests/common/main/tb.sv
diff --git a/tests/src_dir1/Sources.list → tests/common/src_dir1/Sources.list b/tests/src_dir1/Sources.list → tests/common/src_dir1/Sources.list
diff --git a/tests/src_dir1/clk_gen.v → tests/common/src_dir1/clk_gen.v b/tests/src_dir1/clk_gen.v → tests/common/src_dir1/clk_gen.v
diff --git a/tests/src_dir2/Sources.list → tests/common/src_dir2/Sources.list b/tests/src_dir2/Sources.list → tests/common/src_dir2/Sources.list
diff --git a/tests/digital/Batch.list b/tests/digital/Batch.list
@@ -0,0 +1,3 @@
+batch
+cov/simple
+generic_sar
diff --git a/tests/digital/batch/.tmp_report/report.html b/tests/digital/batch/.tmp_report/report.html
@@ -0,0 +1,151 @@
+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <style>
+        :root,
+        html {
+            font-family: Lato, Arial, Helvetica;
+        }
+
+        summary {
+            margin: 0;
+            padding: 0.125rem 1rem;
+            background: #65BBA9;
+            color: #FFF;
+            font-size: 1.125rem;
+            text-transform: uppercase;
+        }
+
+        details {
+            margin: 1rem 0;
+            padding: 0;
+        }
+
+        details h3 {
+            padding: 0.125rem;
+            background: #CCC;
+            font-size: 1rem;
+        }
+
+        details h3~* {
+            margin-bottom: 1rem;
+        }
+
+        details h3:not(:first-child) {
+            margin: 0;
+        }
+
+        table {
+            border-collapse: collapse;
+            width: 100%
+        }
+
+        thead,
+        th {
+            background: #CCC;
+            border: 0;
+        }
+
+        tr:nth-child(2n+1) {
+            background: #EEE;
+        }
+
+        td:first-child {
+            text-align: left;
+            padding-left: 1em;
+        }
+
+        td {
+            text-align: center;
+        }
+    </style>
+</head>
+
+<body>
+    <h1>Saturday, 11. April 2020 20:36</h1>
+    <table>
+        <thead>
+            <th>name</th>
+            <th>lint</th>
+            <th>simulation</th>
+            <th>coverage</th>
+            <th>total time</th>
+        </thead>
+        <tbody>
+            <tr>
+                <td>
+                    <a href="#batch">
+                        batch
+                    </a>
+                </td>
+                <td>0/0</td>
+                <td>6/6</td>
+                <td>0/0</td>
+                <td>0.507s</td>
+            </tr>
+        </tbody>
+    </table>
+
+    <details id="batch" open>
+        <summary>
+            batch
+        </summary>
+        <h3>Lint</h3>
+        <div class="warnings">No lints</div>
+
+        <h3>Simulation</h3>
+        <table>
+            <thead>
+                <th>id</th>
+                <th>warnings</th>
+                <th>errors</th>
+                <th>total time</th>
+            </thead>
+            <tbody>
+                <tr>
+                    <td>s2</td>
+                    <td>0</td>
+                    <td>0</td>
+                    <td>0.10s</td>
+                </tr>
+                <tr>
+                    <td>tb</td>
+                    <td>0</td>
+                    <td>0</td>
+                    <td>0.10s</td>
+                </tr>
+                <tr>
+                    <td>youpi</td>
+                    <td>0</td>
+                    <td>0</td>
+                    <td>0.9s</td>
+                </tr>
+                <tr>
+                    <td>s</td>
+                    <td>0</td>
+                    <td>0</td>
+                    <td>0.10s</td>
+                </tr>
+                <tr>
+                    <td>fast_clock</td>
+                    <td>0</td>
+                    <td>0</td>
+                    <td>0.10s</td>
+                </tr>
+                <tr>
+                    <td>UFC</td>
+                    <td>0</td>
+                    <td>0</td>
+                    <td>0.11s</td>
+                </tr>
+            </tbody>
+        </table>
+
+        <h3>Code coverage</h3>
+        <div class="warnings">No coverage simulations</div>
+    </details>
+</body>
+
+</html>
diff --git a/tests/batch/Batch.list → tests/digital/batch/Batch.list b/tests/batch/Batch.list → tests/digital/batch/Batch.list
diff --git a/tests/batch/tb/Sources.list → tests/digital/batch/tb/Sources.list b/tests/batch/tb/Sources.list → tests/digital/batch/tb/Sources.list
diff --git a/tests/batch/tb/tb.sv → tests/digital/batch/tb/tb.sv b/tests/batch/tb/tb.sv → tests/digital/batch/tb/tb.sv
diff --git a/tests/generic_sar/Makefile → tests/digital/generic_sar/Makefile b/tests/generic_sar/Makefile → tests/digital/generic_sar/Makefile
diff --git a/tests/generic_sar/Sources.list → tests/digital/generic_sar/Sources.list b/tests/generic_sar/Sources.list → tests/digital/generic_sar/Sources.list
diff --git a/tests/generic_sar/generic/Sources.list → .../digital/generic_sar/generic/Sources.list b/tests/generic_sar/generic/Sources.list → .../digital/generic_sar/generic/Sources.list
diff --git a/tests/generic_sar/generic/rs_nand.v → tests/digital/generic_sar/generic/rs_nand.v b/tests/generic_sar/generic/rs_nand.v → tests/digital/generic_sar/generic/rs_nand.v
diff --git a/tests/generic_sar/generic/rs_nor.v → tests/digital/generic_sar/generic/rs_nor.v b/tests/generic_sar/generic/rs_nor.v → tests/digital/generic_sar/generic/rs_nor.v
diff --git a/tests/generic_sar/generic/toggle_resync.v → ...gital/generic_sar/generic/toggle_resync.v b/tests/generic_sar/generic/toggle_resync.v → ...gital/generic_sar/generic/toggle_resync.v
diff --git a/tests/generic_sar/project.config → tests/digital/generic_sar/project.config b/tests/generic_sar/project.config → tests/digital/generic_sar/project.config
@@ -1,7 +1,8 @@
 DIG_SYNTHESIS_TOOL = yosys
 DIG_SIMULATOR_TOOL = iverilog
+DIG_LINTER_TOOL    = iverilog
 DIG_COVERAGE_TOOL  = covered
 WAVEFORM_VIEWER    = gtkwave
-PLATFORM           = Ganymede
+PLATFORM           = reflow
 PROJECT_FLOW       = digital
 TECH_LIB           = $(CADTOOLS)/yosys/examples/cmos/cmos_cells.lib
diff --git a/tests/generic_sar/sar.v → tests/digital/generic_sar/sar.v b/tests/generic_sar/sar.v → tests/digital/generic_sar/sar.v
diff --git a/tests/generic_sar/sar_analog.sv → tests/digital/generic_sar/sar_analog.sv b/tests/generic_sar/sar_analog.sv → tests/digital/generic_sar/sar_analog.sv
diff --git a/tests/generic_sar/sar_reconstruction.v → .../digital/generic_sar/sar_reconstruction.v b/tests/generic_sar/sar_reconstruction.v → .../digital/generic_sar/sar_reconstruction.v
diff --git a/tests/generic_sar/tb.sv → tests/digital/generic_sar/tb.sv b/tests/generic_sar/tb.sv → tests/digital/generic_sar/tb.sv
diff --git a/tests/generic_sar/view.gtkw → tests/digital/generic_sar/view.gtkw b/tests/generic_sar/view.gtkw → tests/digital/generic_sar/view.gtkw