Support tofino build for P4_14 test programs
Also, modified programs such that both the P4_14 and P4_16 versions
produce the same forwarding behaviour and control API (i.e. P4Info)
Change-Id: I90b7fdfedff5f2a89e0f2295d32e2bb61cd0e0eb
diff --git a/tools/test/p4src/p4-16/p4c-out/default.json b/tools/test/p4src/p4-16/p4c-out/default.json
index c35cf25..33af4c7 100644
--- a/tools/test/p4src/p4-16/p4c-out/default.json
+++ b/tools/test/p4src/p4-16/p4c-out/default.json
@@ -2481,7 +2481,7 @@
]
},
{
- "name" : "drop",
+ "name" : "_drop",
"id" : 3,
"runtime_data" : [],
"primitives" : [
@@ -2500,7 +2500,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2519,7 +2519,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2538,7 +2538,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2557,7 +2557,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2576,7 +2576,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2595,7 +2595,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2614,7 +2614,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2633,7 +2633,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2652,7 +2652,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2671,7 +2671,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2690,7 +2690,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2709,7 +2709,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2728,7 +2728,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2747,7 +2747,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2766,7 +2766,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2785,7 +2785,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2804,7 +2804,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2842,7 +2842,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2861,7 +2861,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2880,7 +2880,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2899,7 +2899,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2918,7 +2918,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2937,7 +2937,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2956,7 +2956,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2975,7 +2975,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -2994,7 +2994,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -3013,7 +3013,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -3032,7 +3032,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -3051,7 +3051,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -3070,7 +3070,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -3089,7 +3089,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -3108,7 +3108,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -3127,7 +3127,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
},
@@ -3146,7 +3146,7 @@
"source_info" : {
"filename" : "include/actions.p4",
"line" : 30,
- "column" : 38,
+ "column" : 39,
"source_fragment" : "standard_metadata) { ..."
}
}
@@ -3448,13 +3448,13 @@
"support_timeout" : false,
"direct_meters" : null,
"action_ids" : [0, 2, 5, 3],
- "actions" : ["set_egress_port", "send_to_cpu", "do_ecmp", "drop"],
+ "actions" : ["set_egress_port", "send_to_cpu", "do_ecmp", "_drop"],
"base_default_next" : "node_7",
"next_tables" : {
"do_ecmp" : "ecmp",
"set_egress_port" : "node_7",
"send_to_cpu" : "node_7",
- "drop" : "node_7"
+ "_drop" : "node_7"
},
"default_entry" : {
"action_id" : 3,