syn: Rm redundant header for pedantic build's sake

povik · povik · commit dba6a8e8e584 · 2026-05-22T23:34:29.000+02:00
Signed-off-by: Martin Povišer &lt;povik@cutebit.org&gt;
diff --git a/src/syn/BUILD b/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",
diff --git a/src/syn/src/flow/CMakeLists.txt b/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()
 
diff --git a/src/syn/src/flow/bitblast.cc b/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 {
 
diff --git a/src/syn/src/flow/bitblast.h b/src/syn/src/flow/bitblast.h
diff --git a/src/syn/src/flow/combinational_mapper.cc b/src/syn/src/flow/combinational_mapper.cc
@@ -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>
diff --git a/src/syn/src/flow/combinational_mapper.h b/src/syn/src/flow/combinational_mapper.h
diff --git a/src/syn/src/synthesis.cpp b/src/syn/src/synthesis.cpp
@@ -15,8 +15,6 @@
 
 #include "db_sta/dbSta.hh"
 #include "elab/driver.h"
-#include "flow/bitblast.h"
-#include "flow/combinational_mapper.h"
 #include "flow/constant_fold.h"
 #include "flow/export.h"
 #include "flow/import.h"
diff --git a/src/syn/test/bitblast_test.cc b/src/syn/test/bitblast_test.cc
@@ -9,6 +9,7 @@
 #include "syn/ir/Graph.h"
 #include "syn/ir/Instance.h"
 #include "syn/ir/Net.h"
+#include "syn/synthesis.h"
 
 int main(int argc, char** argv)
 {
@@ -18,8 +19,6 @@ int main(int argc, char** argv)
 
 namespace syn {
 
-void bitblast(Graph& g, bool blast_arith = true);
-
 // Rule 11 (Substitution): a & ~(a & b) → a & ~b (= andnot)
 TEST(BitblastTest, Rule11_Substitution)
 {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ add_library(syn_flow`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`set(_syn_flow_stage ${CMAKE_CURRENT_BINARY_DIR}/include/flow)`
`18`		`-foreach(_h bitblast.h combinational_mapper.h combinational_mapper_npn.h export.h import.h opt_gatefusion.h)`
	`18`	`+foreach(_h combinational_mapper_npn.h export.h import.h opt_gatefusion.h)`
`19`	`19`	`configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${_h} ${_syn_flow_stage}/${_h} COPYONLY)`
`20`	`20`	`endforeach()`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`#include "syn/ir/Graph.h"`
`10`	`10`	`#include "syn/ir/Instance.h"`
`11`	`11`	`#include "syn/ir/Net.h"`
	`12`	`+#include "syn/synthesis.h"`
`12`	`13`
`13`	`14`	`int main(int argc, char** argv)`
`14`	`15`	`{`
`@@ -18,8 +19,6 @@ int main(int argc, char** argv)`
`18`	`19`
`19`	`20`	`namespace syn {`
`20`	`21`
`21`		`-void bitblast(Graph& g, bool blast_arith = true);`
`22`		`-`
`23`	`22`	`// Rule 11 (Substitution): a & ~(a & b) → a & ~b (= andnot)`
`24`	`23`	`TEST(BitblastTest, Rule11_Substitution)`
`25`	`24`	`{`