[DVaaS][Minimization] Enable table-based bisection for minimization.

PiperOrigin-RevId: 786414117

Author: P4 Infra Team

p4_pdpi/BUILD.bazel

@@ -153,6 +153,7 @@ cc_library(
     # Disable default arguments internally. Using them in PDPI itself is very likely a bug.
     local_defines = ["PDPI_DISABLE_TRANSLATION_OPTIONS_DEFAULT"],
     deps = [
+        ":entity_keys",
         ":ir_cc_proto",
         ":names",
         ":references",
@@ -171,6 +172,7 @@ cc_library(
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/types:optional",
         "@com_google_absl//absl/types:span",
         "@com_google_gutil//gutil:collections",
         "@com_google_gutil//gutil:status",

p4_pdpi/sequencing.cc

@@ -19,6 +19,7 @@
 #include <optional>
 #include <queue>
 #include <string>
+#include <tuple>
 #include <utility>
 #include <vector>
 
@@ -30,13 +31,15 @@
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
+#include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "boost/graph/adjacency_list.hpp"
 #include "google/protobuf/repeated_ptr_field.h"
 #include "gutil/collections.h"
 #include "gutil/status.h"
 #include "p4/config/v1/p4info.pb.h"
 #include "p4/v1/p4runtime.pb.h"
+#include "p4_pdpi/entity_keys.h"
 #include "p4_pdpi/ir.pb.h"
 #include "p4_pdpi/names.h"
 #include "p4_pdpi/references.h"
@@ -376,6 +379,34 @@ absl::Status StableSortEntities(const IrP4Info& info,
   return absl::OkStatus();
 }
 
+absl::Status SortEntities(const IrP4Info& info,
+                          std::vector<p4::v1::Entity>& entities) {
+  absl::Status status;
+  absl::c_sort(entities,
+               [&](const p4::v1::Entity& e1, const p4::v1::Entity& e2) {
+                 absl::StatusOr<EntityKey> k1 = EntityKey::MakeEntityKey(e1);
+                 absl::StatusOr<EntityKey> k2 = EntityKey::MakeEntityKey(e2);
+                 status.Update(k1.status());
+                 status.Update(k2.status());
+                 return status.ok() ? *k1 < *k2 : true;
+               });
+  RETURN_IF_ERROR(status);
+  absl::c_stable_sort(
+      entities, [&](const p4::v1::Entity& a, const p4::v1::Entity& b) {
+        auto b_may_depend_on_a = GreaterThanInDependencyOrder(info, a, b);
+        if (!b_may_depend_on_a.ok()) {
+          LOG(ERROR) << "Failed to compare entities with error: "
+                     << b_may_depend_on_a.status() << "\nEntities were:\n"
+                     << a.DebugString() << "\n\n   and   \n\n"
+                     << b.DebugString();
+          return false;
+        }
+        return *b_may_depend_on_a;
+      });
+
+  return absl::OkStatus();
+}
+
 absl::Status StableSortUpdates(
     const IrP4Info& info,
     google::protobuf::RepeatedPtrField<p4::v1::Update>& updates,

p4_pdpi/sequencing.expected

@@ -1212,6 +1212,9 @@ SortTest: Empty input
 --- Sorted entities (output):
 <empty>
 
+--- Non-stable sorted entities (output):
+<empty>
+
 =========================================================================
 SortTest: EntryWithOneKey{key-a} -> EntryThatRefersTo{key-a}
 =========================================================================
@@ -1260,6 +1263,28 @@ referring_by_action_table_entry {
   }
 }
 
+--- Non-stable sorted entities (output):
+one_match_field_table_entry {
+  match {
+    id: "key-a"
+  }
+  action {
+    do_thing_4 {
+    }
+  }
+}
+
+referring_by_action_table_entry {
+  match {
+    val: "0x001"
+  }
+  action {
+    referring_to_one_match_field_action {
+      referring_id_1: "key-a"
+    }
+  }
+}
+
 =========================================================================
 SortTest: EntryWithOneKey{key-a} -> EntryThatRefersTo{key-a, 0x002}
 =========================================================================
@@ -1310,6 +1335,29 @@ referring_by_action_table_entry {
   }
 }
 
+--- Non-stable sorted entities (output):
+one_match_field_table_entry {
+  match {
+    id: "key-a"
+  }
+  action {
+    do_thing_4 {
+    }
+  }
+}
+
+referring_by_action_table_entry {
+  match {
+    val: "0x001"
+  }
+  action {
+    referring_to_two_match_fields_action {
+      referring_id_1: "key-a"
+      referring_id_2: "0x002"
+    }
+  }
+}
+
 =========================================================================
 SortTest: EntryWithTwoKeys{key-a, 0x002} -> EntryThatRefersTo{key-a, 0x002}
 =========================================================================
@@ -1362,6 +1410,30 @@ referring_by_action_table_entry {
   }
 }
 
+--- Non-stable sorted entities (output):
+two_match_fields_table_entry {
+  match {
+    id_1: "key-a"
+    id_2: "0x002"
+  }
+  action {
+    do_thing_4 {
+    }
+  }
+}
+
+referring_by_action_table_entry {
+  match {
+    val: "0x001"
+  }
+  action {
+    referring_to_two_match_fields_action {
+      referring_id_1: "key-a"
+      referring_id_2: "0x002"
+    }
+  }
+}
+
 =========================================================================
 SortTest: EntryThatRefersTo{key-a, 0x002} -> EntryWithTwoKeys{key-c, 0x004}
 =========================================================================
@@ -1414,6 +1486,30 @@ referring_by_action_table_entry {
   }
 }
 
+--- Non-stable sorted entities (output):
+two_match_fields_table_entry {
+  match {
+    id_1: "key-c"
+    id_2: "0x004"
+  }
+  action {
+    do_thing_4 {
+    }
+  }
+}
+
+referring_by_action_table_entry {
+  match {
+    val: "0x001"
+  }
+  action {
+    referring_to_two_match_fields_action {
+      referring_id_1: "key-a"
+      referring_id_2: "0x002"
+    }
+  }
+}
+
 =========================================================================
 SortTest: Entries at same rank should maintain the original order.
 =========================================================================
@@ -1470,6 +1566,32 @@ referring_by_action_table_entry {
   }
 }
 
+--- Non-stable sorted entities (output):
+packet_count_and_meter_table_entry {
+  match {
+    ipv4 {
+      value: "16.36.50.0"
+      prefix_length: 24
+    }
+  }
+  action {
+    packet_count_and_meter {
+    }
+  }
+}
+
+referring_by_action_table_entry {
+  match {
+    val: "0x001"
+  }
+  action {
+    referring_to_two_match_fields_action {
+      referring_id_1: "key-a"
+      referring_id_2: "0x002"
+    }
+  }
+}
+
 =========================================================================
 SortTest: EntryWithOneKey{key-a} -> EntryThatRefersTo{key-a} , another entry
 =========================================================================
@@ -1544,6 +1666,41 @@ referring_by_action_table_entry {
   }
 }
 
+--- Non-stable sorted entities (output):
+lpm2_table_entry {
+  match {
+    ipv6 {
+      value: "ffff::abcd:0:0"
+      prefix_length: 96
+    }
+  }
+  action {
+    NoAction {
+    }
+  }
+}
+
+one_match_field_table_entry {
+  match {
+    id: "key-a"
+  }
+  action {
+    do_thing_4 {
+    }
+  }
+}
+
+referring_by_action_table_entry {
+  match {
+    val: "0x001"
+  }
+  action {
+    referring_to_one_match_field_action {
+      referring_id_1: "key-a"
+    }
+  }
+}
+
 =========================================================================
 SortTest: EntryWithOneKey{key-a} -> EntryThatRefersTo{key-a} ,EntryWithOneKey{key-b} -> EntryThatRefersTo{key-b}
 =========================================================================
@@ -1638,6 +1795,51 @@ referring_by_action_table_entry {
   }
 }
 
+--- Non-stable sorted entities (output):
+two_match_fields_table_entry {
+  match {
+    id_1: "key-c"
+    id_2: "0x004"
+  }
+  action {
+    do_thing_4 {
+    }
+  }
+}
+
+one_match_field_table_entry {
+  match {
+    id: "key-a"
+  }
+  action {
+    do_thing_4 {
+    }
+  }
+}
+
+referring_by_action_table_entry {
+  match {
+    val: "0x001"
+  }
+  action {
+    referring_to_two_match_fields_action {
+      referring_id_1: "key-a"
+      referring_id_2: "0x002"
+    }
+  }
+}
+
+referring_by_action_table_entry {
+  match {
+    val: "0x001"
+  }
+  action {
+    referring_to_one_match_field_action {
+      referring_id_1: "key-a"
+    }
+  }
+}
+
 =========================================================================
 SortTest: two_match_fields_table_entry -> referring_by_match_field_table_entry
 =========================================================================
@@ -1688,6 +1890,29 @@ referring_by_match_field_table_entry {
   }
 }
 
+--- Non-stable sorted entities (output):
+two_match_fields_table_entry {
+  match {
+    id_1: "key-a"
+    id_2: "0x001"
+  }
+  action {
+    do_thing_4 {
+    }
+  }
+}
+
+referring_by_match_field_table_entry {
+  match {
+    referring_id_1: "key-a"
+    referring_id_2: "0x001"
+  }
+  action {
+    do_thing_4 {
+    }
+  }
+}
+
 =========================================================================
 GetEntriesUnreachableFromRootsTest: Empty input generates no garbage.
 =========================================================================

p4_pdpi/sequencing.h

@@ -70,6 +70,14 @@ absl::StatusOr<std::vector<std::vector<int>>> SequencePiUpdatesInPlace(
 absl::Status StableSortEntities(const IrP4Info& info,
                                 std::vector<p4::v1::Entity>& entities);
 
+// Sorts the entities such that entities that may be depended on come first.
+// That is, two entities x and y where x could refer to y will be sorted
+// as [y, x]. This is done based on the dependency ranks given in the IrP4Info.
+// Any entities with the same dependency rank are sorted by their entity key
+// value.
+absl::Status SortEntities(const IrP4Info& info,
+                          std::vector<p4::v1::Entity>& entities);
+
 // Same as StableSortEntities but sorts the repeated `Update` message.
 absl::Status StableSortUpdates(
     const IrP4Info& info,