Improve fabric.p4 to reduce pipeline resources and refactor pipeconf impl

This patch affects both the P4 pipeline implementation and the
Java pipeconf.

P4 PIPELINE
- Less tables and smarter use of metadata to reduce inter-tables
dependencies and favor parallel execution of tables.
- Removed unused actions / renamed existing ones to make forwarding
behavior clearer (e.g. ingress_port_vlan table)
- Remove co-existence of simple and hansed table. Hashed should be the
default one, but implementations that do not support action profiles
might compile fabric.p4 to use the simple one.
- Use @name annotations for match fields to make control plane
independent of table implementation.
- Use @hidden to avoid showing actions and table on the p4info that
cannot be controlled at runtime.
- First attempt to support double VLAN cross-connect (xconnect table).
- New design has been tested with "fabric-refactoring" branch of
fabric-p4test:
github.com/opennetworkinglab/fabric-p4test/tree/fabric-refactoring

JAVA PIPECONF
This patch brings a major refactoring that reflects the experience
gathered in the past months of working on fabric.p4 and reasoning on its
pipeconf implementation. Indeed, the FlowObjective API is
under-specified and sometimes ambiguous which makes the process of
creating and maintaining a pipeliner implementation tedious. This
refactoring brings a simplified implementation by removing unused/
unnecessary functionalities and by recognizing commonality when possible
(e.g. by means of abstract and utility classes). It also makes design
patterns more explicit and consistent. Overall, the goal is to reduce
technical debt and to make it easier to support new features as we
evolve fabric.p4

Changes include:
- Changes in pipeliner/interpreter to reflect new pipeline design.
- By default translate objective treatment to PiAction. This favors
debuggability of flow rules in ONOS.
- Support new NextObjective’s NextTreatment class.
- Remove lots of unused/unnecessary code (e.g. async callback handling
for pending objective install status in pipeliner as current
implementation was always returning success)
- Gather commonality in abstract classes and simplify implementation
for objective translator (filtering, forwarding, next)
- New implementation of ForwardingFunctionTypes (FFT) that looks at
criterion instance values along with their types (to avoid relying on
case-specific if-else conditions to recognize variants of an FFT)
- Adaptive translation of NextObjective based on presence of simple or
hashed table.
- Support DENY FilteringObjective

Also:
- Fix onos-p4-gen-constants to avoid generating conflicting
PiMatchFieldId variable names.
- Install Graphviz tools in p4vm to generate p4c graphs
- Generate p4c graphs by default when compiling fabric.p4
- Use more compact Hex string when printing PI values

Change-Id: Ife79e44054dc5bc48833f95d0551a7370150eac5
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index 9f51572..a10301a 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -4,26 +4,29 @@
       "name" : "scalars_0",
       "id" : 0,
       "fields" : [
-        ["last_ipv4_dscp", 6, false],
-        ["tmp", 4, false],
-        ["tmp_0", 32, false],
+        ["last_ipv4_dscp_0", 6, false],
+        ["tmp_0", 4, false],
+        ["tmp", 32, false],
         ["tmp_1", 32, false],
-        ["filtering_tmp_0", 1, false],
-        ["next_tmp_2", 1, false],
-        ["next_tmp_3", 1, false],
-        ["next_tmp_4", 1, false],
-        ["next_hasReturned_0", 1, false],
-        ["process_int_main_process_int_transit_hasReturned_0", 1, false],
+        ["egress_next_tmp", 1, false],
+        ["process_int_main_process_int_transit_hasReturned", 1, false],
+        ["fabric_metadata_t.eth_type", 16, false],
+        ["fabric_metadata_t.ip_eth_type", 16, false],
+        ["fabric_metadata_t.vlan_id", 12, false],
+        ["fabric_metadata_t.vlan_pri", 3, false],
+        ["fabric_metadata_t.vlan_cfi", 1, false],
+        ["fabric_metadata_t.mpls_label", 20, false],
+        ["fabric_metadata_t.mpls_ttl", 8, false],
+        ["fabric_metadata_t.skip_forwarding", 1, false],
+        ["fabric_metadata_t.skip_next", 1, false],
         ["fabric_metadata_t.fwd_type", 3, false],
         ["fabric_metadata_t.next_id", 32, false],
-        ["fabric_metadata_t.pop_vlan_when_packet_in", 1, false],
         ["fabric_metadata_t.is_multicast", 1, false],
         ["fabric_metadata_t.is_controller_packet_out", 1, false],
         ["fabric_metadata_t.clone_to_cpu", 1, false],
         ["fabric_metadata_t.ip_proto", 8, false],
-        ["fabric_metadata_t.l4_src_port", 16, false],
-        ["fabric_metadata_t.l4_dst_port", 16, false],
-        ["_padding_1", 1, false]
+        ["fabric_metadata_t.l4_sport", 16, false],
+        ["fabric_metadata_t.l4_dport", 16, false]
       ]
     },
     {
@@ -60,7 +63,7 @@
       "fields" : [
         ["dst_addr", 48, false],
         ["src_addr", 48, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -70,7 +73,7 @@
         ["pri", 3, false],
         ["cfi", 1, false],
         ["vlan_id", 12, false],
-        ["ether_type", 16, false]
+        ["eth_type", 16, false]
       ]
     },
     {
@@ -103,22 +106,11 @@
       ]
     },
     {
-      "name" : "arp_t",
+      "name" : "tcp_t",
       "id" : 6,
       "fields" : [
-        ["hw_type", 16, false],
-        ["proto_type", 16, false],
-        ["hw_addr_len", 8, false],
-        ["proto_addr_len", 8, false],
-        ["opcode", 16, false]
-      ]
-    },
-    {
-      "name" : "tcp_t",
-      "id" : 7,
-      "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["seq_no", 32, false],
         ["ack_no", 32, false],
         ["data_offset", 4, false],
@@ -132,17 +124,17 @@
     },
     {
       "name" : "udp_t",
-      "id" : 8,
+      "id" : 7,
       "fields" : [
-        ["src_port", 16, false],
-        ["dst_port", 16, false],
+        ["sport", 16, false],
+        ["dport", 16, false],
         ["len", 16, false],
         ["checksum", 16, false]
       ]
     },
     {
       "name" : "icmp_t",
-      "id" : 9,
+      "id" : 8,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -154,7 +146,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 10,
+      "id" : 9,
       "fields" : [
         ["egress_port", 9, false],
         ["_pad", 7, false]
@@ -162,7 +154,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 11,
+      "id" : 10,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -170,7 +162,7 @@
     },
     {
       "name" : "intl4_shim_t",
-      "id" : 12,
+      "id" : 11,
       "fields" : [
         ["int_type", 8, false],
         ["rsvd1", 8, false],
@@ -180,7 +172,7 @@
     },
     {
       "name" : "int_header_t",
-      "id" : 13,
+      "id" : 12,
       "fields" : [
         ["ver", 2, false],
         ["rep", 2, false],
@@ -199,14 +191,14 @@
     },
     {
       "name" : "int_switch_id_t",
-      "id" : 14,
+      "id" : 13,
       "fields" : [
         ["switch_id", 32, false]
       ]
     },
     {
       "name" : "int_port_ids_t",
-      "id" : 15,
+      "id" : 14,
       "fields" : [
         ["ingress_port_id", 16, false],
         ["egress_port_id", 16, false]
@@ -214,14 +206,14 @@
     },
     {
       "name" : "int_hop_latency_t",
-      "id" : 16,
+      "id" : 15,
       "fields" : [
         ["hop_latency", 32, false]
       ]
     },
     {
       "name" : "int_q_occupancy_t",
-      "id" : 17,
+      "id" : 16,
       "fields" : [
         ["q_id", 8, false],
         ["q_occupancy", 24, false]
@@ -229,21 +221,21 @@
     },
     {
       "name" : "int_ingress_tstamp_t",
-      "id" : 18,
+      "id" : 17,
       "fields" : [
         ["ingress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_egress_tstamp_t",
-      "id" : 19,
+      "id" : 18,
       "fields" : [
         ["egress_tstamp", 32, false]
       ]
     },
     {
       "name" : "int_q_congestion_t",
-      "id" : 20,
+      "id" : 19,
       "fields" : [
         ["q_id", 8, false],
         ["q_congestion", 24, false]
@@ -251,14 +243,14 @@
     },
     {
       "name" : "int_egress_port_tx_util_t",
-      "id" : 21,
+      "id" : 20,
       "fields" : [
         ["egress_port_tx_util", 32, false]
       ]
     },
     {
       "name" : "intl4_tail_t",
-      "id" : 22,
+      "id" : 21,
       "fields" : [
         ["next_proto", 8, false],
         ["dest_port", 16, false],
@@ -268,7 +260,7 @@
     },
     {
       "name" : "int_metadata_t",
-      "id" : 23,
+      "id" : 22,
       "fields" : [
         ["source", 1, 0],
         ["transit", 1, 0],
@@ -312,23 +304,23 @@
       "pi_omit" : true
     },
     {
-      "name" : "mpls",
+      "name" : "inner_vlan_tag",
       "id" : 4,
+      "header_type" : "vlan_tag_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "mpls",
+      "id" : 5,
       "header_type" : "mpls_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "ipv4",
-      "id" : 5,
-      "header_type" : "ipv4_t",
-      "metadata" : false,
-      "pi_omit" : true
-    },
-    {
-      "name" : "arp",
       "id" : 6,
-      "header_type" : "arp_t",
+      "header_type" : "ipv4_t",
       "metadata" : false,
       "pi_omit" : true
     },
@@ -531,6 +523,32 @@
                 }
               ],
               "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ethernet", "eth_type"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0ffe"
+                }
+              ],
+              "op" : "set"
             }
           ],
           "transitions" : [
@@ -548,12 +566,6 @@
             },
             {
               "type" : "hexstr",
-              "value" : "0x0806",
-              "mask" : null,
-              "next_state" : "parse_arp"
-            },
-            {
-              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -567,7 +579,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["ethernet", "eth_type"]
             }
           ]
         },
@@ -588,12 +600,52 @@
           "transitions" : [
             {
               "type" : "hexstr",
-              "value" : "0x0806",
+              "value" : "0x0800",
               "mask" : null,
-              "next_state" : "parse_arp"
+              "next_state" : "parse_ipv4"
             },
             {
               "type" : "hexstr",
+              "value" : "0x8847",
+              "mask" : null,
+              "next_state" : "parse_mpls"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100",
+              "mask" : null,
+              "next_state" : "parse_inner_vlan_tag"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_inner_vlan_tag",
+          "id" : 4,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
+                  "value" : "inner_vlan_tag"
+                }
+              ],
+              "op" : "extract"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
@@ -613,13 +665,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["inner_vlan_tag", "eth_type"]
             }
           ]
         },
         {
           "name" : "parse_mpls",
-          "id" : 4,
+          "id" : 5,
           "parser_ops" : [
             {
               "parameters" : [
@@ -634,7 +686,33 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "tmp"]
+                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "label"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["mpls", "ttl"]
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "tmp_0"]
                 },
                 {
                   "type" : "lookahead",
@@ -660,13 +738,13 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "tmp"]
+              "value" : ["scalars", "tmp_0"]
             }
           ]
         },
         {
           "name" : "parse_ipv4",
-          "id" : 5,
+          "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
@@ -694,7 +772,20 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "last_ipv4_dscp"]
+                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                },
+                {
+                  "type" : "hexstr",
+                  "value" : "0x0800"
+                }
+              ],
+              "op" : "set"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "last_ipv4_dscp_0"]
                 },
                 {
                   "type" : "field",
@@ -737,29 +828,6 @@
           ]
         },
         {
-          "name" : "parse_arp",
-          "id" : 6,
-          "parser_ops" : [
-            {
-              "parameters" : [
-                {
-                  "type" : "regular",
-                  "value" : "arp"
-                }
-              ],
-              "op" : "extract"
-            }
-          ],
-          "transitions" : [
-            {
-              "value" : "default",
-              "mask" : null,
-              "next_state" : null
-            }
-          ],
-          "transition_key" : []
-        },
-        {
           "name" : "parse_tcp",
           "id" : 7,
           "parser_ops" : [
@@ -776,11 +844,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "src_port"]
+                  "value" : ["tcp", "sport"]
                 }
               ],
               "op" : "set"
@@ -789,11 +857,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["tcp", "dst_port"]
+                  "value" : ["tcp", "dport"]
                 }
               ],
               "op" : "set"
@@ -825,11 +893,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "src_port"]
+                  "value" : ["udp", "sport"]
                 }
               ],
               "op" : "set"
@@ -838,11 +906,11 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
                 },
                 {
                   "type" : "field",
-                  "value" : ["udp", "dst_port"]
+                  "value" : ["udp", "dport"]
                 }
               ],
               "op" : "set"
@@ -858,7 +926,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["udp", "dst_port"]
+              "value" : ["udp", "dport"]
             }
           ]
         },
@@ -905,7 +973,7 @@
           "transition_key" : [
             {
               "type" : "field",
-              "value" : ["scalars", "last_ipv4_dscp"]
+              "value" : ["scalars", "last_ipv4_dscp_0"]
             }
           ]
         },
@@ -998,11 +1066,11 @@
       "id" : 0,
       "source_info" : {
         "filename" : "include/parser.p4",
-        "line" : 228,
+        "line" : 243,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "mpls", "arp", "ipv4", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "intl4_tail"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "inner_vlan_tag", "mpls", "ipv4", "tcp", "udp", "icmp", "intl4_shim", "int_header", "int_switch_id", "int_port_ids", "int_hop_latency", "int_q_occupancy", "int_ingress_tstamp", "int_egress_tstamp", "int_q_congestion", "int_egress_tx_util", "intl4_tail"]
     }
   ],
   "meter_arrays" : [],
@@ -1026,7 +1094,7 @@
       "binding" : "FabricIngress.filtering.ingress_port_vlan",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 34,
+        "line" : 31,
         "column" : 50,
         "source_fragment" : "ingress_port_vlan_counter"
       }
@@ -1038,7 +1106,7 @@
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 96,
+        "line" : 79,
         "column" : 50,
         "source_fragment" : "fwd_classifier_counter"
       }
@@ -1050,7 +1118,7 @@
       "binding" : "FabricIngress.forwarding.bridging",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 34,
+        "line" : 36,
         "column" : 50,
         "source_fragment" : "bridging_counter"
       }
@@ -1062,7 +1130,7 @@
       "binding" : "FabricIngress.forwarding.mpls",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 57,
+        "line" : 59,
         "column" : 50,
         "source_fragment" : "mpls_counter"
       }
@@ -1074,45 +1142,45 @@
       "binding" : "FabricIngress.forwarding.routing_v4",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 80,
+        "line" : 82,
         "column" : 50,
         "source_fragment" : "routing_v4_counter"
       }
     },
     {
-      "name" : "FabricIngress.forwarding.acl_counter",
+      "name" : "FabricIngress.acl.acl_counter",
       "id" : 6,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.acl",
+      "binding" : "FabricIngress.acl.acl",
       "source_info" : {
-        "filename" : "include/control/forwarding.p4",
-        "line" : 107,
+        "filename" : "include/control/acl.p4",
+        "line" : 30,
         "column" : 50,
         "source_fragment" : "acl_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.vlan_meta_counter",
+      "name" : "FabricIngress.next.next_vlan_counter",
       "id" : 7,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.vlan_meta",
+      "binding" : "FabricIngress.next.next_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 58,
+        "line" : 67,
         "column" : 50,
-        "source_fragment" : "vlan_meta_counter"
+        "source_fragment" : "next_vlan_counter"
       }
     },
     {
-      "name" : "FabricIngress.next.simple_counter",
+      "name" : "FabricIngress.next.xconnect_counter",
       "id" : 8,
       "is_direct" : true,
-      "binding" : "FabricIngress.next.simple",
+      "binding" : "FabricIngress.next.xconnect",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 82,
+        "line" : 91,
         "column" : 50,
-        "source_fragment" : "simple_counter"
+        "source_fragment" : "xconnect_counter"
       }
     },
     {
@@ -1122,7 +1190,7 @@
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 146,
+        "line" : 162,
         "column" : 50,
         "source_fragment" : "hashed_counter"
       }
@@ -1134,7 +1202,7 @@
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 199,
+        "line" : 205,
         "column" : 50,
         "source_fragment" : "multicast_counter"
       }
@@ -1144,7 +1212,7 @@
       "id" : 11,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 23,
+        "line" : 26,
         "column" : 48,
         "source_fragment" : "egress_port_counter"
       },
@@ -1156,7 +1224,7 @@
       "id" : 12,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
-        "line" : 24,
+        "line" : 27,
         "column" : 48,
         "source_fragment" : "ingress_port_counter"
       },
@@ -1182,7 +1250,7 @@
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 250,
+        "line" : 277,
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
@@ -1316,43 +1384,43 @@
   "learn_lists" : [],
   "actions" : [
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 0,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 1,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 2,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 3,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 4,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 5,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 6,
       "runtime_data" : [],
       "primitives" : []
@@ -1400,179 +1468,16 @@
       ]
     },
     {
-      "name" : "FabricIngress.filtering.drop",
+      "name" : "FabricIngress.filtering.deny",
       "id" : 9,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "mark_to_drop()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.set_vlan",
-      "id" : 10,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 42,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.filtering.push_internal_vlan",
-      "id" : 11,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "vlan_tag"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "cfi"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "pri"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 51,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = 0"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 52,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.ether_type = hdr.ethernet.ether_type"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8100"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 99,
-            "column" : 31,
-            "source_fragment" : "0x8100; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 54,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
+              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
             },
             {
               "type" : "expression",
@@ -1591,22 +1496,82 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 57,
+            "line" : 36,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.pop_vlan_when_packet_in = true"
+            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 37,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
-      "id" : 12,
+      "name" : "FabricIngress.filtering.permit",
+      "id" : 10,
       "runtime_data" : [],
       "primitives" : []
     },
     {
+      "name" : "FabricIngress.filtering.permit_with_internal_vlan",
+      "id" : 11,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 47,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 13,
+      "id" : 12,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -1628,7 +1593,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 99,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
           }
@@ -1637,7 +1602,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 14,
+      "id" : 13,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1659,16 +1624,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 37,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 15,
+      "id" : 14,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1677,18 +1642,22 @@
       ],
       "primitives" : [
         {
-          "op" : "remove_header",
+          "op" : "assign",
           "parameters" : [
             {
-              "type" : "header",
-              "value" : "mpls"
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x000000"
             }
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 60,
+            "line" : 62,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.setInvalid()"
+            "source_fragment" : "fabric_metadata.mpls_label = 0"
           }
         },
         {
@@ -1705,16 +1674,16 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 61,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
-      "id" : 16,
+      "id" : 15,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1736,22 +1705,22 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 83,
+            "line" : 30,
             "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.forwarding.nop_routing_v4",
-      "id" : 17,
+      "id" : 16,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_acl",
-      "id" : 18,
+      "name" : "FabricIngress.acl.set_next_id_acl",
+      "id" : 17,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1772,8 +1741,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 110,
+            "filename" : "include/control/acl.p4",
+            "line" : 33,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -1781,8 +1750,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.punt_to_cpu",
-      "id" : 19,
+      "name" : "FabricIngress.acl.punt_to_cpu",
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1798,27 +1767,46 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 116,
+            "filename" : "include/control/acl.p4",
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = 255"
           }
         },
         {
-          "op" : "exit",
-          "parameters" : [],
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 118,
+            "filename" : "include/control/acl.p4",
+            "line" : 40,
             "column" : 8,
-            "source_fragment" : "exit"
+            "source_fragment" : "fabric_metadata.skip_next = true"
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.clone_to_cpu",
-      "id" : 20,
+      "name" : "FabricIngress.acl.clone_to_cpu",
+      "id" : 19,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1844,8 +1832,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 123,
+            "filename" : "include/control/acl.p4",
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "fabric_metadata.clone_to_cpu = true"
           }
@@ -1853,64 +1841,93 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.drop",
-      "id" : 21,
+      "name" : "FabricIngress.acl.drop",
+      "id" : 20,
       "runtime_data" : [],
       "primitives" : [
         {
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 128,
+            "filename" : "include/control/acl.p4",
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
           }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/acl.p4",
+            "line" : 52,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.skip_next = true"
+          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.nop_acl",
-      "id" : 22,
+      "name" : "FabricIngress.acl.nop_acl",
+      "id" : 21,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.next.set_vlan",
+      "id" : 22,
+      "runtime_data" : [
+        {
+          "name" : "vlan_id",
+          "bitwidth" : 12
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 70,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_xconnect",
       "id" : 23,
       "runtime_data" : [
         {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 61,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.output_simple",
-      "id" : 24,
-      "runtime_data" : [
-        {
           "name" : "port_num",
           "bitwidth" : 9
         }
@@ -1930,69 +1947,77 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_vlan_output",
-      "id" : 25,
-      "runtime_data" : [
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        },
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing_simple",
+      "name" : "FabricIngress.next.set_next_id_xconnect",
+      "id" : 24,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 99,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.output_hashed",
+      "id" : 25,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 31,
+            "column" : 5,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.routing_hashed",
       "id" : 26,
       "runtime_data" : [
         {
@@ -2023,7 +2048,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2061,15 +2086,15 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v4_simple",
+      "name" : "FabricIngress.next.mpls_routing_hashed",
       "id" : 27,
       "runtime_data" : [
         {
@@ -2095,6 +2120,25 @@
           "parameters" : [
             {
               "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
               "value" : ["ethernet", "src_addr"]
             },
             {
@@ -2104,7 +2148,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 37,
+            "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2142,879 +2186,19 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
+            "line" : 31,
+            "column" : 5,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v6_simple",
+      "name" : "FabricIngress.next.set_mcast_group_id",
       "id" : 28,
       "runtime_data" : [
         {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.l3_routing_vlan",
-      "id" : 29,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "new_vlan_id",
-          "bitwidth" : 12
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "vlan_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 90,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 85,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.l3_routing_hashed",
-      "id" : 30,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v4_hashed",
-      "id" : 31,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v6_hashed",
-      "id" : 32,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 41,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 149,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 100,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 48,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 49,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 50,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 123,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.set_mcast_group",
-      "id" : 33,
-      "runtime_data" : [
-        {
-          "name" : "gid",
+          "name" : "group_id",
           "bitwidth" : 16
         }
       ],
@@ -3033,9 +2217,9 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 202,
+            "line" : 208,
             "column" : 8,
-            "source_fragment" : "standard_metadata.mcast_grp = gid"
+            "source_fragment" : "standard_metadata.mcast_grp = group_id"
           }
         },
         {
@@ -3062,7 +2246,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 203,
+            "line" : 209,
             "column" : 8,
             "source_fragment" : "fabric_metadata.is_multicast = true"
           }
@@ -3071,7 +2255,7 @@
     },
     {
       "name" : "act",
-      "id" : 34,
+      "id" : 29,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3088,7 +2272,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 26,
+            "line" : 25,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
           }
@@ -3103,7 +2287,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 27,
+            "line" : 26,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.setInvalid()"
           }
@@ -3132,7 +2316,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 28,
+            "line" : 27,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
           }
@@ -3141,7 +2325,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 35,
+      "id" : 30,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3149,29 +2333,82 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 103,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 104,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 106,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+          }
         }
       ]
     },
     {
       "name" : "act_1",
-      "id" : 36,
+      "id" : 31,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3179,29 +2416,25 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "filtering_tmp_0"]
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
             },
             {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
+              "type" : "hexstr",
+              "value" : "0x41"
             }
-          ]
+          ],
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 113,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+          }
         }
       ]
     },
     {
       "name" : "act_2",
-      "id" : 37,
+      "id" : 32,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3209,354 +2442,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x07"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 119,
-            "column" : 31,
-            "source_fragment" : "7; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_3",
-      "id" : 38,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x0800"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 102,
-            "column" : 31,
-            "source_fragment" : "0x0800; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_4",
-      "id" : 39,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_5",
-      "id" : 40,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_6",
-      "id" : 41,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_4"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_7",
-      "id" : 42,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_8",
-      "id" : 43,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_3"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_9",
-      "id" : 44,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_10",
-      "id" : 45,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_tmp_2"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : false
-                  }
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "name" : "act_11",
-      "id" : 46,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "next_hasReturned_0"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "b2d",
-                  "left" : null,
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 223,
-            "column" : 20,
-            "source_fragment" : "return"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_12",
-      "id" : 47,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ipv4", "ttl"]
-            },
-            {
-              "type" : "expression",
-              "value" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "&",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "+",
-                      "left" : {
-                        "type" : "field",
-                        "value" : ["ipv4", "ttl"]
-                      },
-                      "right" : {
-                        "type" : "hexstr",
-                        "value" : "0xff"
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "hexstr",
-                    "value" : "0xff"
-                  }
-                }
-              }
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 230,
-            "column" : 16,
-            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "act_13",
-      "id" : 48,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp"]
             },
             {
               "type" : "expression",
@@ -3578,7 +2464,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 38,
             "source_fragment" : "(bit<32>)standard_metadata.egress_spec"
           }
@@ -3592,12 +2478,12 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "tmp_0"]
+              "value" : ["scalars", "tmp"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 28,
+            "line" : 31,
             "column" : 12,
             "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
           }
@@ -3605,8 +2491,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 49,
+      "name" : "act_3",
+      "id" : 33,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3636,7 +2522,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 39,
             "source_fragment" : "(bit<32>)standard_metadata.ingress_port"
           }
@@ -3655,7 +2541,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 31,
+            "line" : 34,
             "column" : 12,
             "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
           }
@@ -3663,92 +2549,38 @@
       ]
     },
     {
-      "name" : "NoAction",
-      "id" : 50,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 51,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 52,
+      "name" : "nop",
+      "id" : 34,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 53,
+      "id" : 35,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "nop",
-      "id" : 54,
+      "id" : 36,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 55,
+      "name" : "NoAction",
+      "id" : 37,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
     },
     {
-      "name" : "drop_now",
-      "id" : 56,
+      "name" : "NoAction",
+      "id" : 38,
       "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 24,
-            "column" : 4,
-            "source_fragment" : "mark_to_drop()"
-          }
-        },
-        {
-          "op" : "exit",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/../action.p4",
-            "line" : 25,
-            "column" : 4,
-            "source_fragment" : "exit"
-          }
-        }
-      ]
+      "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_source.int_source_dscp",
-      "id" : 57,
+      "id" : 39,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -3778,7 +2610,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 31,
+            "line" : 32,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.setValid()"
           }
@@ -3797,7 +2629,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 33,
+            "line" : 34,
             "column" : 8,
             "source_fragment" : "hdr.intl4_shim.int_type = 1"
           }
@@ -3816,7 +2648,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 139,
+            "line" : 147,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -3831,7 +2663,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 36,
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.int_header.setValid()"
           }
@@ -3850,7 +2682,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 37,
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ver = 0"
           }
@@ -3869,7 +2701,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 38,
+            "line" : 39,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rep = 0"
           }
@@ -3888,7 +2720,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 39,
+            "line" : 40,
             "column" : 8,
             "source_fragment" : "hdr.int_header.c = 0"
           }
@@ -3907,7 +2739,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_header.e = 0"
           }
@@ -3926,7 +2758,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_header.rsvd1 = 0"
           }
@@ -3945,7 +2777,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 42,
+            "line" : 43,
             "column" : 8,
             "source_fragment" : "hdr.int_header.ins_cnt = ins_cnt; ..."
           }
@@ -3964,7 +2796,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 43,
+            "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.int_header.max_hop_cnt = max_hop; ..."
           }
@@ -3983,7 +2815,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 44,
+            "line" : 45,
             "column" : 8,
             "source_fragment" : "hdr.int_header.total_hop_cnt = 0"
           }
@@ -4002,7 +2834,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 45,
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0003 = ins_mask0003; ..."
           }
@@ -4021,7 +2853,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 46,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0407 = ins_mask0407; ..."
           }
@@ -4040,7 +2872,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 47,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_0811 = 0"
           }
@@ -4059,7 +2891,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 48,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_header.instruction_mask_1215 = 0"
           }
@@ -4074,7 +2906,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 50,
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.setValid()"
           }
@@ -4093,7 +2925,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 51,
+            "line" : 52,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.next_proto = hdr.ipv4.protocol"
           }
@@ -4107,14 +2939,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+              "value" : ["scalars", "fabric_metadata_t.l4_dport"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 52,
+            "line" : 53,
             "column" : 8,
-            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dst_port"
+            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport"
           }
         },
         {
@@ -4131,7 +2963,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 53,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.intl4_tail.dscp = hdr.ipv4.dscp"
           }
@@ -4173,7 +3005,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 55,
+            "line" : 56,
             "column" : 8,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + INT_HEADER_LEN_BYTES"
           }
@@ -4215,7 +3047,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 56,
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "hdr.udp.len = hdr.udp.len + INT_HEADER_LEN_BYTES"
           }
@@ -4234,7 +3066,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 135,
+            "line" : 143,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -4243,7 +3075,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.init_metadata",
-      "id" : 58,
+      "id" : 40,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -4303,13 +3135,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0",
-      "id" : 59,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1",
-      "id" : 60,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4322,7 +3154,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -4341,7 +3173,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -4373,7 +3205,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -4415,7 +3247,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -4457,7 +3289,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -4466,7 +3298,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2",
-      "id" : 61,
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4479,7 +3311,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -4498,7 +3330,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -4540,7 +3372,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -4582,7 +3414,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -4591,7 +3423,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3",
-      "id" : 62,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4604,7 +3436,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -4623,7 +3455,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -4655,7 +3487,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -4670,7 +3502,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -4689,7 +3521,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -4731,7 +3563,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -4773,7 +3605,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -4782,7 +3614,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4",
-      "id" : 63,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4795,7 +3627,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -4827,7 +3659,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -4859,7 +3691,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -4901,7 +3733,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -4943,7 +3775,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -4952,7 +3784,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5",
-      "id" : 64,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4965,7 +3797,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -4984,7 +3816,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -5016,7 +3848,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -5031,7 +3863,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -5063,7 +3895,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -5095,7 +3927,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -5137,7 +3969,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -5179,7 +4011,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -5188,7 +4020,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6",
-      "id" : 65,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5201,7 +4033,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -5220,7 +4052,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -5235,7 +4067,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -5267,7 +4099,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -5299,7 +4131,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -5341,7 +4173,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -5383,7 +4215,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -5392,7 +4224,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7",
-      "id" : 66,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5405,7 +4237,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -5424,7 +4256,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -5456,7 +4288,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -5471,7 +4303,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -5490,7 +4322,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -5505,7 +4337,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -5537,7 +4369,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -5569,7 +4401,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -5611,7 +4443,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -5653,7 +4485,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -5662,7 +4494,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8",
-      "id" : 67,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5675,7 +4507,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -5694,7 +4526,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -5736,7 +4568,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -5778,7 +4610,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -5787,7 +4619,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9",
-      "id" : 68,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5800,7 +4632,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -5819,7 +4651,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -5851,7 +4683,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -5866,7 +4698,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -5885,7 +4717,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -5927,7 +4759,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -5969,7 +4801,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -5978,7 +4810,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10",
-      "id" : 69,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5991,7 +4823,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6010,7 +4842,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6025,7 +4857,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -6044,7 +4876,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -6086,7 +4918,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -6128,7 +4960,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -6137,7 +4969,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11",
-      "id" : 70,
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6150,7 +4982,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6169,7 +5001,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6201,7 +5033,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -6216,7 +5048,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6235,7 +5067,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6250,7 +5082,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -6269,7 +5101,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -6311,7 +5143,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -6353,7 +5185,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -6362,7 +5194,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12",
-      "id" : 71,
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6375,7 +5207,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6407,7 +5239,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -6439,7 +5271,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -6454,7 +5286,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -6473,7 +5305,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -6515,7 +5347,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -6557,7 +5389,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -6566,7 +5398,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13",
-      "id" : 72,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6579,7 +5411,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -6598,7 +5430,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -6630,7 +5462,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -6645,7 +5477,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6677,7 +5509,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -6709,7 +5541,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -6724,7 +5556,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -6743,7 +5575,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -6785,7 +5617,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -6827,7 +5659,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -6836,7 +5668,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14",
-      "id" : 73,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6849,7 +5681,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -6868,7 +5700,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -6883,7 +5715,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -6915,7 +5747,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -6947,7 +5779,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -6962,7 +5794,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -6981,7 +5813,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7023,7 +5855,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -7065,7 +5897,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -7074,7 +5906,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15",
-      "id" : 74,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7087,7 +5919,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 56,
+            "line" : 60,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.setValid()"
           }
@@ -7106,7 +5938,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 58,
+            "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_id = 8w0"
           }
@@ -7138,7 +5970,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 59,
+            "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.int_q_occupancy.q_occupancy = (bit<24>) smeta.deq_qdepth"
           }
@@ -7153,7 +5985,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 51,
+            "line" : 54,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.setValid()"
           }
@@ -7172,7 +6004,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 52,
+            "line" : 55,
             "column" : 8,
             "source_fragment" : "hdr.int_hop_latency.hop_latency = (bit<32>) smeta.deq_timedelta"
           }
@@ -7187,7 +6019,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 45,
+            "line" : 47,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.setValid()"
           }
@@ -7219,7 +6051,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 46,
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.ingress_port_id = (bit<16>) smeta.ingress_port"
           }
@@ -7251,7 +6083,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 47,
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.int_port_ids.egress_port_id = (bit<16>) smeta.egress_port"
           }
@@ -7266,7 +6098,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 40,
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.setValid()"
           }
@@ -7285,7 +6117,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 41,
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
           }
@@ -7327,7 +6159,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 115,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
           }
@@ -7369,7 +6201,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 116,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
           }
@@ -7378,13 +6210,13 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0",
-      "id" : 75,
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1",
-      "id" : 76,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7397,7 +6229,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -7416,7 +6248,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -7458,7 +6290,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -7500,7 +6332,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -7509,7 +6341,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2",
-      "id" : 77,
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7522,7 +6354,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -7541,7 +6373,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -7560,7 +6392,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -7602,7 +6434,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -7644,7 +6476,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -7653,7 +6485,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3",
-      "id" : 78,
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7666,7 +6498,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -7685,7 +6517,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -7700,7 +6532,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -7719,7 +6551,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -7738,7 +6570,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -7780,7 +6612,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -7822,7 +6654,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -7831,7 +6663,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4",
-      "id" : 79,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7844,7 +6676,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -7886,7 +6718,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -7928,7 +6760,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -7970,7 +6802,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -7979,7 +6811,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5",
-      "id" : 80,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7992,7 +6824,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -8011,7 +6843,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -8026,7 +6858,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -8068,7 +6900,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -8110,7 +6942,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8152,7 +6984,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8161,7 +6993,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6",
-      "id" : 81,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8174,7 +7006,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -8193,7 +7025,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -8212,7 +7044,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -8227,7 +7059,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -8269,7 +7101,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -8311,7 +7143,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8353,7 +7185,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8362,7 +7194,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7",
-      "id" : 82,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8375,7 +7207,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -8394,7 +7226,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -8409,7 +7241,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -8428,7 +7260,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -8447,7 +7279,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -8462,7 +7294,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -8504,7 +7336,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -8546,7 +7378,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -8588,7 +7420,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -8597,7 +7429,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8",
-      "id" : 83,
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8610,7 +7442,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -8629,7 +7461,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -8671,7 +7503,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 88,
+            "line" : 97,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
           }
@@ -8713,7 +7545,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 89,
+            "line" : 98,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
           }
@@ -8722,7 +7554,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9",
-      "id" : 84,
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8735,7 +7567,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -8754,7 +7586,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -8769,7 +7601,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -8788,7 +7620,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -8830,7 +7662,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -8872,7 +7704,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -8881,7 +7713,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10",
-      "id" : 85,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8894,7 +7726,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -8913,7 +7745,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -8932,7 +7764,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -8947,7 +7779,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -8966,7 +7798,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -9008,7 +7840,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -9050,7 +7882,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -9059,7 +7891,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11",
-      "id" : 86,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9072,7 +7904,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9091,7 +7923,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9106,7 +7938,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9125,7 +7957,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9144,7 +7976,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9159,7 +7991,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -9178,7 +8010,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -9220,7 +8052,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -9262,7 +8094,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -9271,7 +8103,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12",
-      "id" : 87,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9284,7 +8116,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9326,7 +8158,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -9341,7 +8173,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -9360,7 +8192,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -9402,7 +8234,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 93,
+            "line" : 103,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
           }
@@ -9444,7 +8276,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 94,
+            "line" : 104,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
           }
@@ -9453,7 +8285,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13",
-      "id" : 88,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9466,7 +8298,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9485,7 +8317,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9500,7 +8332,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9542,7 +8374,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -9557,7 +8389,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -9576,7 +8408,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -9618,7 +8450,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -9660,7 +8492,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -9669,7 +8501,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14",
-      "id" : 89,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9682,7 +8514,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9701,7 +8533,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9720,7 +8552,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -9735,7 +8567,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -9777,7 +8609,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -9792,7 +8624,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -9811,7 +8643,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -9853,7 +8685,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 98,
+            "line" : 109,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
           }
@@ -9895,7 +8727,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 99,
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
           }
@@ -9904,7 +8736,7 @@
     },
     {
       "name" : "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15",
-      "id" : 90,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9917,7 +8749,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 80,
+            "line" : 88,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.setValid()"
           }
@@ -9936,7 +8768,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 82,
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tx_util.egress_port_tx_util = 32w0"
           }
@@ -9951,7 +8783,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 73,
+            "line" : 80,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.setValid()"
           }
@@ -9970,7 +8802,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 75,
+            "line" : 82,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_id = 8w0"
           }
@@ -9989,7 +8821,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 76,
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "hdr.int_q_congestion.q_congestion = 24w0"
           }
@@ -10004,7 +8836,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 68,
+            "line" : 74,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.setValid()"
           }
@@ -10046,7 +8878,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 69,
+            "line" : 75,
             "column" : 8,
             "source_fragment" : "hdr.int_egress_tstamp.egress_tstamp = (bit<32>) smeta.enq_timestamp + (bit<32>) smeta.deq_timedelta"
           }
@@ -10061,7 +8893,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 63,
+            "line" : 68,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.setValid()"
           }
@@ -10080,7 +8912,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 64,
+            "line" : 69,
             "column" : 8,
             "source_fragment" : "hdr.int_ingress_tstamp.ingress_tstamp = (bit<32>) smeta.enq_timestamp"
           }
@@ -10122,7 +8954,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 103,
+            "line" : 115,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
           }
@@ -10164,7 +8996,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 104,
+            "line" : 116,
             "column" : 8,
             "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
           }
@@ -10172,68 +9004,302 @@
       ]
     },
     {
-      "name" : "FabricEgress.pkt_io_egress.pop_vlan",
-      "id" : 91,
+      "name" : "FabricEgress.egress_next.pop_mpls_if_present",
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 40,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
-          }
-        },
-        {
           "op" : "remove_header",
           "parameters" : [
             {
               "type" : "header",
-              "value" : "vlan_tag"
+              "value" : "mpls"
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 41,
+            "filename" : "include/control/next.p4",
+            "line" : 246,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setInvalid()"
+            "source_fragment" : "hdr.mpls.setInvalid()"
           }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 92,
-      "runtime_data" : [],
-      "primitives" : [
+        },
         {
           "op" : "assign",
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["ethernet", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
             },
             {
               "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
+              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 248,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.set_mpls",
+      "id" : 74,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 253,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
+            "source_fragment" : "hdr.mpls.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "label"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 254,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "tc"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 255,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.tc = 3w0"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "bos"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 256,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.bos = 1w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 257,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 108,
+            "column" : 31,
+            "source_fragment" : "0x8847; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.push_vlan",
+      "id" : 75,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 265,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "cfi"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 266,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "pri"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 267,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 268,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "vlan_id"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 269,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8100"
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/../define.p4",
+            "line" : 107,
+            "column" : 31,
+            "source_fragment" : "0x8100; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.pop_vlan",
+      "id" : 76,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "eth_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 280,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
           }
         },
         {
@@ -10246,7 +9312,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 254,
+            "line" : 281,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -10254,8 +9320,25 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 93,
+      "name" : "act_4",
+      "id" : 77,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_5",
+      "id" : 78,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10268,7 +9351,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 57,
+            "line" : 49,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
           }
@@ -10287,7 +9370,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 58,
+            "line" : 50,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
           }
@@ -10295,8 +9378,25 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 94,
+      "name" : "act_6",
+      "id" : 79,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 301,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_7",
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10304,7 +9404,37 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+              "value" : ["scalars", "egress_next_tmp"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : true
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_8",
+      "id" : 81,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "egress_next_tmp"]
             },
             {
               "type" : "expression",
@@ -10325,8 +9455,25 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 95,
+      "name" : "act_9",
+      "id" : 82,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_10",
+      "id" : 83,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10334,7 +9481,152 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["mpls", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 319,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_11",
+      "id" : 84,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "drop",
+          "parameters" : [],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_12",
+      "id" : 85,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ipv4", "ttl"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv4", "ttl"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 323,
+            "column" : 16,
+            "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_13",
+      "id" : 86,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "b2d",
+                  "left" : null,
+                  "right" : {
+                    "type" : "bool",
+                    "value" : false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name" : "act_14",
+      "id" : 87,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
             },
             {
               "type" : "expression",
@@ -10353,7 +9645,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 376,
+            "line" : 420,
             "column" : 12,
             "source_fragment" : "return"
           }
@@ -10361,8 +9653,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 96,
+      "name" : "act_15",
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10402,7 +9694,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 384,
+            "line" : 428,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.total_len = hdr.ipv4.total_len + fmeta.int_meta.new_bytes"
           }
@@ -10410,8 +9702,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 97,
+      "name" : "act_16",
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10451,7 +9743,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 381,
+            "line" : 425,
             "column" : 8,
             "source_fragment" : "hdr.int_header.total_hop_cnt = hdr.int_header.total_hop_cnt + 1"
           }
@@ -10459,8 +9751,8 @@
       ]
     },
     {
-      "name" : "act_20",
-      "id" : 98,
+      "name" : "act_17",
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10500,7 +9792,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 387,
+            "line" : 431,
             "column" : 12,
             "source_fragment" : "hdr.udp.len = hdr.udp.len + fmeta.int_meta.new_bytes"
           }
@@ -10508,8 +9800,8 @@
       ]
     },
     {
-      "name" : "act_21",
-      "id" : 99,
+      "name" : "act_18",
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10549,7 +9841,7 @@
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 390,
+            "line" : 434,
             "column" : 12,
             "source_fragment" : "hdr.intl4_shim.len_words = hdr.intl4_shim.len_words + fmeta.int_meta.new_words"
           }
@@ -10563,7 +9855,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 40,
+        "line" : 41,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -10579,14 +9871,60 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [34],
+          "action_ids" : [29],
           "actions" : ["act"],
           "base_default_next" : null,
           "next_tables" : {
             "act" : null
           },
           "default_entry" : {
-            "action_id" : 34,
+            "action_id" : 29,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_0",
+          "id" : 1,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [30],
+          "actions" : ["act_0"],
+          "base_default_next" : "node_6",
+          "next_tables" : {
+            "act_0" : "node_6"
+          },
+          "default_entry" : {
+            "action_id" : 30,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_1",
+          "id" : 2,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [31],
+          "actions" : ["act_1"],
+          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "next_tables" : {
+            "act_1" : "FabricIngress.filtering.ingress_port_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 31,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -10594,29 +9932,29 @@
         },
         {
           "name" : "FabricIngress.filtering.ingress_port_vlan",
-          "id" : 1,
+          "id" : 3,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 66,
+            "line" : 51,
             "column" : 10,
             "source_fragment" : "ingress_port_vlan"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.is_valid",
+              "name" : "vlan_is_valid",
               "target" : ["vlan_tag", "$valid$"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
+              "name" : "vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             }
@@ -10627,61 +9965,16 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [11, 10, 9, 12],
-          "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "FabricIngress.filtering.drop", "FabricIngress.filtering.nop_ingress_port_vlan"],
-          "base_default_next" : null,
+          "action_ids" : [9, 10, 11],
+          "actions" : ["FabricIngress.filtering.deny", "FabricIngress.filtering.permit", "FabricIngress.filtering.permit_with_internal_vlan"],
+          "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
-            "__HIT__" : "tbl_act_0",
-            "__MISS__" : "tbl_act_1"
+            "FabricIngress.filtering.deny" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.permit_with_internal_vlan" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 11,
-            "action_const" : true,
-            "action_data" : ["0xffe"],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_0",
-          "id" : 2,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [35],
-          "actions" : ["act_0"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_0" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 35,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_1",
-          "id" : 3,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [36],
-          "actions" : ["act_1"],
-          "base_default_next" : "node_7",
-          "next_tables" : {
-            "act_1" : "node_7"
-          },
-          "default_entry" : {
-            "action_id" : 36,
+            "action_id" : 9,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -10692,27 +9985,27 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 103,
+            "line" : 86,
             "column" : 10,
             "source_fragment" : "fwd_classifier"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
               "mask" : null
             }
           ],
@@ -10722,61 +10015,38 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13],
+          "action_ids" : [12],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "FabricIngress.filtering.set_forwarding_type" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 13,
+            "action_id" : 12,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_2",
-          "id" : 5,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [37],
-          "actions" : ["act_2"],
-          "base_default_next" : "node_10",
-          "next_tables" : {
-            "act_2" : "node_10"
-          },
-          "default_entry" : {
-            "action_id" : 37,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.forwarding.bridging",
-          "id" : 6,
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 41,
+            "line" : 43,
             "column" : 10,
             "source_fragment" : "bridging"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             }
@@ -10787,34 +10057,34 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14, 1],
-          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [13, 1],
+          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 1,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricIngress.forwarding.mpls",
-          "id" : 7,
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 65,
+            "line" : 67,
             "column" : 10,
             "source_fragment" : "mpls"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.mpls.label",
-              "target" : ["mpls", "label"],
+              "name" : "mpls_label",
+              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
               "mask" : null
             }
           ],
@@ -10824,38 +10094,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [15, 2],
-          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
-          "base_default_next" : "tbl_act_3",
+          "action_ids" : [14, 2],
+          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_3",
-            "NoAction" : "tbl_act_3"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 2,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_3",
-          "id" : 8,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [38],
-          "actions" : ["act_3"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
-          "next_tables" : {
-            "act_3" : "FabricIngress.forwarding.acl"
-          },
-          "default_entry" : {
-            "action_id" : 38,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -10863,17 +10110,17 @@
         },
         {
           "name" : "FabricIngress.forwarding.routing_v4",
-          "id" : 9,
+          "id" : 7,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 91,
+            "line" : 93,
             "column" : 10,
             "source_fragment" : "routing_v4"
           },
           "key" : [
             {
               "match_type" : "lpm",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -10884,100 +10131,100 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [16, 17, 3],
-          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
+          "action_ids" : [15, 16, 3],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "FabricIngress.forwarding.nop_routing_v4", "nop"],
+          "base_default_next" : "FabricIngress.acl.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
-            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.acl.acl",
+            "FabricIngress.forwarding.nop_routing_v4" : "FabricIngress.acl.acl",
+            "nop" : "FabricIngress.acl.acl"
           },
           "default_entry" : {
             "action_id" : 3,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.forwarding.acl",
-          "id" : 10,
+          "name" : "FabricIngress.acl.acl",
+          "id" : 8,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 136,
+            "filename" : "include/control/acl.p4",
+            "line" : 60,
             "column" : 10,
             "source_fragment" : "acl"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.ip_proto",
+              "name" : "ip_proto",
               "target" : ["scalars", "fabric_metadata_t.ip_proto"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.dst_addr",
+              "name" : "eth_src",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ethernet.src_addr",
+              "name" : "eth_dst",
               "target" : ["ethernet", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.vlan_id",
+              "name" : "vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.vlan_tag.ether_type",
-              "target" : ["vlan_tag", "ether_type"],
+              "name" : "eth_type",
+              "target" : ["scalars", "fabric_metadata_t.eth_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_type",
+              "name" : "icmp_type",
               "target" : ["icmp", "icmp_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.icmp.icmp_code",
+              "name" : "icmp_code",
               "target" : ["icmp", "icmp_code"],
               "mask" : null
             }
@@ -10988,26 +10235,178 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [18, 19, 20, 21, 22],
-          "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "FabricIngress.forwarding.nop_acl"],
-          "base_default_next" : "tbl_act_4",
+          "action_ids" : [17, 18, 19, 20, 21],
+          "actions" : ["FabricIngress.acl.set_next_id_acl", "FabricIngress.acl.punt_to_cpu", "FabricIngress.acl.clone_to_cpu", "FabricIngress.acl.drop", "FabricIngress.acl.nop_acl"],
+          "base_default_next" : "node_18",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_acl" : "tbl_act_4",
-            "FabricIngress.forwarding.punt_to_cpu" : "tbl_act_4",
-            "FabricIngress.forwarding.clone_to_cpu" : "tbl_act_4",
-            "FabricIngress.forwarding.drop" : "tbl_act_4",
-            "FabricIngress.forwarding.nop_acl" : "tbl_act_4"
+            "FabricIngress.acl.set_next_id_acl" : "node_18",
+            "FabricIngress.acl.punt_to_cpu" : "node_18",
+            "FabricIngress.acl.clone_to_cpu" : "node_18",
+            "FabricIngress.acl.drop" : "node_18",
+            "FabricIngress.acl.nop_acl" : "node_18"
           },
           "default_entry" : {
-            "action_id" : 22,
+            "action_id" : 21,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_4",
+          "name" : "FabricIngress.next.xconnect",
+          "id" : 9,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 103,
+            "column" : 10,
+            "source_fragment" : "xconnect"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "ig_port",
+              "target" : ["standard_metadata", "ingress_port"],
+              "mask" : null
+            },
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [23, 24, 5],
+          "actions" : ["FabricIngress.next.output_xconnect", "FabricIngress.next.set_next_id_xconnect", "nop"],
+          "base_default_next" : "FabricIngress.next.hashed",
+          "next_tables" : {
+            "FabricIngress.next.output_xconnect" : "FabricIngress.next.hashed",
+            "FabricIngress.next.set_next_id_xconnect" : "FabricIngress.next.hashed",
+            "nop" : "FabricIngress.next.hashed"
+          },
+          "default_entry" : {
+            "action_id" : 5,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.hashed",
+          "id" : 10,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 180,
+            "column" : 10,
+            "source_fragment" : "hashed"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "indirect_ws",
+          "action_profile" : "FabricIngress.next.hashed_selector",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [25, 26, 27, 6],
+          "actions" : ["FabricIngress.next.output_hashed", "FabricIngress.next.routing_hashed", "FabricIngress.next.mpls_routing_hashed", "nop"],
+          "base_default_next" : "FabricIngress.next.multicast",
+          "next_tables" : {
+            "FabricIngress.next.output_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.routing_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.mpls_routing_hashed" : "FabricIngress.next.multicast",
+            "nop" : "FabricIngress.next.multicast"
+          }
+        },
+        {
+          "name" : "FabricIngress.next.multicast",
           "id" : 11,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 213,
+            "column" : 10,
+            "source_fragment" : "multicast"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [28, 7],
+          "actions" : ["FabricIngress.next.set_mcast_group_id", "nop"],
+          "base_default_next" : "FabricIngress.next.next_vlan",
+          "next_tables" : {
+            "FabricIngress.next.set_mcast_group_id" : "FabricIngress.next.next_vlan",
+            "nop" : "FabricIngress.next.next_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 7,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.next_vlan",
+          "id" : 12,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 74,
+            "column" : 10,
+            "source_fragment" : "next_vlan"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [22, 4],
+          "actions" : ["FabricIngress.next.set_vlan", "nop"],
+          "base_default_next" : "node_23",
+          "next_tables" : {
+            "FabricIngress.next.set_vlan" : "node_23",
+            "nop" : "node_23"
+          },
+          "default_entry" : {
+            "action_id" : 4,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_2",
+          "id" : 13,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11015,95 +10414,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39],
-          "actions" : ["act_4"],
-          "base_default_next" : "FabricIngress.next.vlan_meta",
+          "action_ids" : [32],
+          "actions" : ["act_2"],
+          "base_default_next" : "node_25",
           "next_tables" : {
-            "act_4" : "FabricIngress.next.vlan_meta"
+            "act_2" : "node_25"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 32,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.next.vlan_meta",
-          "id" : 12,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 65,
-            "column" : 10,
-            "source_fragment" : "vlan_meta"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [23, 7],
-          "actions" : ["FabricIngress.next.set_vlan", "nop"],
-          "base_default_next" : "FabricIngress.next.simple",
-          "next_tables" : {
-            "FabricIngress.next.set_vlan" : "FabricIngress.next.simple",
-            "nop" : "FabricIngress.next.simple"
-          },
-          "default_entry" : {
-            "action_id" : 7,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "FabricIngress.next.simple",
-          "id" : 13,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 122,
-            "column" : 10,
-            "source_fragment" : "simple"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [24, 25, 26, 27, 28, 29, 4],
-          "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing_simple", "FabricIngress.next.mpls_routing_v4_simple", "FabricIngress.next.mpls_routing_v6_simple", "FabricIngress.next.l3_routing_vlan", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_5",
-            "__MISS__" : "tbl_act_6"
-          },
-          "default_entry" : {
-            "action_id" : 4,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_5",
+          "name" : "tbl_act_3",
           "id" : 14,
           "key" : [],
           "match_type" : "exact",
@@ -11112,290 +10437,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
-          "actions" : ["act_5"],
-          "base_default_next" : "node_23",
-          "next_tables" : {
-            "act_5" : "node_23"
-          },
-          "default_entry" : {
-            "action_id" : 40,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_6",
-          "id" : 15,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [41],
-          "actions" : ["act_6"],
-          "base_default_next" : "node_23",
-          "next_tables" : {
-            "act_6" : "node_23"
-          },
-          "default_entry" : {
-            "action_id" : 41,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.hashed",
-          "id" : 16,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 175,
-            "column" : 10,
-            "source_fragment" : "hashed"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "indirect_ws",
-          "action_profile" : "FabricIngress.next.ecmp_selector",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [30, 31, 32, 5],
-          "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_7",
-            "__MISS__" : "tbl_act_8"
-          }
-        },
-        {
-          "name" : "tbl_act_7",
-          "id" : 17,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [42],
-          "actions" : ["act_7"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_7" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 42,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_8",
-          "id" : 18,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [43],
-          "actions" : ["act_8"],
-          "base_default_next" : "node_27",
-          "next_tables" : {
-            "act_8" : "node_27"
-          },
-          "default_entry" : {
-            "action_id" : 43,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "FabricIngress.next.multicast",
-          "id" : 19,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 207,
-            "column" : 10,
-            "source_fragment" : "multicast"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "fabric_metadata.next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [33, 6],
-          "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
-          "base_default_next" : null,
-          "next_tables" : {
-            "__HIT__" : "tbl_act_9",
-            "__MISS__" : "tbl_act_10"
-          },
-          "default_entry" : {
-            "action_id" : 6,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "tbl_act_9",
-          "id" : 20,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_9"],
-          "base_default_next" : "node_31",
-          "next_tables" : {
-            "act_9" : "node_31"
-          },
-          "default_entry" : {
-            "action_id" : 44,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_10",
-          "id" : 21,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_10"],
-          "base_default_next" : "node_31",
-          "next_tables" : {
-            "act_10" : "node_31"
-          },
-          "default_entry" : {
-            "action_id" : 45,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_11",
-          "id" : 22,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [46],
-          "actions" : ["act_11"],
-          "base_default_next" : "node_33",
-          "next_tables" : {
-            "act_11" : "node_33"
-          },
-          "default_entry" : {
-            "action_id" : 46,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_12",
-          "id" : 23,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [47],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_37",
-          "next_tables" : {
-            "act_12" : "node_37"
-          },
-          "default_entry" : {
-            "action_id" : 47,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_13",
-          "id" : 24,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [48],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_39",
-          "next_tables" : {
-            "act_13" : "node_39"
-          },
-          "default_entry" : {
-            "action_id" : 48,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_14",
-          "id" : 25,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [49],
-          "actions" : ["act_14"],
+          "action_ids" : [33],
+          "actions" : ["act_3"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_14" : "FabricIngress.process_set_source_sink.tb_set_source"
+            "act_3" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 33,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11403,7 +10452,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 26,
+          "id" : 15,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 46,
@@ -11413,7 +10462,7 @@
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.ingress_port",
+              "name" : "ig_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             }
@@ -11425,29 +10474,29 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [8, 0],
-          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"],
+          "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "nop"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricIngress.process_set_source_sink.int_set_source" : null,
-            "NoAction" : null
+            "nop" : null
           },
           "default_entry" : {
             "action_id" : 0,
-            "action_const" : false,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         }
       ],
       "action_profiles" : [
         {
-          "name" : "FabricIngress.next.ecmp_selector",
+          "name" : "FabricIngress.next.hashed_selector",
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 145,
+            "line" : 161,
             "column" : 55,
-            "source_fragment" : "ecmp_selector"
+            "source_fragment" : "hashed_selector"
           },
           "max_size" : 64,
           "selector" : {
@@ -11467,11 +10516,11 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_src_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dst_port"]
+                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
               }
             ]
           }
@@ -11483,7 +10532,7 @@
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 25,
+            "line" : 24,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.isValid()"
           },
@@ -11499,11 +10548,17 @@
             }
           },
           "true_next" : "tbl_act",
-          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
+          "false_next" : "node_4"
         },
         {
-          "name" : "node_7",
+          "name" : "node_4",
           "id" : 1,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 102,
+            "column" : 12,
+            "source_fragment" : "hdr.vlan_tag.isValid()"
+          },
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -11511,20 +10566,83 @@
               "left" : null,
               "right" : {
                 "type" : "field",
-                "value" : ["scalars", "filtering_tmp_0"]
+                "value" : ["vlan_tag", "$valid$"]
               }
             }
           },
-          "true_next" : "FabricIngress.filtering.fwd_classifier",
-          "false_next" : "tbl_act_2"
+          "true_next" : "tbl_act_0",
+          "false_next" : "node_6"
+        },
+        {
+          "name" : "node_6",
+          "id" : 2,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 108,
+            "column" : 12,
+            "source_fragment" : "!hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["mpls", "$valid$"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "tbl_act_1",
+          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
           "name" : "node_10",
-          "id" : 2,
+          "id" : 3,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 66,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_forwarding == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "true_next" : "node_11",
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_11",
+          "id" : 4,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 191,
-            "column" : 11,
+            "line" : 131,
+            "column" : 12,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
           "expression" : {
@@ -11542,14 +10660,14 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.bridging",
-          "false_next" : "node_12"
+          "false_next" : "node_13"
         },
         {
-          "name" : "node_12",
-          "id" : 3,
+          "name" : "node_13",
+          "id" : 5,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 192,
+            "line" : 132,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -11572,10 +10690,10 @@
         },
         {
           "name" : "node_15",
-          "id" : 4,
+          "id" : 6,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 198,
+            "line" : 133,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -11594,181 +10712,47 @@
             }
           },
           "true_next" : "FabricIngress.forwarding.routing_v4",
-          "false_next" : "FabricIngress.forwarding.acl"
+          "false_next" : "FabricIngress.acl.acl"
+        },
+        {
+          "name" : "node_18",
+          "id" : 7,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 70,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.skip_next == false"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                  }
+                }
+              },
+              "right" : {
+                "type" : "bool",
+                "value" : false
+              }
+            }
+          },
+          "false_next" : null,
+          "true_next" : "FabricIngress.next.xconnect"
         },
         {
           "name" : "node_23",
-          "id" : 5,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 219,
-            "column" : 12,
-            "source_fragment" : "!simple.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_4"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.hashed",
-          "false_next" : "node_33"
-        },
-        {
-          "name" : "node_27",
-          "id" : 6,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 220,
-            "column" : 16,
-            "source_fragment" : "!hashed.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_3"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "FabricIngress.next.multicast",
-          "false_next" : "node_33"
-        },
-        {
-          "name" : "node_31",
-          "id" : 7,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 221,
-            "column" : 20,
-            "source_fragment" : "!multicast.apply().hit"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_tmp_2"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_act_11",
-          "false_next" : "node_33"
-        },
-        {
-          "name" : "node_33",
           "id" : 8,
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["scalars", "next_hasReturned_0"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_34",
-          "false_next" : "node_37"
-        },
-        {
-          "name" : "node_34",
-          "id" : 9,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 228,
-            "column" : 12,
-            "source_fragment" : "!hdr.mpls.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "not",
-              "left" : null,
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["mpls", "$valid$"]
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "node_35",
-          "false_next" : "node_37"
-        },
-        {
-          "name" : "node_35",
-          "id" : 10,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 229,
-            "column" : 15,
-            "source_fragment" : "hdr.ipv4.isValid()"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "d2b",
-              "left" : null,
-              "right" : {
-                "type" : "field",
-                "value" : ["ipv4", "$valid$"]
-              }
-            }
-          },
-          "true_next" : "tbl_act_12",
-          "false_next" : "node_37"
-        },
-        {
-          "name" : "node_37",
-          "id" : 11,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 27,
+            "line" : 30,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec < 511"
           },
@@ -11786,15 +10770,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_13",
-          "false_next" : "node_39"
+          "true_next" : "tbl_act_2",
+          "false_next" : "node_25"
         },
         {
-          "name" : "node_39",
-          "id" : 12,
+          "name" : "node_25",
+          "id" : 9,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
-            "line" : 30,
+            "line" : 33,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port < 511"
           },
@@ -11812,7 +10796,7 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
+          "true_next" : "tbl_act_3",
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         }
       ]
@@ -11822,15 +10806,15 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 80,
+        "line" : 84,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_44",
+      "init_table" : "node_30",
       "tables" : [
         {
-          "name" : "tbl_pkt_io_egress_pop_vlan",
-          "id" : 27,
+          "name" : "tbl_act_4",
+          "id" : 16,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11838,22 +10822,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [91],
-          "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
-          "base_default_next" : "node_48",
+          "action_ids" : [77],
+          "actions" : ["act_4"],
+          "base_default_next" : "tbl_act_5",
           "next_tables" : {
-            "FabricEgress.pkt_io_egress.pop_vlan" : "node_48"
+            "act_4" : "tbl_act_5"
           },
           "default_entry" : {
-            "action_id" : 91,
+            "action_id" : 77,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now",
-          "id" : 28,
+          "name" : "tbl_act_5",
+          "id" : 17,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11861,45 +10845,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_15",
-          "next_tables" : {
-            "drop_now" : "tbl_act_15"
-          },
-          "default_entry" : {
-            "action_id" : 55,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_15",
-          "id" : 29,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [93],
-          "actions" : ["act_15"],
+          "action_ids" : [78],
+          "actions" : ["act_5"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_15" : null
+            "act_5" : null
           },
           "default_entry" : {
-            "action_id" : 93,
+            "action_id" : 78,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_0",
-          "id" : 30,
+          "name" : "tbl_act_6",
+          "id" : 18,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11907,14 +10868,60 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
-          "actions" : ["drop_now"],
-          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "action_ids" : [79],
+          "actions" : ["act_6"],
+          "base_default_next" : "node_37",
           "next_tables" : {
-            "drop_now" : "FabricEgress.egress_next.egress_vlan"
+            "act_6" : "node_37"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 79,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_pop_mpls_if_present",
+          "id" : 19,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [73],
+          "actions" : ["FabricEgress.egress_next.pop_mpls_if_present"],
+          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "next_tables" : {
+            "FabricEgress.egress_next.pop_mpls_if_present" : "FabricEgress.egress_next.egress_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 73,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_set_mpls",
+          "id" : 20,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [74],
+          "actions" : ["FabricEgress.egress_next.set_mpls"],
+          "base_default_next" : "FabricEgress.egress_next.egress_vlan",
+          "next_tables" : {
+            "FabricEgress.egress_next.set_mpls" : "FabricEgress.egress_next.egress_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 74,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11922,23 +10929,23 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 31,
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 258,
+            "line" : 285,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
+              "name" : "vlan_id",
+              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "exact",
-              "name" : "standard_metadata.egress_port",
+              "name" : "eg_port",
               "target" : ["standard_metadata", "egress_port"],
               "mask" : null
             }
@@ -11949,52 +10956,213 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [92, 54],
+          "action_ids" : [76, 36],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
-          "base_default_next" : "node_54",
+          "base_default_next" : null,
           "next_tables" : {
-            "FabricEgress.egress_next.pop_vlan" : "node_54",
-            "nop" : "node_54"
+            "__HIT__" : "tbl_act_7",
+            "__MISS__" : "tbl_act_8"
           },
           "default_entry" : {
-            "action_id" : 54,
-            "action_const" : false,
+            "action_id" : 36,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_7",
+          "id" : 22,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [80],
+          "actions" : ["act_7"],
+          "base_default_next" : "node_44",
+          "next_tables" : {
+            "act_7" : "node_44"
+          },
+          "default_entry" : {
+            "action_id" : 80,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_8",
+          "id" : 23,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [81],
+          "actions" : ["act_8"],
+          "base_default_next" : "node_44",
+          "next_tables" : {
+            "act_8" : "node_44"
+          },
+          "default_entry" : {
+            "action_id" : 81,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_egress_next_push_vlan",
+          "id" : 24,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [75],
+          "actions" : ["FabricEgress.egress_next.push_vlan"],
+          "base_default_next" : "node_47",
+          "next_tables" : {
+            "FabricEgress.egress_next.push_vlan" : "node_47"
+          },
+          "default_entry" : {
+            "action_id" : 75,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_9",
+          "id" : 25,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [83],
+          "actions" : ["act_10"],
+          "base_default_next" : "node_49",
+          "next_tables" : {
+            "act_10" : "node_49"
+          },
+          "default_entry" : {
+            "action_id" : 83,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_10",
+          "id" : 26,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [82],
+          "actions" : ["act_9"],
+          "base_default_next" : "node_55",
+          "next_tables" : {
+            "act_9" : "node_55"
+          },
+          "default_entry" : {
+            "action_id" : 82,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_11",
+          "id" : 27,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [85],
+          "actions" : ["act_12"],
+          "base_default_next" : "node_53",
+          "next_tables" : {
+            "act_12" : "node_53"
+          },
+          "default_entry" : {
+            "action_id" : 85,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_12",
+          "id" : 28,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [84],
+          "actions" : ["act_11"],
+          "base_default_next" : "node_55",
+          "next_tables" : {
+            "act_11" : "node_55"
+          },
+          "default_entry" : {
+            "action_id" : 84,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
           }
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "id" : 32,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_source.p4",
-            "line" : 65,
+            "line" : 66,
             "column" : 10,
             "source_fragment" : "tb_int_source"
           },
           "key" : [
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.src_addr",
+              "name" : "ipv4_src",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "hdr.ipv4.dst_addr",
+              "name" : "ipv4_dst",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_src_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
+              "name" : "l4_sport",
+              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
-              "name" : "fabric_metadata.l4_dst_port",
-              "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
+              "name" : "l4_dport",
+              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
               "mask" : null
             }
           ],
@@ -12004,23 +11172,23 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57, 50],
-          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "NoAction"],
-          "base_default_next" : "node_57",
+          "action_ids" : [39, 34],
+          "actions" : ["FabricEgress.process_int_main.process_int_source.int_source_dscp", "nop"],
+          "base_default_next" : "node_58",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_57",
-            "NoAction" : "node_57"
+            "FabricEgress.process_int_main.process_int_source.int_source_dscp" : "node_58",
+            "nop" : "node_58"
           },
           "default_entry" : {
-            "action_id" : 50,
-            "action_const" : false,
+            "action_id" : 34,
+            "action_const" : true,
             "action_data" : [],
-            "action_entry_const" : false
+            "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
-          "id" : 33,
+          "name" : "tbl_act_13",
+          "id" : 30,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12028,14 +11196,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [94],
-          "actions" : ["act_16"],
+          "action_ids" : [86],
+          "actions" : ["act_13"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
           "next_tables" : {
-            "act_16" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
+            "act_13" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert"
           },
           "default_entry" : {
-            "action_id" : 94,
+            "action_id" : 86,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12043,17 +11211,17 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_insert",
-          "id" : 34,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 271,
+            "line" : 315,
             "column" : 10,
             "source_fragment" : "tb_int_insert"
           },
           "key" : [
             {
               "match_type" : "exact",
-              "name" : "hdr.int_header.is_valid",
+              "name" : "int_is_valid",
               "target" : ["int_header", "$valid$"],
               "mask" : null
             }
@@ -12064,23 +11232,23 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58, 53],
+          "action_ids" : [40, 35],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.init_metadata", "nop"],
-          "base_default_next" : "node_60",
+          "base_default_next" : "node_61",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_60",
-            "nop" : "node_60"
+            "FabricEgress.process_int_main.process_int_transit.init_metadata" : "node_61",
+            "nop" : "node_61"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 35,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
-          "id" : 35,
+          "name" : "tbl_act_14",
+          "id" : 32,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12088,14 +11256,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [95],
-          "actions" : ["act_17"],
-          "base_default_next" : "node_62",
+          "action_ids" : [87],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_63",
           "next_tables" : {
-            "act_17" : "node_62"
+            "act_14" : "node_63"
           },
           "default_entry" : {
-            "action_id" : 95,
+            "action_id" : 87,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12103,10 +11271,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003",
-          "id" : 36,
+          "id" : 33,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 286,
+            "line" : 331,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0003"
           },
@@ -12124,7 +11292,7 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 51],
+          "action_ids" : [41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 37],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -12147,7 +11315,7 @@
             "NoAction" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 37,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -12156,7 +11324,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 310,
+                "line" : 354,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0003_i0()"
               },
@@ -12167,7 +11335,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 59,
+                "action_id" : 41,
                 "action_data" : []
               },
               "priority" : 1
@@ -12175,7 +11343,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 311,
+                "line" : 355,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0003_i1()"
               },
@@ -12186,7 +11354,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 60,
+                "action_id" : 42,
                 "action_data" : []
               },
               "priority" : 2
@@ -12194,7 +11362,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 312,
+                "line" : 356,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0003_i2()"
               },
@@ -12205,7 +11373,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 61,
+                "action_id" : 43,
                 "action_data" : []
               },
               "priority" : 3
@@ -12213,7 +11381,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 313,
+                "line" : 357,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0003_i3()"
               },
@@ -12224,7 +11392,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 62,
+                "action_id" : 44,
                 "action_data" : []
               },
               "priority" : 4
@@ -12232,7 +11400,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 314,
+                "line" : 358,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0003_i4()"
               },
@@ -12243,7 +11411,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 63,
+                "action_id" : 45,
                 "action_data" : []
               },
               "priority" : 5
@@ -12251,7 +11419,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 315,
+                "line" : 359,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0003_i5()"
               },
@@ -12262,7 +11430,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 64,
+                "action_id" : 46,
                 "action_data" : []
               },
               "priority" : 6
@@ -12270,7 +11438,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 316,
+                "line" : 360,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0003_i6()"
               },
@@ -12281,7 +11449,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 65,
+                "action_id" : 47,
                 "action_data" : []
               },
               "priority" : 7
@@ -12289,7 +11457,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 317,
+                "line" : 361,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0003_i7()"
               },
@@ -12300,7 +11468,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 66,
+                "action_id" : 48,
                 "action_data" : []
               },
               "priority" : 8
@@ -12308,7 +11476,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 318,
+                "line" : 362,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0003_i8()"
               },
@@ -12319,7 +11487,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 67,
+                "action_id" : 49,
                 "action_data" : []
               },
               "priority" : 9
@@ -12327,7 +11495,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 319,
+                "line" : 363,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0003_i9()"
               },
@@ -12338,7 +11506,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 68,
+                "action_id" : 50,
                 "action_data" : []
               },
               "priority" : 10
@@ -12346,7 +11514,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 320,
+                "line" : 364,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0003_i10()"
               },
@@ -12357,7 +11525,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 69,
+                "action_id" : 51,
                 "action_data" : []
               },
               "priority" : 11
@@ -12365,7 +11533,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 321,
+                "line" : 365,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0003_i11()"
               },
@@ -12376,7 +11544,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 70,
+                "action_id" : 52,
                 "action_data" : []
               },
               "priority" : 12
@@ -12384,7 +11552,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 322,
+                "line" : 366,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0003_i12()"
               },
@@ -12395,7 +11563,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 71,
+                "action_id" : 53,
                 "action_data" : []
               },
               "priority" : 13
@@ -12403,7 +11571,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 323,
+                "line" : 367,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0003_i13()"
               },
@@ -12414,7 +11582,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 72,
+                "action_id" : 54,
                 "action_data" : []
               },
               "priority" : 14
@@ -12422,7 +11590,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 324,
+                "line" : 368,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0003_i14()"
               },
@@ -12433,7 +11601,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 73,
+                "action_id" : 55,
                 "action_data" : []
               },
               "priority" : 15
@@ -12441,7 +11609,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 325,
+                "line" : 369,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0003_i15()"
               },
@@ -12452,7 +11620,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 74,
+                "action_id" : 56,
                 "action_data" : []
               },
               "priority" : 16
@@ -12461,10 +11629,10 @@
         },
         {
           "name" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0407",
-          "id" : 37,
+          "id" : 34,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 330,
+            "line" : 375,
             "column" : 10,
             "source_fragment" : "tb_int_inst_0407"
           },
@@ -12482,30 +11650,30 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 52],
+          "action_ids" : [57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 38],
           "actions" : ["FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15", "NoAction"],
-          "base_default_next" : "tbl_act_18",
+          "base_default_next" : "tbl_act_15",
           "next_tables" : {
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_18",
-            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_18",
-            "NoAction" : "tbl_act_18"
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i0" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i1" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i2" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i3" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i4" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i5" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i6" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i7" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i8" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i9" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i10" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i11" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i12" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i13" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i14" : "tbl_act_15",
+            "FabricEgress.process_int_main.process_int_transit.int_set_header_0407_i15" : "tbl_act_15",
+            "NoAction" : "tbl_act_15"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 38,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -12514,7 +11682,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 354,
+                "line" : 398,
                 "column" : 12,
                 "source_fragment" : "(0x0) : int_set_header_0407_i0()"
               },
@@ -12525,7 +11693,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 75,
+                "action_id" : 57,
                 "action_data" : []
               },
               "priority" : 1
@@ -12533,7 +11701,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 355,
+                "line" : 399,
                 "column" : 12,
                 "source_fragment" : "(0x1) : int_set_header_0407_i1()"
               },
@@ -12544,7 +11712,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 76,
+                "action_id" : 58,
                 "action_data" : []
               },
               "priority" : 2
@@ -12552,7 +11720,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 356,
+                "line" : 400,
                 "column" : 12,
                 "source_fragment" : "(0x2) : int_set_header_0407_i2()"
               },
@@ -12563,7 +11731,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 77,
+                "action_id" : 59,
                 "action_data" : []
               },
               "priority" : 3
@@ -12571,7 +11739,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 357,
+                "line" : 401,
                 "column" : 12,
                 "source_fragment" : "(0x3) : int_set_header_0407_i3()"
               },
@@ -12582,7 +11750,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 78,
+                "action_id" : 60,
                 "action_data" : []
               },
               "priority" : 4
@@ -12590,7 +11758,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 358,
+                "line" : 402,
                 "column" : 12,
                 "source_fragment" : "(0x4) : int_set_header_0407_i4()"
               },
@@ -12601,7 +11769,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 79,
+                "action_id" : 61,
                 "action_data" : []
               },
               "priority" : 5
@@ -12609,7 +11777,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 359,
+                "line" : 403,
                 "column" : 12,
                 "source_fragment" : "(0x5) : int_set_header_0407_i5()"
               },
@@ -12620,7 +11788,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 80,
+                "action_id" : 62,
                 "action_data" : []
               },
               "priority" : 6
@@ -12628,7 +11796,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 360,
+                "line" : 404,
                 "column" : 12,
                 "source_fragment" : "(0x6) : int_set_header_0407_i6()"
               },
@@ -12639,7 +11807,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 81,
+                "action_id" : 63,
                 "action_data" : []
               },
               "priority" : 7
@@ -12647,7 +11815,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 361,
+                "line" : 405,
                 "column" : 12,
                 "source_fragment" : "(0x7) : int_set_header_0407_i7()"
               },
@@ -12658,7 +11826,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 82,
+                "action_id" : 64,
                 "action_data" : []
               },
               "priority" : 8
@@ -12666,7 +11834,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 362,
+                "line" : 406,
                 "column" : 12,
                 "source_fragment" : "(0x8) : int_set_header_0407_i8()"
               },
@@ -12677,7 +11845,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 83,
+                "action_id" : 65,
                 "action_data" : []
               },
               "priority" : 9
@@ -12685,7 +11853,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 363,
+                "line" : 407,
                 "column" : 12,
                 "source_fragment" : "(0x9) : int_set_header_0407_i9()"
               },
@@ -12696,7 +11864,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 84,
+                "action_id" : 66,
                 "action_data" : []
               },
               "priority" : 10
@@ -12704,7 +11872,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 364,
+                "line" : 408,
                 "column" : 12,
                 "source_fragment" : "(0xA) : int_set_header_0407_i10()"
               },
@@ -12715,7 +11883,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 85,
+                "action_id" : 67,
                 "action_data" : []
               },
               "priority" : 11
@@ -12723,7 +11891,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 365,
+                "line" : 409,
                 "column" : 12,
                 "source_fragment" : "(0xB) : int_set_header_0407_i11()"
               },
@@ -12734,7 +11902,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 86,
+                "action_id" : 68,
                 "action_data" : []
               },
               "priority" : 12
@@ -12742,7 +11910,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 366,
+                "line" : 410,
                 "column" : 12,
                 "source_fragment" : "(0xC) : int_set_header_0407_i12()"
               },
@@ -12753,7 +11921,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 87,
+                "action_id" : 69,
                 "action_data" : []
               },
               "priority" : 13
@@ -12761,7 +11929,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 367,
+                "line" : 411,
                 "column" : 12,
                 "source_fragment" : "(0xD) : int_set_header_0407_i13()"
               },
@@ -12772,7 +11940,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 88,
+                "action_id" : 70,
                 "action_data" : []
               },
               "priority" : 14
@@ -12780,7 +11948,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 368,
+                "line" : 412,
                 "column" : 12,
                 "source_fragment" : "(0xE) : int_set_header_0407_i14()"
               },
@@ -12791,7 +11959,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 89,
+                "action_id" : 71,
                 "action_data" : []
               },
               "priority" : 15
@@ -12799,7 +11967,7 @@
             {
               "source_info" : {
                 "filename" : "include/int/int_transit.p4",
-                "line" : 369,
+                "line" : 413,
                 "column" : 12,
                 "source_fragment" : "(0xF) : int_set_header_0407_i15()"
               },
@@ -12810,7 +11978,7 @@
                 }
               ],
               "action_entry" : {
-                "action_id" : 90,
+                "action_id" : 72,
                 "action_data" : []
               },
               "priority" : 16
@@ -12818,6 +11986,75 @@
           ]
         },
         {
+          "name" : "tbl_act_15",
+          "id" : 35,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [89],
+          "actions" : ["act_16"],
+          "base_default_next" : "node_67",
+          "next_tables" : {
+            "act_16" : "node_67"
+          },
+          "default_entry" : {
+            "action_id" : 89,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_16",
+          "id" : 36,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [88],
+          "actions" : ["act_15"],
+          "base_default_next" : "node_69",
+          "next_tables" : {
+            "act_15" : "node_69"
+          },
+          "default_entry" : {
+            "action_id" : 88,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 37,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [90],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_71",
+          "next_tables" : {
+            "act_17" : "node_71"
+          },
+          "default_entry" : {
+            "action_id" : 90,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
           "name" : "tbl_act_18",
           "id" : 38,
           "key" : [],
@@ -12827,83 +12064,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [97],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_66",
-          "next_tables" : {
-            "act_19" : "node_66"
-          },
-          "default_entry" : {
-            "action_id" : 97,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_19",
-          "id" : 39,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [96],
+          "action_ids" : [91],
           "actions" : ["act_18"],
-          "base_default_next" : "node_68",
-          "next_tables" : {
-            "act_18" : "node_68"
-          },
-          "default_entry" : {
-            "action_id" : 96,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_20",
-          "id" : 40,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [98],
-          "actions" : ["act_20"],
-          "base_default_next" : "node_70",
-          "next_tables" : {
-            "act_20" : "node_70"
-          },
-          "default_entry" : {
-            "action_id" : 98,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_21",
-          "id" : 41,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [99],
-          "actions" : ["act_21"],
           "base_default_next" : null,
           "next_tables" : {
-            "act_21" : null
+            "act_18" : null
           },
           "default_entry" : {
-            "action_id" : 99,
+            "action_id" : 91,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12913,11 +12081,11 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_44",
-          "id" : 13,
+          "name" : "node_30",
+          "id" : 10,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 44,
+            "line" : 39,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_controller_packet_out == true"
           },
@@ -12943,14 +12111,14 @@
             }
           },
           "true_next" : null,
-          "false_next" : "node_45"
+          "false_next" : "node_31"
         },
         {
-          "name" : "node_45",
-          "id" : 14,
+          "name" : "node_31",
+          "id" : 11,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 48,
+            "line" : 43,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_port == 255"
           },
@@ -12968,65 +12136,15 @@
               }
             }
           },
-          "true_next" : "node_46",
-          "false_next" : "node_51"
+          "true_next" : "node_32",
+          "false_next" : "node_35"
         },
         {
-          "name" : "node_46",
-          "id" : 15,
+          "name" : "node_32",
+          "id" : 12,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
-            "line" : 49,
-            "column" : 16,
-            "source_fragment" : "hdr.vlan_tag.isValid() && fabric_metadata.pop_vlan_when_packet_in == true"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "and",
-              "left" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "d2b",
-                  "left" : null,
-                  "right" : {
-                    "type" : "field",
-                    "value" : ["vlan_tag", "$valid$"]
-                  }
-                }
-              },
-              "right" : {
-                "type" : "expression",
-                "value" : {
-                  "op" : "==",
-                  "left" : {
-                    "type" : "expression",
-                    "value" : {
-                      "op" : "d2b",
-                      "left" : null,
-                      "right" : {
-                        "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.pop_vlan_when_packet_in"]
-                      }
-                    }
-                  },
-                  "right" : {
-                    "type" : "bool",
-                    "value" : true
-                  }
-                }
-              }
-            }
-          },
-          "true_next" : "tbl_pkt_io_egress_pop_vlan",
-          "false_next" : "node_48"
-        },
-        {
-          "name" : "node_48",
-          "id" : 16,
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 52,
+            "line" : 44,
             "column" : 16,
             "source_fragment" : "fabric_metadata.is_multicast == true && ..."
           },
@@ -13078,15 +12196,15 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now",
-          "false_next" : "tbl_act_15"
+          "true_next" : "tbl_act_4",
+          "false_next" : "tbl_act_5"
         },
         {
-          "name" : "node_51",
-          "id" : 17,
+          "name" : "node_35",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 272,
+            "line" : 299,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -13131,15 +12249,218 @@
               }
             }
           },
-          "true_next" : "tbl_drop_now_0",
+          "true_next" : "tbl_act_6",
+          "false_next" : "node_37"
+        },
+        {
+          "name" : "node_37",
+          "id" : 14,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 304,
+            "column" : 12,
+            "source_fragment" : "fabric_metadata.mpls_label == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x000000"
+              }
+            }
+          },
+          "true_next" : "node_38",
+          "false_next" : "tbl_egress_next_set_mpls"
+        },
+        {
+          "name" : "node_38",
+          "id" : 15,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 305,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_pop_mpls_if_present",
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_54",
+          "name" : "node_44",
+          "id" : 16,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 310,
+            "column" : 12,
+            "source_fragment" : "!egress_vlan.apply().hit"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "not",
+              "left" : null,
+              "right" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "d2b",
+                  "left" : null,
+                  "right" : {
+                    "type" : "field",
+                    "value" : ["scalars", "egress_next_tmp"]
+                  }
+                }
+              }
+            }
+          },
+          "true_next" : "node_45",
+          "false_next" : "node_47"
+        },
+        {
+          "name" : "node_45",
+          "id" : 17,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 16,
+            "source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "!=",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x0ffe"
+              }
+            }
+          },
+          "true_next" : "tbl_egress_next_push_vlan",
+          "false_next" : "node_47"
+        },
+        {
+          "name" : "node_47",
           "id" : 18,
           "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 318,
+            "column" : 12,
+            "source_fragment" : "hdr.mpls.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["mpls", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_9",
+          "false_next" : "node_51"
+        },
+        {
+          "name" : "node_49",
+          "id" : 19,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "hdr.mpls.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["mpls", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_10",
+          "false_next" : "node_55"
+        },
+        {
+          "name" : "node_51",
+          "id" : 20,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 322,
+            "column" : 15,
+            "source_fragment" : "hdr.ipv4.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv4", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_11",
+          "false_next" : "node_55"
+        },
+        {
+          "name" : "node_53",
+          "id" : 21,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 324,
+            "column" : 20,
+            "source_fragment" : "hdr.ipv4.ttl == 0"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["ipv4", "ttl"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x00"
+              }
+            }
+          },
+          "true_next" : "tbl_act_12",
+          "false_next" : "node_55"
+        },
+        {
+          "name" : "node_55",
+          "id" : 22,
+          "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 98,
+            "line" : 102,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port != 255 && ..."
           },
@@ -13212,14 +12533,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_55"
+          "true_next" : "node_56"
         },
         {
-          "name" : "node_55",
-          "id" : 19,
+          "name" : "node_56",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 102,
+            "line" : 106,
             "column" : 16,
             "source_fragment" : "fabric_metadata.int_meta.source == true"
           },
@@ -13245,14 +12566,14 @@
             }
           },
           "true_next" : "FabricEgress.process_int_main.process_int_source.tb_int_source",
-          "false_next" : "node_57"
+          "false_next" : "node_58"
         },
         {
-          "name" : "node_57",
-          "id" : 20,
+          "name" : "node_58",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/int/int_main.p4",
-            "line" : 106,
+            "line" : 110,
             "column" : 15,
             "source_fragment" : "hdr.int_header.isValid()"
           },
@@ -13268,14 +12589,14 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_16"
+          "true_next" : "tbl_act_13"
         },
         {
-          "name" : "node_60",
-          "id" : 21,
+          "name" : "node_61",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 375,
+            "line" : 419,
             "column" : 12,
             "source_fragment" : "fmeta.int_meta.transit == false"
           },
@@ -13300,12 +12621,12 @@
               }
             }
           },
-          "true_next" : "tbl_act_17",
-          "false_next" : "node_62"
+          "true_next" : "tbl_act_14",
+          "false_next" : "node_63"
         },
         {
-          "name" : "node_62",
-          "id" : 22,
+          "name" : "node_63",
+          "id" : 26,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -13318,7 +12639,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned_0"]
+                    "value" : ["scalars", "process_int_main_process_int_transit_hasReturned"]
                   }
                 }
               }
@@ -13328,11 +12649,11 @@
           "true_next" : "FabricEgress.process_int_main.process_int_transit.tb_int_inst_0003"
         },
         {
-          "name" : "node_66",
-          "id" : 23,
+          "name" : "node_67",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 383,
+            "line" : 427,
             "column" : 12,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -13347,15 +12668,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_19",
-          "false_next" : "node_68"
+          "true_next" : "tbl_act_16",
+          "false_next" : "node_69"
         },
         {
-          "name" : "node_68",
-          "id" : 24,
+          "name" : "node_69",
+          "id" : 28,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 386,
+            "line" : 430,
             "column" : 12,
             "source_fragment" : "hdr.udp.isValid()"
           },
@@ -13370,15 +12691,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_20",
-          "false_next" : "node_70"
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_71"
         },
         {
-          "name" : "node_70",
-          "id" : 25,
+          "name" : "node_71",
+          "id" : 29,
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
-            "line" : 389,
+            "line" : 433,
             "column" : 12,
             "source_fragment" : "hdr.intl4_shim.isValid()"
           },
@@ -13394,7 +12715,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_21"
+          "true_next" : "tbl_act_18"
         }
       ]
     }