Update install-p4-tools.sh to use P4Runtime v1.0

Includes also various improvements to the p4vm scripts, such as:
- Choose to build VM with Ubuntu 16.04 or 18.04 (experimental)
- Allow users to specify version of protobuf and grpc to use
- Avoid building protobuf and grpc if already installed in the system
- Install Bazel 0.22

Also:
- Remove check for invalid group member weights (now PI always returns
members with weight 1)
- Re-compiled all P4 programs and fixed missing padding in controller
packet headers

Change-Id: I0e672fcebbaba63354c749f0c774af251f3cbc6c
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index e77a652..b2ff159 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -16,24 +16,37 @@
         ["spgw_ingress_hasReturned", 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.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_sport", 16, false],
-        ["fabric_metadata_t.l4_dport", 16, false],
-        ["_padding_2", 4, false]
+        ["fabric_metadata_t._eth_type0", 16, false],
+        ["fabric_metadata_t._ip_eth_type1", 16, false],
+        ["fabric_metadata_t._vlan_id2", 12, false],
+        ["fabric_metadata_t._vlan_pri3", 3, false],
+        ["fabric_metadata_t._vlan_cfi4", 1, false],
+        ["fabric_metadata_t._mpls_label5", 20, false],
+        ["fabric_metadata_t._mpls_ttl6", 8, false],
+        ["fabric_metadata_t._skip_forwarding7", 1, false],
+        ["fabric_metadata_t._skip_next8", 1, false],
+        ["fabric_metadata_t._fwd_type9", 3, false],
+        ["fabric_metadata_t._next_id10", 32, false],
+        ["fabric_metadata_t._is_multicast11", 1, false],
+        ["fabric_metadata_t._is_controller_packet_out12", 1, false],
+        ["fabric_metadata_t._clone_to_cpu13", 1, false],
+        ["fabric_metadata_t._ip_proto14", 8, false],
+        ["fabric_metadata_t._l4_sport15", 16, false],
+        ["fabric_metadata_t._l4_dport16", 16, false],
+        ["fabric_metadata_t._spgw_direction17", 2, false],
+        ["fabric_metadata_t._spgw_ipv4_len18", 16, false],
+        ["fabric_metadata_t._spgw_teid19", 32, false],
+        ["fabric_metadata_t._spgw_s1u_enb_addr20", 32, false],
+        ["fabric_metadata_t._spgw_s1u_sgw_addr21", 32, false],
+        ["fabric_metadata_t._int_meta_source22", 1, false],
+        ["fabric_metadata_t._int_meta_transit23", 1, false],
+        ["fabric_metadata_t._int_meta_sink24", 1, false],
+        ["fabric_metadata_t._int_meta_switch_id25", 32, false],
+        ["fabric_metadata_t._int_meta_new_words26", 8, false],
+        ["fabric_metadata_t._int_meta_new_bytes27", 16, false],
+        ["fabric_metadata_t._int_meta_ig_tstamp28", 32, false],
+        ["fabric_metadata_t._int_meta_eg_tstamp29", 32, false],
+        ["_padding_0", 7, false]
       ]
     },
     {
@@ -316,33 +329,6 @@
         ["padding", 2, false],
         ["dscp", 6, false]
       ]
-    },
-    {
-      "name" : "spgw_meta_t",
-      "id" : 26,
-      "fields" : [
-        ["direction", 2, false],
-        ["ipv4_len", 16, false],
-        ["teid", 32, false],
-        ["s1u_enb_addr", 32, false],
-        ["s1u_sgw_addr", 32, false],
-        ["_padding_0", 6, false]
-      ]
-    },
-    {
-      "name" : "int_metadata_t",
-      "id" : 27,
-      "fields" : [
-        ["source", 1, 0],
-        ["transit", 1, 0],
-        ["sink", 1, 0],
-        ["switch_id", 32, false],
-        ["new_words", 8, false],
-        ["new_bytes", 16, false],
-        ["ig_tstamp", 32, false],
-        ["eg_tstamp", 32, false],
-        ["_padding_1", 5, false]
-      ]
     }
   ],
   "headers" : [
@@ -583,20 +569,6 @@
       "header_type" : "intl4_tail_t",
       "metadata" : false,
       "pi_omit" : true
-    },
-    {
-      "name" : "userMetadata.spgw",
-      "id" : 34,
-      "header_type" : "spgw_meta_t",
-      "metadata" : true,
-      "pi_omit" : true
-    },
-    {
-      "name" : "userMetadata.int_meta",
-      "id" : 35,
-      "header_type" : "int_metadata_t",
-      "metadata" : true,
-      "pi_omit" : true
     }
   ],
   "header_stacks" : [],
@@ -703,7 +675,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._eth_type0"]
                 },
                 {
                   "type" : "field",
@@ -716,7 +688,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                  "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
                 },
                 {
                   "type" : "hexstr",
@@ -879,7 +851,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
                 },
                 {
                   "type" : "field",
@@ -892,7 +864,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+                  "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
                 },
                 {
                   "type" : "field",
@@ -958,7 +930,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
                 },
                 {
                   "type" : "field",
@@ -971,7 +943,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
                 },
                 {
                   "type" : "hexstr",
@@ -1043,7 +1015,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
                 },
                 {
                   "type" : "field",
@@ -1056,7 +1028,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+                  "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
                 },
                 {
                   "type" : "hexstr",
@@ -1115,7 +1087,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -1128,7 +1100,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -1164,7 +1136,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -1177,7 +1149,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -1386,7 +1358,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
                 },
                 {
                   "type" : "field",
@@ -1399,7 +1371,7 @@
               "parameters" : [
                 {
                   "type" : "field",
-                  "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                  "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
                 },
                 {
                   "type" : "field",
@@ -2193,7 +2165,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "teid"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
             },
             {
               "type" : "runtime_data",
@@ -2203,8 +2175,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 63,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.teid = teid"
+            "column" : 30,
+            "source_fragment" : "= teid; ..."
           }
         },
         {
@@ -2212,7 +2184,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_enb_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
             },
             {
               "type" : "runtime_data",
@@ -2222,8 +2194,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 64,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.s1u_enb_addr = s1u_enb_addr"
+            "column" : 38,
+            "source_fragment" : "= s1u_enb_addr; ..."
           }
         },
         {
@@ -2231,7 +2203,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_sgw_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
             },
             {
               "type" : "runtime_data",
@@ -2241,8 +2213,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 65,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.s1u_sgw_addr = s1u_sgw_addr"
+            "column" : 38,
+            "source_fragment" : "= s1u_sgw_addr; ..."
           }
         }
       ]
@@ -2257,7 +2229,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "source"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_source22"]
             },
             {
               "type" : "expression",
@@ -2277,8 +2249,8 @@
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 42,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.int_meta.source = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2293,7 +2265,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "sink"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_sink24"]
             },
             {
               "type" : "expression",
@@ -2313,8 +2285,8 @@
           "source_info" : {
             "filename" : "include/int/int_main.p4",
             "line" : 63,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.int_meta.sink = true"
+            "column" : 38,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2329,7 +2301,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+              "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
             },
             {
               "type" : "expression",
@@ -2349,8 +2321,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 36,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_forwarding = true"
+            "column" : 40,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -2358,7 +2330,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -2378,8 +2350,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 37,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2405,7 +2377,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -2415,8 +2387,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 47,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -2436,7 +2408,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
             },
             {
               "type" : "runtime_data",
@@ -2446,8 +2418,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 82,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
+            "column" : 33,
+            "source_fragment" : "= fwd_type; ..."
           }
         }
       ]
@@ -2467,7 +2439,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2477,8 +2449,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2498,7 +2470,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "hexstr",
@@ -2508,8 +2480,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 62,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = 0"
+            "column" : 35,
+            "source_fragment" : "= 0; ..."
           }
         },
         {
@@ -2517,7 +2489,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2527,8 +2499,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2548,7 +2520,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2558,8 +2530,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2585,7 +2557,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2595,8 +2567,8 @@
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 30,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id; ..."
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2616,7 +2588,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2626,8 +2598,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 33,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -2661,7 +2633,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -2681,8 +2653,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 40,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2697,7 +2669,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+              "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
             },
             {
               "type" : "expression",
@@ -2717,8 +2689,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.clone_to_cpu = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2743,7 +2715,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.skip_next"]
+              "value" : ["scalars", "fabric_metadata_t._skip_next8"]
             },
             {
               "type" : "expression",
@@ -2763,8 +2735,8 @@
           "source_info" : {
             "filename" : "include/control/acl.p4",
             "line" : 52,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.skip_next = true"
+            "column" : 34,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -2790,7 +2762,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "runtime_data",
@@ -2800,8 +2772,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 70,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.vlan_id = vlan_id"
+            "column" : 32,
+            "source_fragment" : "= vlan_id; ..."
           }
         }
       ]
@@ -2852,7 +2824,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
+              "value" : ["scalars", "fabric_metadata_t._next_id10"]
             },
             {
               "type" : "runtime_data",
@@ -2862,8 +2834,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 99,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
+            "column" : 32,
+            "source_fragment" : "= next_id; ..."
           }
         }
       ]
@@ -3003,7 +2975,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "runtime_data",
@@ -3013,8 +2985,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+            "column" : 35,
+            "source_fragment" : "= label; ..."
           }
         },
         {
@@ -3211,7 +3183,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             },
             {
               "type" : "runtime_data",
@@ -3221,8 +3193,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 46,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.mpls_label = label; ..."
+            "column" : 35,
+            "source_fragment" : "= label; ..."
           }
         },
         {
@@ -3318,7 +3290,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+              "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
             },
             {
               "type" : "expression",
@@ -3338,8 +3310,8 @@
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 209,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.is_multicast = true"
+            "column" : 37,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -3596,7 +3568,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+              "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
             },
             {
               "type" : "expression",
@@ -3616,8 +3588,8 @@
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 27,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.is_controller_packet_out = true"
+            "column" : 53,
+            "source_fragment" : "= true; ..."
           }
         }
       ]
@@ -3632,7 +3604,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
@@ -3642,8 +3614,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 103,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.eth_type = hdr.vlan_tag.eth_type"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
           }
         },
         {
@@ -3651,7 +3623,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             },
             {
               "type" : "field",
@@ -3661,8 +3633,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 104,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_id = hdr.vlan_tag.vlan_id"
+            "column" : 36,
+            "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           }
         },
         {
@@ -3670,7 +3642,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             },
             {
               "type" : "field",
@@ -3680,8 +3652,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 105,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_pri = hdr.vlan_tag.pri"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.pri; ..."
           }
         },
         {
@@ -3689,7 +3661,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             },
             {
               "type" : "field",
@@ -3699,8 +3671,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 106,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.vlan_cfi = hdr.vlan_tag.cfi"
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.cfi; ..."
           }
         }
       ]
@@ -3715,7 +3687,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             },
             {
               "type" : "hexstr",
@@ -3725,8 +3697,8 @@
           "source_info" : {
             "filename" : "include/control/filtering.p4",
             "line" : 113,
-            "column" : 12,
-            "source_fragment" : "fabric_metadata.mpls_ttl = DEFAULT_MPLS_TTL + 1"
+            "column" : 37,
+            "source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
           }
         }
       ]
@@ -3818,7 +3790,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -3904,7 +3876,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -3930,7 +3902,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "direction"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
             },
             {
               "type" : "hexstr",
@@ -4015,7 +3987,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
             },
             {
               "type" : "field",
@@ -4025,8 +3997,8 @@
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 174,
-            "column" : 8,
-            "source_fragment" : "fabric_meta.spgw.ipv4_len = ipv4.total_len"
+            "column" : 34,
+            "source_fragment" : "= ipv4.total_len; ..."
           }
         }
       ]
@@ -4451,14 +4423,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_enb_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_enb_addr20"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 202,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr"
+            "source_fragment" : "gtpu_ipv4.dst_addr = fabric_meta.spgw.s1u_enb_addr; ..."
           }
         },
         {
@@ -4470,14 +4442,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "s1u_sgw_addr"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_s1u_sgw_addr21"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 203,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr"
+            "source_fragment" : "gtpu_ipv4.src_addr = fabric_meta.spgw.s1u_sgw_addr; ..."
           }
         },
         {
@@ -4571,7 +4543,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.spgw", "ipv4_len"]
+                        "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -4770,14 +4742,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "ipv4_len"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_ipv4_len18"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 221,
             "column" : 8,
-            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len"
+            "source_fragment" : "gtpu.msglen = fabric_meta.spgw.ipv4_len; ..."
           }
         },
         {
@@ -4789,14 +4761,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.spgw", "teid"]
+              "value" : ["scalars", "fabric_metadata_t._spgw_teid19"]
             }
           ],
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 222,
             "column" : 8,
-            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid"
+            "source_fragment" : "gtpu.teid = fabric_meta.spgw.teid; ..."
           }
         }
       ]
@@ -5162,14 +5134,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+              "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_source.p4",
             "line" : 53,
             "column" : 8,
-            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport"
+            "source_fragment" : "hdr.intl4_tail.dest_port = fabric_metadata.l4_dport; ..."
           }
         },
         {
@@ -5311,7 +5283,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "transit"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_transit23"]
             },
             {
               "type" : "expression",
@@ -5331,8 +5303,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 26,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.transit = true"
+            "column" : 31,
+            "source_fragment" : "= true; ..."
           }
         },
         {
@@ -5340,7 +5312,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             },
             {
               "type" : "runtime_data",
@@ -5350,8 +5322,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 31,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.switch_id = switch_id"
+            "column" : 33,
+            "source_fragment" : "= switch_id; ..."
           }
         }
       ]
@@ -5438,7 +5410,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5452,7 +5424,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5471,8 +5443,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -5480,7 +5452,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5494,7 +5466,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5513,8 +5485,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -5563,7 +5535,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5577,7 +5549,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5596,8 +5568,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -5605,7 +5577,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5619,7 +5591,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5638,8 +5610,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -5754,7 +5726,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5768,7 +5740,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5787,8 +5759,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -5796,7 +5768,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5810,7 +5782,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5829,8 +5801,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -5924,7 +5896,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -5938,7 +5910,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5957,8 +5929,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -5966,7 +5938,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -5980,7 +5952,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -5999,8 +5971,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6160,7 +6132,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6174,7 +6146,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6193,8 +6165,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6202,7 +6174,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6216,7 +6188,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6235,8 +6207,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -6364,7 +6336,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6378,7 +6350,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6397,8 +6369,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6406,7 +6378,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6420,7 +6392,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6439,8 +6411,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -6634,7 +6606,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6648,7 +6620,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6667,8 +6639,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -6676,7 +6648,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6690,7 +6662,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6709,8 +6681,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -6744,14 +6716,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -6759,7 +6731,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6773,7 +6745,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6792,8 +6764,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -6801,7 +6773,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -6815,7 +6787,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6834,8 +6806,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -6935,14 +6907,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -6950,7 +6922,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -6964,7 +6936,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -6983,8 +6955,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -6992,7 +6964,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7006,7 +6978,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7025,8 +6997,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7094,14 +7066,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -7109,7 +7081,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7123,7 +7095,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7142,8 +7114,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7151,7 +7123,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7165,7 +7137,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7184,8 +7156,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7319,14 +7291,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -7334,7 +7306,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7348,7 +7320,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7367,8 +7339,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -7376,7 +7348,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7390,7 +7362,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7409,8 +7381,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -7523,14 +7495,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -7538,7 +7510,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7552,7 +7524,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7571,8 +7543,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -7580,7 +7552,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7594,7 +7566,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7613,8 +7585,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -7793,14 +7765,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -7808,7 +7780,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -7822,7 +7794,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7841,8 +7813,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -7850,7 +7822,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -7864,7 +7836,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -7883,8 +7855,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -8031,14 +8003,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -8046,7 +8018,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8060,7 +8032,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8079,8 +8051,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -8088,7 +8060,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8102,7 +8074,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8121,8 +8093,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -8335,14 +8307,14 @@
             },
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "switch_id"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_switch_id25"]
             }
           ],
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 42,
             "column" : 8,
-            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id"
+            "source_fragment" : "hdr.int_switch_id.switch_id = fmeta.int_meta.switch_id; ..."
           }
         },
         {
@@ -8350,7 +8322,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8364,7 +8336,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8383,8 +8355,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 115,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -8392,7 +8364,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8406,7 +8378,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8425,8 +8397,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 116,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -8481,7 +8453,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8495,7 +8467,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8514,8 +8486,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -8523,7 +8495,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8537,7 +8509,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8556,8 +8528,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -8625,7 +8597,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8639,7 +8611,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8658,8 +8630,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -8667,7 +8639,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8681,7 +8653,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8700,8 +8672,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -8803,7 +8775,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8817,7 +8789,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8836,8 +8808,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -8845,7 +8817,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -8859,7 +8831,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8878,8 +8850,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -8951,7 +8923,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -8965,7 +8937,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -8984,8 +8956,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -8993,7 +8965,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9007,7 +8979,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9026,8 +8998,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -9133,7 +9105,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9147,7 +9119,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9166,8 +9138,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -9175,7 +9147,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9189,7 +9161,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9208,8 +9180,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -9334,7 +9306,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9348,7 +9320,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9367,8 +9339,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -9376,7 +9348,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9390,7 +9362,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9409,8 +9381,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -9569,7 +9541,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9583,7 +9555,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9602,8 +9574,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -9611,7 +9583,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9625,7 +9597,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9644,8 +9616,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -9694,7 +9666,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9708,7 +9680,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9727,8 +9699,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 97,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 1"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 1; ..."
           }
         },
         {
@@ -9736,7 +9708,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9750,7 +9722,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9769,8 +9741,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 98,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 4; ..."
           }
         }
       ]
@@ -9853,7 +9825,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -9867,7 +9839,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9886,8 +9858,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -9895,7 +9867,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -9909,7 +9881,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -9928,8 +9900,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -10031,7 +10003,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10045,7 +10017,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10064,8 +10036,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -10073,7 +10045,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10087,7 +10059,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10106,8 +10078,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -10243,7 +10215,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10257,7 +10229,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10276,8 +10248,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -10285,7 +10257,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10299,7 +10271,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10318,8 +10290,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -10425,7 +10397,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10439,7 +10411,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10458,8 +10430,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 103,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 2"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 2; ..."
           }
         },
         {
@@ -10467,7 +10439,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10481,7 +10453,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10500,8 +10472,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 104,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 8"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 8; ..."
           }
         }
       ]
@@ -10641,7 +10613,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10655,7 +10627,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10674,8 +10646,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -10683,7 +10655,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10697,7 +10669,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10716,8 +10688,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -10876,7 +10848,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -10890,7 +10862,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10909,8 +10881,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 109,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 3"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 3; ..."
           }
         },
         {
@@ -10918,7 +10890,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -10932,7 +10904,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -10951,8 +10923,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 110,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 12"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 12; ..."
           }
         }
       ]
@@ -11145,7 +11117,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_words"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
             },
             {
               "type" : "expression",
@@ -11159,7 +11131,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11178,8 +11150,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 115,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_words = fmeta.int_meta.new_words + 4"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_words + 4; ..."
           }
         },
         {
@@ -11187,7 +11159,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["userMetadata.int_meta", "new_bytes"]
+              "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
             },
             {
               "type" : "expression",
@@ -11201,7 +11173,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -11220,8 +11192,8 @@
           "source_info" : {
             "filename" : "include/int/int_transit.p4",
             "line" : 116,
-            "column" : 8,
-            "source_fragment" : "fmeta.int_meta.new_bytes = fmeta.int_meta.new_bytes + 16"
+            "column" : 33,
+            "source_fragment" : "= fmeta.int_meta.new_bytes + 16; ..."
           }
         }
       ]
@@ -12274,18 +12246,18 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.ip_eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._ip_eth_type1"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 248,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.eth_type = fabric_metadata.ip_eth_type"
+            "column" : 33,
+            "source_fragment" : "= fabric_metadata.ip_eth_type; ..."
           }
         }
       ]
@@ -12319,14 +12291,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 254,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label"
+            "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
           }
         },
         {
@@ -12376,14 +12348,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.mpls_ttl"]
+              "value" : ["scalars", "fabric_metadata_t._mpls_ttl6"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 257,
             "column" : 8,
-            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl"
+            "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push. ..."
           }
         },
         {
@@ -12391,7 +12363,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             },
             {
               "type" : "hexstr",
@@ -12436,14 +12408,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_cfi"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_cfi4"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 266,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi"
+            "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
           }
         },
         {
@@ -12455,14 +12427,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_pri"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_pri3"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 267,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri"
+            "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
           }
         },
         {
@@ -12474,14 +12446,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 268,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -12493,14 +12465,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+              "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 269,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id"
+            "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id; ..."
           }
         },
         {
@@ -12538,14 +12510,14 @@
             },
             {
               "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.eth_type"]
+              "value" : ["scalars", "fabric_metadata_t._eth_type0"]
             }
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 280,
             "column" : 8,
-            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type"
+            "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type; ..."
           }
         },
         {
@@ -12992,7 +12964,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       }
                     }
                   },
@@ -13090,7 +13062,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_bytes"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_bytes27"]
                       }
                     }
                   },
@@ -13139,7 +13111,7 @@
                       },
                       "right" : {
                         "type" : "field",
-                        "value" : ["userMetadata.int_meta", "new_words"]
+                        "value" : ["scalars", "fabric_metadata_t._int_meta_new_words26"]
                       }
                     }
                   },
@@ -13432,7 +13404,7 @@
             {
               "match_type" : "exact",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             }
           ],
@@ -13795,7 +13767,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -13838,7 +13810,7 @@
             {
               "match_type" : "exact",
               "name" : "mpls_label",
-              "target" : ["scalars", "fabric_metadata_t.mpls_label"],
+              "target" : ["scalars", "fabric_metadata_t._mpls_label5"],
               "mask" : null
             }
           ],
@@ -13956,19 +13928,19 @@
             {
               "match_type" : "ternary",
               "name" : "ip_proto",
-              "target" : ["scalars", "fabric_metadata_t.ip_proto"],
+              "target" : ["scalars", "fabric_metadata_t._ip_proto14"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
               "mask" : null
             },
             {
@@ -13992,7 +13964,7 @@
             {
               "match_type" : "ternary",
               "name" : "eth_type",
-              "target" : ["scalars", "fabric_metadata_t.eth_type"],
+              "target" : ["scalars", "fabric_metadata_t._eth_type0"],
               "mask" : null
             },
             {
@@ -14062,7 +14034,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -14100,7 +14072,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -14139,7 +14111,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -14173,7 +14145,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -14210,7 +14182,7 @@
             {
               "match_type" : "exact",
               "name" : "next_id",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "target" : ["scalars", "fabric_metadata_t._next_id10"],
               "mask" : null
             }
           ],
@@ -14402,15 +14374,15 @@
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                "value" : ["scalars", "fabric_metadata_t._ip_proto14"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_sport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_sport15"]
               },
               {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.l4_dport"]
+                "value" : ["scalars", "fabric_metadata_t._l4_dport16"]
               }
             ]
           }
@@ -14684,7 +14656,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_forwarding"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_forwarding7"]
                   }
                 }
               },
@@ -14712,7 +14684,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14738,7 +14710,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14764,7 +14736,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14790,7 +14762,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+                "value" : ["scalars", "fabric_metadata_t._fwd_type9"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -14821,7 +14793,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.skip_next"]
+                    "value" : ["scalars", "fabric_metadata_t._skip_next8"]
                   }
                 }
               },
@@ -14906,7 +14878,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "sink"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink24"]
                   }
                 }
               },
@@ -15060,7 +15032,7 @@
             {
               "match_type" : "exact",
               "name" : "vlan_id",
-              "target" : ["scalars", "fabric_metadata_t.vlan_id"],
+              "target" : ["scalars", "fabric_metadata_t._vlan_id2"],
               "mask" : null
             },
             {
@@ -15345,13 +15317,13 @@
             {
               "match_type" : "ternary",
               "name" : "l4_sport",
-              "target" : ["scalars", "fabric_metadata_t.l4_sport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_sport15"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
               "name" : "l4_dport",
-              "target" : ["scalars", "fabric_metadata_t.l4_dport"],
+              "target" : ["scalars", "fabric_metadata_t._l4_dport16"],
               "mask" : null
             }
           ],
@@ -16365,7 +16337,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["scalars", "fabric_metadata_t.is_controller_packet_out"]
+                    "value" : ["scalars", "fabric_metadata_t._is_controller_packet_out12"]
                   }
                 }
               },
@@ -16428,7 +16400,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -16449,7 +16421,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.clone_to_cpu"]
+                        "value" : ["scalars", "fabric_metadata_t._clone_to_cpu13"]
                       }
                     }
                   },
@@ -16488,7 +16460,7 @@
                       "left" : null,
                       "right" : {
                         "type" : "field",
-                        "value" : ["scalars", "fabric_metadata_t.is_multicast"]
+                        "value" : ["scalars", "fabric_metadata_t._is_multicast11"]
                       }
                     }
                   },
@@ -16532,7 +16504,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.mpls_label"]
+                "value" : ["scalars", "fabric_metadata_t._mpls_label5"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -16611,7 +16583,7 @@
               "op" : "!=",
               "left" : {
                 "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.vlan_id"]
+                "value" : ["scalars", "fabric_metadata_t._vlan_id2"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -16784,7 +16756,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["userMetadata.spgw", "direction"]
+                "value" : ["scalars", "fabric_metadata_t._spgw_direction17"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -16895,7 +16867,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "source"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_source22"]
                   }
                 }
               },
@@ -16951,7 +16923,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "transit"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_transit23"]
                   }
                 }
               },
@@ -17103,7 +17075,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["userMetadata.int_meta", "sink"]
+                    "value" : ["scalars", "fabric_metadata_t._int_meta_sink24"]
                   }
                 }
               },
@@ -17132,6 +17104,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -17156,6 +17130,8 @@
       "target" : ["gtpu_ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_0",
+      "verify" : false,
+      "update" : true,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -17180,6 +17156,8 @@
       "target" : ["ipv4", "hdr_checksum"],
       "type" : "generic",
       "calculation" : "calc_1",
+      "verify" : true,
+      "update" : false,
       "if_cond" : {
         "type" : "expression",
         "value" : {
@@ -17246,4 +17224,4 @@
     "version" : [2, 18],
     "compiler" : "https://github.com/p4lang/p4c"
   }
-}
\ No newline at end of file
+}