From fc87bf7ea30d68e3eff53c29bac4b3b2afa0ccd5 Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Thu, 16 May 2024 17:11:04 -0700 Subject: [PATCH] Fix includes in xls/ir. --- xls/ir/BUILD | 17 ++++- xls/ir/abstract_evaluator_test.cc | 4 +- xls/ir/abstract_node_evaluator_test.cc | 4 +- xls/ir/benchmark_support_test.cc | 2 +- xls/ir/big_int_test.cc | 3 +- xls/ir/bits_ops_test.cc | 6 +- xls/ir/bits_test.cc | 7 +- xls/ir/block_elaboration_test.cc | 4 +- xls/ir/block_test.cc | 4 +- xls/ir/caret.cc | 2 + xls/ir/caret_test.cc | 7 +- xls/ir/channel.cc | 1 + xls/ir/channel_test.cc | 2 +- xls/ir/code_template.cc | 2 +- xls/ir/code_template_test.cc | 4 +- xls/ir/dfs_visitor_test.cc | 4 +- xls/ir/elaborated_block_dfs_visitor_test.cc | 4 +- xls/ir/format_preference_test.cc | 2 +- xls/ir/format_strings.cc | 3 + xls/ir/format_strings_test.cc | 3 +- xls/ir/function.cc | 5 +- xls/ir/function_base.cc | 4 +- xls/ir/function_builder.cc | 13 ++-- xls/ir/function_builder_test.cc | 9 +-- xls/ir/function_test.cc | 5 +- xls/ir/fuzz_type_domain.cc | 3 +- xls/ir/instantiation.cc | 2 +- xls/ir/interval.cc | 2 +- xls/ir/interval_ops.cc | 1 + xls/ir/interval_ops_test.cc | 6 +- xls/ir/interval_set_test.cc | 6 +- xls/ir/interval_test.cc | 6 +- xls/ir/ir_matcher.cc | 4 +- xls/ir/ir_matcher_test.cc | 2 +- xls/ir/ir_parser.cc | 7 +- xls/ir/ir_parser_test.cc | 6 +- xls/ir/ir_scanner.cc | 7 +- xls/ir/ir_scanner_test.cc | 4 +- xls/ir/ir_test_base.cc | 8 +-- xls/ir/ir_test_base_test.cc | 1 + xls/ir/keyword_args.cc | 3 + xls/ir/node.cc | 2 +- xls/ir/node_test.cc | 2 +- xls/ir/node_util.cc | 33 +++++----- xls/ir/node_util_test.cc | 15 ++--- xls/ir/number_parser.cc | 2 + xls/ir/number_parser_test.cc | 3 +- xls/ir/package_test.cc | 6 +- xls/ir/proc.cc | 15 +++-- xls/ir/proc_conversion_test.cc | 2 +- xls/ir/proc_elaboration.cc | 1 + xls/ir/proc_elaboration_test.cc | 4 +- xls/ir/proc_test.cc | 4 +- xls/ir/proc_testutils_test.cc | 4 +- xls/ir/ternary_test.cc | 2 +- xls/ir/topo_sort_test.cc | 8 +-- xls/ir/type_test.cc | 2 +- xls/ir/value_builder_test.cc | 2 +- xls/ir/value_conversion_utils_test.cc | 4 +- xls/ir/value_test.cc | 72 ++++++++++++++------- xls/ir/value_test_util.cc | 1 + xls/ir/value_utils.cc | 3 + xls/ir/value_utils_test.cc | 2 +- xls/ir/value_view_test.cc | 5 +- xls/ir/verifier.cc | 4 +- xls/ir/verifier_test.cc | 4 +- 66 files changed, 227 insertions(+), 164 deletions(-) diff --git a/xls/ir/BUILD b/xls/ir/BUILD index 8dbb8a6409..15a43f77da 100644 --- a/xls/ir/BUILD +++ b/xls/ir/BUILD @@ -392,6 +392,7 @@ cc_test( ":bits", ":bits_ops", ":bits_test_utils", + ":format_preference", ":number_parser", ":value", "//xls/common:bits_util", @@ -611,11 +612,13 @@ cc_library( deps = [ ":channel", ":channel_ops", + ":foreign_function_data_cc_proto", ":format_strings", ":ir", ":op", ":register", ":source_location", + ":type", ":value", ":verifier", "//xls/common:casts", @@ -646,6 +649,7 @@ cc_test( ":ir_matcher", ":node_util", ":op", + ":register", ":source_location", ":type", ":value", @@ -917,10 +921,13 @@ cc_library( ":bits", ":type", ":value", + "//xls/common:bits_util", "//xls/common/status:ret_check", "//xls/common/status:status_macros", "//xls/data_structures:leaf_type_tree", + "@com_google_absl//absl/base", "@com_google_absl//absl/log", + "@com_google_absl//absl/log:check", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", ], @@ -991,6 +998,7 @@ cc_test( name = "ir_test_base_test", srcs = ["ir_test_base_test.cc"], deps = [ + ":ir", ":ir_test_base", "//xls/common:xls_gunit_main", "//xls/common/status:matchers", @@ -1051,6 +1059,7 @@ cc_library( hdrs = ["format_strings.h"], deps = [ ":format_preference", + "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", @@ -1062,6 +1071,7 @@ cc_test( name = "format_strings_test", srcs = ["format_strings_test.cc"], deps = [ + ":format_preference", ":format_strings", "//xls/common:xls_gunit_main", "//xls/common/status:matchers", @@ -1208,6 +1218,7 @@ cc_library( "//xls/common:string_to_int", "//xls/common/status:ret_check", "//xls/common/status:status_macros", + "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", @@ -1283,6 +1294,7 @@ cc_test( deps = [ ":bits", ":bits_ops", + ":format_preference", ":number_parser", "//xls/common:xls_gunit_main", "//xls/common/status:matchers", @@ -1298,6 +1310,7 @@ cc_test( ":big_int", ":bits", ":bits_ops", + ":format_preference", ":number_parser", "//xls/common:xls_gunit_main", "//xls/common/status:matchers", @@ -1417,6 +1430,7 @@ cc_library( "//xls/common/status:status_macros", "@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:str_format", ], @@ -1594,6 +1608,7 @@ cc_test( "//xls/common/status:matchers", "//xls/common/status:ret_check", "//xls/common/status:status_macros", + "@com_google_absl//absl/base", "@com_google_absl//absl/status", "@com_google_absl//absl/types:span", "@com_google_googletest//:gtest", @@ -1811,7 +1826,6 @@ cc_library( "//xls/common/status:status_macros", "@com_google_absl//absl/algorithm:container", "@com_google_absl//absl/base:nullability", - "@com_google_absl//absl/container:btree", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/log", @@ -1852,6 +1866,7 @@ cc_library( hdrs = ["proc_elaboration.h"], deps = [ ":channel", + ":channel_cc_proto", ":channel_ops", ":elaboration", ":ir", diff --git a/xls/ir/abstract_evaluator_test.cc b/xls/ir/abstract_evaluator_test.cc index f9113beb28..02ec473bf2 100644 --- a/xls/ir/abstract_evaluator_test.cc +++ b/xls/ir/abstract_evaluator_test.cc @@ -17,10 +17,10 @@ #include #include -#include "gtest/gtest.h" -#include "fuzztest/fuzztest.h" #include "absl/log/check.h" #include "absl/types/span.h" +#include "fuzztest/fuzztest.h" +#include "gtest/gtest.h" #include "xls/ir/big_int.h" #include "xls/ir/bits.h" #include "xls/ir/bits_ops.h" diff --git a/xls/ir/abstract_node_evaluator_test.cc b/xls/ir/abstract_node_evaluator_test.cc index b1da42c14b..e803512c50 100644 --- a/xls/ir/abstract_node_evaluator_test.cc +++ b/xls/ir/abstract_node_evaluator_test.cc @@ -20,11 +20,11 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "absl/log/check.h" #include "absl/status/statusor.h" #include "absl/types/span.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/status/matchers.h" #include "xls/common/status/ret_check.h" #include "xls/common/status/status_macros.h" diff --git a/xls/ir/benchmark_support_test.cc b/xls/ir/benchmark_support_test.cc index e144c34585..4095083296 100644 --- a/xls/ir/benchmark_support_test.cc +++ b/xls/ir/benchmark_support_test.cc @@ -17,9 +17,9 @@ #include #include +#include "absl/types/span.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "absl/types/span.h" #include "xls/common/status/matchers.h" #include "xls/ir/bits.h" #include "xls/ir/function.h" diff --git a/xls/ir/big_int_test.cc b/xls/ir/big_int_test.cc index 37c92dd513..77cb41ef0a 100644 --- a/xls/ir/big_int_test.cc +++ b/xls/ir/big_int_test.cc @@ -20,12 +20,13 @@ #include #include +#include "absl/status/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "absl/status/status.h" #include "xls/common/status/matchers.h" #include "xls/ir/bits.h" #include "xls/ir/bits_ops.h" +#include "xls/ir/format_preference.h" #include "xls/ir/number_parser.h" namespace xls { diff --git a/xls/ir/bits_ops_test.cc b/xls/ir/bits_ops_test.cc index 3c119e2f9f..5860de41d8 100644 --- a/xls/ir/bits_ops_test.cc +++ b/xls/ir/bits_ops_test.cc @@ -21,12 +21,12 @@ #include #include -#include "benchmark/benchmark.h" -#include "gtest/gtest.h" -#include "fuzztest/fuzztest.h" #include "absl/container/inlined_vector.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" +#include "benchmark/benchmark.h" +#include "fuzztest/fuzztest.h" +#include "gtest/gtest.h" #include "xls/common/status/matchers.h" #include "xls/data_structures/inline_bitmap.h" #include "xls/ir/bits.h" diff --git a/xls/ir/bits_test.cc b/xls/ir/bits_test.cc index 877704f998..10f3cdc5d1 100644 --- a/xls/ir/bits_test.cc +++ b/xls/ir/bits_test.cc @@ -20,20 +20,21 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" -#include "fuzztest/fuzztest.h" #include "absl/container/inlined_vector.h" #include "absl/status/status.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/types/span.h" +#include "fuzztest/fuzztest.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/bits_util.h" #include "xls/common/math_util.h" #include "xls/common/status/matchers.h" #include "xls/data_structures/inline_bitmap.h" #include "xls/ir/bits_ops.h" #include "xls/ir/bits_test_utils.h" +#include "xls/ir/format_preference.h" #include "xls/ir/number_parser.h" #include "xls/ir/value.h" diff --git a/xls/ir/block_elaboration_test.cc b/xls/ir/block_elaboration_test.cc index b4465e2d45..18500acdb7 100644 --- a/xls/ir/block_elaboration_test.cc +++ b/xls/ir/block_elaboration_test.cc @@ -19,11 +19,11 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/types/span.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/status/matchers.h" #include "xls/common/status/status_macros.h" #include "xls/ir/bits.h" diff --git a/xls/ir/block_test.cc b/xls/ir/block_test.cc index 55b37a8f87..b606e2a897 100644 --- a/xls/ir/block_test.cc +++ b/xls/ir/block_test.cc @@ -20,11 +20,11 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/types/span.h" #include "absl/types/variant.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/logging/log_lines.h" #include "xls/common/status/matchers.h" #include "xls/common/visitor.h" diff --git a/xls/ir/caret.cc b/xls/ir/caret.cc index 676a57c555..daf41ba206 100644 --- a/xls/ir/caret.cc +++ b/xls/ir/caret.cc @@ -29,6 +29,8 @@ #include "xls/common/file/filesystem.h" #include "xls/common/status/ret_check.h" #include "xls/common/status/status_macros.h" +#include "xls/ir/fileno.h" +#include "xls/ir/source_location.h" namespace xls { diff --git a/xls/ir/caret_test.cc b/xls/ir/caret_test.cc index 65a26b4c6d..cc45822deb 100644 --- a/xls/ir/caret_test.cc +++ b/xls/ir/caret_test.cc @@ -18,10 +18,11 @@ #include #include -#include "gtest/gtest.h" #include "absl/strings/str_format.h" +#include "gtest/gtest.h" #include "xls/common/file/temp_file.h" #include "xls/common/status/matchers.h" +#include "xls/ir/fileno.h" #include "xls/ir/package.h" #include "xls/ir/source_location.h" @@ -64,8 +65,8 @@ TEST(CaretTest, FileContent) { 2 | this is a line of code that does stuff | ^ )"; - std::string expected = absl::StrFormat(expected_format, - std::string(temp_file.path())); + std::string expected = + absl::StrFormat(expected_format, std::string(temp_file.path())); EXPECT_EQ( PrintCaret(LookUpInPackage(&p), loc, std::nullopt, std::nullopt, 60), expected); diff --git a/xls/ir/channel.cc b/xls/ir/channel.cc index a27e480b7c..139a2abc7f 100644 --- a/xls/ir/channel.cc +++ b/xls/ir/channel.cc @@ -29,6 +29,7 @@ #include "absl/types/variant.h" #include "google/protobuf/text_format.h" #include "xls/common/casts.h" +#include "xls/ir/channel.pb.h" #include "xls/ir/channel_ops.h" #include "xls/ir/type.h" #include "xls/ir/value_utils.h" diff --git a/xls/ir/channel_test.cc b/xls/ir/channel_test.cc index 252fa55ebd..9f618cb4a7 100644 --- a/xls/ir/channel_test.cc +++ b/xls/ir/channel_test.cc @@ -18,9 +18,9 @@ #include #include +#include "absl/status/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "absl/status/status.h" #include "xls/common/status/matchers.h" #include "xls/ir/bits.h" #include "xls/ir/channel.pb.h" diff --git a/xls/ir/code_template.cc b/xls/ir/code_template.cc index 9dd309fb04..9d6cf78371 100644 --- a/xls/ir/code_template.cc +++ b/xls/ir/code_template.cc @@ -23,8 +23,8 @@ #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" -#include "xls/common/status/status_macros.h" #include "re2/re2.h" +#include "xls/common/status/status_macros.h" namespace xls { diff --git a/xls/ir/code_template_test.cc b/xls/ir/code_template_test.cc index be7a32c828..c6016f6c88 100644 --- a/xls/ir/code_template_test.cc +++ b/xls/ir/code_template_test.cc @@ -17,11 +17,11 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/status/matchers.h" using testing::ElementsAre; diff --git a/xls/ir/dfs_visitor_test.cc b/xls/ir/dfs_visitor_test.cc index 484c3fc9a6..86b8ce4e69 100644 --- a/xls/ir/dfs_visitor_test.cc +++ b/xls/ir/dfs_visitor_test.cc @@ -19,11 +19,11 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "absl/container/flat_hash_set.h" #include "absl/log/log.h" #include "absl/status/status.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/status/matchers.h" #include "xls/ir/function.h" #include "xls/ir/ir_test_base.h" diff --git a/xls/ir/elaborated_block_dfs_visitor_test.cc b/xls/ir/elaborated_block_dfs_visitor_test.cc index f29c46c829..f538c82cfa 100644 --- a/xls/ir/elaborated_block_dfs_visitor_test.cc +++ b/xls/ir/elaborated_block_dfs_visitor_test.cc @@ -19,12 +19,12 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "absl/container/flat_hash_set.h" #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/status/matchers.h" #include "xls/common/status/status_macros.h" #include "xls/ir/bits.h" diff --git a/xls/ir/format_preference_test.cc b/xls/ir/format_preference_test.cc index 48800609e2..d738e538ba 100644 --- a/xls/ir/format_preference_test.cc +++ b/xls/ir/format_preference_test.cc @@ -17,9 +17,9 @@ #include #include +#include "absl/status/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "absl/status/status.h" #include "xls/common/status/matchers.h" namespace xls { diff --git a/xls/ir/format_strings.cc b/xls/ir/format_strings.cc index 4e44cc6b21..90efdc1569 100644 --- a/xls/ir/format_strings.cc +++ b/xls/ir/format_strings.cc @@ -15,18 +15,21 @@ #include "xls/ir/format_strings.h" #include +#include #include #include #include #include #include +#include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/strings/str_replace.h" #include "absl/types/span.h" +#include "xls/ir/format_preference.h" namespace xls { diff --git a/xls/ir/format_strings_test.cc b/xls/ir/format_strings_test.cc index b7cb96c719..d6303ce33d 100644 --- a/xls/ir/format_strings_test.cc +++ b/xls/ir/format_strings_test.cc @@ -17,10 +17,11 @@ #include #include +#include "absl/status/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "absl/status/status.h" #include "xls/common/status/matchers.h" +#include "xls/ir/format_preference.h" namespace xls { namespace { diff --git a/xls/ir/function.cc b/xls/ir/function.cc index 26d2f3bb14..6da29b51a6 100644 --- a/xls/ir/function.cc +++ b/xls/ir/function.cc @@ -98,9 +98,8 @@ absl::StatusOr Function::Clone( // Clone parameters over first to maintain order. for (Param* param : (const_cast(this))->params()) { - XLS_ASSIGN_OR_RETURN( - original_to_clone[param], - param->CloneInNewFunction({}, cloned_function)); + XLS_ASSIGN_OR_RETURN(original_to_clone[param], + param->CloneInNewFunction({}, cloned_function)); } for (Node* node : TopoSort(const_cast(this))) { if (node->Is()) { // Params were already copied. diff --git a/xls/ir/function_base.cc b/xls/ir/function_base.cc index 79a1d665e4..0a8b7c960a 100644 --- a/xls/ir/function_base.cc +++ b/xls/ir/function_base.cc @@ -50,8 +50,8 @@ std::vector FunctionBase::AttributeIrStrings() const { std::vector attribute_strings; if (ForeignFunctionData().has_value()) { std::string serialized; - CHECK( - google::protobuf::TextFormat::PrintToString(*ForeignFunctionData(), &serialized)); + CHECK(google::protobuf::TextFormat::PrintToString(*ForeignFunctionData(), + &serialized)); // Triple-quoted attribute strings allow for newlines. attribute_strings.push_back( absl::StrCat("ffi_proto(\"\"\"", serialized, "\"\"\")")); diff --git a/xls/ir/function_builder.cc b/xls/ir/function_builder.cc index ad7538fedd..af6e635ade 100644 --- a/xls/ir/function_builder.cc +++ b/xls/ir/function_builder.cc @@ -39,15 +39,18 @@ #include "xls/common/symbolized_stacktrace.h" #include "xls/ir/channel.h" #include "xls/ir/channel_ops.h" +#include "xls/ir/foreign_function_data.pb.h" #include "xls/ir/format_strings.h" #include "xls/ir/function.h" #include "xls/ir/function_base.h" +#include "xls/ir/lsb_or_msb.h" #include "xls/ir/nodes.h" #include "xls/ir/op.h" #include "xls/ir/package.h" #include "xls/ir/proc.h" #include "xls/ir/register.h" #include "xls/ir/source_location.h" +#include "xls/ir/type.h" #include "xls/ir/value.h" #include "xls/ir/verifier.h" #include "xls/ir/verify_node.h" @@ -215,8 +218,7 @@ BValue BuilderBase::OneHot(BValue input, LsbOrMsb priority, BValue BuilderBase::OneHotSelect(BValue selector, absl::Span cases, - const SourceInfo& loc, - std::string_view name) { + const SourceInfo& loc, std::string_view name) { if (ErrorPending()) { return BValue(); } @@ -1333,8 +1335,7 @@ BValue BuilderBase::AddBinOp(Op op, BValue lhs, BValue rhs, } BValue BuilderBase::AddCompareOp(Op op, BValue lhs, BValue rhs, - const SourceInfo& loc, - std::string_view name) { + const SourceInfo& loc, std::string_view name) { if (ErrorPending()) { return BValue(); } @@ -1841,8 +1842,8 @@ absl::StatusOr BlockBuilder::Build() { } BValue BlockBuilder::InstantiationInput(Instantiation* instantiation, - std::string_view port_name, - BValue data, const SourceInfo& loc, + std::string_view port_name, BValue data, + const SourceInfo& loc, std::string_view name) { if (ErrorPending()) { return BValue(); diff --git a/xls/ir/function_builder_test.cc b/xls/ir/function_builder_test.cc index 8b1e4f5c65..e944a38fd8 100644 --- a/xls/ir/function_builder_test.cc +++ b/xls/ir/function_builder_test.cc @@ -17,10 +17,10 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/status/statusor.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/status/matchers.h" #include "xls/ir/bits.h" #include "xls/ir/channel_ops.h" @@ -32,6 +32,7 @@ #include "xls/ir/nodes.h" #include "xls/ir/op.h" #include "xls/ir/package.h" +#include "xls/ir/register.h" #include "xls/ir/source_location.h" #include "xls/ir/type.h" #include "xls/ir/value.h" @@ -335,7 +336,8 @@ TEST(FunctionBuilderTest, MinDelayNegativeWithGetError) { BValue token = fb.AfterAll({}); fb.MinDelay(token, /*delay=*/-5); - EXPECT_THAT(fb.GetError(), + EXPECT_THAT( + fb.GetError(), status_testing::StatusIs(absl::StatusCode::kInvalidArgument, testing::HasSubstr("Delay cannot be negative"))); } @@ -1006,7 +1008,6 @@ TEST(FunctionBuilderTest, TraceWithVerbosity) { EXPECT_EQ(f->return_value()->As()->verbosity(), 1); } - TEST(FunctionBuilderTest, TraceWrongTypeOperand0) { Package p("p"); FunctionBuilder b("f", &p); diff --git a/xls/ir/function_test.cc b/xls/ir/function_test.cc index 6ffb162dfd..a78401ce8f 100644 --- a/xls/ir/function_test.cc +++ b/xls/ir/function_test.cc @@ -20,12 +20,13 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/status/matchers.h" #include "xls/ir/bits.h" +#include "xls/ir/dfs_visitor.h" #include "xls/ir/function_builder.h" #include "xls/ir/ir_test_base.h" #include "xls/ir/node_util.h" diff --git a/xls/ir/fuzz_type_domain.cc b/xls/ir/fuzz_type_domain.cc index d7086a9884..c677b2a2c6 100644 --- a/xls/ir/fuzz_type_domain.cc +++ b/xls/ir/fuzz_type_domain.cc @@ -40,8 +40,7 @@ std::optional TypeProtoSize(const TypeProto& type_proto, case TypeProto::TUPLE: { int64_t total_size = 0; for (const auto& element : type_proto.tuple_elements()) { - std::optional element_size = - TypeProtoSize(element, max_size); + std::optional element_size = TypeProtoSize(element, max_size); if (!element_size.has_value()) { return std::nullopt; } diff --git a/xls/ir/instantiation.cc b/xls/ir/instantiation.cc index c55a627dee..e2e8c41871 100644 --- a/xls/ir/instantiation.cc +++ b/xls/ir/instantiation.cc @@ -28,6 +28,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/substitute.h" +#include "re2/re2.h" #include "xls/common/status/status_macros.h" #include "xls/ir/block.h" #include "xls/ir/channel.h" @@ -35,7 +36,6 @@ #include "xls/ir/nodes.h" #include "xls/ir/package.h" #include "xls/ir/type.h" -#include "re2/re2.h" namespace xls { diff --git a/xls/ir/interval.cc b/xls/ir/interval.cc index 2b3b0fa8d7..efc93c6a86 100644 --- a/xls/ir/interval.cc +++ b/xls/ir/interval.cc @@ -134,7 +134,7 @@ Interval Interval::ConvexHull(const Interval& lhs, const Interval& rhs) { } std::optional Interval::Intersect(const Interval& lhs, - const Interval& rhs) { + const Interval& rhs) { CHECK_EQ(lhs.BitCount(), rhs.BitCount()); CHECK(!lhs.IsImproper()); CHECK(!rhs.IsImproper()); diff --git a/xls/ir/interval_ops.cc b/xls/ir/interval_ops.cc index 99e4db455b..0452a44f36 100644 --- a/xls/ir/interval_ops.cc +++ b/xls/ir/interval_ops.cc @@ -31,6 +31,7 @@ #include "xls/ir/bits_ops.h" #include "xls/ir/interval.h" #include "xls/ir/interval_set.h" +#include "xls/ir/lsb_or_msb.h" #include "xls/ir/node.h" #include "xls/ir/ternary.h" #include "xls/passes/ternary_evaluator.h" diff --git a/xls/ir/interval_ops_test.cc b/xls/ir/interval_ops_test.cc index f08aab0fa9..728bbf9e16 100644 --- a/xls/ir/interval_ops_test.cc +++ b/xls/ir/interval_ops_test.cc @@ -22,14 +22,14 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" -#include "fuzztest/fuzztest.h" #include "absl/algorithm/container.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/time/time.h" #include "absl/types/span.h" +#include "fuzztest/fuzztest.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/status/matchers.h" #include "xls/ir/bits.h" #include "xls/ir/function.h" diff --git a/xls/ir/interval_set_test.cc b/xls/ir/interval_set_test.cc index a69172be3a..8b585f9dd3 100644 --- a/xls/ir/interval_set_test.cc +++ b/xls/ir/interval_set_test.cc @@ -21,12 +21,12 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" -#include "fuzztest/fuzztest.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/str_format.h" #include "absl/types/span.h" +#include "fuzztest/fuzztest.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/ir/bits.h" #include "xls/ir/interval.h" #include "xls/ir/interval_set_test_utils.h" diff --git a/xls/ir/interval_test.cc b/xls/ir/interval_test.cc index 7726d658df..f1d70c934f 100644 --- a/xls/ir/interval_test.cc +++ b/xls/ir/interval_test.cc @@ -21,11 +21,11 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" -#include "fuzztest/fuzztest.h" #include "absl/container/flat_hash_set.h" #include "absl/types/span.h" +#include "fuzztest/fuzztest.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/status/matchers.h" #include "xls/ir/bits.h" #include "xls/ir/bits_ops.h" diff --git a/xls/ir/ir_matcher.cc b/xls/ir/ir_matcher.cc index 81cb135839..5e80c3f1fc 100644 --- a/xls/ir/ir_matcher.cc +++ b/xls/ir/ir_matcher.cc @@ -24,14 +24,14 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "absl/log/log.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl/types/span.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/ir/bits.h" #include "xls/ir/channel.h" #include "xls/ir/function_base.h" diff --git a/xls/ir/ir_matcher_test.cc b/xls/ir/ir_matcher_test.cc index 78b6c64064..0a98478397 100644 --- a/xls/ir/ir_matcher_test.cc +++ b/xls/ir/ir_matcher_test.cc @@ -19,9 +19,9 @@ #include #include +#include "absl/status/statusor.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "absl/status/statusor.h" #include "xls/common/status/matchers.h" #include "xls/ir/bits.h" #include "xls/ir/channel.h" diff --git a/xls/ir/ir_parser.cc b/xls/ir/ir_parser.cc index 50d964002e..392d2a9017 100644 --- a/xls/ir/ir_parser.cc +++ b/xls/ir/ir_parser.cc @@ -2096,7 +2096,8 @@ absl::StatusOr Parser::ParseFunction( result->SetInitiationInterval(ii); } else if (attribute == "ffi_proto") { ForeignFunctionData ffi; - if (!google::protobuf::TextFormat::ParseFromString(literal.value(), &ffi)) { + if (!google::protobuf::TextFormat::ParseFromString(literal.value(), + &ffi)) { return absl::InvalidArgumentError("Non-parseable FFI metadata proto."); } // Dummy parse to make sure it is a valid template. @@ -2326,8 +2327,8 @@ absl::StatusOr Parser::ParseChannel(Package* package, Token metadata_token, scanner_.PopTokenOrError(LexicalTokenType::kQuotedString)); ChannelMetadataProto proto; - bool success = - google::protobuf::TextFormat::ParseFromString(metadata_token.value(), &proto); + bool success = google::protobuf::TextFormat::ParseFromString( + metadata_token.value(), &proto); if (!success) { return absl::InvalidArgumentError( absl::StrFormat("Invalid channel metadata @ %s", diff --git a/xls/ir/ir_parser_test.cc b/xls/ir/ir_parser_test.cc index 6603b0eba9..dea4e98361 100644 --- a/xls/ir/ir_parser_test.cc +++ b/xls/ir/ir_parser_test.cc @@ -20,12 +20,12 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/strings/ascii.h" #include "absl/strings/str_format.h" #include "absl/strings/substitute.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/casts.h" #include "xls/common/source_location.h" #include "xls/common/status/matchers.h" @@ -41,7 +41,6 @@ namespace xls { - using status_testing::StatusIs; using ::testing::ElementsAre; using ::testing::Eq; @@ -1874,7 +1873,6 @@ block my_block(x: bits[32], y: bits[32]) { ParsePackageAndCheckDump(input); } - TEST(IrParserTest, ParseArrayIndex) { const std::string input = R"( fn foo(x: bits[32][6]) -> bits[32] { diff --git a/xls/ir/ir_scanner.cc b/xls/ir/ir_scanner.cc index e923d5d447..fa2dc1f036 100644 --- a/xls/ir/ir_scanner.cc +++ b/xls/ir/ir_scanner.cc @@ -31,6 +31,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "xls/common/status/status_macros.h" +#include "xls/ir/bits.h" #include "xls/ir/number_parser.h" namespace xls { @@ -184,8 +185,8 @@ class Tokenizer { int64_t content_start = index(); while (!EndOfString()) { if (MatchSubstring(quote)) { - std::string_view content = std::string_view( - str_.data() + content_start, index() - content_start); + std::string_view content = std::string_view(str_.data() + content_start, + index() - content_start); Advance(quote.size()); return content; } @@ -225,7 +226,7 @@ class Tokenizer { // last matching character. min_chars is the minimum number of characters // which are unconditionally captured. std::string_view CaptureWhile(std::function test_f, - int64_t min_chars = 0) { + int64_t min_chars = 0) { int64_t start = index(); while (!EndOfString() && ((index() < min_chars + start) || test_f(current()))) { diff --git a/xls/ir/ir_scanner_test.cc b/xls/ir/ir_scanner_test.cc index a25f299300..f0f6c8b15c 100644 --- a/xls/ir/ir_scanner_test.cc +++ b/xls/ir/ir_scanner_test.cc @@ -17,10 +17,10 @@ #include #include -#include "gmock/gmock.h" -#include "gtest/gtest.h" #include "absl/status/status.h" #include "absl/types/span.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "xls/common/status/matchers.h" namespace xls { diff --git a/xls/ir/ir_test_base.cc b/xls/ir/ir_test_base.cc index 6b7afe6eba..379f6f2691 100644 --- a/xls/ir/ir_test_base.cc +++ b/xls/ir/ir_test_base.cc @@ -21,12 +21,12 @@ #include #include -#include "gtest/gtest.h" #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_format.h" +#include "gtest/gtest.h" // #include "xls/codegen/codegen_options.h" // #include "xls/codegen/combinational_generator.h" // #include "xls/codegen/module_signature.h" @@ -60,9 +60,9 @@ VerifiedPackage::~VerifiedPackage() { absl::StatusOr> IrTestBase::ParsePackage( std::string_view text) { - XLS_ASSIGN_OR_RETURN(std::unique_ptr package, - Parser::ParseDerivedPackageNoVerify( - text, std::nullopt)); + XLS_ASSIGN_OR_RETURN( + std::unique_ptr package, + Parser::ParseDerivedPackageNoVerify(text, std::nullopt)); XLS_RETURN_IF_ERROR(VerifyPackage(package.get())); return std::move(package); } diff --git a/xls/ir/ir_test_base_test.cc b/xls/ir/ir_test_base_test.cc index 699bfaa1eb..3c9e799d4b 100644 --- a/xls/ir/ir_test_base_test.cc +++ b/xls/ir/ir_test_base_test.cc @@ -20,6 +20,7 @@ #include "gtest/gtest-spi.h" #include "gtest/gtest.h" #include "xls/common/status/matchers.h" +#include "xls/ir/function_base.h" namespace xls { namespace { diff --git a/xls/ir/keyword_args.cc b/xls/ir/keyword_args.cc index f8d1d55f1f..11a1e8194c 100644 --- a/xls/ir/keyword_args.cc +++ b/xls/ir/keyword_args.cc @@ -20,9 +20,12 @@ #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_format.h" #include "xls/common/status/status_macros.h" +#include "xls/ir/function_base.h" +#include "xls/ir/nodes.h" #include "xls/ir/value.h" namespace xls { diff --git a/xls/ir/node.cc b/xls/ir/node.cc index 1e3b8e825b..132cb8b910 100644 --- a/xls/ir/node.cc +++ b/xls/ir/node.cc @@ -767,7 +767,7 @@ absl::Status Node::ReplaceOperandNumber(int64_t operand_no, Node* new_operand, absl::Status Node::ReplaceUsesWith(Node* replacement, const std::function& filter, - bool replace_implicit_uses) { + bool replace_implicit_uses) { XLS_RET_CHECK(replacement != nullptr); XLS_RET_CHECK(GetType() == replacement->GetType()) << "type was: " << GetType()->ToString() diff --git a/xls/ir/node_test.cc b/xls/ir/node_test.cc index 56b049ee67..705a3a70e5 100644 --- a/xls/ir/node_test.cc +++ b/xls/ir/node_test.cc @@ -18,9 +18,9 @@ #include #include +#include "absl/status/status.h" #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "absl/status/status.h" #include "xls/common/status/matchers.h" #include "xls/ir/bits.h" #include "xls/ir/channel_ops.h" diff --git a/xls/ir/node_util.cc b/xls/ir/node_util.cc index da0a0ee5a3..063b815551 100644 --- a/xls/ir/node_util.cc +++ b/xls/ir/node_util.cc @@ -369,21 +369,21 @@ absl::StatusOr> GetPredicateUsedByNode(Node* node) { } namespace { - absl::flat_hash_set GetTransitiveUsers(Node* node) { - absl::flat_hash_set users; - std::deque deque{node}; - while (!deque.empty()) { - Node* front = deque.front(); - users.insert(front); - for (Node* user : front->users()) { - if (!users.contains(user)) { - deque.push_back(user); - } +absl::flat_hash_set GetTransitiveUsers(Node* node) { + absl::flat_hash_set users; + std::deque deque{node}; + while (!deque.empty()) { + Node* front = deque.front(); + users.insert(front); + for (Node* user : front->users()) { + if (!users.contains(user)) { + deque.push_back(user); } - deque.pop_front(); } - return users; + deque.pop_front(); } + return users; +} } // namespace absl::StatusOr ReplaceTupleElementsWith( @@ -421,9 +421,9 @@ absl::StatusOr ReplaceTupleElementsWith( absl::flat_hash_set users = GetTransitiveUsers(node); for (auto& [index, replacement] : replacements) { if (users.contains(replacement)) { - return absl::InvalidArgumentError( - absl::StrFormat("Replacement index %d (%v) depends on node %v.", - index, *replacement, *node)); + return absl::InvalidArgumentError( + absl::StrFormat("Replacement index %d (%v) depends on node %v.", + index, *replacement, *node)); } } @@ -470,7 +470,6 @@ absl::StatusOr ReplaceTupleElementsWith(Node* node, int64_t index, return ReplaceTupleElementsWith(node, {{index, replacement_element}}); } - bool IsBinarySelect(Node* node) { if (!node->Is