Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[P4_Symbolic] Remove assumption on argument order matching parameter definition order. Match parameter to argument based on name. k #816

Merged
merged 11 commits into from
Dec 11, 2024

Conversation

VSuryaprasad-HCL
Copy link
Contributor

Keyword Check:
~/sonic-buildimage/src/sonic-p4rt/sonic-pins$ ~/tools/keyword_checks.sh .
Keyword check Passed.

Build Result:
/sonic/src/sonic-p4rt/sonic-pins$ bazel build $BAZEL_BUILD_OPTS ...
Starting local Bazel server and connecting to it...
INFO: From Compiling p4_symbolic/symbolic/table.cc [for host]:
p4_symbolic/symbolic/table.cc: In function 'std::vector<std::pair<int, pdpi::IrTableEntry> > p4_symbolic::symbolic::table::{anonymous}::SortEntries(const p4_symbolic::ir::Table&, const std::vectorpdpi::IrTableEntry&)':
p4_symbolic/symbolic/table.cc:115:21: warning: comparison of integer expressions of different signedness: 'int' and 'std::vectorpdpi::IrTableEntry::size_type' {aka 'long unsigned int'} [-Wsign-compare]
115 | for (int i = 0; i < entries.size(); i++) {
| ~~^~~~~~~~~~~~~~~~
INFO: From Compiling p4_symbolic/ir/cfg.cc [for host]:
In file included from p4_symbolic/ir/cfg.cc:15:
./p4_symbolic/ir/cfg.h:79:3: warning: multi-line comment [-Wcomment]
79 | // /
| ^
p4_symbolic/ir/cfg.cc:349:5: warning: multi-line comment [-Wcomment]
349 | // /
| ^
p4_symbolic/ir/cfg.cc:388:7: warning: multi-line comment [-Wcomment]
388 | // /
| ^
p4_symbolic/ir/cfg.cc: In function 'p4_symbolic::ir::ControlPath p4_symbolic::ir::{anonymous}::LongestCommonPrefix(const ControlPath&, const ControlPath&)':
p4_symbolic/ir/cfg.cc:101:16: warning: comparison of integer expressions of different signedness: 'int' and 'std::vector<std::__cxx11::basic_string >::size_type' {aka 'long unsigned int'} [-Wsign-compare]
101 | while (index < l.size() && index < r.size() && l[index] == r[index]) {
| ~~~~~~^~~~~~~~~~
p4_symbolic/ir/cfg.cc:101:36: warning: comparison of integer expressions of different signedness: 'int' and 'std::vector<std::__cxx11::basic_string >::size_type' {aka 'long unsigned int'} [-Wsign-compare]
101 | while (index < l.size() && index < r.size() && l[index] == r[index]) {
| ~~~~~~^~~~~~~~~~
INFO: From Compiling P4 program sai_p4/instantiations/google/middleblock.p4:
INFO: From Compiling p4_symbolic/tests/sai_p4_component_test.cc:
In file included from p4_symbolic/tests/sai_p4_component_test.cc:22:
p4_symbolic/tests/sai_p4_component_test.cc: In member function 'virtual void p4_symbolic::{anonymous}::P4SymbolicComponentTest_CanGenerateTestPacketsForSimpleSaiP4Entries_Test::TestBody()':
p4_symbolic/tests/sai_p4_component_test.cc:128:32: warning: 'absl::lts_20230802::StatusOrp4::v1::TableEntry pdpi::PartialPdTableEntryToPiTableEntry(const pdpi::IrP4Info&, const google::protobuf::Message&, const pdpi::TranslationOptions&)' is deprecated: Use PdTableEntryToPiEntity instead [-Wdeprecated-declarations]
128 | pdpi::PartialPdTableEntryToPiTableEntry(ir_p4info, pd_entry));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./gutil/status_matchers.h:64:43: note: in definition of macro 'ASSERT_OK_AND_ASSIGN'
64 | auto __ASSIGN_OR_RETURN_VAL(LINE) = expression;
| ^~~~~~~~~~
In file included from p4_symbolic/tests/sai_p4_component_test.cc:27:
./p4_pdpi/pd.h:141:36: note: declared here
141 | absl::StatusOrp4::v1::TableEntry PartialPdTableEntryToPiTableEntry(
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from p4_symbolic/tests/sai_p4_component_test.cc:22:
p4_symbolic/tests/sai_p4_component_test.cc:128:85: warning: 'absl::lts_20230802::StatusOrp4::v1::TableEntry pdpi::PartialPdTableEntryToPiTableEntry(const pdpi::IrP4Info&, const google::protobuf::Message&, const pdpi::TranslationOptions&)' is deprecated: Use PdTableEntryToPiEntity instead [-Wdeprecated-declarations]
128 | pdpi::PartialPdTableEntryToPiTableEntry(ir_p4info, pd_entry));
| ^
./gutil/status_matchers.h:64:43: note: in definition of macro 'ASSERT_OK_AND_ASSIGN'
64 | auto __ASSIGN_OR_RETURN_VAL(LINE) = expression;
| ^~~~~~~~~~
In file included from p4_symbolic/tests/sai_p4_component_test.cc:27:
./p4_pdpi/pd.h:141:36: note: declared here
141 | absl::StatusOrp4::v1::TableEntry PartialPdTableEntryToPiTableEntry(
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
INFO: Elapsed time: 74.088s, Critical Path: 34.13s
INFO: 82 processes: 6 internal, 76 linux-sandbox.
INFO: Build completed successfully, 82 total actions

Test Result:
/sonic/src/sonic-p4rt/sonic-pins$ bazel test $BAZEL_BUILD_OPTS --cache_test_results=no ...
INFO: Analyzed 625 targets (0 packages loaded, 25 targets configured).
INFO: Found 418 targets and 207 test targets...
INFO: Elapsed time: 189.596s, Critical Path: 121.28s
INFO: 261 processes: 315 linux-sandbox, 18 local.
INFO: Build completed successfully, 261 total actions
//dvaas:port_id_map_test PASSED in 0.8s
//dvaas:test_run_validation_golden_test PASSED in 0.4s
//dvaas:test_run_validation_test PASSED in 0.6s
//dvaas:test_run_validation_test_runner PASSED in 0.0s
//dvaas:test_vector_stats_diff_test PASSED in 0.1s
//dvaas:test_vector_stats_test PASSED in 0.0s
//dvaas:test_vector_test PASSED in 0.7s
//dvaas:user_provided_packet_test_vector_diff_test PASSED in 0.1s
//dvaas:user_provided_packet_test_vector_test PASSED in 1.5s
//gutil:collections_test PASSED in 0.5s
//gutil:io_test PASSED in 0.5s
//gutil:proto_matchers_test PASSED in 0.7s
//gutil:proto_ordering_test PASSED in 0.8s
//gutil:proto_test PASSED in 0.5s
//gutil:status_matchers_test PASSED in 0.5s
//gutil:test_artifact_writer_test PASSED in 0.8s
//gutil:testing_test PASSED in 0.6s
//gutil:timer_test PASSED in 5.1s
//gutil:version_test PASSED in 1.0s
//lib:basic_switch_test PASSED in 0.9s
//lib:ixia_helper_test PASSED in 1.3s
//lib/basic_traffic:basic_p4rt_util_test PASSED in 1.0s
//lib/basic_traffic:basic_traffic_test PASSED in 15.1s
//lib/gnmi:gnmi_helper_test PASSED in 2.9s
//lib/gnoi:gnoi_helper_test PASSED in 0.5s
//lib/p4rt:p4rt_port_test PASSED in 0.6s
//lib/p4rt:p4rt_programming_context_test PASSED in 0.9s
//p4rt_app/tests:packet_replication_table_test PASSED in 3.2s
//p4rt_app/tests:packetio_test PASSED in 5.0s
//p4rt_app/tests:port_name_and_id_test PASSED in 5.2s
//p4rt_app/tests:resource_limits_test PASSED in 2.6s
//p4rt_app/tests:response_path_test PASSED in 6.3s
//p4rt_app/tests:role_test PASSED in 1.6s
//p4rt_app/tests:state_verification_test PASSED in 2.6s
//p4rt_app/tests:vrf_table_test PASSED in 2.6s
//p4rt_app/tests/lib:app_db_entry_builder_test PASSED in 0.0s
//p4rt_app/utils:event_data_tracker_test PASSED in 0.1s
//p4rt_app/utils:table_utility_test PASSED in 0.7s
//sai_p4/instantiations/google:clos_stage_test PASSED in 0.5s
//sai_p4/instantiations/google:fabric_border_router_p4info_up_to_date_test PASSED in 0.0s
//sai_p4/instantiations/google:middleblock_p4info_up_to_date_test PASSED in 0.0s
//sai_p4/instantiations/google:sai_nonstandard_platforms_build_test PASSED in 1.1s
//sai_p4/instantiations/google:sai_nonstandard_platforms_cc_test PASSED in 0.6s
//sai_p4/instantiations/google:sai_p4info_fetcher_test PASSED in 0.7s
//sai_p4/instantiations/google:sai_p4info_test PASSED in 1.1s
//sai_p4/instantiations/google:sai_pd_proto_test PASSED in 0.0s
//sai_p4/instantiations/google:sai_pd_util_test PASSED in 0.7s
//sai_p4/instantiations/google:tor_p4info_up_to_date_test PASSED in 0.0s
//sai_p4/instantiations/google:union_p4info_up_to_date_test PASSED in 0.3s
//sai_p4/instantiations/google:wbb_p4info_up_to_date_test PASSED in 0.0s
//sai_p4/instantiations/google/test_tools:table_entry_generator_helper_test PASSED in 1.3s
//sai_p4/instantiations/google/test_tools:test_entries_test PASSED in 1.0s
//sai_p4/instantiations/google/tests:p4_fuzzer_integration_test PASSED in 3.8s
//sai_p4/tools:p4info_tools_test PASSED in 0.7s
//sai_p4/tools:packetio_tools_test PASSED in 0.9s
//tests:thinkit_gnmi_interface_util_tests PASSED in 1.1s
//tests/lib:switch_test_setup_helpers_golden_test PASSED in 0.1s
//tests/lib:switch_test_setup_helpers_golden_test_runner PASSED in 0.2s
//tests/qos:gnmi_parsers_test PASSED in 0.1s
//tests/qos:gnmi_parsers_test_runner PASSED in 0.1s
//thinkit:bazel_test_environment_test PASSED in 0.5s
//thinkit:generic_testbed_test PASSED in 1.0s
//thinkit:mock_control_device_test PASSED in 0.6s
//thinkit:mock_generic_testbed_test PASSED in 0.8s
//thinkit:mock_mirror_testbed_test PASSED in 0.7s
//thinkit:mock_ssh_client_test PASSED in 0.0s
//thinkit:mock_switch_test PASSED in 0.7s
//thinkit:mock_test_environment_test PASSED in 0.1s
//thinkit:switch_test PASSED in 0.7s
//sai_p4/instantiations/google/tests:p4_constraints_integration_test PASSED in 0.9s
Stats over 5 runs: max = 0.9s, min = 0.8s, avg = 0.8s, dev = 0.0s
//sai_p4/instantiations/google/test_tools:table_entry_generator_test PASSED in 43.9s
Stats over 50 runs: max = 43.9s, min = 0.8s, avg = 2.9s, dev = 8.4s

Executed 207 out of 207 tests: 207 tests pass.
INFO: Build completed successfully, 261 total actions

@VSuryaprasad-HCL
Copy link
Contributor Author

Co-authored-by: Srikishen Pondicherry Shanmugam [email protected]

VSuryaprasad-HCL and others added 2 commits December 6, 2024 12:32
…definition order. Match parameter to argument based on name.

k
@VSuryaprasad-HCL VSuryaprasad-HCL force-pushed the symbolic_import_branch_127 branch from de22d3c to 8eb53fc Compare December 6, 2024 07:10
Copy link
Contributor

@divyagayathri-hcl divyagayathri-hcl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kishanps, Could you please review.
Thanks.

@kishanps kishanps merged commit 48cb06a into sonic-net:main Dec 11, 2024
2 checks passed
VSuryaprasad-HCL added a commit to VSuryaprasad-HCL/sonic-pins that referenced this pull request Dec 11, 2024
…definition order. Match parameter to argument based on name. k (sonic-net#816)



Co-authored-by: kishanps <[email protected]>
Co-authored-by: smolkaj <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants