Merge pull request facebook#3 from adamcalabrigo/fb_upstream_2_13_2023

Pull upstream changes from 2/13/2023
arajeev-ARISTA · Feb 15, 2023 · d0277c9 · d0277c9
2 parents d1534ba + f6cd3cc
commit d0277c9
Show file tree

Hide file tree

Showing 343 changed files with 34,351 additions and 3,193 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -70,10 +70,12 @@ if (SAI_BRCM_IMPL)
   # TODO (skhare) IS_OSS_BRCM_SAI is only a short-term change to unblock.
   # Refactor/fix the code and then remove this flag.
   add_definitions (-DIS_OSS_BRCM_SAI=true)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSAI_VERSION_7_2_0_0_ODP")
+  # TODO: Replace SAI_VERSION_9_0_EA_DNX_ODP with SAI_VERSION_9_0_EA_ODP
+  # to build bcm xgs
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSAI_VERSION_9_0_EA_DNX_ODP")
   set(SAI_VER_MAJOR "1")
-  set(SAI_VER_MINOR "10")
-  set(SAI_VER_RELEASE "2")
+  set(SAI_VER_MINOR "11")
+  set(SAI_VER_RELEASE "0")
 else()
   set(SAI_VER_MAJOR "1")
   set(SAI_VER_MINOR "7")

diff --git a/build/deps/github_hashes/facebook/fbthrift-rev.txt b/build/deps/github_hashes/facebook/fbthrift-rev.txt
@@ -1 +1 @@
-Subproject commit f90c9696176ff4951b4361614e9287aaff34115a
+Subproject commit 0d58d2e8515f4fd12a9ec222c44007de015a495f
diff --git a/build/deps/github_hashes/facebook/folly-rev.txt b/build/deps/github_hashes/facebook/folly-rev.txt
@@ -1 +1 @@
-Subproject commit 22b89282c9d3bb56a625b7def37f42e8cdd93dd0
+Subproject commit 6ab600f394e71c6c0179f509472e0a77b8baaaa4
diff --git a/build/deps/github_hashes/facebook/wangle-rev.txt b/build/deps/github_hashes/facebook/wangle-rev.txt
@@ -1 +1 @@
-Subproject commit 57f32870d5b451b8d17fe4250c26646955421157
+Subproject commit ae80140abe477d22b3f28211f33efaeec552e152
diff --git a/build/fbcode_builder/getdeps.py b/build/fbcode_builder/getdeps.py
@@ -627,8 +627,12 @@ def run_project_cmd(self, args, loader, manifest):
                     )
                     builder.build(install_dirs, reconfigure=reconfigure)
 
-                    # Update built_marker only if user hasn't built a specific target
-                    if m == manifest and args.cmake_target == "install":
+                    # If we are building the project (not depdendency) and a specific
+                    # cmake_target (not 'install') has been requested, then we don't
+                    # set the built_marker. This allows subsequent runs of getdeps.py
+                    # for the project to run with different cmake_targets to trigger
+                    # cmake
+                    if not (m == manifest and args.cmake_target != "install"):
                         with open(built_marker, "w") as f:
                             f.write(project_hash)
 

diff --git a/cmake/AgentHwBcmBenchmarks.cmake b/cmake/AgentHwBcmBenchmarks.cmake
@@ -50,7 +50,7 @@ target_link_libraries(bcm_fsw_scale_route_add_speed
   hw_fsw_scale_route_add_speed
   route_scale_gen
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -67,7 +67,7 @@ target_link_libraries(bcm_fsw_scale_route_del_speed
   hw_fsw_scale_route_del_speed
   route_scale_gen
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -84,7 +84,7 @@ target_link_libraries(bcm_th_alpm_scale_route_add_speed
   hw_th_alpm_scale_route_add_speed
   route_scale_gen
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -101,7 +101,7 @@ target_link_libraries(bcm_th_alpm_scale_route_del_speed
   hw_th_alpm_scale_route_del_speed
   route_scale_gen
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -118,7 +118,7 @@ target_link_libraries(bcm_hgrid_du_scale_route_add_speed
   hw_hgrid_du_scale_route_add_speed
   route_scale_gen
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -135,7 +135,7 @@ target_link_libraries(bcm_hgrid_du_scale_route_del_speed
   hw_hgrid_du_scale_route_del_speed
   route_scale_gen
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -152,7 +152,7 @@ target_link_libraries(bcm_hgrid_uu_scale_route_add_speed
   hw_hgrid_uu_scale_route_add_speed
   route_scale_gen
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -169,7 +169,7 @@ target_link_libraries(bcm_hgrid_uu_scale_route_del_speed
   hw_hgrid_uu_scale_route_del_speed
   route_scale_gen
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -186,7 +186,7 @@ target_link_libraries(bcm_anticipated_scale_route_add_speed
   hw_anticipated_scale_route_add_speed
   route_scale_gen
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -203,7 +203,7 @@ target_link_libraries(bcm_anticipated_scale_route_del_speed
   hw_anticipated_scale_route_del_speed
   route_scale_gen
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -344,12 +344,11 @@ target_link_libraries(bcm_teflow_scale_add
   -Wl,--whole-archive
   bcm
   config
-  bcm_switch_ensemble
   config_factory
   hw_teflow_scale_add
   bcm_teflow_utils
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -361,12 +360,11 @@ target_link_libraries(bcm_teflow_scale_del
   -Wl,--whole-archive
   bcm
   config
-  bcm_switch_ensemble
   config_factory
   hw_teflow_scale_del
   bcm_teflow_utils
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark
@@ -383,7 +381,7 @@ target_link_libraries(bcm_teflow_stats_collection_speed
   hw_teflow_stats_collection_speed
   bcm_teflow_utils
   -Wl,--no-whole-archive
-  hw_benchmark_main
+  bcm_agent_benchmarks_main
   Folly::folly
   ${OPENNSA}
   Folly::follybenchmark

diff --git a/cmake/AgentHwBcmTests.cmake b/cmake/AgentHwBcmTests.cmake
@@ -99,11 +99,20 @@ target_link_libraries(bcm_test
   sflow_cpp2
   packettrace_cpp2
   wedge_led_utils
+  bcm_phy_capabilities
   Folly::folly
   ${GTEST}
   ${LIBGMOCK_LIBRARIES}
 )
 
+add_library(bcm_phy_capabilities
+  fboss/agent/hw/bcm/tests/PhyCapabilities.cpp
+)
+
+target_link_libraries(bcm_phy_capabilities
+  bcm
+)
+
 add_library(bcm_switch_ensemble
   fboss/agent/hw/bcm/tests/BcmSwitchEnsemble.cpp
   fboss/agent/hw/bcm/tests/HwSwitchEnsembleFactory.cpp

diff --git a/cmake/AgentHwBenchmarks.cmake b/cmake/AgentHwBenchmarks.cmake
@@ -43,10 +43,11 @@ add_library(hw_fsw_scale_route_add_speed
 )
 
 target_link_libraries(hw_fsw_scale_route_add_speed
+  agent_ensemble
+  agent_benchmarks
   config_factory
   hw_packet_utils
   ecmp_helper
-  hw_benchmark_main
   function_call_time_reporter
   Folly::folly
 )
@@ -56,10 +57,11 @@ add_library(hw_fsw_scale_route_del_speed
 )
 
 target_link_libraries(hw_fsw_scale_route_del_speed
+  agent_ensemble
+  agent_benchmarks
   config_factory
   hw_packet_utils
   ecmp_helper
-  hw_benchmark_main
   function_call_time_reporter
   Folly::folly
 )
@@ -69,10 +71,11 @@ add_library(hw_th_alpm_scale_route_add_speed
 )
 
 target_link_libraries(hw_th_alpm_scale_route_add_speed
+  agent_ensemble
+  agent_benchmarks
   config_factory
   hw_packet_utils
   ecmp_helper
-  hw_benchmark_main
   function_call_time_reporter
   Folly::folly
 )
@@ -82,10 +85,11 @@ add_library(hw_th_alpm_scale_route_del_speed
 )
 
 target_link_libraries(hw_th_alpm_scale_route_del_speed
+  agent_ensemble
+  agent_benchmarks
   config_factory
   hw_packet_utils
   ecmp_helper
-  hw_benchmark_main
   function_call_time_reporter
   Folly::folly
 )
@@ -95,10 +99,11 @@ add_library(hw_hgrid_du_scale_route_add_speed
 )
 
 target_link_libraries(hw_hgrid_du_scale_route_add_speed
+  agent_ensemble
+  agent_benchmarks
   config_factory
   hw_packet_utils
   ecmp_helper
-  hw_benchmark_main
   function_call_time_reporter
   Folly::folly
 )
@@ -108,10 +113,11 @@ add_library(hw_hgrid_du_scale_route_del_speed
 )
 
 target_link_libraries(hw_hgrid_du_scale_route_del_speed
+  agent_ensemble
+  agent_benchmarks
   config_factory
   hw_packet_utils
   ecmp_helper
-  hw_benchmark_main
   function_call_time_reporter
   Folly::folly
 )
@@ -121,10 +127,11 @@ add_library(hw_hgrid_uu_scale_route_add_speed
 )
 
 target_link_libraries(hw_hgrid_uu_scale_route_add_speed
+  agent_ensemble
+  agent_benchmarks
   config_factory
   hw_packet_utils
   ecmp_helper
-  hw_benchmark_main
   function_call_time_reporter
   Folly::folly
 )
@@ -134,10 +141,11 @@ add_library(hw_hgrid_uu_scale_route_del_speed
 )
 
 target_link_libraries(hw_hgrid_uu_scale_route_del_speed
+  agent_ensemble
+  agent_benchmarks
   config_factory
   hw_packet_utils
   ecmp_helper
-  hw_benchmark_main
   function_call_time_reporter
   Folly::folly
 )
@@ -169,7 +177,8 @@ add_library(hw_teflow_scale_add
 target_link_libraries(hw_teflow_scale_add
   config_factory
   hw_teflow_utils
-  hw_benchmark_main
+  agent_ensemble
+  agent_benchmarks
   Folly::folly
 )
 
@@ -180,7 +189,8 @@ add_library(hw_teflow_scale_del
 target_link_libraries(hw_teflow_scale_del
   config_factory
   hw_teflow_utils
-  hw_benchmark_main
+  agent_ensemble
+  agent_benchmarks
   Folly::folly
 )
 
@@ -191,7 +201,8 @@ add_library(hw_teflow_stats_collection_speed
 target_link_libraries(hw_teflow_stats_collection_speed
   config_factory
   hw_teflow_utils
-  hw_benchmark_main
+  agent_ensemble
+  agent_benchmarks
   Folly::folly
 )
 

diff --git a/cmake/AgentHwSaiBenchmarks.cmake b/cmake/AgentHwSaiBenchmarks.cmake
@@ -15,6 +15,7 @@ function(BUILD_SAI_BENCHMARKS SAI_IMPL_NAME SAI_IMPL_ARG)
   target_link_libraries(sai_fsw_scale_route_add_speed-${SAI_IMPL_NAME}-${SAI_VER_SUFFIX}
     -Wl,--whole-archive
     sai_switch_ensemble
+    sai_agent_benchmarks_main
     hw_fsw_scale_route_add_speed
     route_scale_gen
     ${SAI_IMPL_ARG}
@@ -33,6 +34,7 @@ function(BUILD_SAI_BENCHMARKS SAI_IMPL_NAME SAI_IMPL_ARG)
   target_link_libraries(sai_fsw_scale_route_del_speed-${SAI_IMPL_NAME}-${SAI_VER_SUFFIX}
     -Wl,--whole-archive
     sai_switch_ensemble
+    sai_agent_benchmarks_main
     hw_fsw_scale_route_del_speed
     route_scale_gen
     ${SAI_IMPL_ARG}
@@ -51,6 +53,7 @@ function(BUILD_SAI_BENCHMARKS SAI_IMPL_NAME SAI_IMPL_ARG)
   target_link_libraries(sai_th_alpm_scale_route_add_speed-${SAI_IMPL_NAME}-${SAI_VER_SUFFIX}
     -Wl,--whole-archive
     sai_switch_ensemble
+    sai_agent_benchmarks_main
     hw_th_alpm_scale_route_add_speed
     route_scale_gen
     ${SAI_IMPL_ARG}
@@ -69,6 +72,7 @@ function(BUILD_SAI_BENCHMARKS SAI_IMPL_NAME SAI_IMPL_ARG)
   target_link_libraries(sai_th_alpm_scale_route_del_speed-${SAI_IMPL_NAME}-${SAI_VER_SUFFIX}
     -Wl,--whole-archive
     sai_switch_ensemble
+    sai_agent_benchmarks_main
     hw_th_alpm_scale_route_del_speed
     route_scale_gen
     ${SAI_IMPL_ARG}
@@ -105,6 +109,7 @@ function(BUILD_SAI_BENCHMARKS SAI_IMPL_NAME SAI_IMPL_ARG)
   target_link_libraries(sai_hgrid_du_scale_route_del_speed-${SAI_IMPL_NAME}-${SAI_VER_SUFFIX}
     -Wl,--whole-archive
     sai_switch_ensemble
+    sai_agent_benchmarks_main
     hw_hgrid_du_scale_route_del_speed
     route_scale_gen
     ${SAI_IMPL_ARG}
@@ -123,6 +128,7 @@ function(BUILD_SAI_BENCHMARKS SAI_IMPL_NAME SAI_IMPL_ARG)
   target_link_libraries(sai_hgrid_uu_scale_route_add_speed-${SAI_IMPL_NAME}-${SAI_VER_SUFFIX}
     -Wl,--whole-archive
     sai_switch_ensemble
+    sai_agent_benchmarks_main
     hw_hgrid_uu_scale_route_add_speed
     route_scale_gen
     ${SAI_IMPL_ARG}
@@ -141,6 +147,7 @@ function(BUILD_SAI_BENCHMARKS SAI_IMPL_NAME SAI_IMPL_ARG)
   target_link_libraries(sai_hgrid_uu_scale_route_del_speed-${SAI_IMPL_NAME}-${SAI_VER_SUFFIX}
     -Wl,--whole-archive
     sai_switch_ensemble
+    sai_agent_benchmarks_main
     hw_hgrid_uu_scale_route_del_speed
     route_scale_gen
     ${SAI_IMPL_ARG}
@@ -159,6 +166,7 @@ function(BUILD_SAI_BENCHMARKS SAI_IMPL_NAME SAI_IMPL_ARG)
   target_link_libraries(sai_anticipated_scale_route_add_speed-${SAI_IMPL_NAME}-${SAI_VER_SUFFIX}
     -Wl,--whole-archive
     sai_switch_ensemble
+    sai_agent_benchmarks_main
     hw_anticipated_scale_route_add_speed
     route_scale_gen
     ${SAI_IMPL_ARG}
@@ -177,6 +185,7 @@ function(BUILD_SAI_BENCHMARKS SAI_IMPL_NAME SAI_IMPL_ARG)
   target_link_libraries(sai_anticipated_scale_route_del_speed-${SAI_IMPL_NAME}-${SAI_VER_SUFFIX}
     -Wl,--whole-archive
     sai_switch_ensemble
+    sai_agent_benchmarks_main
     hw_anticipated_scale_route_del_speed
     route_scale_gen
     ${SAI_IMPL_ARG}