Merge branch 'main' into fix-ctags-target

Author: Vineet1101

BUILD.bazel

@@ -71,7 +71,7 @@ cc_library(
         "@boost.format",
         "@boost.multi_index",
         "@boost.multiprecision",
-        "@googletest//:gtest",
+        "@googletest//:gtest_prod",
         "@protobuf",
     ],
 )
@@ -315,7 +315,7 @@ cc_binary(
         "backends/bmv2/simple_switch/main.cpp",
         "backends/bmv2/simple_switch/version.h",
     ],
-    data = [":p4include"],
+    data = ["//p4include"],
     deps = [
         ":ir_frontend_midend_control_plane",
         ":lib",
@@ -387,7 +387,7 @@ cc_binary(
         "backends/dpdk/main.cpp",
         "backends/dpdk/version.h",
     ],
-    data = [":p4include"],
+    data = ["//p4include"],
     deps = [
         ":ir_frontend_midend_control_plane",
         ":lib",
@@ -437,7 +437,7 @@ cc_binary(
     srcs = [
         "backends/graphs/p4c-graphs.cpp",
     ],
-    data = [":p4include"],
+    data = ["//p4include"],
     deps = [
         ":config_h",
         ":ir_frontend_midend_control_plane",

backends/bmv2/common/options.h

@@ -20,6 +20,7 @@ limitations under the License.
 #include <getopt.h>
 
 #include "frontends/common/options.h"
+#include "lib/options.h"
 
 namespace P4::BMV2 {
 

bazel/p4_library.bzl

@@ -169,7 +169,7 @@ p4_library = rule(
             cfg = "exec",
         ),
         "_p4include": attr.label(
-            default = Label("//:p4include"),
+            default = Label("//p4include"),
             allow_files = [".p4", ".h"],
         ),
     },
@@ -248,7 +248,7 @@ p4_graphs = rule(
             cfg = "exec",
         ),
         "_p4include": attr.label(
-            default = Label("//:p4include"),
+            default = Label("//p4include"),
             allow_files = [".p4", ".h"],
         ),
     },

frontends/p4/metrics/metricsStructure.h

@@ -6,6 +6,7 @@ Structure definitions used by the code metric collection passes.
 #define FRONTENDS_P4_METRICS_METRICSSTRUCTURE_H_
 
 #include <string>
+#include <vector>
 
 #include "lib/cstring.h"
 #include "lib/ordered_map.h"

lib/exename.cpp

@@ -17,13 +17,11 @@ limitations under the License.
 #include "exename.h"
 
 #include <array>
+#include <climits>
 #include <cstring>
 #include <filesystem>
 #include <system_error>
 
-namespace P4 {
-
-#include <climits>
 #ifdef __APPLE__
 #include <unistd.h>
 
@@ -34,6 +32,8 @@ namespace P4 {
 #include <unistd.h>
 #endif
 
+namespace P4 {
+
 std::filesystem::path getExecutablePath() {
 #if defined(__APPLE__)
     std::array<char, PATH_MAX> buffer{};