Extend IR proto and translation to support parsers.

sonic-net · Nov 27, 2024 · 72f5c3b · 72f5c3b
1 parent 22ac77e
commit 72f5c3b
Show file tree

Hide file tree

Showing 16 changed files with 1,150 additions and 29 deletions.
diff --git a/p4_symbolic/ir/BUILD.bazel b/p4_symbolic/ir/BUILD.bazel
@@ -90,7 +90,7 @@ cc_library(
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
-	 "@com_google_absl//absl/strings:str_format",
+        "@com_google_absl//absl/strings:str_format",
     ],
 )
 
@@ -211,10 +211,30 @@ ir_parsing_test(
     p4_program = "//p4_symbolic/testdata:parser/sai_parser.p4",
 )
 
+ir_parsing_test(
+    name = "extract_parser_operation_test",
+    golden_file = "expected/extract_parser_operation.txt",
+    p4_deps = ["//p4_symbolic/testdata:common/headers.p4"],
+    p4_program = "//p4_symbolic/testdata:parser/extract_parser_operation.p4",
+)
+
+ir_parsing_test(
+    name = "set_parser_operation_test",
+    golden_file = "expected/set_parser_operation.txt",
+    p4_deps = ["//p4_symbolic/testdata:common/headers.p4"],
+    p4_program = "//p4_symbolic/testdata:parser/set_parser_operation.p4",
+)
+
+ir_parsing_test(
+    name = "default_transition_test",
+    golden_file = "expected/default_transition.txt",
+    p4_deps = ["//p4_symbolic/testdata:common/headers.p4"],
+    p4_program = "//p4_symbolic/testdata:parser/default_transition.p4",
+)
+
 ir_parsing_test(
     name = "hex_string_transition_test",
     golden_file = "expected/hex_string_transition.txt",
     p4_deps = ["//p4_symbolic/testdata:common/headers.p4"],
     p4_program = "//p4_symbolic/testdata:parser/hex_string_transition.p4",
 )
-
diff --git a/p4_symbolic/ir/expected/basic.txt b/p4_symbolic/ir/expected/basic.txt
@@ -643,6 +643,61 @@ pipeline {
     initial_control: "node_2"
   }
 }
+parsers {
+  key: "parser"
+  value {
+    name: "parser"
+    initial_state: "start"
+    parse_states {
+      key: "parse_ipv4"
+      value {
+        name: "parse_ipv4"
+        parser_ops {
+          extract {
+            header {
+              header_name: "ipv4"
+            }
+          }
+        }
+        transitions {
+          default_transition {
+            next_state: "__END_OF_PARSER__"
+          }
+        }
+      }
+    }
+    parse_states {
+      key: "start"
+      value {
+        name: "start"
+        parser_ops {
+          extract {
+            header {
+              header_name: "ethernet"
+            }
+          }
+        }
+        transition_key_fields {
+          field {
+            header_name: "ethernet"
+            field_name: "etherType"
+          }
+        }
+        transitions {
+          hex_string_transition {
+            value: "0x0800"
+            next_state: "parse_ipv4"
+          }
+        }
+        transitions {
+          default_transition {
+            next_state: "__END_OF_PARSER__"
+          }
+        }
+      }
+    }
+  }
+}
 
 =====MyIngress.ipv4_lpm Entries=====
 

diff --git a/p4_symbolic/ir/expected/complex_conditional.txt b/p4_symbolic/ir/expected/complex_conditional.txt
@@ -2071,4 +2071,29 @@ pipeline {
     initial_control: "node_2"
   }
 }
+parsers {
+  key: "parser"
+  value {
+    name: "parser"
+    initial_state: "start"
+    parse_states {
+      key: "start"
+      value {
+        name: "start"
+        parser_ops {
+          extract {
+            header {
+              header_name: "h1"
+            }
+          }
+        }
+        transitions {
+          default_transition {
+            next_state: "__END_OF_PARSER__"
+          }
+        }
+      }
+    }
+  }
+}
 
diff --git a/p4_symbolic/ir/expected/conditional.txt b/p4_symbolic/ir/expected/conditional.txt
@@ -703,4 +703,29 @@ pipeline {
     initial_control: "node_2"
   }
 }
+parsers {
+  key: "parser"
+  value {
+    name: "parser"
+    initial_state: "start"
+    parse_states {
+      key: "start"
+      value {
+        name: "start"
+        parser_ops {
+          extract {
+            header {
+              header_name: "ethernet"
+            }
+          }
+        }
+        transitions {
+          default_transition {
+            next_state: "__END_OF_PARSER__"
+          }
+        }
+      }
+    }
+  }
+}
 
diff --git a/p4_symbolic/ir/expected/conditional_sequence.txt b/p4_symbolic/ir/expected/conditional_sequence.txt
@@ -2340,4 +2340,29 @@ pipeline {
     initial_control: "node_2"
   }
 }
+parsers {
+  key: "parser"
+  value {
+    name: "parser"
+    initial_state: "start"
+    parse_states {
+      key: "start"
+      value {
+        name: "start"
+        parser_ops {
+          extract {
+            header {
+              header_name: "h1"
+            }
+          }
+        }
+        transitions {
+          default_transition {
+            next_state: "__END_OF_PARSER__"
+          }
+        }
+      }
+    }
+  }
+}
 
diff --git a/p4_symbolic/ir/expected/hardcoded.txt b/p4_symbolic/ir/expected/hardcoded.txt
@@ -279,4 +279,22 @@ pipeline {
     initial_control: "node_2"
   }
 }
+parsers {
+  key: "parser"
+  value {
+    name: "parser"
+    initial_state: "start"
+    parse_states {
+      key: "start"
+      value {
+        name: "start"
+        transitions {
+          default_transition {
+            next_state: "__END_OF_PARSER__"
+          }
+        }
+      }
+    }
+  }
+}
 
diff --git a/p4_symbolic/ir/expected/hex_string_transition.txt b/p4_symbolic/ir/expected/hex_string_transition.txt
@@ -284,4 +284,66 @@ pipeline {
     initial_control: "__END_OF_PIPELINE__"
   }
 }
+parsers {
+  key: "parser"
+  value {
+    name: "parser"
+    initial_state: "start"
+    parse_states {
+      key: "parse_ipv4"
+      value {
+        name: "parse_ipv4"
+        parser_ops {
+          extract {
+            header {
+              header_name: "ipv4"
+            }
+          }
+        }
+        transitions {
+          default_transition {
+            next_state: "__END_OF_PARSER__"
+          }
+        }
+      }
+    }
+    parse_states {
+      key: "start"
+      value {
+        name: "start"
+        parser_ops {
+          extract {
+            header {
+              header_name: "ethernet"
+            }
+          }
+        }
+        transition_key_fields {
+          field {
+            header_name: "ethernet"
+            field_name: "ether_type"
+          }
+        }
+        transitions {
+          hex_string_transition {
+            value: "0x0000"
+            mask: "0xfe00"
+            next_state: "__END_OF_PARSER__"
+          }
+        }
+        transitions {
+          hex_string_transition {
+            value: "0x0800"
+            next_state: "parse_ipv4"
+          }
+        }
+        transitions {
+          default_transition {
+            next_state: "__END_OF_PARSER__"
+          }
+        }
+      }
+    }
+  }
+}
 
diff --git a/p4_symbolic/ir/expected/reflector.txt b/p4_symbolic/ir/expected/reflector.txt
@@ -198,4 +198,22 @@ pipeline {
     initial_control: "tbl_reflector54"
   }
 }
+parsers {
+  key: "parser"
+  value {
+    name: "parser"
+    initial_state: "start"
+    parse_states {
+      key: "start"
+      value {
+        name: "start"
+        transitions {
+          default_transition {
+            next_state: "__END_OF_PARSER__"
+          }
+        }
+      }
+    }
+  }
+}