From e4132f5512bbc4aa7cc2e631ad4b12f9bb4e6ac6 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Thu, 2 May 2024 16:06:24 -0700 Subject: [PATCH] Don't include unused protocol buffer headers. Also: tell clang-tidy that poll.h is needed in subprocess.cc PiperOrigin-RevId: 630206678 --- xls/codegen/BUILD | 4 ---- xls/codegen/block_execution_fuzz_test.cc | 1 - xls/codegen/block_generator_test.cc | 1 - xls/codegen/register_combining_pass_test.cc | 2 -- xls/common/subprocess.cc | 2 +- xls/contrib/xlscc/unit_tests/BUILD | 4 ---- xls/contrib/xlscc/unit_tests/translator_io_test.cc | 1 - xls/contrib/xlscc/unit_tests/translator_proc_test.cc | 1 - xls/contrib/xlscc/unit_tests/translator_verilog_test.cc | 1 - xls/fdo/BUILD | 1 - xls/fdo/synthesizer.cc | 1 - xls/interpreter/BUILD | 2 -- xls/interpreter/block_interpreter.cc | 1 - xls/interpreter/block_interpreter_test.cc | 1 - xls/interpreter/channel_queue_test_base.cc | 1 - xls/noc/simulation/BUILD | 2 -- xls/noc/simulation/global_routing_table.cc | 1 - xls/noc/simulation/sim_objects.cc | 1 - xls/tools/BUILD | 5 ----- xls/tools/booleanifier_test.cc | 1 - xls/tools/generate_options_protos_main.cc | 3 --- xls/tools/opt_main.cc | 1 - 22 files changed, 1 insertion(+), 37 deletions(-) diff --git a/xls/codegen/BUILD b/xls/codegen/BUILD index 6f2327ea76..094fe7b783 100644 --- a/xls/codegen/BUILD +++ b/xls/codegen/BUILD @@ -616,7 +616,6 @@ cc_test( "//xls/ir:value", "//xls/ir:value_utils", "//xls/ir:xls_type_cc_proto", - "//xls/ir:xls_value_cc_proto", "//xls/jit:block_jit", "//xls/public:ir_parser", "//xls/tools:codegen", @@ -1010,7 +1009,6 @@ cc_test( "//xls/simulation:module_testbench_thread", "//xls/simulation:testbench_signal_capture", "//xls/simulation:verilog_test_base", - "//xls/tools:codegen_flags_cc_proto", "//xls/tools:verilog_include", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/log", @@ -1029,7 +1027,6 @@ cc_test( ":block_conversion", ":codegen_options", ":codegen_pass", - ":module_signature_cc_proto", ":register_combining_pass", "//xls/common:xls_gunit_main", "//xls/common/status:matchers", @@ -1043,7 +1040,6 @@ cc_test( "//xls/ir:source_location", "//xls/passes:pass_base", "//xls/scheduling:pipeline_schedule", - "//xls/tools:codegen_flags_cc_proto", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", diff --git a/xls/codegen/block_execution_fuzz_test.cc b/xls/codegen/block_execution_fuzz_test.cc index 615d2ad8c2..496f1ad838 100644 --- a/xls/codegen/block_execution_fuzz_test.cc +++ b/xls/codegen/block_execution_fuzz_test.cc @@ -44,7 +44,6 @@ #include "xls/ir/value.h" #include "xls/ir/value_utils.h" #include "xls/ir/xls_type.pb.h" -#include "xls/ir/xls_value.pb.h" #include "xls/jit/block_jit.h" #include "xls/public/ir_parser.h" #include "xls/tools/codegen.h" diff --git a/xls/codegen/block_generator_test.cc b/xls/codegen/block_generator_test.cc index 60040f8032..f323f23d2e 100644 --- a/xls/codegen/block_generator_test.cc +++ b/xls/codegen/block_generator_test.cc @@ -69,7 +69,6 @@ #include "xls/simulation/module_testbench_thread.h" #include "xls/simulation/testbench_signal_capture.h" #include "xls/simulation/verilog_test_base.h" -#include "xls/tools/codegen_flags.pb.h" #include "xls/tools/verilog_include.h" namespace xls { diff --git a/xls/codegen/register_combining_pass_test.cc b/xls/codegen/register_combining_pass_test.cc index c9d4575678..21fcea5afb 100644 --- a/xls/codegen/register_combining_pass_test.cc +++ b/xls/codegen/register_combining_pass_test.cc @@ -24,7 +24,6 @@ #include "xls/codegen/block_conversion.h" #include "xls/codegen/codegen_options.h" #include "xls/codegen/codegen_pass.h" -#include "xls/codegen/module_signature.pb.h" #include "xls/common/status/matchers.h" #include "xls/ir/bits.h" #include "xls/ir/function_builder.h" @@ -36,7 +35,6 @@ #include "xls/ir/source_location.h" #include "xls/passes/pass_base.h" #include "xls/scheduling/pipeline_schedule.h" -#include "xls/tools/codegen_flags.pb.h" namespace m = xls::op_matchers; namespace xls::verilog { diff --git a/xls/common/subprocess.cc b/xls/common/subprocess.cc index c970f74a33..cd2c5b1521 100644 --- a/xls/common/subprocess.cc +++ b/xls/common/subprocess.cc @@ -15,7 +15,7 @@ #include "xls/common/subprocess.h" #include -#include +#include // IWYU pragma: keep #include #include #include diff --git a/xls/contrib/xlscc/unit_tests/BUILD b/xls/contrib/xlscc/unit_tests/BUILD index 82607546b5..68bb96a011 100644 --- a/xls/contrib/xlscc/unit_tests/BUILD +++ b/xls/contrib/xlscc/unit_tests/BUILD @@ -96,7 +96,6 @@ cc_test( "//xls/common:xls_gunit_main", "//xls/common/status:matchers", "//xls/contrib/xlscc:hls_block_cc_proto", - "//xls/contrib/xlscc:metadata_output_cc_proto", "//xls/contrib/xlscc:translator", "//xls/ir:bits", "//xls/ir:value", @@ -134,7 +133,6 @@ cc_test( "//xls/common:xls_gunit_main", "//xls/common/status:matchers", "//xls/contrib/xlscc:hls_block_cc_proto", - "//xls/contrib/xlscc:metadata_output_cc_proto", "//xls/contrib/xlscc:translator", "//xls/ir", "//xls/ir:bits", @@ -152,7 +150,6 @@ cc_test( "@com_google_absl//absl/strings:str_format", "@com_google_googletest//:gtest", "@com_google_protobuf//:protobuf", - "@llvm-project//clang:ast", ], ) @@ -217,7 +214,6 @@ cc_test( "//xls/codegen:signature_generator", "//xls/common:xls_gunit_main", "//xls/common/status:matchers", - "//xls/common/status:status_macros", "//xls/contrib/xlscc:hls_block_cc_proto", "//xls/contrib/xlscc:translator", "//xls/ir", diff --git a/xls/contrib/xlscc/unit_tests/translator_io_test.cc b/xls/contrib/xlscc/unit_tests/translator_io_test.cc index 23b86358f0..bfbed12aa8 100644 --- a/xls/contrib/xlscc/unit_tests/translator_io_test.cc +++ b/xls/contrib/xlscc/unit_tests/translator_io_test.cc @@ -23,7 +23,6 @@ #include "absl/status/status.h" #include "xls/common/status/matchers.h" #include "xls/contrib/xlscc/hls_block.pb.h" -#include "xls/contrib/xlscc/metadata_output.pb.h" #include "xls/contrib/xlscc/translator.h" #include "xls/contrib/xlscc/unit_tests/unit_test.h" #include "xls/ir/bits.h" diff --git a/xls/contrib/xlscc/unit_tests/translator_proc_test.cc b/xls/contrib/xlscc/unit_tests/translator_proc_test.cc index ca2ee40500..8e9deab7ba 100644 --- a/xls/contrib/xlscc/unit_tests/translator_proc_test.cc +++ b/xls/contrib/xlscc/unit_tests/translator_proc_test.cc @@ -30,7 +30,6 @@ #include "google/protobuf/util/message_differencer.h" #include "xls/common/status/matchers.h" #include "xls/contrib/xlscc/hls_block.pb.h" -#include "xls/contrib/xlscc/metadata_output.pb.h" #include "xls/contrib/xlscc/translator.h" #include "xls/contrib/xlscc/unit_tests/unit_test.h" #include "xls/ir/bits.h" diff --git a/xls/contrib/xlscc/unit_tests/translator_verilog_test.cc b/xls/contrib/xlscc/unit_tests/translator_verilog_test.cc index c6351a3ff0..b48dbb26c0 100644 --- a/xls/contrib/xlscc/unit_tests/translator_verilog_test.cc +++ b/xls/contrib/xlscc/unit_tests/translator_verilog_test.cc @@ -26,7 +26,6 @@ #include "xls/codegen/codegen_pass.h" #include "xls/codegen/signature_generator.h" #include "xls/common/status/matchers.h" -#include "xls/common/status/status_macros.h" #include "xls/contrib/xlscc/hls_block.pb.h" #include "xls/contrib/xlscc/translator.h" #include "xls/contrib/xlscc/unit_tests/unit_test.h" diff --git a/xls/fdo/BUILD b/xls/fdo/BUILD index f6dbb16b33..014877ce49 100644 --- a/xls/fdo/BUILD +++ b/xls/fdo/BUILD @@ -129,7 +129,6 @@ cc_library( "//xls/ir", "//xls/scheduling:pipeline_schedule", "//xls/scheduling:scheduling_options", - "//xls/synthesis:synthesis_cc_proto", ], ) diff --git a/xls/fdo/synthesizer.cc b/xls/fdo/synthesizer.cc index e2d070347d..19bad95054 100644 --- a/xls/fdo/synthesizer.cc +++ b/xls/fdo/synthesizer.cc @@ -43,7 +43,6 @@ #include "xls/ir/node.h" #include "xls/scheduling/pipeline_schedule.h" #include "xls/scheduling/scheduling_options.h" -#include "xls/synthesis/synthesis.pb.h" namespace xls { namespace synthesis { diff --git a/xls/interpreter/BUILD b/xls/interpreter/BUILD index 998446bcfb..29507f28b9 100644 --- a/xls/interpreter/BUILD +++ b/xls/interpreter/BUILD @@ -202,7 +202,6 @@ cc_test( deps = [ ":block_evaluator_test_base", ":ir_interpreter", - "//xls/codegen:module_signature_cc_proto", "//xls/common:xls_gunit_main", "@com_google_googletest//:gtest", ], @@ -316,7 +315,6 @@ cc_library( "//xls/ir", "//xls/ir:bits", "//xls/ir:channel", - "//xls/ir:channel_cc_proto", "//xls/ir:channel_ops", "//xls/ir:elaboration", "//xls/ir:ir_test_base", diff --git a/xls/interpreter/block_interpreter.cc b/xls/interpreter/block_interpreter.cc index d78a1f1213..b01f7859fd 100644 --- a/xls/interpreter/block_interpreter.cc +++ b/xls/interpreter/block_interpreter.cc @@ -28,7 +28,6 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.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/interpreter/block_evaluator.h" diff --git a/xls/interpreter/block_interpreter_test.cc b/xls/interpreter/block_interpreter_test.cc index 2de881570e..6c544641f1 100644 --- a/xls/interpreter/block_interpreter_test.cc +++ b/xls/interpreter/block_interpreter_test.cc @@ -17,7 +17,6 @@ #include #include "gtest/gtest.h" -#include "xls/codegen/module_signature.pb.h" #include "xls/interpreter/block_evaluator_test_base.h" namespace xls { diff --git a/xls/interpreter/channel_queue_test_base.cc b/xls/interpreter/channel_queue_test_base.cc index 55a97c44a0..289c38da95 100644 --- a/xls/interpreter/channel_queue_test_base.cc +++ b/xls/interpreter/channel_queue_test_base.cc @@ -25,7 +25,6 @@ #include "xls/interpreter/channel_queue.h" #include "xls/ir/bits.h" #include "xls/ir/channel.h" -#include "xls/ir/channel.pb.h" #include "xls/ir/channel_ops.h" #include "xls/ir/package.h" #include "xls/ir/value.h" diff --git a/xls/noc/simulation/BUILD b/xls/noc/simulation/BUILD index ffc25af924..385f965e83 100644 --- a/xls/noc/simulation/BUILD +++ b/xls/noc/simulation/BUILD @@ -213,7 +213,6 @@ cc_library( "@com_google_absl//absl/types:variant", "//xls/common/status:ret_check", "//xls/common/status:status_macros", - "//xls/noc/config:network_config_cc_proto", ], ) @@ -273,7 +272,6 @@ cc_library( "//xls/common/status:ret_check", "//xls/common/status:status_macros", "//xls/ir:bits", - "//xls/noc/config:network_config_cc_proto", ], ) diff --git a/xls/noc/simulation/global_routing_table.cc b/xls/noc/simulation/global_routing_table.cc index def2b9baf0..97ff7c2458 100644 --- a/xls/noc/simulation/global_routing_table.cc +++ b/xls/noc/simulation/global_routing_table.cc @@ -32,7 +32,6 @@ #include "absl/types/variant.h" #include "xls/common/status/ret_check.h" #include "xls/common/status/status_macros.h" -#include "xls/noc/config/network_config.pb.h" #include "xls/noc/simulation/common.h" #include "xls/noc/simulation/network_graph.h" #include "xls/noc/simulation/parameters.h" diff --git a/xls/noc/simulation/sim_objects.cc b/xls/noc/simulation/sim_objects.cc index a609a60572..0f03f84d65 100644 --- a/xls/noc/simulation/sim_objects.cc +++ b/xls/noc/simulation/sim_objects.cc @@ -29,7 +29,6 @@ #include "xls/common/status/ret_check.h" #include "xls/common/status/status_macros.h" #include "xls/ir/bits.h" -#include "xls/noc/config/network_config.pb.h" #include "xls/noc/simulation/common.h" #include "xls/noc/simulation/flit.h" #include "xls/noc/simulation/network_graph.h" diff --git a/xls/tools/BUILD b/xls/tools/BUILD index 07253b2c2a..9c838774e2 100644 --- a/xls/tools/BUILD +++ b/xls/tools/BUILD @@ -101,7 +101,6 @@ cc_test( "//xls/ir:ir_test_base", "//xls/ir:value", "//xls/ir:value_builder", - "//xls/ir:xls_type_cc_proto", "//xls/jit:function_jit", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", @@ -700,7 +699,6 @@ cc_binary( "//xls/common:init_xls", "//xls/common/file:filesystem", "//xls/common/status:status_macros", - "//xls/ir:ram_rewrite_cc_proto", "//xls/passes:optimization_pass", "//xls/passes:optimization_pass_pipeline", "@com_google_absl//absl/cleanup", @@ -918,13 +916,10 @@ cc_binary( visibility = ["//xls:xls_internal"], deps = [ ":codegen_flags", - ":codegen_flags_cc_proto", ":scheduling_options_flags", - ":scheduling_options_flags_cc_proto", "//xls/common:exit_status", "//xls/common:init_xls", "//xls/common/status:status_macros", - "//xls/scheduling:pipeline_schedule_cc_proto", "@com_google_absl//absl/flags:flag", "@com_google_absl//absl/log", "@com_google_absl//absl/status", diff --git a/xls/tools/booleanifier_test.cc b/xls/tools/booleanifier_test.cc index a6c870c6f7..dc35071280 100644 --- a/xls/tools/booleanifier_test.cc +++ b/xls/tools/booleanifier_test.cc @@ -38,7 +38,6 @@ #include "xls/ir/package.h" #include "xls/ir/value.h" #include "xls/ir/value_builder.h" -#include "xls/ir/xls_type.pb.h" #include "xls/jit/function_jit.h" namespace xls { diff --git a/xls/tools/generate_options_protos_main.cc b/xls/tools/generate_options_protos_main.cc index a302c29d86..81e7e31ec3 100644 --- a/xls/tools/generate_options_protos_main.cc +++ b/xls/tools/generate_options_protos_main.cc @@ -21,11 +21,8 @@ #include "xls/common/exit_status.h" #include "xls/common/init_xls.h" #include "xls/common/status/status_macros.h" -#include "xls/scheduling/pipeline_schedule.pb.h" #include "xls/tools/codegen_flags.h" -#include "xls/tools/codegen_flags.pb.h" #include "xls/tools/scheduling_options_flags.h" -#include "xls/tools/scheduling_options_flags.pb.h" static constexpr std::string_view kUsage = R"( Create a scheduling options and codegen options proto with values populated diff --git a/xls/tools/opt_main.cc b/xls/tools/opt_main.cc index a4a608737b..2daf901a57 100644 --- a/xls/tools/opt_main.cc +++ b/xls/tools/opt_main.cc @@ -39,7 +39,6 @@ #include "xls/common/file/filesystem.h" #include "xls/common/init_xls.h" #include "xls/common/status/status_macros.h" -#include "xls/ir/ram_rewrite.pb.h" #include "xls/passes/optimization_pass.h" #include "xls/passes/optimization_pass_pipeline.h" #include "xls/tools/opt.h"