Address some late comments on previous cl.

Some minor clang-tidy things slipped through by accident. Address them. PiperOrigin-RevId: 553620543
google · Aug 3, 2023 · e29dba6 · e29dba6
1 parent cbfa65b
commit e29dba6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/xls/ir/BUILD b/xls/ir/BUILD
@@ -183,9 +183,11 @@ cc_library(
     deps = [
         ":bits",
         ":bits_ops",
+        ":interval",
         ":interval_set",
         ":ir",
         ":ternary",
+        "//xls/common/logging",
     ],
 )
 

diff --git a/xls/ir/interval_ops.cc b/xls/ir/interval_ops.cc
@@ -17,7 +17,9 @@
 #include <cstdint>
 #include <optional>
 
+#include "xls/common/logging/logging.h"
 #include "xls/ir/bits.h"
+#include "xls/ir/interval.h"
 #include "xls/ir/bits_ops.h"
 #include "xls/ir/node.h"
 #include "xls/ir/ternary.h"

diff --git a/xls/ir/interval_ops_test.cc b/xls/ir/interval_ops_test.cc
@@ -35,38 +35,44 @@ IntervalSet SetOf(absl::Span<const Interval> intervals) {
   is.Normalize();
   return is;
 }
+
 TEST(IntervalOpsTest, BitsPrecise) {
   IntervalSet is = SetOf({Interval::Precise(UBits(21, 8))});
   auto known = ExtractKnownBits(is);
   EXPECT_EQ(known.known_bits, Bits::AllOnes(8));
   EXPECT_EQ(known.known_bit_values, UBits(21, 8));
 }
+
 TEST(IntervalOpsTest, BitsMaximal) {
   IntervalSet is = SetOf({Interval::Maximal(8)});
   auto known = ExtractKnownBits(is);
   EXPECT_EQ(known.known_bits, Bits(8));
   EXPECT_EQ(known.known_bit_values, Bits(8));
 }
+
 TEST(IntervalOpsTest, BitsHalfFull) {
   IntervalSet is = SetOf({Interval::Maximal(4).ZeroExtend(8)});
   auto known = ExtractKnownBits(is);
   EXPECT_EQ(known.known_bits, UBits(0xf0, 8));
   EXPECT_EQ(known.known_bit_values, Bits(8));
 }
+
 TEST(IntervalOpsTest, MiddleOut) {
   IntervalSet is = SetOf({Interval(UBits(0, 8), UBits(0x4, 8)),
                           Interval(UBits(0x10, 8), UBits(0x14, 8))});
   auto known = ExtractKnownBits(is);
   EXPECT_EQ(known.known_bits, UBits(0xe0, 8));
   EXPECT_EQ(known.known_bit_values, Bits(8));
 }
+
 TEST(IntervalOpsTest, MiddleOutHigh) {
   IntervalSet is = SetOf({Interval(UBits(0xe0, 8), UBits(0xe4, 8)),
                           Interval(UBits(0xf0, 8), UBits(0xf4, 8))});
   auto known = ExtractKnownBits(is);
   EXPECT_EQ(known.known_bits, UBits(0xe0, 8));
   EXPECT_EQ(known.known_bit_values, UBits(0xe0, 8));
 }
+
 TEST(IntervalOpsTest, MiddleOutTernary) {
   IntervalSet is = SetOf({Interval(UBits(0, 8), UBits(0x4, 8)),
                           Interval(UBits(0x10, 8), UBits(0x14, 8))});

diff --git a/xls/passes/range_query_engine.cc b/xls/passes/range_query_engine.cc
@@ -26,6 +26,7 @@
 #include "xls/ir/bits_ops.h"
 #include "xls/ir/dfs_visitor.h"
 #include "xls/ir/function_base.h"
+#include "xls/ir/interval.h"
 #include "xls/ir/interval_ops.h"
 #include "xls/ir/node_iterator.h"
 #include "xls/ir/nodes.h"