Merge pull request #10495 from The-OpenROAD-Project-staging/syn-fixes

syn: Fix combinational mapper; extend tests

Author: povik

bazel/bzl_fmt_test.sh

@@ -11,8 +11,13 @@ TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
 [ -L MODULE.bazel ] || { echo "MODULE.bazel missing from runfiles" >&2; exit 1; }
 WORKSPACE="$(dirname "$(readlink MODULE.bazel)")"
 cd "$WORKSPACE"
-# `git ls-files` skips submodule contents (src/sta, third-party/abc).
+# `-c submodule.recurse=false` keeps git ls-files from descending into
+# submodules (src/sta, third-party/abc, third-party/slang-elab and the
+# fmt sub-submodule nested in it) — we never want to reformat files
+# owned by another repo. The override is needed because CI sets
+# submodule.recurse=true globally.
 # Explicit -mode=check -lint=off separates format errors from lint warnings,
 # and overrides the repo-root .buildifier.json default (mode: fix).
-git ls-files '*.bazel' '*.bzl' '**/BUILD' 'BUILD' '**/WORKSPACE' 'WORKSPACE' -z \
+git -c submodule.recurse=false ls-files \
+        '*.bazel' '*.bzl' '**/BUILD' 'BUILD' '**/WORKSPACE' 'WORKSPACE' -z \
     | xargs -0 "$TOOL" -mode=check -lint=off

bazel/bzl_lint_test.sh

@@ -11,8 +11,12 @@ TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
 [ -L MODULE.bazel ] || { echo "MODULE.bazel missing from runfiles" >&2; exit 1; }
 WORKSPACE="$(dirname "$(readlink MODULE.bazel)")"
 cd "$WORKSPACE"
-# `git ls-files` skips submodule contents (src/sta, third-party/abc), so
-# we never try to reformat files owned by another repo.
+# `-c submodule.recurse=false` keeps git ls-files from descending into
+# submodules (src/sta, third-party/abc, third-party/slang-elab and the
+# fmt sub-submodule nested in it) — we never want to reformat files
+# owned by another repo. The override is needed because CI sets
+# submodule.recurse=true globally.
 # Explicit -mode=check overrides the repo-root .buildifier.json default.
-git ls-files '*.bazel' '*.bzl' '**/BUILD' 'BUILD' '**/WORKSPACE' 'WORKSPACE' -z \
+git -c submodule.recurse=false ls-files \
+        '*.bazel' '*.bzl' '**/BUILD' 'BUILD' '**/WORKSPACE' 'WORKSPACE' -z \
     | xargs -0 "$TOOL" -mode=check -lint=warn

bazel/bzl_tidy.sh

@@ -6,7 +6,11 @@
 set -euo pipefail
 TOOL="$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
 cd "${BUILD_WORKSPACE_DIRECTORY:-$PWD}"
-# `git ls-files` skips submodule contents (src/sta, third-party/abc),
-# so we never rewrite files owned by another repo.
-git ls-files '*.bazel' '*.bzl' '**/BUILD' 'BUILD' '**/WORKSPACE' 'WORKSPACE' -z \
+# `-c submodule.recurse=false` keeps git ls-files from descending into
+# submodules (src/sta, third-party/abc, third-party/slang-elab and the
+# fmt sub-submodule nested in it) — we never want to rewrite files
+# owned by another repo. The override is needed because CI sets
+# submodule.recurse=true globally.
+git -c submodule.recurse=false ls-files \
+        '*.bazel' '*.bzl' '**/BUILD' 'BUILD' '**/WORKSPACE' 'WORKSPACE' -z \
     | xargs -0 "$TOOL" -mode=fix -lint=fix

src/syn/BUILD

@@ -16,9 +16,7 @@ cc_library(
     srcs = [
         "src/flow/abc.cc",
         "src/flow/bitblast.cc",
-        "src/flow/bitblast.h",
         "src/flow/combinational_mapper.cc",
-        "src/flow/combinational_mapper.h",
         "src/flow/combinational_mapper_npn.cc",
         "src/flow/combinational_mapper_npn.h",
         "src/flow/constant_fold.cc",

src/syn/include/syn/synthesis.h

@@ -117,10 +117,15 @@ class Synthesis : public sta::dbStaState
 // Free-function entry points re-declared here so tests don't need to
 // pull in the private flow/ headers. The Synthesis methods of the same
 // names forward to these.
+void bitblast(Graph& g, bool blast_arith = true);
 void mapSequentials(Graph& g,
                     sta::Network* network,
                     utl::Logger* logger,
                     const Synthesis& syn);
+void mapCombinationals(Graph& g,
+                       sta::Network* network,
+                       utl::Logger* logger,
+                       const Synthesis& syn);
 void abcRoundtrip(Graph& g, const std::string& commands, utl::Logger* logger);
 void livenessOpt(Graph& g,
                  utl::Logger* logger,

src/syn/src/flow/CMakeLists.txt

@@ -15,7 +15,7 @@ add_library(syn_flow
 )
 
 set(_syn_flow_stage ${CMAKE_CURRENT_BINARY_DIR}/include/flow)
-foreach(_h bitblast.h combinational_mapper.h combinational_mapper_npn.h export.h import.h opt_gatefusion.h)
+foreach(_h combinational_mapper_npn.h export.h import.h opt_gatefusion.h)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_h} ${_syn_flow_stage}/${_h} COPYONLY)
 endforeach()
 

src/syn/src/flow/bitblast.cc

@@ -4,8 +4,6 @@
 // Bitblast pass: converts arithmetic operations and muxes
 // to And/Andnot/Or/Xor/Not gates.
 
-#include "flow/bitblast.h"
-
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
@@ -22,6 +20,7 @@
 #include "syn/ir/Graph.h"
 #include "syn/ir/Instance.h"
 #include "syn/ir/Net.h"
+#include "syn/synthesis.h"
 
 namespace syn {
 

src/syn/src/flow/bitblast.h

@@ -5,8 +5,6 @@
 // standard cells from a liberty library using cut-based technology
 // mapping with NPN canonicalization.
 
-#include "flow/combinational_mapper.h"
-
 #include <algorithm>
 #include <cassert>
 #include <cmath>
@@ -677,8 +675,8 @@ void Mapping::prepareMatches(const int npriority_cuts,
     int psSlot = 0;
     ClassMatch* matchBuf = allocMatches(nmatches_max);
 
-    for (int i = -1; i < cache[n1->fid].ps.size(); i++) {
-      for (int j = -1; j < cache[n2->fid].ps.size(); j++) {
+    for (int i = -1; i < (int) cache[n1->fid].ps.size(); i++) {
+      for (int j = -1; j < (int) cache[n2->fid].ps.size(); j++) {
         Net* n1Cut = ((i == -1) ? t1 : cache[n1->fid].ps[i].cut);
         Net* n2Cut = ((j == -1) ? t2 : cache[n2->fid].ps[j].cut);
         int n1CutLen = (i == -1) ? 1 : cutLen(n1Cut);