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] Overload GetFieldBitwidth to accept separate header and field names as parameters. #939

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

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 ...
INFO: Analyzed 669 targets (1 packages loaded, 87 targets configured).
INFO: Found 669 targets...
INFO: From Compiling p4_symbolic/symbolic/symbolic.cc [for host]:
In file included from ./p4_symbolic/z3_util.h:18,
from ./p4_symbolic/symbolic/symbolic.h:31,
from p4_symbolic/symbolic/symbolic.cc:15:
./p4_pdpi/string_encodings/bit_string.h: In member function 'void pdpi::BitString::AppendBytes(absl::lts_20230802::string_view)':
./p4_pdpi/string_encodings/bit_string.h:55:23: warning: comparison of integer expressions of different signedness: 'int' and 'std::basic_string_view::size_type' {aka 'long unsigned int'} [-Wsign-compare]
55 | for (int i = 0; i < bytes.size(); i++) {
| ~~^~~~~~~~~~~~~~
./p4_pdpi/string_encodings/bit_string.h: In instantiation of 'void pdpi::BitString::AppendBits(const std::bitset<_Nb>&) [with long unsigned int num_bits = 8]':
./p4_pdpi/string_encodings/bit_string.h:41:50: required from here
./p4_pdpi/string_encodings/bit_string.h:49:23: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
49 | for (int i = 0; i < num_bits; i++) {
| ~~^~~~~~~~~~
INFO: From Compiling p4_symbolic/symbolic/table.cc [for host]:
p4_symbolic/symbolic/table.cc: In function 'std::vector<std::pair<int, p4_symbolic::ir::TableEntry> > p4_symbolic::symbolic::table::{anonymous}::SortEntries(const p4_symbolic::ir::Table&, const std::vector<p4_symbolic::ir::TableEntry>&)':
p4_symbolic/symbolic/table.cc:135:21: warning: comparison of integer expressions of different signedness: 'int' and 'std::vector<p4_symbolic::ir::TableEntry>::size_type' {aka 'long unsigned int'} [-Wsign-compare]
135 | for (int i = 0; i < entries.size(); i++) {
| ~~^~~~~~~~~~~~~~~~
INFO: From Compiling p4_symbolic/symbolic/util.cc [for host]:
In file included from ./p4_symbolic/z3_util.h:18,
from ./p4_symbolic/symbolic/symbolic.h:31,
from p4_symbolic/symbolic/util.cc:35:
./p4_pdpi/string_encodings/bit_string.h: In member function 'void pdpi::BitString::AppendBytes(absl::lts_20230802::string_view)':
./p4_pdpi/string_encodings/bit_string.h:55:23: warning: comparison of integer expressions of different signedness: 'int' and 'std::basic_string_view::size_type' {aka 'long unsigned int'} [-Wsign-compare]
55 | for (int i = 0; i < bytes.size(); i++) {
| ~~^~~~~~~~~~~~~~
./p4_pdpi/string_encodings/bit_string.h: In instantiation of 'void pdpi::BitString::AppendBits(const std::bitset<_Nb>&) [with long unsigned int num_bits = 8]':
./p4_pdpi/string_encodings/bit_string.h:41:50: required from here
./p4_pdpi/string_encodings/bit_string.h:49:23: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
49 | for (int i = 0; i < num_bits; i++) {
| ~~^~~~~~~~~~
INFO: From Compiling p4_symbolic/symbolic/symbolic.cc:
./p4_pdpi/string_encodings/bit_string.h: In instantiation of 'void pdpi::BitString::AppendBits(const std::bitset<_Nb>&) [with long unsigned int num_bits = 8]':
./p4_pdpi/string_encodings/bit_string.h:41:50: required from here
./p4_pdpi/string_encodings/bit_string.h:49:23: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
49 | for (int i = 0; i < num_bits; i++) {
| ~~^~~~~~~~~~
INFO: From Compiling p4_symbolic/deparser_test.cc:
In file included from ./p4_symbolic/z3_util.h:18,
from ./p4_symbolic/symbolic/symbolic.h:31,
from ./p4_symbolic/deparser.h:21,
from p4_symbolic/deparser_test.cc:15:
./p4_pdpi/string_encodings/bit_string.h: In member function 'void pdpi::BitString::AppendBytes(absl::lts_20230802::string_view)':
./p4_pdpi/string_encodings/bit_string.h:55:23: warning: comparison of integer expressions of different signedness: 'int' and 'std::basic_string_view::size_type' {aka 'long unsigned int'} [-Wsign-compare]
55 | for (int i = 0; i < bytes.size(); i++) {
| ~~^~~~~~~~~~~~~~
./p4_pdpi/string_encodings/bit_string.h: In instantiation of 'void pdpi::BitString::AppendBits(const std::bitset<_Nb>&) [with long unsigned int num_bits = 8]':
./p4_pdpi/string_encodings/bit_string.h:41:50: required from here
./p4_pdpi/string_encodings/bit_string.h:49:23: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
49 | for (int i = 0; i < num_bits; i++) {
| ~~^~~~~~~~~~
INFO: Elapsed time: 19.577s, Critical Path: 8.30s
INFO: 22 processes: 1 internal, 21 linux-sandbox.
INFO: Build completed successfully, 22 total actions

Test Result:
/sonic/src/sonic-p4rt/sonic-pins$ bazel test $BAZEL_BUILD_OPTS --cache_test_results=no ...
INFO: Analyzed 669 targets (0 packages loaded, 12 targets configured).
INFO: Found 453 targets and 216 test targets...
INFO: Elapsed time: 176.083s, Critical Path: 113.87s
INFO: 270 processes: 325 linux-sandbox, 18 local.
INFO: Build completed successfully, 270 total actions
//dvaas:port_id_map_test PASSED in 0.8s
//dvaas:test_run_validation_golden_test PASSED in 0.0s
//dvaas:test_run_validation_test PASSED in 0.7s
//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 0.1s
//gutil:collections_test PASSED in 0.5s
//gutil:io_test PASSED in 0.6s
//gutil:proto_matchers_test PASSED in 0.6s
//gutil:proto_ordering_test PASSED in 0.5s
//gutil:proto_test PASSED in 0.5s
//gutil:status_matchers_test PASSED in 0.5s
//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.0s
//p4rt_app/utils:table_utility_test PASSED in 0.7s
//sai_p4/instantiations/google:clos_stage_test PASSED in 0.6s
//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 0.0s
//sai_p4/instantiations/google:sai_nonstandard_platforms_cc_test PASSED in 0.7s
//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.6s
//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.1s
//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.4s
//sai_p4/instantiations/google/test_tools:test_entries_test PASSED in 0.9s
//sai_p4/instantiations/google/tests:p4_fuzzer_integration_test PASSED in 3.4s
//sai_p4/tools:p4info_tools_test PASSED in 0.6s
//sai_p4/tools:packetio_tools_test PASSED in 0.7s
//tests:thinkit_gnmi_interface_util_tests PASSED in 1.2s
//tests/lib:p4info_helper_test PASSED in 0.9s
//tests/lib:p4rt_fixed_table_programming_helper_test PASSED in 0.7s
//tests/lib:packet_generator_test PASSED in 27.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.1s
//tests/qos:gnmi_parsers_test PASSED in 0.0s
//tests/qos:gnmi_parsers_test_runner PASSED in 0.0s
//tests/sflow:sflow_util_test PASSED in 7.0s
//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.7s
//thinkit:mock_generic_testbed_test PASSED in 0.7s
//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 1.0s
Stats over 5 runs: max = 1.0s, min = 0.7s, avg = 0.8s, dev = 0.1s
//sai_p4/instantiations/google/test_tools:table_entry_generator_test PASSED in 44.2s
Stats over 50 runs: max = 44.2s, min = 0.8s, avg = 4.5s, dev = 11.7s

Executed 216 out of 216 tests: 216 tests pass.
INFO: Build completed successfully, 270 total actions

@mssonicbld
Copy link

/azp run

Copy link

No pipelines are associated with this pull request.

@VSuryaprasad-HCL
Copy link
Contributor Author

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

Copy link

@jaanah-hcl jaanah-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 Kindly review the PR
Thanks

@VSuryaprasad-HCL VSuryaprasad-HCL force-pushed the symbolic_import_branch_175 branch from 83af378 to 6f09485 Compare January 8, 2025 16:44
@mssonicbld
Copy link

/azp run

Copy link

No pipelines are associated with this pull request.

@VSuryaprasad-HCL VSuryaprasad-HCL force-pushed the symbolic_import_branch_175 branch from 6f09485 to 3cfd559 Compare January 10, 2025 06:27
@mssonicbld
Copy link

/azp run

Copy link

No pipelines are associated with this pull request.

@VSuryaprasad-HCL VSuryaprasad-HCL force-pushed the symbolic_import_branch_175 branch from 3cfd559 to cc2a7f0 Compare January 13, 2025 09:26
@mssonicbld
Copy link

/azp run

Copy link

No pipelines are associated with this pull request.

@VSuryaprasad-HCL VSuryaprasad-HCL force-pushed the symbolic_import_branch_175 branch from cc2a7f0 to fcc8aa6 Compare January 16, 2025 06:56
@mssonicbld
Copy link

/azp run

Copy link

No pipelines are associated with this pull request.

@VSuryaprasad-HCL VSuryaprasad-HCL force-pushed the symbolic_import_branch_175 branch from fcc8aa6 to 9066aad Compare January 17, 2025 05:56
@mssonicbld
Copy link

/azp run

Copy link

No pipelines are associated with this pull request.

…creating symbolic header fields deterministic.Initialize standard metadata fields to 0.
@VSuryaprasad-HCL VSuryaprasad-HCL force-pushed the symbolic_import_branch_175 branch from 9066aad to 5ef654f Compare January 17, 2025 10:48
@mssonicbld
Copy link

/azp run

Copy link

No pipelines are associated with this pull request.

@VSuryaprasad-HCL
Copy link
Contributor Author

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 ...
INFO: Analyzed 682 targets (0 packages loaded, 0 targets configured).
INFO: Found 682 targets...
INFO: From Compiling p4_symbolic/symbolic/parser.cc:
In file included from ./p4_symbolic/z3_util.h:18,
from ./p4_symbolic/symbolic/symbolic.h:31,
from p4_symbolic/symbolic/parser.cc:28:
./p4_pdpi/string_encodings/bit_string.h: In member function 'void pdpi::BitString::AppendBytes(absl::lts_20230802::string_view)':
./p4_pdpi/string_encodings/bit_string.h:55:23: warning: comparison of integer expressions of different signedness: 'int' and 'std::basic_string_view::size_type' {aka 'long unsigned int'} [-Wsign-compare]
55 | for (int i = 0; i < bytes.size(); i++) {
| ~~^~~~~~~~~~~~~~
./p4_pdpi/string_encodings/bit_string.h: In instantiation of 'void pdpi::BitString::AppendBits(const std::bitset<_Nb>&) [with long unsigned int num_bits = 8]':
./p4_pdpi/string_encodings/bit_string.h:41:50: required from here
./p4_pdpi/string_encodings/bit_string.h:49:23: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
49 | for (int i = 0; i < num_bits; i++) {
| ~~^~~~~~~~~~
INFO: From Compiling p4_symbolic/symbolic/symbolic.cc [for host]:
In file included from ./p4_symbolic/z3_util.h:18,
from ./p4_symbolic/symbolic/symbolic.h:31,
from p4_symbolic/symbolic/symbolic.cc:15:
INFO: From Compiling p4_symbolic/packet_synthesizer/util.cc:
In file included from ./p4_symbolic/z3_util.h:18,
from ./p4_symbolic/symbolic/symbolic.h:31,
from ./p4_symbolic/packet_synthesizer/util.h:19,
from p4_symbolic/packet_synthesizer/util.cc:15:
./p4_pdpi/string_encodings/bit_string.h: In member function 'void pdpi::BitString::AppendBytes(absl::lts_20230802::string_view)':
./p4_pdpi/string_encodings/bit_string.h:55:23: warning: comparison of integer expressions of different signedness: 'int' and 'std::basic_string_view::size_type' {aka 'long unsigned int'} [-Wsign-compare]
55 | for (int i = 0; i < bytes.size(); i++) {
| ~~^~~~~~~~~~~~~~
./p4_pdpi/string_encodings/bit_string.h: In instantiation of 'void pdpi::BitString::AppendBits(const std::bitset<_Nb>&) [with long unsigned int num_bits = 8]':
./p4_pdpi/string_encodings/bit_string.h:41:50: required from here
./p4_pdpi/string_encodings/bit_string.h:49:23: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
49 | for (int i = 0; i < num_bits; i++) {
| ~~^~~~~~~~~~
INFO: From Compiling p4_symbolic/deparser_test.cc:
In file included from ./p4_symbolic/z3_util.h:18,
from ./p4_symbolic/symbolic/symbolic.h:31,
from ./p4_symbolic/deparser.h:21,
from p4_symbolic/deparser_test.cc:15:
./p4_pdpi/string_encodings/bit_string.h: In member function 'void pdpi::BitString::AppendBytes(absl::lts_20230802::string_view)':
./p4_pdpi/string_encodings/bit_string.h:55:23: warning: comparison of integer expressions of different signedness: 'int' and 'std::basic_string_view::size_type' {aka 'long unsigned int'} [-Wsign-compare]
55 | for (int i = 0; i < bytes.size(); i++) {
| ~~^~~~~~~~~~~~~~
./p4_pdpi/string_encodings/bit_string.h: In instantiation of 'void pdpi::BitString::AppendBits(const std::bitset<_Nb>&) [with long unsigned int num_bits = 8]':
./p4_pdpi/string_encodings/bit_string.h:41:50: required from here
./p4_pdpi/string_encodings/bit_string.h:49:23: warning: comparison of integer expressions of different signedness: 'int' and 'long unsigned int' [-Wsign-compare]
49 | for (int i = 0; i < num_bits; i++) {
| ~~^~~~~~~~~~
INFO: Elapsed time: 19.395s, Critical Path: 7.89s
INFO: 33 processes: 2 internal, 31 linux-sandbox.
INFO: Build completed successfully, 33 total actions

Test Result:
/sonic/src/sonic-p4rt/sonic-pins$ bazel test $BAZEL_BUILD_OPTS --cache_test_results=no ...
INFO: Analyzed 682 targets (0 packages loaded, 0 targets configured).
INFO: Found 466 targets and 216 test targets...
INFO: Elapsed time: 239.195s, Critical Path: 110.67s
INFO: 270 processes: 325 linux-sandbox, 18 local.
INFO: Build completed successfully, 270 total actions
//dvaas:port_id_map_test PASSED in 0.8s
//dvaas:test_run_validation_golden_test PASSED in 0.1s
//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.0s
//dvaas:test_vector_stats_test PASSED in 0.0s
//dvaas:test_vector_test PASSED in 0.6s
//dvaas:user_provided_packet_test_vector_diff_test PASSED in 0.1s
//dvaas:user_provided_packet_test_vector_test PASSED in 0.1s
//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.6s
//p4rt_app/tests:response_path_test PASSED in 6.8s
//p4rt_app/tests:role_test PASSED in 1.5s
//p4rt_app/tests:state_verification_test PASSED in 3.2s
//p4rt_app/tests:vrf_table_test PASSED in 2.5s
//p4rt_app/tests/lib:app_db_entry_builder_test PASSED in 0.0s
//p4rt_app/utils:event_data_tracker_test PASSED in 0.0s
//p4rt_app/utils:table_utility_test PASSED in 0.8s
//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.1s
//sai_p4/instantiations/google:sai_nonstandard_platforms_build_test PASSED in 0.0s
//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.1s
//sai_p4/instantiations/google:sai_pd_util_test PASSED in 0.6s
//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.1s
//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 0.9s
//sai_p4/instantiations/google/tests:p4_fuzzer_integration_test PASSED in 3.5s
//sai_p4/tools:p4info_tools_test PASSED in 0.6s
//sai_p4/tools:packetio_tools_test PASSED in 0.7s
//tests:thinkit_gnmi_interface_util_tests PASSED in 1.0s
//tests/lib:p4info_helper_test PASSED in 0.8s
//tests/lib:p4rt_fixed_table_programming_helper_test PASSED in 0.9s
//tests/lib:packet_generator_test PASSED in 26.8s
//tests/lib:switch_test_setup_helpers_golden_test PASSED in 0.1s
//tests/lib:switch_test_setup_helpers_golden_test_runner PASSED in 0.1s
//tests/qos:gnmi_parsers_test PASSED in 0.0s
//tests/qos:gnmi_parsers_test_runner PASSED in 0.1s
//tests/sflow:sflow_util_test PASSED in 6.9s
//thinkit:bazel_test_environment_test PASSED in 0.6s
//thinkit:generic_testbed_test PASSED in 0.9s
//thinkit:mock_control_device_test PASSED in 0.5s
//thinkit:mock_generic_testbed_test PASSED in 0.7s
//thinkit:mock_mirror_testbed_test PASSED in 0.6s
//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.7s, avg = 0.7s, dev = 0.1s
//sai_p4/instantiations/google/test_tools:table_entry_generator_test PASSED in 44.0s
Stats over 50 runs: max = 44.0s, min = 0.8s, avg = 4.8s, dev = 11.6s

Executed 216 out of 216 tests: 216 tests pass.
INFO: Build completed successfully, 270 total actions

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