Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch statement not correctly translated when default case is not present #2986

Closed
wants to merge 2 commits into from
+1,371 −0
Closed

Switch statement not correctly translated when default case is not present #2986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d517fa
Switch statement not correctly translated when default case is not pr…
github-sajan Dec 13, 2021
ae63850
Switch statement not correctly translated when default case is not pr…
github-sajan Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions midend/eliminateSwitch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,19 @@ const IR::Node* DoEliminateSwitch::postorder(IR::SwitchStatement* statement) {
properties.push_back(new IR::Property(src, "key", new IR::Key({tableKeyEl}), false));
IR::ID defaultAction = P4CoreLibrary::instance.noAction.Id();

// Add Default switch Expression if not present
bool isDefaultPresent = false;
for (auto sc : statement->cases) {
if (sc->label->is<IR::DefaultExpression>()) {
isDefaultPresent = true;
break;
}
}
if (!isDefaultPresent) {
statement->cases.push_back(
new IR::SwitchCase(new IR::DefaultExpression(IR::Type_Dontcare::get()),
new IR::BlockStatement));
}
// Create actions
IR::Vector<IR::Expression> pendingLabels; // switch labels with no statement
for (auto sc : statement->cases) {
Expand Down
174 changes: 174 additions & 0 deletions testdata/p4_16_samples/psa-switch-expression-without-default.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
#include <core.p4>
#include <psa.p4>

struct EMPTY { };

typedef bit<48> EthernetAddress;

struct user_meta_t {
bit<16> data;
bit<16> data1;
}

header ethernet_t {
EthernetAddress dstAddr;
EthernetAddress srcAddr;
bit<16> etherType;
}

header ipv4_t {
bit<4> version;
bit<4> ihl;
bit<8> diffserv;
bit<16> totalLen;
bit<16> identification;
bit<3> flags;
bit<13> fragOffset;
bit<8> ttl;
bit<8> protocol;
bit<16> hdrChecksum;
bit<32> srcAddr;
bit<32> dstAddr;
bit<80> newfield;
}

header tcp_t {
bit<16> srcPort;
bit<16> dstPort;
bit<32> seqNo;
bit<32> ackNo;
bit<4> dataOffset;
bit<3> res;
bit<3> ecn;
bit<6> ctrl;
bit<16> window;
bit<16> checksum;
bit<16> urgentPtr;
}

struct headers_t {
ethernet_t ethernet;
ipv4_t ipv4;
tcp_t tcp;
}

parser MyIP(
packet_in buffer,
out headers_t hdr,
inout user_meta_t b,
in psa_ingress_parser_input_metadata_t c,
in EMPTY d,
in EMPTY e) {

state start {
buffer.extract(hdr.ethernet);
transition select(hdr.ethernet.etherType) {
0x0800 &&& 0x0F00 : parse_ipv4;
16w0x0d00 : parse_tcp;
default : accept;
}
}
state parse_ipv4 {
buffer.extract(hdr.ipv4);
transition select(hdr.ipv4.protocol) {
8w4 .. 8w7: parse_tcp;
default: accept;
}
}
state parse_tcp {
buffer.extract(hdr.tcp);
transition accept;
}
}

parser MyEP(
packet_in buffer,
out EMPTY a,
inout EMPTY b,
in psa_egress_parser_input_metadata_t c,
in EMPTY d,
in EMPTY e,
in EMPTY f) {
state start {
transition accept;
}
}

control MyIC(
inout headers_t hdr,
inout user_meta_t b,
in psa_ingress_input_metadata_t c,
inout psa_ingress_output_metadata_t d) {
bit<16> tmp = 16;
action a1(bit<48> param) { hdr.ethernet.dstAddr = param; }
action a2(bit<16> param) { hdr.ethernet.etherType = param; }
table tbl {
key = {
hdr.ethernet.srcAddr : exact;
b.data : lpm;
}
actions = { NoAction; a1; a2; }
}

table foo {
actions = { NoAction; }
}

table bar {
actions = { NoAction; }
}

apply {
switch (tmp) {
16:
32: { tmp = 1; }
64: { tmp = 2; }
92:
}
switch (tbl.apply().action_run) {
a1: { if (tmp == 1) foo.apply(); }
a2: { bar.apply(); }
}
}
}

control MyEC(
inout EMPTY a,
inout EMPTY b,
in psa_egress_input_metadata_t c,
inout psa_egress_output_metadata_t d) {
apply { }
}

control MyID(
packet_out buffer,
out EMPTY a,
out EMPTY b,
out EMPTY c,
inout headers_t hdr,
in user_meta_t e,
in psa_ingress_output_metadata_t f) {
apply {
buffer.emit(hdr.ethernet);
}
}

control MyED(
packet_out buffer,
out EMPTY a,
out EMPTY b,
inout EMPTY c,
in EMPTY d,
in psa_egress_output_metadata_t e,
in psa_egress_deparser_input_metadata_t f) {
apply { }
}

IngressPipeline(MyIP(), MyIC(), MyID()) ip;
EgressPipeline(MyEP(), MyEC(), MyED()) ep;

PSA_Switch(
ip,
PacketReplicationEngine(),
ep,
BufferingQueueingEngine()) main;
161 changes: 161 additions & 0 deletions testdata/p4_16_samples_outputs/psa-switch-expression-without-default-first.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
#include <core.p4>
#include <bmv2/psa.p4>

struct EMPTY {
}

typedef bit<48> EthernetAddress;
struct user_meta_t {
bit<16> data;
bit<16> data1;
}

header ethernet_t {
EthernetAddress dstAddr;
EthernetAddress srcAddr;
bit<16> etherType;
}

header ipv4_t {
bit<4> version;
bit<4> ihl;
bit<8> diffserv;
bit<16> totalLen;
bit<16> identification;
bit<3> flags;
bit<13> fragOffset;
bit<8> ttl;
bit<8> protocol;
bit<16> hdrChecksum;
bit<32> srcAddr;
bit<32> dstAddr;
bit<80> newfield;
}

header tcp_t {
bit<16> srcPort;
bit<16> dstPort;
bit<32> seqNo;
bit<32> ackNo;
bit<4> dataOffset;
bit<3> res;
bit<3> ecn;
bit<6> ctrl;
bit<16> window;
bit<16> checksum;
bit<16> urgentPtr;
}

struct headers_t {
ethernet_t ethernet;
ipv4_t ipv4;
tcp_t tcp;
}

parser MyIP(packet_in buffer, out headers_t hdr, inout user_meta_t b, in psa_ingress_parser_input_metadata_t c, in EMPTY d, in EMPTY e) {
state start {
buffer.extract<ethernet_t>(hdr.ethernet);
transition select(hdr.ethernet.etherType) {
16w0x800 &&& 16w0xf00: parse_ipv4;
16w0xd00: parse_tcp;
default: accept;
}
}
state parse_ipv4 {
buffer.extract<ipv4_t>(hdr.ipv4);
transition select(hdr.ipv4.protocol) {
8w4 .. 8w7: parse_tcp;
default: accept;
}
}
state parse_tcp {
buffer.extract<tcp_t>(hdr.tcp);
transition accept;
}
}

parser MyEP(packet_in buffer, out EMPTY a, inout EMPTY b, in psa_egress_parser_input_metadata_t c, in EMPTY d, in EMPTY e, in EMPTY f) {
state start {
transition accept;
}
}

control MyIC(inout headers_t hdr, inout user_meta_t b, in psa_ingress_input_metadata_t c, inout psa_ingress_output_metadata_t d) {
bit<16> tmp = 16w16;
action a1(bit<48> param) {
hdr.ethernet.dstAddr = param;
}
action a2(bit<16> param) {
hdr.ethernet.etherType = param;
}
table tbl {
key = {
hdr.ethernet.srcAddr: exact @name("hdr.ethernet.srcAddr") ;
b.data : lpm @name("b.data") ;
}
actions = {
NoAction();
a1();
a2();
}
default_action = NoAction();
}
table foo {
actions = {
NoAction();
}
default_action = NoAction();
}
table bar {
actions = {
NoAction();
}
default_action = NoAction();
}
apply {
switch (tmp) {
16w16:
16w32: {
tmp = 16w1;
}
16w64: {
tmp = 16w2;
}
}
switch (tbl.apply().action_run) {
a1: {
if (tmp == 16w1) {
foo.apply();
}
}
a2: {
bar.apply();
}
default: {
}
}
}
}

control MyEC(inout EMPTY a, inout EMPTY b, in psa_egress_input_metadata_t c, inout psa_egress_output_metadata_t d) {
apply {
}
}

control MyID(packet_out buffer, out EMPTY a, out EMPTY b, out EMPTY c, inout headers_t hdr, in user_meta_t e, in psa_ingress_output_metadata_t f) {
apply {
buffer.emit<ethernet_t>(hdr.ethernet);
}
}

control MyED(packet_out buffer, out EMPTY a, out EMPTY b, inout EMPTY c, in EMPTY d, in psa_egress_output_metadata_t e, in psa_egress_deparser_input_metadata_t f) {
apply {
}
}

IngressPipeline<headers_t, user_meta_t, EMPTY, EMPTY, EMPTY, EMPTY>(MyIP(), MyIC(), MyID()) ip;

EgressPipeline<EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY>(MyEP(), MyEC(), MyED()) ep;

PSA_Switch<headers_t, user_meta_t, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY, EMPTY>(ip, PacketReplicationEngine(), ep, BufferingQueueingEngine()) main;

Loading