Skip to content

Commit fc87bf7

Browse files
hzellerhzeller
committed
Fix includes in xls/ir.
1 parent 9a06d1d commit fc87bf7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+227
-164
lines changed

Diff for: ‎xls/ir/BUILD

+16-1
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ cc_test(
392392
":bits",
393393
":bits_ops",
394394
":bits_test_utils",
395+
":format_preference",
395396
":number_parser",
396397
":value",
397398
"//xls/common:bits_util",
@@ -611,11 +612,13 @@ cc_library(
611612
deps = [
612613
":channel",
613614
":channel_ops",
615+
":foreign_function_data_cc_proto",
614616
":format_strings",
615617
":ir",
616618
":op",
617619
":register",
618620
":source_location",
621+
":type",
619622
":value",
620623
":verifier",
621624
"//xls/common:casts",
@@ -646,6 +649,7 @@ cc_test(
646649
":ir_matcher",
647650
":node_util",
648651
":op",
652+
":register",
649653
":source_location",
650654
":type",
651655
":value",
@@ -917,10 +921,13 @@ cc_library(
917921
":bits",
918922
":type",
919923
":value",
924+
"//xls/common:bits_util",
920925
"//xls/common/status:ret_check",
921926
"//xls/common/status:status_macros",
922927
"//xls/data_structures:leaf_type_tree",
928+
"@com_google_absl//absl/base",
923929
"@com_google_absl//absl/log",
930+
"@com_google_absl//absl/log:check",
924931
"@com_google_absl//absl/status:statusor",
925932
"@com_google_absl//absl/strings",
926933
],
@@ -991,6 +998,7 @@ cc_test(
991998
name = "ir_test_base_test",
992999
srcs = ["ir_test_base_test.cc"],
9931000
deps = [
1001+
":ir",
9941002
":ir_test_base",
9951003
"//xls/common:xls_gunit_main",
9961004
"//xls/common/status:matchers",
@@ -1051,6 +1059,7 @@ cc_library(
10511059
hdrs = ["format_strings.h"],
10521060
deps = [
10531061
":format_preference",
1062+
"@com_google_absl//absl/status",
10541063
"@com_google_absl//absl/status:statusor",
10551064
"@com_google_absl//absl/strings",
10561065
"@com_google_absl//absl/strings:str_format",
@@ -1062,6 +1071,7 @@ cc_test(
10621071
name = "format_strings_test",
10631072
srcs = ["format_strings_test.cc"],
10641073
deps = [
1074+
":format_preference",
10651075
":format_strings",
10661076
"//xls/common:xls_gunit_main",
10671077
"//xls/common/status:matchers",
@@ -1208,6 +1218,7 @@ cc_library(
12081218
"//xls/common:string_to_int",
12091219
"//xls/common/status:ret_check",
12101220
"//xls/common/status:status_macros",
1221+
"@com_google_absl//absl/status",
12111222
"@com_google_absl//absl/status:statusor",
12121223
"@com_google_absl//absl/strings",
12131224
"@com_google_absl//absl/strings:str_format",
@@ -1283,6 +1294,7 @@ cc_test(
12831294
deps = [
12841295
":bits",
12851296
":bits_ops",
1297+
":format_preference",
12861298
":number_parser",
12871299
"//xls/common:xls_gunit_main",
12881300
"//xls/common/status:matchers",
@@ -1298,6 +1310,7 @@ cc_test(
12981310
":big_int",
12991311
":bits",
13001312
":bits_ops",
1313+
":format_preference",
13011314
":number_parser",
13021315
"//xls/common:xls_gunit_main",
13031316
"//xls/common/status:matchers",
@@ -1417,6 +1430,7 @@ cc_library(
14171430
"//xls/common/status:status_macros",
14181431
"@com_google_absl//absl/container:flat_hash_map",
14191432
"@com_google_absl//absl/log",
1433+
"@com_google_absl//absl/status",
14201434
"@com_google_absl//absl/status:statusor",
14211435
"@com_google_absl//absl/strings:str_format",
14221436
],
@@ -1594,6 +1608,7 @@ cc_test(
15941608
"//xls/common/status:matchers",
15951609
"//xls/common/status:ret_check",
15961610
"//xls/common/status:status_macros",
1611+
"@com_google_absl//absl/base",
15971612
"@com_google_absl//absl/status",
15981613
"@com_google_absl//absl/types:span",
15991614
"@com_google_googletest//:gtest",
@@ -1811,7 +1826,6 @@ cc_library(
18111826
"//xls/common/status:status_macros",
18121827
"@com_google_absl//absl/algorithm:container",
18131828
"@com_google_absl//absl/base:nullability",
1814-
"@com_google_absl//absl/container:btree",
18151829
"@com_google_absl//absl/container:flat_hash_map",
18161830
"@com_google_absl//absl/container:flat_hash_set",
18171831
"@com_google_absl//absl/log",
@@ -1852,6 +1866,7 @@ cc_library(
18521866
hdrs = ["proc_elaboration.h"],
18531867
deps = [
18541868
":channel",
1869+
":channel_cc_proto",
18551870
":channel_ops",
18561871
":elaboration",
18571872
":ir",

Diff for: ‎xls/ir/abstract_evaluator_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
#include <cstdint>
1818
#include <vector>
1919

20-
#include "gtest/gtest.h"
21-
#include "fuzztest/fuzztest.h"
2220
#include "absl/log/check.h"
2321
#include "absl/types/span.h"
22+
#include "fuzztest/fuzztest.h"
23+
#include "gtest/gtest.h"
2424
#include "xls/ir/big_int.h"
2525
#include "xls/ir/bits.h"
2626
#include "xls/ir/bits_ops.h"

Diff for: ‎xls/ir/abstract_node_evaluator_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#include <utility>
2121
#include <vector>
2222

23-
#include "gmock/gmock.h"
24-
#include "gtest/gtest.h"
2523
#include "absl/log/check.h"
2624
#include "absl/status/statusor.h"
2725
#include "absl/types/span.h"
26+
#include "gmock/gmock.h"
27+
#include "gtest/gtest.h"
2828
#include "xls/common/status/matchers.h"
2929
#include "xls/common/status/ret_check.h"
3030
#include "xls/common/status/status_macros.h"

Diff for: ‎xls/ir/benchmark_support_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include <array>
1818
#include <vector>
1919

20+
#include "absl/types/span.h"
2021
#include "gmock/gmock.h"
2122
#include "gtest/gtest.h"
22-
#include "absl/types/span.h"
2323
#include "xls/common/status/matchers.h"
2424
#include "xls/ir/bits.h"
2525
#include "xls/ir/function.h"

Diff for: ‎xls/ir/big_int_test.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@
2020
#include <string_view>
2121
#include <utility>
2222

23+
#include "absl/status/status.h"
2324
#include "gmock/gmock.h"
2425
#include "gtest/gtest.h"
25-
#include "absl/status/status.h"
2626
#include "xls/common/status/matchers.h"
2727
#include "xls/ir/bits.h"
2828
#include "xls/ir/bits_ops.h"
29+
#include "xls/ir/format_preference.h"
2930
#include "xls/ir/number_parser.h"
3031

3132
namespace xls {

Diff for: ‎xls/ir/bits_ops_test.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
#include <utility>
2222
#include <vector>
2323

24-
#include "benchmark/benchmark.h"
25-
#include "gtest/gtest.h"
26-
#include "fuzztest/fuzztest.h"
2724
#include "absl/container/inlined_vector.h"
2825
#include "absl/strings/str_join.h"
2926
#include "absl/strings/str_split.h"
27+
#include "benchmark/benchmark.h"
28+
#include "fuzztest/fuzztest.h"
29+
#include "gtest/gtest.h"
3030
#include "xls/common/status/matchers.h"
3131
#include "xls/data_structures/inline_bitmap.h"
3232
#include "xls/ir/bits.h"

Diff for: ‎xls/ir/bits_test.cc

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,21 @@
2020
#include <string>
2121
#include <vector>
2222

23-
#include "gmock/gmock.h"
24-
#include "gtest/gtest.h"
25-
#include "fuzztest/fuzztest.h"
2623
#include "absl/container/inlined_vector.h"
2724
#include "absl/status/status.h"
2825
#include "absl/strings/str_format.h"
2926
#include "absl/strings/str_join.h"
3027
#include "absl/types/span.h"
28+
#include "fuzztest/fuzztest.h"
29+
#include "gmock/gmock.h"
30+
#include "gtest/gtest.h"
3131
#include "xls/common/bits_util.h"
3232
#include "xls/common/math_util.h"
3333
#include "xls/common/status/matchers.h"
3434
#include "xls/data_structures/inline_bitmap.h"
3535
#include "xls/ir/bits_ops.h"
3636
#include "xls/ir/bits_test_utils.h"
37+
#include "xls/ir/format_preference.h"
3738
#include "xls/ir/number_parser.h"
3839
#include "xls/ir/value.h"
3940

Diff for: ‎xls/ir/block_elaboration_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
#include <string_view>
2020
#include <vector>
2121

22-
#include "gmock/gmock.h"
23-
#include "gtest/gtest.h"
2422
#include "absl/status/status.h"
2523
#include "absl/status/statusor.h"
2624
#include "absl/types/span.h"
25+
#include "gmock/gmock.h"
26+
#include "gtest/gtest.h"
2727
#include "xls/common/status/matchers.h"
2828
#include "xls/common/status/status_macros.h"
2929
#include "xls/ir/bits.h"

Diff for: ‎xls/ir/block_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#include <string_view>
2121
#include <vector>
2222

23-
#include "gmock/gmock.h"
24-
#include "gtest/gtest.h"
2523
#include "absl/status/status.h"
2624
#include "absl/types/span.h"
2725
#include "absl/types/variant.h"
26+
#include "gmock/gmock.h"
27+
#include "gtest/gtest.h"
2828
#include "xls/common/logging/log_lines.h"
2929
#include "xls/common/status/matchers.h"
3030
#include "xls/common/visitor.h"

Diff for: ‎xls/ir/caret.cc

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
#include "xls/common/file/filesystem.h"
3030
#include "xls/common/status/ret_check.h"
3131
#include "xls/common/status/status_macros.h"
32+
#include "xls/ir/fileno.h"
33+
#include "xls/ir/source_location.h"
3234

3335
namespace xls {
3436

Diff for: ‎xls/ir/caret_test.cc

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818
#include <optional>
1919
#include <string>
2020

21-
#include "gtest/gtest.h"
2221
#include "absl/strings/str_format.h"
22+
#include "gtest/gtest.h"
2323
#include "xls/common/file/temp_file.h"
2424
#include "xls/common/status/matchers.h"
25+
#include "xls/ir/fileno.h"
2526
#include "xls/ir/package.h"
2627
#include "xls/ir/source_location.h"
2728

@@ -64,8 +65,8 @@ TEST(CaretTest, FileContent) {
6465
2 | this is a line of code that does stuff
6566
| ^
6667
)";
67-
std::string expected = absl::StrFormat(expected_format,
68-
std::string(temp_file.path()));
68+
std::string expected =
69+
absl::StrFormat(expected_format, std::string(temp_file.path()));
6970
EXPECT_EQ(
7071
PrintCaret(LookUpInPackage(&p), loc, std::nullopt, std::nullopt, 60),
7172
expected);

Diff for: ‎xls/ir/channel.cc

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "absl/types/variant.h"
3030
#include "google/protobuf/text_format.h"
3131
#include "xls/common/casts.h"
32+
#include "xls/ir/channel.pb.h"
3233
#include "xls/ir/channel_ops.h"
3334
#include "xls/ir/type.h"
3435
#include "xls/ir/value_utils.h"

Diff for: ‎xls/ir/channel_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
#include <string>
1919
#include <vector>
2020

21+
#include "absl/status/status.h"
2122
#include "gmock/gmock.h"
2223
#include "gtest/gtest.h"
23-
#include "absl/status/status.h"
2424
#include "xls/common/status/matchers.h"
2525
#include "xls/ir/bits.h"
2626
#include "xls/ir/channel.pb.h"

Diff for: ‎xls/ir/code_template.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "absl/status/statusor.h"
2424
#include "absl/strings/str_cat.h"
2525
#include "absl/strings/str_format.h"
26-
#include "xls/common/status/status_macros.h"
2726
#include "re2/re2.h"
27+
#include "xls/common/status/status_macros.h"
2828

2929
namespace xls {
3030

Diff for: ‎xls/ir/code_template_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
#include <string>
1818
#include <string_view>
1919

20-
#include "gmock/gmock.h"
21-
#include "gtest/gtest.h"
2220
#include "absl/container/flat_hash_map.h"
2321
#include "absl/status/status.h"
2422
#include "absl/strings/str_cat.h"
23+
#include "gmock/gmock.h"
24+
#include "gtest/gtest.h"
2525
#include "xls/common/status/matchers.h"
2626

2727
using testing::ElementsAre;

Diff for: ‎xls/ir/dfs_visitor_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
#include <string>
2020
#include <vector>
2121

22-
#include "gmock/gmock.h"
23-
#include "gtest/gtest.h"
2422
#include "absl/container/flat_hash_set.h"
2523
#include "absl/log/log.h"
2624
#include "absl/status/status.h"
25+
#include "gmock/gmock.h"
26+
#include "gtest/gtest.h"
2727
#include "xls/common/status/matchers.h"
2828
#include "xls/ir/function.h"
2929
#include "xls/ir/ir_test_base.h"

Diff for: ‎xls/ir/elaborated_block_dfs_visitor_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
#include <string_view>
2020
#include <vector>
2121

22-
#include "gmock/gmock.h"
23-
#include "gtest/gtest.h"
2422
#include "absl/container/flat_hash_set.h"
2523
#include "absl/log/log.h"
2624
#include "absl/status/status.h"
2725
#include "absl/status/statusor.h"
26+
#include "gmock/gmock.h"
27+
#include "gtest/gtest.h"
2828
#include "xls/common/status/matchers.h"
2929
#include "xls/common/status/status_macros.h"
3030
#include "xls/ir/bits.h"

Diff for: ‎xls/ir/format_preference_test.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include <string>
1818
#include <vector>
1919

20+
#include "absl/status/status.h"
2021
#include "gmock/gmock.h"
2122
#include "gtest/gtest.h"
22-
#include "absl/status/status.h"
2323
#include "xls/common/status/matchers.h"
2424

2525
namespace xls {

Diff for: ‎xls/ir/format_strings.cc

+3
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,21 @@
1515
#include "xls/ir/format_strings.h"
1616

1717
#include <algorithm>
18+
#include <cstddef>
1819
#include <cstdint>
1920
#include <string>
2021
#include <string_view>
2122
#include <variant>
2223
#include <vector>
2324

25+
#include "absl/status/status.h"
2426
#include "absl/status/statusor.h"
2527
#include "absl/strings/str_cat.h"
2628
#include "absl/strings/str_format.h"
2729
#include "absl/strings/str_join.h"
2830
#include "absl/strings/str_replace.h"
2931
#include "absl/types/span.h"
32+
#include "xls/ir/format_preference.h"
3033

3134
namespace xls {
3235

Diff for: ‎xls/ir/format_strings_test.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@
1717
#include <string>
1818
#include <vector>
1919

20+
#include "absl/status/status.h"
2021
#include "gmock/gmock.h"
2122
#include "gtest/gtest.h"
22-
#include "absl/status/status.h"
2323
#include "xls/common/status/matchers.h"
24+
#include "xls/ir/format_preference.h"
2425

2526
namespace xls {
2627
namespace {

0 commit comments

Comments
 (0)