diff --git a/p4_symbolic/ir/BUILD.bazel b/p4_symbolic/ir/BUILD.bazel
index 3e29443c..0b1b73e9 100644
--- a/p4_symbolic/ir/BUILD.bazel
+++ b/p4_symbolic/ir/BUILD.bazel
@@ -204,6 +204,13 @@ ir_parsing_test(
     p4_program = "//p4_symbolic/testdata:conditional/table_hit_2.p4",
 )
 
+ir_parsing_test(
+    name = "sai_parser_test",
+    golden_file = "expected/sai_parser.txt",
+    p4_deps = ["//p4_symbolic/testdata:common/headers.p4"],
+    p4_program = "//p4_symbolic/testdata:parser/sai_parser.p4",
+)
+
 ir_parsing_test(
     name = "hex_string_transition_test",
     golden_file = "expected/hex_string_transition.txt",
diff --git a/p4_symbolic/ir/expected/sai_parser.txt b/p4_symbolic/ir/expected/sai_parser.txt
index e22d0a0e..f0ab9137 100644
--- a/p4_symbolic/ir/expected/sai_parser.txt
+++ b/p4_symbolic/ir/expected/sai_parser.txt
@@ -1117,455 +1117,3 @@ pipeline {
     initial_control: "__END_OF_PIPELINE__"
   }
 }
-parsers {
-  key: "parser"
-  value {
-    name: "parser"
-    initial_state: "start"
-    parse_states {
-      key: "parse_8021q_vlan"
-      value {
-        name: "parse_8021q_vlan"
-        parser_ops {
-          extract {
-            header {
-              header_name: "vlan"
-            }
-          }
-        }
-        transition_key_fields {
-          field {
-            header_name: "vlan"
-            field_name: "ether_type"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x0800"
-            next_state: "parse_ipv4"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x86dd"
-            next_state: "parse_ipv6"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x0806"
-            next_state: "parse_arp"
-          }
-        }
-        transitions {
-          default_transition {
-            next_state: "__END_OF_PARSER__"
-          }
-        }
-      }
-    }
-    parse_states {
-      key: "parse_arp"
-      value {
-        name: "parse_arp"
-        parser_ops {
-          extract {
-            header {
-              header_name: "arp"
-            }
-          }
-        }
-        transitions {
-          default_transition {
-            next_state: "__END_OF_PARSER__"
-          }
-        }
-      }
-    }
-    parse_states {
-      key: "parse_ethernet"
-      value {
-        name: "parse_ethernet"
-        parser_ops {
-          extract {
-            header {
-              header_name: "ethernet"
-            }
-          }
-        }
-        transition_key_fields {
-          field {
-            header_name: "ethernet"
-            field_name: "ether_type"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x0800"
-            next_state: "parse_ipv4"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x86dd"
-            next_state: "parse_ipv6"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x0806"
-            next_state: "parse_arp"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x8100"
-            next_state: "parse_8021q_vlan"
-          }
-        }
-        transitions {
-          default_transition {
-            next_state: "__END_OF_PARSER__"
-          }
-        }
-      }
-    }
-    parse_states {
-      key: "parse_icmp"
-      value {
-        name: "parse_icmp"
-        parser_ops {
-          extract {
-            header {
-              header_name: "icmp"
-            }
-          }
-        }
-        transitions {
-          default_transition {
-            next_state: "__END_OF_PARSER__"
-          }
-        }
-      }
-    }
-    parse_states {
-      key: "parse_ipv4"
-      value {
-        name: "parse_ipv4"
-        parser_ops {
-          extract {
-            header {
-              header_name: "ipv4"
-            }
-          }
-        }
-        transition_key_fields {
-          field {
-            header_name: "ipv4"
-            field_name: "protocol"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x01"
-            next_state: "parse_icmp"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x06"
-            next_state: "parse_tcp"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x11"
-            next_state: "parse_udp"
-          }
-        }
-        transitions {
-          default_transition {
-            next_state: "__END_OF_PARSER__"
-          }
-        }
-      }
-    }
-    parse_states {
-      key: "parse_ipv6"
-      value {
-        name: "parse_ipv6"
-        parser_ops {
-          extract {
-            header {
-              header_name: "ipv6"
-            }
-          }
-        }
-        transition_key_fields {
-          field {
-            header_name: "ipv6"
-            field_name: "next_header"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x3a"
-            next_state: "parse_icmp"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x06"
-            next_state: "parse_tcp"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x11"
-            next_state: "parse_udp"
-          }
-        }
-        transitions {
-          default_transition {
-            next_state: "__END_OF_PARSER__"
-          }
-        }
-      }
-    }
-    parse_states {
-      key: "parse_packet_out_header"
-      value {
-        name: "parse_packet_out_header"
-        parser_ops {
-          extract {
-            header {
-              header_name: "packet_out_header"
-            }
-          }
-        }
-        transitions {
-          default_transition {
-            next_state: "parse_ethernet"
-          }
-        }
-      }
-    }
-    parse_states {
-      key: "parse_tcp"
-      value {
-        name: "parse_tcp"
-        parser_ops {
-          extract {
-            header {
-              header_name: "tcp"
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._l4_src_port6"
-            }
-            field_rvalue {
-              header_name: "tcp"
-              field_name: "src_port"
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._l4_dst_port7"
-            }
-            field_rvalue {
-              header_name: "tcp"
-              field_name: "dst_port"
-            }
-          }
-        }
-        transitions {
-          default_transition {
-            next_state: "__END_OF_PARSER__"
-          }
-        }
-      }
-    }
-    parse_states {
-      key: "parse_udp"
-      value {
-        name: "parse_udp"
-        parser_ops {
-          extract {
-            header {
-              header_name: "udp"
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._l4_src_port6"
-            }
-            field_rvalue {
-              header_name: "udp"
-              field_name: "src_port"
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._l4_dst_port7"
-            }
-            field_rvalue {
-              header_name: "udp"
-              field_name: "dst_port"
-            }
-          }
-        }
-        transitions {
-          default_transition {
-            next_state: "__END_OF_PARSER__"
-          }
-        }
-      }
-    }
-    parse_states {
-      key: "start"
-      value {
-        name: "start"
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._vlan_id_valid1"
-            }
-            expression_rvalue {
-              builtin_expression {
-                arguments {
-                  bool_value {
-                  }
-                }
-              }
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._vlan_id0"
-            }
-            hexstr_rvalue {
-              value: "0x0000"
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._admit_to_l32"
-            }
-            expression_rvalue {
-              builtin_expression {
-                arguments {
-                  bool_value {
-                  }
-                }
-              }
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._vrf_id3"
-            }
-            hexstr_rvalue {
-              value: "0x0000"
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._packet_rewrites_src_mac4"
-            }
-            hexstr_rvalue {
-              value: "0x000000000000"
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._packet_rewrites_dst_mac5"
-            }
-            hexstr_rvalue {
-              value: "0x000000000000"
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._l4_src_port6"
-            }
-            hexstr_rvalue {
-              value: "0x0000"
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._l4_dst_port7"
-            }
-            hexstr_rvalue {
-              value: "0x0000"
-            }
-          }
-        }
-        parser_ops {
-          set {
-            lvalue {
-              header_name: "scalars"
-              field_name: "local_metadata_t._wcmp_selector_input8"
-            }
-            hexstr_rvalue {
-              value: "0x0000"
-            }
-          }
-        }
-        transition_key_fields {
-          field {
-            header_name: "standard_metadata"
-            field_name: "ingress_port"
-          }
-        }
-        transitions {
-          hex_string_transition {
-            value: "0x01fe"
-            next_state: "parse_packet_out_header"
-          }
-        }
-        transitions {
-          default_transition {
-            next_state: "parse_ethernet"
-          }
-        }
-      }
-    }
-  }
-}
-
diff --git a/p4_symbolic/testdata/parser/default_transition.p4 b/p4_symbolic/testdata/parser/default_transition.p4
new file mode 100644
index 00000000..cd7e1374
--- /dev/null
+++ b/p4_symbolic/testdata/parser/default_transition.p4
@@ -0,0 +1,60 @@
+#include <v1model.p4>
+#include "../common/headers.p4"
+
+struct local_metadata_t {
+  /* empty */
+}
+
+struct headers_t {
+  ethernet_t ethernet;
+}
+
+parser packet_parser(packet_in packet, out headers_t headers,
+                     inout local_metadata_t local_metadata,
+                     inout standard_metadata_t standard_metadata) {
+  state start {
+    transition parse_ethernet;
+  }
+
+  state parse_ethernet {
+    packet.extract(headers.ethernet);
+    transition accept;
+  }
+}
+
+control empty_verify_checksum(inout headers_t headers,
+                        inout local_metadata_t local_metadata) {
+  apply {}
+}  // control empty_verify_checksum
+
+control ingress(inout headers_t headers,
+                inout local_metadata_t local_metadata,
+                inout standard_metadata_t standard_metadata) {
+  apply {}
+}  // control ingress
+
+control egress(inout headers_t headers,
+               inout local_metadata_t local_metadata,
+               inout standard_metadata_t standard_metadata) {
+  apply {}
+}  // control egress
+
+control empty_compute_checksum(inout headers_t headers,
+                         inout local_metadata_t local_metadata) {
+  apply {}
+}  // control empty_compute_checksum
+
+control packet_deparser(packet_out packet, in headers_t headers) {
+  apply {
+    packet.emit(headers.ethernet);
+  }
+}  // control packet_deparser
+
+V1Switch(
+  packet_parser(),
+  empty_verify_checksum(),
+  ingress(),
+  egress(),
+  empty_compute_checksum(),
+  packet_deparser()
+) main;
diff --git a/p4_symbolic/testdata/parser/sai_parser.p4 b/p4_symbolic/testdata/parser/sai_parser.p4
new file mode 100644
index 00000000..70de9cc2
--- /dev/null
+++ b/p4_symbolic/testdata/parser/sai_parser.p4
@@ -0,0 +1,267 @@
+#include <v1model.p4>
+#include "../common/headers.p4"
+
+struct headers_t {
+  // Never extracted during parsing, but serialized during deparsing for packets
+  // punted to the controller.
+  packet_in_header_t packet_in_header;
+
+  // PacketOut header; extracted only for packets received from the controller.
+  packet_out_header_t packet_out_header;
+
+  // ERSPAN headers, not extracted during parsing.
+  ethernet_t erspan_ethernet;
+  ipv4_t erspan_ipv4;
+  gre_t erspan_gre;
+
+  ethernet_t ethernet;
+  vlan_t vlan;
+
+  // Not extracted during parsing.
+  ipv6_t tunnel_encap_ipv6;
+  gre_t tunnel_encap_gre;
+
+  ipv4_t ipv4;
+  ipv6_t ipv6;
+  icmp_t icmp;
+  tcp_t tcp;
+  udp_t udp;
+  arp_t arp;
+}
+
+// Header fields rewritten by the ingress pipeline. Rewrites are computed and
+// stored in this struct, but actual rewriting is dealyed until the egress
+// pipeline so that the original values aren't overridden and get be matched on.
+struct packet_rewrites_t {
+  ethernet_addr_t src_mac;
+  ethernet_addr_t dst_mac;
+}
+
+// Local metadata for each packet being processed.
+struct local_metadata_t {
+  vlan_id_t vlan_id;
+  // True iff `vlan_id` is valid.
+  bool vlan_id_valid;
+  bool admit_to_l3;
+  vrf_id_t vrf_id;
+  packet_rewrites_t packet_rewrites;
+  bit<16> l4_src_port;
+  bit<16> l4_dst_port;
+  bit<16> wcmp_selector_input;
+  // GRE tunnel encap related fields.
+  bool apply_tunnel_encap_at_egress;
+  ipv6_addr_t tunnel_encap_src_ipv6;
+  ipv6_addr_t tunnel_encap_dst_ipv6;
+
+  // Packet-in related fields, which we can't group into a struct, because BMv2
+  // doesn't support passing structs in clone3.
+
+  // The value to be copied into the `ingress_port` field of packet_in_header on
+  // punted packets.
+  @field_list(PreservedFieldList.CLONE_I2E_PACKET_IN)
+  port_id_t packet_in_ingress_port;
+  // The value to be copied into the `target_egress_port` field of
+  // packet_in_header on punted packets.
+  @field_list(PreservedFieldList.CLONE_I2E_PACKET_IN)
+  port_id_t packet_in_target_egress_port;
+}
+
+parser packet_parser(packet_in packet, out headers_t headers,
+                     inout local_metadata_t local_metadata,
+                     inout standard_metadata_t standard_metadata) {
+  state start {
+    // Initialize local metadata fields.
+    local_metadata.vlan_id_valid = false;
+    local_metadata.vlan_id = 0;
+    local_metadata.admit_to_l3 = false;
+    local_metadata.vrf_id = kDefaultVrf;
+    local_metadata.packet_rewrites.src_mac = 0;
+    local_metadata.packet_rewrites.dst_mac = 0;
+    local_metadata.l4_src_port = 0;
+    local_metadata.l4_dst_port = 0;
+    local_metadata.wcmp_selector_input = 0;
+
+    transition select(standard_metadata.ingress_port) {
+      SAI_P4_CPU_PORT: parse_packet_out_header;
+      _              : parse_ethernet;
+    }
+  }
+
+  state parse_packet_out_header {
+    packet.extract(headers.packet_out_header);
+    transition parse_ethernet;
+  }
+
+  state parse_ethernet {
+    packet.extract(headers.ethernet);
+    transition select(headers.ethernet.ether_type) {
+      ETHERTYPE_IPV4: parse_ipv4;
+      ETHERTYPE_IPV6: parse_ipv6;
+      ETHERTYPE_ARP:  parse_arp;
+      ETHERTYPE_8021Q: parse_8021q_vlan;
+      // VLAN double-tagging (ether_type 0x88a8) is not modeled as we do not
+      // have a use case for it.
+      _:              accept;
+    }
+  }
+
+ state parse_8021q_vlan {
+    packet.extract(headers.vlan);
+    transition select(headers.vlan.ether_type) {
+      ETHERTYPE_IPV4: parse_ipv4;
+      ETHERTYPE_IPV6: parse_ipv6;
+      ETHERTYPE_ARP:  parse_arp;
+      _:              accept;
+    }
+  }
+
+  state parse_ipv4 {
+    packet.extract(headers.ipv4);
+    transition select(headers.ipv4.protocol) {
+      IP_PROTOCOL_ICMP: parse_icmp;
+      IP_PROTOCOL_TCP:  parse_tcp;
+      IP_PROTOCOL_UDP:  parse_udp;
+      _:                accept;
+    }
+  }
+
+  state parse_ipv6 {
+    packet.extract(headers.ipv6);
+    transition select(headers.ipv6.next_header) {
+      IP_PROTOCOL_ICMPV6: parse_icmp;
+      IP_PROTOCOL_TCP:    parse_tcp;
+      IP_PROTOCOL_UDP:    parse_udp;
+      _:                  accept;
+    }
+  }
+
+  state parse_tcp {
+    packet.extract(headers.tcp);
+    // Normalize TCP port metadata to common port metadata.
+    local_metadata.l4_src_port = headers.tcp.src_port;
+    local_metadata.l4_dst_port = headers.tcp.dst_port;
+    transition accept;
+  }
+
+  state parse_udp {
+    packet.extract(headers.udp);
+    // Normalize UDP port metadata to common port metadata.
+    local_metadata.l4_src_port = headers.udp.src_port;
+    local_metadata.l4_dst_port = headers.udp.dst_port;
+    transition accept;
+  }
+
+  state parse_icmp {
+    packet.extract(headers.icmp);
+    transition accept;
+  }
+
+  state parse_arp {
+    packet.extract(headers.arp);
+    transition accept;
+  }
+}  // parser packet_parser
+
+control verify_ipv4_checksum(inout headers_t headers,
+                             inout local_metadata_t local_metadata) {
+  apply {
+    verify_checksum(headers.ipv4.isValid(), {
+      headers.ipv4.version,
+      headers.ipv4.ihl,
+      headers.ipv4.dscp,
+      headers.ipv4.ecn,
+      headers.ipv4.total_len,
+      headers.ipv4.identification,
+      headers.ipv4.reserved,
+      headers.ipv4.do_not_fragment,
+      headers.ipv4.more_fragments,
+      headers.ipv4.frag_offset,
+      headers.ipv4.ttl,
+      headers.ipv4.protocol,
+      headers.ipv4.src_addr,
+      headers.ipv4.dst_addr
+    }, headers.ipv4.header_checksum, HashAlgorithm.csum16);
+  }
+}  // control verify_ipv4_checksum
+
+control ingress(inout headers_t headers,
+                inout local_metadata_t local_metadata,
+                inout standard_metadata_t standard_metadata) {
+  apply {}
+}  // control ingress
+
+control egress(inout headers_t headers,
+               inout local_metadata_t local_metadata,
+               inout standard_metadata_t standard_metadata) {
+  apply {}
+}  // control egress
+
+control compute_ipv4_checksum(inout headers_t headers,
+                              inout local_metadata_t local_metadata) {
+  apply {
+    update_checksum(headers.erspan_ipv4.isValid(), {
+        headers.erspan_ipv4.version,
+        headers.erspan_ipv4.ihl,
+        headers.erspan_ipv4.dscp,
+        headers.erspan_ipv4.ecn,
+        headers.erspan_ipv4.total_len,
+        headers.erspan_ipv4.identification,
+        headers.erspan_ipv4.reserved,
+        headers.erspan_ipv4.do_not_fragment,
+        headers.erspan_ipv4.more_fragments,
+        headers.erspan_ipv4.frag_offset,
+        headers.erspan_ipv4.ttl,
+        headers.erspan_ipv4.protocol,
+        headers.erspan_ipv4.src_addr,
+        headers.erspan_ipv4.dst_addr
+      }, headers.erspan_ipv4.header_checksum, HashAlgorithm.csum16);
+
+    update_checksum(headers.ipv4.isValid(), {
+        headers.ipv4.version,
+        headers.ipv4.ihl,
+        headers.ipv4.dscp,
+        headers.ipv4.ecn,
+        headers.ipv4.total_len,
+        headers.ipv4.identification,
+        headers.ipv4.reserved,
+        headers.ipv4.do_not_fragment,
+        headers.ipv4.more_fragments,
+        headers.ipv4.frag_offset,
+        headers.ipv4.ttl,
+        headers.ipv4.protocol,
+        headers.ipv4.src_addr,
+        headers.ipv4.dst_addr
+      }, headers.ipv4.header_checksum, HashAlgorithm.csum16);
+  }
+}  // control compute_ipv4_checksum
+
+control packet_deparser(packet_out packet, in headers_t headers) {
+  apply {
+    // We always expect the packet_out_header to be invalid at the end of the
+    // pipeline, so this line has no effect on the output packet.
+    packet.emit(headers.packet_out_header);
+    packet.emit(headers.packet_in_header);
+    packet.emit(headers.erspan_ethernet);
+    packet.emit(headers.erspan_ipv4);
+    packet.emit(headers.erspan_gre);
+    packet.emit(headers.ethernet);
+    packet.emit(headers.vlan);
+    packet.emit(headers.tunnel_encap_ipv6);
+    packet.emit(headers.tunnel_encap_gre);
+    packet.emit(headers.ipv4);
+    packet.emit(headers.ipv6);
+    packet.emit(headers.arp);
+    packet.emit(headers.icmp);
+    packet.emit(headers.tcp);
+    packet.emit(headers.udp);
+  }
+}  // control packet_deparser
+
+V1Switch(
+  packet_parser(),
+  verify_ipv4_checksum(),
+  ingress(),
+  egress(),
+  compute_ipv4_checksum(),
+  packet_deparser()
+) main;