From 3d8e1fc532416c07f283422e26eaf3511f106cff Mon Sep 17 00:00:00 2001 From: David Plass Date: Thu, 30 Jul 2026 11:19:27 -0700 Subject: [PATCH] Clean up includes in xls/passes. PiperOrigin-RevId: 956634287 --- xls/passes/BUILD | 12 +++++++++--- xls/passes/array_simplification_pass.cc | 1 + xls/passes/basic_simplification_pass.cc | 1 + xls/passes/bdd_query_engine.cc | 1 - xls/passes/bdd_simplification_pass.h | 1 + xls/passes/data_flow_node_info.h | 1 + xls/passes/data_flow_node_info_test.cc | 1 + xls/passes/dfe_pass_test.cc | 2 -- xls/passes/folding_graph.cc | 1 + xls/passes/folding_graph_test.cc | 1 + xls/passes/next_value_optimization_pass.cc | 2 ++ xls/passes/optimization_pass.h | 1 + xls/passes/pass_base_test.cc | 1 + xls/passes/proc_state_analysis.cc | 1 - xls/passes/proc_state_array_flattening_pass.cc | 1 - xls/passes/proc_state_provenance_narrowing_pass.cc | 1 - xls/passes/range_query_engine_test.cc | 1 + xls/passes/reassociation_pass.cc | 1 + xls/passes/resource_sharing_pass.cc | 1 + xls/passes/strength_reduction_pass_test.cc | 1 - xls/passes/token_simplification_pass_test.cc | 1 - xls/passes/tools/BUILD | 1 + xls/passes/tools/generate_documentation_proto.cc | 1 + xls/passes/tools/passes_profile.cc | 2 ++ 24 files changed, 27 insertions(+), 11 deletions(-) diff --git a/xls/passes/BUILD b/xls/passes/BUILD index 7c7edd9989..5260589529 100644 --- a/xls/passes/BUILD +++ b/xls/passes/BUILD @@ -766,6 +766,7 @@ cc_library( "@abseil-cpp//absl/hash", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/log:vlog_is_on", "@abseil-cpp//absl/status", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings:str_format", @@ -1093,6 +1094,7 @@ cc_library( "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/log:vlog_is_on", "@abseil-cpp//absl/status", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", @@ -1137,6 +1139,7 @@ xls_pass( "@abseil-cpp//absl/functional:function_ref", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/log:vlog_is_on", "@abseil-cpp//absl/random", "@abseil-cpp//absl/status", "@abseil-cpp//absl/status:statusor", @@ -1895,7 +1898,6 @@ cc_library( "//xls/ir:bits", "//xls/ir:interval", "//xls/ir:interval_set", - "//xls/ir:node_util", "//xls/ir:op", "//xls/ir:ternary", "//xls/ir:type", @@ -2267,6 +2269,7 @@ xls_pass( "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/log:vlog_is_on", "@abseil-cpp//absl/status", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", @@ -2331,6 +2334,7 @@ xls_pass( "@abseil-cpp//absl/algorithm:container", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:vlog_is_on", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings:str_format", "@abseil-cpp//absl/types:span", @@ -2589,7 +2593,6 @@ xls_pass( "//xls/ir:value", "@abseil-cpp//absl/log", "@abseil-cpp//absl/status:statusor", - "@abseil-cpp//absl/strings", ], ) @@ -3452,7 +3455,6 @@ cc_test( ":pass_base", "//xls/common:xls_gunit_main", "//xls/common/status:matchers", - "//xls/common/status:status_macros", "//xls/ir", "//xls/ir:bits", "//xls/ir:channel", @@ -3495,6 +3497,7 @@ cc_test( srcs = ["range_query_engine_test.cc"], deps = [ ":range_query_engine", + "//xls/common:math_util", "//xls/common:xls_gunit_main", "//xls/common/fuzzing:fuzztest", "//xls/common/status:matchers", @@ -4095,6 +4098,7 @@ xls_pass( "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/log:vlog_is_on", "@abseil-cpp//absl/status", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings", @@ -4770,6 +4774,7 @@ cc_library( "//xls/ir:op", "//xls/ir:type", "//xls/ir:value", + "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/container:inlined_vector", "@abseil-cpp//absl/log", "@abseil-cpp//absl/log:check", @@ -4794,6 +4799,7 @@ cc_test( "//xls/ir:function_builder", "//xls/ir:ir_test_base", "//xls/ir:op", + "//xls/ir:source_location", "//xls/ir:value", "@abseil-cpp//absl/container:flat_hash_set", "@abseil-cpp//absl/log", diff --git a/xls/passes/array_simplification_pass.cc b/xls/passes/array_simplification_pass.cc index 7ebe280ad9..4cb4e5ab35 100644 --- a/xls/passes/array_simplification_pass.cc +++ b/xls/passes/array_simplification_pass.cc @@ -27,6 +27,7 @@ #include "absl/algorithm/container.h" #include "absl/container/flat_hash_set.h" #include "absl/log/log.h" +#include "absl/log/vlog_is_on.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "absl/types/span.h" diff --git a/xls/passes/basic_simplification_pass.cc b/xls/passes/basic_simplification_pass.cc index 03b796764b..d40aec255c 100644 --- a/xls/passes/basic_simplification_pass.cc +++ b/xls/passes/basic_simplification_pass.cc @@ -14,6 +14,7 @@ #include "xls/passes/basic_simplification_pass.h" #include +#include #include #include #include diff --git a/xls/passes/bdd_query_engine.cc b/xls/passes/bdd_query_engine.cc index effa5891a0..103a68acee 100644 --- a/xls/passes/bdd_query_engine.cc +++ b/xls/passes/bdd_query_engine.cc @@ -51,7 +51,6 @@ #include "xls/ir/interval.h" #include "xls/ir/interval_set.h" #include "xls/ir/node.h" -#include "xls/ir/node_util.h" #include "xls/ir/nodes.h" #include "xls/ir/op.h" #include "xls/ir/ternary.h" diff --git a/xls/passes/bdd_simplification_pass.h b/xls/passes/bdd_simplification_pass.h index fe64646ff6..07d06b8244 100644 --- a/xls/passes/bdd_simplification_pass.h +++ b/xls/passes/bdd_simplification_pass.h @@ -15,6 +15,7 @@ #ifndef XLS_PASSES_BDD_SIMPLIFICATION_PASS_H_ #define XLS_PASSES_BDD_SIMPLIFICATION_PASS_H_ +#include #include "absl/status/statusor.h" #include "xls/ir/function_base.h" diff --git a/xls/passes/data_flow_node_info.h b/xls/passes/data_flow_node_info.h index 14472fa9ef..d58e1b4c56 100644 --- a/xls/passes/data_flow_node_info.h +++ b/xls/passes/data_flow_node_info.h @@ -19,6 +19,7 @@ #include #include +#include "absl/container/flat_hash_map.h" #include "absl/container/inlined_vector.h" #include "absl/log/check.h" #include "absl/log/log.h" diff --git a/xls/passes/data_flow_node_info_test.cc b/xls/passes/data_flow_node_info_test.cc index e89ec93912..ea487095b5 100644 --- a/xls/passes/data_flow_node_info_test.cc +++ b/xls/passes/data_flow_node_info_test.cc @@ -33,6 +33,7 @@ #include "xls/ir/node.h" #include "xls/ir/nodes.h" #include "xls/ir/op.h" +#include "xls/ir/source_location.h" #include "xls/ir/value.h" #include "xls/passes/node_source_analysis.h" #include "xls/passes/partial_info_query_engine.h" diff --git a/xls/passes/dfe_pass_test.cc b/xls/passes/dfe_pass_test.cc index 7fa993a3e0..048a31a217 100644 --- a/xls/passes/dfe_pass_test.cc +++ b/xls/passes/dfe_pass_test.cc @@ -16,7 +16,6 @@ #include #include -#include #include "gmock/gmock.h" #include "gtest/gtest.h" @@ -24,7 +23,6 @@ #include "absl/status/status_matchers.h" #include "absl/status/statusor.h" #include "xls/common/status/matchers.h" -#include "xls/common/status/status_macros.h" #include "xls/ir/bits.h" #include "xls/ir/channel.h" #include "xls/ir/channel_ops.h" diff --git a/xls/passes/folding_graph.cc b/xls/passes/folding_graph.cc index 9ac47e55fe..8199c91cbe 100644 --- a/xls/passes/folding_graph.cc +++ b/xls/passes/folding_graph.cc @@ -26,6 +26,7 @@ #include "absl/container/flat_hash_set.h" #include "absl/log/check.h" #include "absl/log/log.h" +#include "absl/log/vlog_is_on.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" #include "absl/types/span.h" diff --git a/xls/passes/folding_graph_test.cc b/xls/passes/folding_graph_test.cc index 6c93e955de..4391432fbf 100644 --- a/xls/passes/folding_graph_test.cc +++ b/xls/passes/folding_graph_test.cc @@ -14,6 +14,7 @@ #include "xls/passes/folding_graph.h" +#include #include #include diff --git a/xls/passes/next_value_optimization_pass.cc b/xls/passes/next_value_optimization_pass.cc index f59a287e62..599f8df21a 100644 --- a/xls/passes/next_value_optimization_pass.cc +++ b/xls/passes/next_value_optimization_pass.cc @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -24,6 +25,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/log/check.h" #include "absl/log/log.h" +#include "absl/log/vlog_is_on.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" diff --git a/xls/passes/optimization_pass.h b/xls/passes/optimization_pass.h index 99a784652b..364a811a55 100644 --- a/xls/passes/optimization_pass.h +++ b/xls/passes/optimization_pass.h @@ -36,6 +36,7 @@ #include "absl/hash/hash.h" #include "absl/log/check.h" #include "absl/log/log.h" +#include "absl/log/vlog_is_on.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" diff --git a/xls/passes/pass_base_test.cc b/xls/passes/pass_base_test.cc index 25b1115f75..73bbab9a3b 100644 --- a/xls/passes/pass_base_test.cc +++ b/xls/passes/pass_base_test.cc @@ -14,6 +14,7 @@ #include "xls/passes/pass_base.h" +#include #include #include #include diff --git a/xls/passes/proc_state_analysis.cc b/xls/passes/proc_state_analysis.cc index 4a17f93b6f..f0d8b18f95 100644 --- a/xls/passes/proc_state_analysis.cc +++ b/xls/passes/proc_state_analysis.cc @@ -28,7 +28,6 @@ #include "xls/passes/proc_state_range_query_engine.h" #include "xls/passes/query_engine.h" #include "xls/solvers/solver.h" -#include "xls/solvers/z3_ir_translator.h" namespace xls { diff --git a/xls/passes/proc_state_array_flattening_pass.cc b/xls/passes/proc_state_array_flattening_pass.cc index 8d18cd8b65..4a4b760f58 100644 --- a/xls/passes/proc_state_array_flattening_pass.cc +++ b/xls/passes/proc_state_array_flattening_pass.cc @@ -19,7 +19,6 @@ #include "absl/log/log.h" #include "absl/status/statusor.h" -#include "absl/strings/str_cat.h" #include "xls/common/math_util.h" #include "xls/common/status/ret_check.h" #include "xls/common/status/status_macros.h" diff --git a/xls/passes/proc_state_provenance_narrowing_pass.cc b/xls/passes/proc_state_provenance_narrowing_pass.cc index b2a4df6d18..e59c5c72db 100644 --- a/xls/passes/proc_state_provenance_narrowing_pass.cc +++ b/xls/passes/proc_state_provenance_narrowing_pass.cc @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/xls/passes/range_query_engine_test.cc b/xls/passes/range_query_engine_test.cc index aa6c76ade0..2e95b7be79 100644 --- a/xls/passes/range_query_engine_test.cc +++ b/xls/passes/range_query_engine_test.cc @@ -30,6 +30,7 @@ #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "absl/types/span.h" +#include "xls/common/math_util.h" #include "xls/common/status/matchers.h" #include "xls/common/status/status_macros.h" #include "xls/data_structures/leaf_type_tree.h" diff --git a/xls/passes/reassociation_pass.cc b/xls/passes/reassociation_pass.cc index 64df88818d..29b53c542b 100644 --- a/xls/passes/reassociation_pass.cc +++ b/xls/passes/reassociation_pass.cc @@ -31,6 +31,7 @@ #include "absl/container/flat_hash_set.h" #include "absl/log/check.h" #include "absl/log/log.h" +#include "absl/log/vlog_is_on.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" diff --git a/xls/passes/resource_sharing_pass.cc b/xls/passes/resource_sharing_pass.cc index 35c1165d65..5c427f3f33 100644 --- a/xls/passes/resource_sharing_pass.cc +++ b/xls/passes/resource_sharing_pass.cc @@ -36,6 +36,7 @@ #include "absl/functional/function_ref.h" #include "absl/log/check.h" #include "absl/log/log.h" +#include "absl/log/vlog_is_on.h" #include "absl/random/random.h" #include "absl/status/status.h" #include "absl/status/statusor.h" diff --git a/xls/passes/strength_reduction_pass_test.cc b/xls/passes/strength_reduction_pass_test.cc index 2ef0bc5a8a..16370efb42 100644 --- a/xls/passes/strength_reduction_pass_test.cc +++ b/xls/passes/strength_reduction_pass_test.cc @@ -39,7 +39,6 @@ #include "xls/solvers/ir_equivalence.h" #include "xls/solvers/ir_equivalence_testutils.h" #include "xls/solvers/solver.h" -#include "xls/solvers/z3_ir_translator.h" namespace m = ::xls::op_matchers; diff --git a/xls/passes/token_simplification_pass_test.cc b/xls/passes/token_simplification_pass_test.cc index 74c6c868c4..6f302f9806 100644 --- a/xls/passes/token_simplification_pass_test.cc +++ b/xls/passes/token_simplification_pass_test.cc @@ -14,7 +14,6 @@ #include "xls/passes/token_simplification_pass.h" -#include #include #include diff --git a/xls/passes/tools/BUILD b/xls/passes/tools/BUILD index ed04ae5919..68f8edc1ce 100644 --- a/xls/passes/tools/BUILD +++ b/xls/passes/tools/BUILD @@ -145,6 +145,7 @@ cc_library( "//xls/passes:optimization_pass", "@abseil-cpp//absl/algorithm:container", "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:vlog_is_on", "@abseil-cpp//absl/status:statusor", "@abseil-cpp//absl/strings:str_format", "@abseil-cpp//absl/types:span", diff --git a/xls/passes/tools/generate_documentation_proto.cc b/xls/passes/tools/generate_documentation_proto.cc index 512499030c..7c110441ec 100644 --- a/xls/passes/tools/generate_documentation_proto.cc +++ b/xls/passes/tools/generate_documentation_proto.cc @@ -25,6 +25,7 @@ #include "absl/algorithm/container.h" #include "absl/log/log.h" +#include "absl/log/vlog_is_on.h" #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "absl/types/span.h" diff --git a/xls/passes/tools/passes_profile.cc b/xls/passes/tools/passes_profile.cc index 37129273cf..d6c1915bc8 100644 --- a/xls/passes/tools/passes_profile.cc +++ b/xls/passes/tools/passes_profile.cc @@ -24,6 +24,7 @@ #include #include #include +#include #include "proto/profile.pb.h" #include "absl/base/no_destructor.h" @@ -35,6 +36,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/synchronization/mutex.h" +#include "absl/time/clock.h" #include "absl/time/time.h" #include "absl/types/span.h" #include "cppitertools/reversed.hpp"