Allow to use simple types inside out struct as a parser's parameter

backends/bmv2/simple_switch/simpleSwitch.cpp

@@ -1129,18 +1129,6 @@ SimpleSwitchBackend::convert(const IR::ToplevelBlock* tlb) {
                     "%1%: expected type to be a struct", headersParam->type);
             return;
         }
-        LOG2("Headers type is " << st);
-        for (auto f : st->fields) {
-            auto t = typeMap->getType(f, true);
-            if (!t->is<IR::Type_Header>() &&
-                !t->is<IR::Type_Stack>() &&
-                !t->is<IR::Type_HeaderUnion>()) {
-                ::error(ErrorType::ERR_EXPECTED,
-                        "%1%: the type should be a struct of headers, stacks, or unions",
-                        headersParam->type);
-                return;
-            }
-        }
     }
 
     auto evaluator = new P4::EvaluatorPass(refMap, typeMap);

testdata/p4_16_samples/struct_with_st-bmv2.p4

@@ -0,0 +1,53 @@
+#include "v1model.p4"
+struct metadata {
+    /* empty */
+}
+
+enum bit<7> X {
+    Zero = 0,
+    One = 1
+}
+
+header BITS {
+    bit<8> bt;
+    int<8> it;
+    bool b;
+    X  x; 
+}
+
+struct headers {
+    BITS    bits;
+    bit<8>  bt;
+    int<8>  it;
+    bool    b;
+    X       x;
+}
+
+parser MyParser(packet_in packet,
+                out headers hdr,
+                inout metadata meta,
+                inout standard_metadata_t standard_metadata) {
+    state start {
+        packet.extract(hdr.bits);
+        hdr.bt = hdr.bits.bt;
+        hdr.it = hdr.bits.it;
+        hdr.b = hdr.bits.b;
+        hdr.x = hdr.bits.x;
+        transition accept;
+    }
+}
+
+control mau(inout headers hdr, inout metadata meta, inout standard_metadata_t sm) {
+apply {}
+}
+control deparse(packet_out pkt, in headers hdr) {
+apply {}
+}
+control verifyChecksum(inout headers hdr, inout metadata meta) {
+apply {}
+}
+control computeChecksum(inout headers hdr, inout metadata meta) {
+apply {}
+}
+V1Switch(MyParser(), verifyChecksum(), mau(), mau(), computeChecksum(),
+        deparse()) main;

testdata/p4_16_samples_outputs/struct_with_st-bmv2-first.p4

@@ -0,0 +1,60 @@
+#include <core.p4>
+#define V1MODEL_VERSION 20180101
+#include <v1model.p4>
+
+struct metadata {
+}
+
+enum bit<7> X {
+    Zero = 7w0,
+    One = 7w1
+}
+
+header BITS {
+    bit<8> bt;
+    int<8> it;
+    bool   b;
+    X      x;
+}
+
+struct headers {
+    BITS   bits;
+    bit<8> bt;
+    int<8> it;
+    bool   b;
+    X      x;
+}
+
+parser MyParser(packet_in packet, out headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) {
+    state start {
+        packet.extract<BITS>(hdr.bits);
+        hdr.bt = hdr.bits.bt;
+        hdr.it = hdr.bits.it;
+        hdr.b = hdr.bits.b;
+        hdr.x = hdr.bits.x;
+        transition accept;
+    }
+}
+
+control mau(inout headers hdr, inout metadata meta, inout standard_metadata_t sm) {
+    apply {
+    }
+}
+
+control deparse(packet_out pkt, in headers hdr) {
+    apply {
+    }
+}
+
+control verifyChecksum(inout headers hdr, inout metadata meta) {
+    apply {
+    }
+}
+
+control computeChecksum(inout headers hdr, inout metadata meta) {
+    apply {
+    }
+}
+
+V1Switch<headers, metadata>(MyParser(), verifyChecksum(), mau(), mau(), computeChecksum(), deparse()) main;
+

testdata/p4_16_samples_outputs/struct_with_st-bmv2-frontend.p4

@@ -0,0 +1,60 @@
+#include <core.p4>
+#define V1MODEL_VERSION 20180101
+#include <v1model.p4>
+
+struct metadata {
+}
+
+enum bit<7> X {
+    Zero = 7w0,
+    One = 7w1
+}
+
+header BITS {
+    bit<8> bt;
+    int<8> it;
+    bool   b;
+    X      x;
+}
+
+struct headers {
+    BITS   bits;
+    bit<8> bt;
+    int<8> it;
+    bool   b;
+    X      x;
+}
+
+parser MyParser(packet_in packet, out headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) {
+    state start {
+        packet.extract<BITS>(hdr.bits);
+        hdr.bt = hdr.bits.bt;
+        hdr.it = hdr.bits.it;
+        hdr.b = hdr.bits.b;
+        hdr.x = hdr.bits.x;
+        transition accept;
+    }
+}
+
+control mau(inout headers hdr, inout metadata meta, inout standard_metadata_t sm) {
+    apply {
+    }
+}
+
+control deparse(packet_out pkt, in headers hdr) {
+    apply {
+    }
+}
+
+control verifyChecksum(inout headers hdr, inout metadata meta) {
+    apply {
+    }
+}
+
+control computeChecksum(inout headers hdr, inout metadata meta) {
+    apply {
+    }
+}
+
+V1Switch<headers, metadata>(MyParser(), verifyChecksum(), mau(), mau(), computeChecksum(), deparse()) main;
+

testdata/p4_16_samples_outputs/struct_with_st-bmv2-midend.p4

@@ -0,0 +1,55 @@
+#include <core.p4>
+#define V1MODEL_VERSION 20180101
+#include <v1model.p4>
+
+struct metadata {
+}
+
+header BITS {
+    bit<8> bt;
+    int<8> it;
+    bool   b;
+    bit<7> x;
+}
+
+struct headers {
+    BITS   bits;
+    bit<8> bt;
+    int<8> it;
+    bool   b;
+    bit<7> x;
+}
+
+parser MyParser(packet_in packet, out headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) {
+    state start {
+        packet.extract<BITS>(hdr.bits);
+        hdr.bt = hdr.bits.bt;
+        hdr.it = hdr.bits.it;
+        hdr.b = hdr.bits.b;
+        hdr.x = hdr.bits.x;
+        transition accept;
+    }
+}
+
+control mau(inout headers hdr, inout metadata meta, inout standard_metadata_t sm) {
+    apply {
+    }
+}
+
+control deparse(packet_out pkt, in headers hdr) {
+    apply {
+    }
+}
+
+control verifyChecksum(inout headers hdr, inout metadata meta) {
+    apply {
+    }
+}
+
+control computeChecksum(inout headers hdr, inout metadata meta) {
+    apply {
+    }
+}
+
+V1Switch<headers, metadata>(MyParser(), verifyChecksum(), mau(), mau(), computeChecksum(), deparse()) main;
+

testdata/p4_16_samples_outputs/struct_with_st-bmv2.p4

@@ -0,0 +1,60 @@
+#include <core.p4>
+#define V1MODEL_VERSION 20180101
+#include <v1model.p4>
+
+struct metadata {
+}
+
+enum bit<7> X {
+    Zero = 0,
+    One = 1
+}
+
+header BITS {
+    bit<8> bt;
+    int<8> it;
+    bool   b;
+    X      x;
+}
+
+struct headers {
+    BITS   bits;
+    bit<8> bt;
+    int<8> it;
+    bool   b;
+    X      x;
+}
+
+parser MyParser(packet_in packet, out headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) {
+    state start {
+        packet.extract(hdr.bits);
+        hdr.bt = hdr.bits.bt;
+        hdr.it = hdr.bits.it;
+        hdr.b = hdr.bits.b;
+        hdr.x = hdr.bits.x;
+        transition accept;
+    }
+}
+
+control mau(inout headers hdr, inout metadata meta, inout standard_metadata_t sm) {
+    apply {
+    }
+}
+
+control deparse(packet_out pkt, in headers hdr) {
+    apply {
+    }
+}
+
+control verifyChecksum(inout headers hdr, inout metadata meta) {
+    apply {
+    }
+}
+
+control computeChecksum(inout headers hdr, inout metadata meta) {
+    apply {
+    }
+}
+
+V1Switch(MyParser(), verifyChecksum(), mau(), mau(), computeChecksum(), deparse()) main;
+

testdata/p4_16_samples_outputs/struct_with_st-bmv2.p4.p4info.txt

@@ -0,0 +1,3 @@
+pkg_info {
+  arch: "v1model"
+}