[P4_Symbolic] Migrate logging from gLog and gFlags to Abseil logging and flags in P4_Symbolic. (#1127)

Co-authored-by: rhalstea <[email protected]>
Co-authored-by: bhagatgit <[email protected]>

Author: 3 people

.bazelversion

@@ -1 +1 @@
-5.4.0
+6.4.0

p4_symbolic/BUILD.bazel

@@ -30,11 +30,11 @@ cc_binary(
         "//p4_pdpi/internal:ordered_map",
         "//p4_symbolic/symbolic",
         "//p4_symbolic/symbolic:solver_state",
-        "@com_github_google_glog//:glog",
         "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
         "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/flags:parse",
         "@com_google_absl//absl/flags:usage",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_protobuf//:protobuf",

p4_symbolic/ir/BUILD.bazel

@@ -73,9 +73,9 @@ cc_library(
         "//p4_pdpi:names",
         "//p4_pdpi/internal:ordered_map",
         "//p4_symbolic/bmv2:bmv2_cc_proto",
-        "@com_github_google_glog//:glog",
         "@com_github_p4lang_p4runtime//:p4info_cc_proto",
         "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
@@ -97,10 +97,10 @@ cc_library(
         "//gutil:status",
         "//p4_pdpi:ir_cc_proto",
         "//p4_symbolic/bmv2:bmv2_cc_proto",
-        "@com_github_google_glog//:glog",
         "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
         "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/container:node_hash_map",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",

p4_symbolic/ir/ir.cc

@@ -20,14 +20,14 @@
 #include <utility>
 #include <vector>
 
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/strip.h"
-#include "glog/logging.h"
 #include "google/protobuf/repeated_ptr_field.h"
 #include "google/protobuf/struct.pb.h"
 #include "gutil/status.h"

p4_symbolic/ir/ir.h

@@ -23,8 +23,8 @@
 #include <optional>
 #include <string>
 
+#include "absl/log/log.h"
 #include "absl/status/statusor.h"
-#include "glog/logging.h"
 #include "google/protobuf/repeated_ptr_field.h"
 #include "p4/v1/p4runtime.pb.h"
 #include "p4_pdpi/ir.pb.h"

p4_symbolic/main.cc

@@ -27,9 +27,9 @@
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"
 #include "absl/flags/usage.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
-#include "glog/logging.h"
 #include "google/protobuf/message_lite.h"
 #include "gutil/io.h"
 #include "gutil/status.h"

p4_symbolic/packet_synthesizer/BUILD.bazel

@@ -123,9 +123,9 @@ cc_library(
         "//p4_symbolic/symbolic",
         "//p4_symbolic/symbolic:solver_state",
         "//p4_symbolic/symbolic:values",
-        "@com_github_google_glog//:glog",
         "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
         "@com_github_z3prover_z3//:api",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/memory",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",

p4_symbolic/packet_synthesizer/packet_synthesizer.cc

@@ -19,14 +19,14 @@
 #include <utility>
 #include <vector>
 
+#include "absl/log/log.h"
 #include "absl/memory/memory.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/substitute.h"
 #include "absl/time/time.h"
-#include "glog/logging.h"
 #include "google/protobuf/duration.pb.h"
 #include "gutil/status.h"
 #include "gutil/timer.h"

p4_symbolic/sai/BUILD.bazel

@@ -32,6 +32,7 @@ cc_library(
         "//p4_symbolic/symbolic:values",
         "@com_github_z3prover_z3//:api",
         "@com_google_absl//absl/container:flat_hash_set",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
@@ -93,6 +94,7 @@ cc_test(
         "//sai_p4/instantiations/google:sai_nonstandard_platforms_cc",
         "//sai_p4/instantiations/google:sai_p4info_cc",
         "//sai_p4/instantiations/google:sai_pd_cc_proto",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
     ],
@@ -116,8 +118,8 @@ cc_test(
         "//sai_p4/instantiations/google:sai_nonstandard_platforms_cc",
         "//sai_p4/instantiations/google:sai_p4info_cc",
         "//sai_p4/instantiations/google:sai_pd_cc_proto",
-        "@com_github_google_glog//:glog",
         "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/types:optional",
         "@com_google_googletest//:gtest_main",
         "@com_google_protobuf//:protobuf",

p4_symbolic/sai/criteria_generator_test.cc

@@ -17,11 +17,9 @@
 #include <string>
 #include <vector>
 
+#include "absl/log/log.h"
 #include "absl/types/optional.h"
-#include "glog/logging.h"
-#include "gmock/gmock.h"
 #include "google/protobuf/message.h"
-#include "gtest/gtest.h"
 #include "gutil/proto_matchers.h"
 #include "gutil/status_matchers.h"
 #include "gutil/testing.h"
@@ -36,6 +34,8 @@
 #include "sai_p4/instantiations/google/sai_nonstandard_platforms.h"
 #include "sai_p4/instantiations/google/sai_p4info.h"
 #include "sai_p4/instantiations/google/sai_pd.pb.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 
 namespace p4_symbolic::packet_synthesizer {
 namespace {

p4_symbolic/sai/packet_synthesizer_test.cc

@@ -16,10 +16,9 @@
 
 #include <optional>
 
+#include "absl/log/log.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "gutil/proto.h"
 #include "gutil/status_matchers.h"
 #include "gutil/test_artifact_writer.h"
@@ -33,6 +32,8 @@
 #include "sai_p4/instantiations/google/sai_nonstandard_platforms.h"
 #include "sai_p4/instantiations/google/sai_p4info.h"
 #include "sai_p4/instantiations/google/sai_pd.pb.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 
 namespace p4_symbolic::packet_synthesizer {
 namespace {

p4_symbolic/sai/sai.cc

@@ -20,6 +20,7 @@
 #include <vector>
 
 #include "absl/container/flat_hash_set.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/ascii.h"

p4_symbolic/symbolic/BUILD.bazel

@@ -89,13 +89,13 @@ cc_library(
         "//p4_symbolic/ir",
         "//p4_symbolic/ir:ir_cc_proto",
         "//p4_symbolic/ir:table_entries",
-        "@com_github_google_glog//:glog",
         "@com_github_p4lang_p4runtime//:p4info_cc_proto",
         "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
         "@com_github_z3prover_z3//:api",
         "@com_google_absl//absl/algorithm:container",
         "@com_google_absl//absl/container:btree",
         "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/numeric:bits",
         "@com_google_absl//absl/numeric:int128",
         "@com_google_absl//absl/status",
@@ -147,13 +147,13 @@ cc_library(
         "//p4_symbolic/ir:table_entries",
         "//p4_symbolic/packet_synthesizer:packet_synthesizer_cc_proto",
         "//p4_symbolic/packet_synthesizer:z3_model_to_packet",
-        "@com_github_google_glog//:glog",
         "@com_github_p4lang_p4runtime//:p4info_cc_proto",
         "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
         "@com_github_z3prover_z3//:api",
         "@com_google_absl//absl/algorithm:container",
         "@com_google_absl//absl/cleanup",
         "@com_google_absl//absl/container:btree",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
@@ -227,9 +227,9 @@ cc_test(
         "//gutil:status_matchers",
         "//p4_symbolic/ir",
         "//p4_symbolic/ir:ir_cc_proto",
-        "@com_github_google_glog//:glog",
         "@com_github_z3prover_z3//:api",
         "@com_google_absl//absl/container:btree",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",
     ],
@@ -265,9 +265,9 @@ cc_test(
         "//p4_pdpi/packetlib",
         "//p4_pdpi/packetlib:packetlib_cc_proto",
         "//p4_symbolic:test_util",
-        "@com_github_google_glog//:glog",
         "@com_github_p4lang_p4runtime//:p4runtime_cc_proto",
         "@com_github_z3prover_z3//:api",
+        "@com_google_absl//absl/log",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_googletest//:gtest_main",

p4_symbolic/symbolic/action.cc

@@ -18,12 +18,12 @@
 #include <string>
 #include <vector>
 
+#include "absl/log/log.h"
 #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/string_view.h"
-#include "glog/logging.h"
 #include "google/protobuf/repeated_ptr_field.h"
 #include "gutil/collections.h"
 #include "gutil/status.h"

p4_symbolic/symbolic/conditional.cc

@@ -19,9 +19,9 @@
 
 #include <string>
 
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
-#include "glog/logging.h"
 #include "gutil/status.h"
 #include "p4_symbolic/ir/ir.h"
 #include "p4_symbolic/ir/ir.pb.h"

p4_symbolic/symbolic/deparser_test.cc

@@ -18,12 +18,10 @@
 #include <string>
 #include <vector>
 
+#include "absl/log/log.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/string_view.h"
-#include "glog/logging.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "gutil/status_matchers.h"
 #include "p4/v1/p4runtime.pb.h"
 #include "p4_pdpi/packetlib/packetlib.h"
@@ -33,6 +31,8 @@
 #include "p4_symbolic/symbolic/util.h"
 #include "p4_symbolic/test_util.h"
 #include "z3++.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 
 namespace p4_symbolic {
 namespace {

p4_symbolic/symbolic/parser.cc

@@ -19,11 +19,11 @@
 #include <utility>
 #include <vector>
 
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/optional.h"
-#include "glog/logging.h"
 #include "gutil/status.h"
 #include "p4_pdpi/internal/ordered_map.h"
 #include "p4_symbolic/ir/ir.h"

p4_symbolic/symbolic/parser_test.cc

@@ -18,18 +18,18 @@
 #include <vector>
 
 #include "absl/container/btree_map.h"
+#include "absl/log/log.h"
 #include "absl/strings/str_replace.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/substitute.h"
-#include "glog/logging.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "gutil/proto.h"
 #include "gutil/status_matchers.h"
 #include "p4_symbolic/ir/ir.h"
 #include "p4_symbolic/ir/ir.pb.h"
 #include "p4_symbolic/symbolic/v1model.h"
 #include "z3++.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
 
 namespace p4_symbolic::symbolic::parser {
 namespace {

p4_symbolic/symbolic/symbolic.cc

@@ -25,11 +25,11 @@
 
 #include "absl/cleanup/cleanup.h"
 #include "absl/container/btree_map.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
 #include "absl/types/optional.h"
-#include "glog/logging.h"
 #include "gutil/status.h"
 #include "p4/v1/p4runtime.pb.h"
 #include "p4_pdpi/built_ins.h"

p4_symbolic/symbolic/symbolic_table_entry.cc

@@ -24,14 +24,14 @@
 #include "absl/algorithm/container.h"
 #include "absl/container/btree_map.h"
 #include "absl/container/flat_hash_map.h"
+#include "absl/log/log.h"
 #include "absl/numeric/bits.h"
 #include "absl/numeric/int128.h"
 #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/string_view.h"
-#include "glog/logging.h"
 #include "gutil/collections.h"
 #include "gutil/status.h"
 #include "p4/config/v1/p4info.pb.h"

p4_symbolic/symbolic/table.cc

@@ -28,6 +28,7 @@
 
 #include "absl/algorithm/container.h"
 #include "absl/container/btree_map.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -36,7 +37,6 @@
 #include "absl/strings/substitute.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
-#include "glog/logging.h"
 #include "google/protobuf/map.h"
 #include "gutil/status.h"
 #include "p4/config/v1/p4info.pb.h"

p4_symbolic/symbolic/util.cc

@@ -20,13 +20,13 @@
 #include <utility>
 
 #include "absl/container/btree_map.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_split.h"
 #include "absl/strings/string_view.h"
 #include "absl/strings/substitute.h"
-#include "glog/logging.h"
 #include "gutil/status.h"
 #include "p4_pdpi/internal/ordered_map.h"
 #include "p4_pdpi/ir.pb.h"

p4_symbolic/symbolic/v1model.cc

@@ -19,13 +19,13 @@
 #include <utility>
 #include <vector>
 
+#include "absl/log/log.h"
 #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/string_view.h"
 #include "absl/strings/substitute.h"
-#include "glog/logging.h"
 #include "gutil/collections.h"
 #include "gutil/status.h"
 #include "p4_pdpi/built_ins.h"