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] Make certain Z3 APIs more general. #744

Merged
merged 4 commits into from
Nov 21, 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 ...
INFO: Analyzed 590 targets (2 packages loaded, 45 targets configured).
INFO: Found 590 targets...
INFO: From Compiling p4_symbolic/symbolic/util.cc [for host]:
p4_symbolic/symbolic/util.cc:34:6: warning: 'bool p4_symbolic::symbolic::util::{anonymous}::Z3BooltoBool(Z3_lbool)' defined but not used [-Wunused-function]
34 | bool Z3BooltoBool(Z3_lbool z3_bool) {
| ^~~~~~~~~~~~
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/symbolic/util.cc:
p4_symbolic/symbolic/util.cc:34:6: warning: 'bool p4_symbolic::symbolic::util::{anonymous}::Z3BooltoBool(Z3_lbool)' defined but not used [-Wunused-function]
34 | bool Z3BooltoBool(Z3_lbool z3_bool) {
| ^~~~~~~~~~~~
INFO: From Compiling p4_symbolic/symbolic/table.cc:
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/sai/parser.cc:
INFO: From Compiling p4_symbolic/main.cc:
In file included from ./gutil/io.h:22,
from p4_symbolic/main.cc:30:
p4_symbolic/main.cc: In function 'absl::lts_20230802::Status {anonymous}::ParseAndEvaluate()':
p4_symbolic/main.cc:114:75: warning: 'absl::lts_20230802::StatusOr<std::optional<p4_symbolic::symbolic::ConcreteContext> > p4_symbolic::symbolic::Solve(const std::unique_ptr<p4_symbolic::symbolic::SolverState>&, const Assertion&)' is deprecated: Use the overload Solve(SolverState&, const Assertion&) instead. [-Wdeprecated-declarations]
114 | p4_symbolic::symbolic::Solve(solver_state, table_entry_assertion));
| ^
./gutil/status.h:294:43: note: in definition of macro '__ASSIGN_OR_RETURN'
294 | auto __ASSIGN_OR_RETURN_VAL(LINE) = expr;
| ^~~~
p4_symbolic/main.cc:112:7: note: in expansion of macro 'ASSIGN_OR_RETURN'
112 | ASSIGN_OR_RETURN(
| ^~~~~~~~~~~~~~~~
In file included from ./p4_symbolic/parser.h:27,
from p4_symbolic/main.cc:33:
./p4_symbolic/symbolic/symbolic.h:247:48: note: declared here
247 | absl::StatusOr<std::optional> Solve(
| ^~~~~
INFO: Elapsed time: 79.505s, Critical Path: 29.31s
INFO: 59 processes: 4 internal, 55 linux-sandbox.
INFO: Build completed successfully, 59 total actions

Test Result:
/sonic/src/sonic-p4rt/sonic-pins$ bazel test $BAZEL_BUILD_OPTS --cache_test_results=no ...
INFO: Analyzed 590 targets (0 packages loaded, 9 targets configured).
INFO: Found 396 targets and 194 test targets...
INFO: Elapsed time: 208.737s, Critical Path: 116.82s
INFO: 248 processes: 292 linux-sandbox, 18 local.
INFO: Build completed successfully, 248 total actions
//dvaas:port_id_map_test PASSED in 0.6s
//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.6s
//gutil:collections_test PASSED in 0.6s
//gutil:io_test PASSED in 0.6s
//gutil:proto_matchers_test PASSED in 0.9s
//gutil:proto_ordering_test PASSED in 0.6s
//gutil:proto_test PASSED in 0.5s
//p4rt_app/tests/lib:app_db_entry_builder_test PASSED in 0.1s
//p4rt_app/utils:event_data_tracker_test PASSED in 0.1s
//p4rt_app/utils:table_utility_test PASSED in 0.9s
//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.1s
//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.2s
//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.8s
//sai_p4/instantiations/google/test_tools:test_entries_test PASSED in 1.5s
//sai_p4/instantiations/google/tests:p4_fuzzer_integration_test PASSED in 4.5s
//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.0s
//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.6s
//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.9s
//thinkit:mock_mirror_testbed_test PASSED in 0.6s
//thinkit:mock_ssh_client_test PASSED in 0.1s
//thinkit:mock_switch_test PASSED in 0.8s
//thinkit:mock_test_environment_test PASSED in 0.1s
//thinkit:switch_test PASSED in 0.8s
//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.8s, dev = 0.1s
//sai_p4/instantiations/google/test_tools:table_entry_generator_test PASSED in 45.4s
Stats over 50 runs: max = 45.4s, min = 0.8s, avg = 2.0s, dev = 6.3s

Executed 194 out of 194 tests: 194 tests pass.
INFO: Build completed successfully, 248 total actions

Copy link
Contributor

@bibhuprasad-hcl bibhuprasad-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 1b4c12a into sonic-net:main Nov 21, 2024
2 checks passed
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