[P4_Symbolic] Restrict the symbolic variables of statically translated types to only the mapped values. #957
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/azp run |
|
No pipelines are associated with this pull request. |
|
Co-authored-by: Srikishen Pondicherry Shanmugam kishanps@google.com |
jaanah-hcl
approved these changes
Jan 20, 2025
VSuryaprasad-HCL
force-pushed
the
symbolic_import_branch_183
branch
from
68c3118 to
fbdeb35
Compare
|
/azp run |
|
No pipelines are associated with this pull request. |
…d types to only the mapped values.
VSuryaprasad-HCL
force-pushed
the
symbolic_import_branch_183
branch
from
fbdeb35 to
5d46503
Compare
|
/azp run |
|
No pipelines are associated with this pull request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 684 targets (0 packages loaded, 0 targets configured).
INFO: Found 466 targets and 218 test targets...
INFO: From Compiling p4_symbolic/sai/sai_test.cc:
In file included from ./p4_symbolic/z3_util.h:26,
from ./p4_symbolic/symbolic/symbolic.h:36,
from ./p4_symbolic/sai/sai.h:24,
from p4_symbolic/sai/sai_test.cc:14:
./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++) {
| ~~^~~~~~~~~~~~~~
In file included from p4_symbolic/sai/sai_test.cc:23:
p4_symbolic/sai/sai_test.cc: In member function 'virtual void p4_symbolic::{anonymous}::GetLocalMetadataIngressPortFromModel_IngressPortIsAmongPassedValues_Test::TestBody()':
p4_symbolic/sai/sai_test.cc:106:17: 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]
106 | pdpi::PartialPdTableEntryToPiTableEntry(ir_p4info, pd_entry));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
./gutil/status_matchers.h:63:43: note: in definition of macro 'ASSERT_OK_AND_ASSIGN'
63 | auto __ASSIGN_OR_RETURN_VAL(LINE) = expression;
| ^~~~~~~~~~
In file included from p4_symbolic/sai/sai_test.cc:27:
./p4_pdpi/pd.h:142:36: note: declared here
142 | absl::StatusOrp4::v1::TableEntry PartialPdTableEntryToPiTableEntry(
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from p4_symbolic/sai/sai_test.cc:23:
p4_symbolic/sai/sai_test.cc:106:70: 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]
106 | pdpi::PartialPdTableEntryToPiTableEntry(ir_p4info, pd_entry));
| ^
./gutil/status_matchers.h:63:43: note: in definition of macro 'ASSERT_OK_AND_ASSIGN'
63 | auto __ASSIGN_OR_RETURN_VAL(LINE) = expression;
| ^~~~~~~~~~
In file included from p4_symbolic/sai/sai_test.cc:27:
./p4_pdpi/pd.h:142:36: note: declared here
142 | absl::StatusOrp4::v1::TableEntry PartialPdTableEntryToPiTableEntry(
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from ./p4_symbolic/z3_util.h:26,
INFO: From Compiling p4_symbolic/main.cc:
In file included from ./p4_symbolic/z3_util.h:26,
from ./p4_symbolic/symbolic/symbolic.h:36,
from p4_symbolic/main.cc:39:
./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:26,
from ./p4_symbolic/symbolic/symbolic.h:36,
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: 48.664s, Critical Path: 11.06s
INFO: 58 processes: 2 internal, 56 linux-sandbox.
INFO: Build completed successfully, 58 total actions
Test Result:
/sonic/src/sonic-p4rt/sonic-pins$ bazel test $BAZEL_BUILD_OPTS --cache_test_results=no ...
INFO: Analyzed 684 targets (0 packages loaded, 0 targets configured).
INFO: Found 466 targets and 218 test targets...
INFO: From Compiling p4_symbolic/sai/sai_test.cc:
In file included from ./p4_symbolic/z3_util.h:26,
from ./p4_symbolic/symbolic/symbolic.h:36,
from ./p4_symbolic/sai/sai.h:24,
from p4_symbolic/sai/sai_test.cc:14:
./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++) {
| ~~^~~~~~~~~~~~~~
In file included from p4_symbolic/sai/sai_test.cc:23:
p4_symbolic/sai/sai_test.cc: In member function 'virtual void p4_symbolic::{anonymous}::GetLocalMetadataIngressPortFromModel_IngressPortIsAmongPassedValues_Test::TestBody()':
p4_symbolic/sai/sai_test.cc:106:17: 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]
106 | pdpi::PartialPdTableEntryToPiTableEntry(ir_p4info, pd_entry));
INFO: Elapsed time: 198.175s, Critical Path: 115.84s
INFO: 281 processes: 336 linux-sandbox, 18 local.
INFO: Build completed successfully, 281 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.1s
//dvaas:test_vector_stats_diff_test PASSED in 0.1s
//dvaas:test_vector_stats_test PASSED in 0.1s
//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.6s
//gutil:proto_matchers_test PASSED in 0.6s
//gutil:proto_ordering_test PASSED in 0.7s
//gutil:proto_test PASSED in 0.5s
//gutil:status_matchers_test PASSED in 0.5s
//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.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.5s
//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.8s
//tests:thinkit_gnmi_interface_util_tests PASSED in 1.1s
//tests/lib:p4info_helper_test PASSED in 0.8s
//tests/lib:p4rt_fixed_table_programming_helper_test PASSED in 0.8s
//tests/lib:packet_generator_test PASSED in 27.0s
//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.1s
//tests/qos:gnmi_parsers_test_runner PASSED in 0.0s
//tests/sflow:sflow_util_test PASSED in 6.9s
//thinkit:bazel_test_environment_test PASSED in 0.5s
//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.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.7s, avg = 0.7s, dev = 0.1s
//sai_p4/instantiations/google/test_tools:table_entry_generator_test PASSED in 45.3s
Stats over 50 runs: max = 45.3s, min = 0.8s, avg = 4.8s, dev = 11.8s
Executed 218 out of 218 tests: 218 tests pass.
INFO: Build completed successfully, 281 total actions