Refine includes needed.

* source_location: Only include in preprocessor branches that need it. * testbench: looks like it included some headers not needed anymore. * A few more of these here and there, all pointed out by clang-tidy misc-include-cleaner PiperOrigin-RevId: 649223641
google · Jul 3, 2024 · 3add73f · 3add73f
1 parent 4fa1743
commit 3add73f
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 28 deletions.
diff --git a/xls/common/BUILD b/xls/common/BUILD
@@ -250,7 +250,6 @@ cc_test(
 cc_library(
     name = "source_location",
     hdrs = ["source_location.h"],
-    deps = ["@com_google_absl//absl/base:config"],
 )
 
 cc_test(

diff --git a/xls/common/source_location.h b/xls/common/source_location.h
@@ -29,10 +29,6 @@
 #ifndef XLS_COMMON_SOURCE_LOCATION_H_
 #define XLS_COMMON_SOURCE_LOCATION_H_
 
-#include <cstdint>
-
-#include "absl/base/config.h"
-
 #ifdef XLS_USE_ABSL_SOURCE_LOCATION
 #include "absl/types/source_location.h"
 
@@ -44,6 +40,7 @@ using SourceLocation = absl::SourceLocation;
 }  // namespace xabsl
 
 #else
+#include <cstdint>
 
 // OSS Version of source_location
 

diff --git a/xls/interpreter/BUILD b/xls/interpreter/BUILD
@@ -200,7 +200,6 @@ cc_library(
         "//xls/ir",
         "//xls/ir:bits",
         "//xls/ir:channel",
-        "//xls/ir:elaboration",
         "//xls/ir:format_preference",
         "//xls/ir:function_builder",
         "//xls/ir:ir_test_base",

diff --git a/xls/interpreter/block_evaluator.cc b/xls/interpreter/block_evaluator.cc
@@ -41,7 +41,6 @@
 #include "xls/ir/block.h"
 #include "xls/ir/block_elaboration.h"
 #include "xls/ir/elaboration.h"
-#include "xls/ir/events.h"
 #include "xls/ir/instantiation.h"
 #include "xls/ir/node.h"
 #include "xls/ir/nodes.h"

diff --git a/xls/interpreter/block_evaluator.h b/xls/interpreter/block_evaluator.h
@@ -20,8 +20,6 @@
 #include <optional>
 #include <string>
 #include <string_view>
-#include <type_traits>
-#include <utility>
 #include <vector>
 
 #include "absl/container/flat_hash_map.h"
@@ -30,8 +28,6 @@
 #include "absl/status/statusor.h"
 #include "absl/types/span.h"
 #include "xls/codegen/module_signature.pb.h"
-#include "xls/common/status/ret_check.h"
-#include "xls/common/status/status_macros.h"
 #include "xls/ir/block.h"
 #include "xls/ir/block_elaboration.h"
 #include "xls/ir/events.h"

diff --git a/xls/ir/big_int.h b/xls/ir/big_int.h
@@ -21,7 +21,8 @@
 #include <tuple>
 
 #include "absl/status/statusor.h"
-#include "openssl/bn.h"
+#include "openssl/base.h"
+#include "openssl/bn.h"  // IWYU pragma: keep
 #include "xls/ir/bits.h"
 
 namespace xls {

diff --git a/xls/ir/instantiation.cc b/xls/ir/instantiation.cc
@@ -15,7 +15,6 @@
 #include "xls/ir/instantiation.h"
 
 #include <cstdint>
-#include <initializer_list>
 #include <optional>
 #include <ostream>
 #include <string>

diff --git a/xls/ir/instantiation.h b/xls/ir/instantiation.h
@@ -21,7 +21,6 @@
 #include <string>
 #include <string_view>
 
-#include "absl/container/flat_hash_map.h"
 #include "absl/status/statusor.h"
 #include "xls/ir/channel.h"
 #include "xls/ir/package.h"

diff --git a/xls/jit/BUILD b/xls/jit/BUILD
@@ -697,7 +697,6 @@ cc_library(
         ":orc_jit",
         "//xls/codegen:block_inlining_pass",
         "//xls/codegen:codegen_pass",
-        "//xls/codegen:module_signature_cc_proto",
         "//xls/common/status:ret_check",
         "//xls/common/status:status_macros",
         "//xls/interpreter:block_evaluator",
@@ -712,7 +711,6 @@ cc_library(
         "//xls/ir:value_utils",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/log",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",

diff --git a/xls/jit/block_jit.cc b/xls/jit/block_jit.cc
@@ -18,22 +18,19 @@
 #include <cstring>
 #include <memory>
 #include <optional>
-#include <random>
 #include <sstream>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "absl/container/flat_hash_map.h"
-#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/span.h"
 #include "xls/codegen/block_inlining_pass.h"
 #include "xls/codegen/codegen_pass.h"
-#include "xls/codegen/module_signature.pb.h"
 #include "xls/common/status/ret_check.h"
 #include "xls/common/status/status_macros.h"
 #include "xls/interpreter/block_evaluator.h"

diff --git a/xls/jit/block_jit.h b/xls/jit/block_jit.h
@@ -19,7 +19,6 @@
 #include <cstdint>
 #include <initializer_list>
 #include <memory>
-#include <optional>
 #include <string>
 #include <string_view>
 #include <utility>
@@ -30,8 +29,6 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/span.h"
-#include "xls/codegen/module_signature.pb.h"
-#include "xls/common/status/status_macros.h"
 #include "xls/interpreter/block_evaluator.h"
 #include "xls/ir/block.h"
 #include "xls/ir/block_elaboration.h"

diff --git a/xls/modules/aes/sample_generator.cc b/xls/modules/aes/sample_generator.cc
@@ -39,6 +39,7 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 #include "openssl/aead.h"  // NOLINT
+#include "openssl/base.h"
 #include "xls/common/exit_status.h"
 #include "xls/common/init_xls.h"
 #include "xls/common/status/status_macros.h"

diff --git a/xls/protected/netlist.h b/xls/protected/netlist.h
@@ -22,11 +22,13 @@
 #ifndef XLS_PROTECTED_NETLIST_H_
 #define XLS_PROTECTED_NETLIST_H_
 
+// IWYU pragma: begin_exports
 #include "xls/netlist/cell_library.h"
 #include "xls/netlist/function_extractor.h"
 #include "xls/netlist/interpreter.h"
 #include "xls/netlist/lib_parser.h"
 #include "xls/netlist/netlist.h"
 #include "xls/netlist/netlist_parser.h"
+// IWYU pragma: end_exports
 
 #endif  // XLS_PROTECTED_NETLIST_H_
diff --git a/xls/simulation/verilog_test_base.h b/xls/simulation/verilog_test_base.h
@@ -89,7 +89,7 @@ inline std::ostream& operator<<(std::ostream& os, const SimulationTarget& t) {
   return os;
 }
 
-#include "xls/simulation/simulation_targets.inc"
+#include "xls/simulation/simulation_targets.inc"  // IWYU pragma: keep
 
 // Returns the name of the parameterized test from the Paramtype info. Use in
 // INSTANTIATE_TEST_SUITE_P invocation so tests have meaningful names (e.g.,

diff --git a/xls/tools/BUILD b/xls/tools/BUILD
@@ -588,8 +588,6 @@ cc_library(
     hdrs = ["testbench.h"],
     deps = [
         ":testbench_thread",
-        "//xls/common/file:filesystem",
-        "@com_google_absl//absl/base",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings:str_format",

diff --git a/xls/tools/testbench.h b/xls/tools/testbench.h
@@ -20,18 +20,15 @@
 #include <functional>
 #include <iostream>
 #include <memory>
-#include <thread>  // NOLINT(build/c++11)
 #include <type_traits>
 #include <vector>
 
-#include "absl/base/internal/sysinfo.h"
 #include "absl/base/thread_annotations.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/synchronization/mutex.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-#include "xls/common/file/filesystem.h"
 #include "xls/tools/testbench_thread.h"
 
 namespace xls {