Skip to content

Commit

Permalink
Flatten local struct decl in dpdk
Browse files Browse the repository at this point in the history
  • Loading branch information
@kamleshbhalui
kamleshbhalui committed Mar 4, 2022
1 parent df473f7 commit f33523a
Show file tree
Hide file tree
Showing 13 changed files with 895 additions and 0 deletions.
21 changes: 21 additions & 0 deletions backends/dpdk/dpdkArch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,15 @@ const IR::Node *CollectLocalVariables::postorder(IR::Type_Struct *s) {
LOG3("Variable: " << dv << std::endl <<
" type: " << type << std::endl <<
" already added to: " << structure->header_type);
} else if(auto strct = type->to<IR::Type_Struct>()) {
for (auto field : strct->fields) {
auto sf = new IR::StructField(IR::ID(kv.second + "_" + field->name),
field->type);
LOG2("New field: " << sf << std::endl <<
" type: " << field->type << std::endl <<
" added to: " << s->name.name);
s->fields.push_back(sf);
}
} else {
auto sf = new IR::StructField(IR::ID(kv.second), dv->type);
LOG2("New field: " << sf << std::endl <<
Expand Down Expand Up @@ -984,6 +993,18 @@ CollectLocalVariables::postorder(IR::PathExpression *p) {
return p;
}

const IR::Node *
CollectLocalVariables::postorder(IR::Member *mem) {
// Ensure that member's expression is a member expression
// then convert like (m.field.field_0 to m.field_field_0)
auto expr = mem->expr->to<IR::Member>();
if (expr && expr->expr->toString() == "m")
return new IR::Member(new IR::PathExpression(IR::ID("m")),
IR::ID(expr->member.toString() + "_" + mem->member.toString()));
else
return mem;
}

const IR::Node *CollectLocalVariables::postorder(IR::P4Control *c) {
IR::IndexedVector<IR::Declaration> decls;
for (auto d : c->controlLocals) {
Expand Down
1 change: 1 addition & 0 deletions backends/dpdk/dpdkArch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,7 @@ class CollectLocalVariables : public Transform {
: refMap(refMap), typeMap(typeMap), structure(structure) {}
const IR::Node *preorder(IR::P4Program *p) override;
const IR::Node *postorder(IR::Type_Struct *s) override;
const IR::Node *postorder(IR::Member *m) override;
const IR::Node *postorder(IR::PathExpression *path) override;
const IR::Node *postorder(IR::P4Control *c) override;
const IR::Node *postorder(IR::P4Parser *p) override;
Expand Down
133 changes: 133 additions & 0 deletions testdata/p4_16_samples/psa-dpdk-flatten-local-struct.p4
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
#include <core.p4>
#include <psa.p4>

struct empty_metadata_t {
}

typedef bit<48> ethernet_addr_t;

header ethernet_t {
ethernet_addr_t dst_addr;
ethernet_addr_t src_addr;
bit<16> ether_type;
}

header ipv4_t {
bit<8> ver_ihl;
bit<8> diffserv;
bit<16> total_len;
bit<16> identification;
bit<16> flags_offset;
bit<8> ttl;
bit<8> protocol;
bit<16> hdr_checksum;
bit<32> src_addr;
bit<32> dst_addr;
}

struct headers_t {
ethernet_t ethernet;
ipv4_t ipv4;
ethernet_t outer_ethernet;
ipv4_t outer_ipv4;
}

struct host_info_rx_bytes_t2 {
bit<16> flex_0;
bit<16> flex_1;
bit<16> flex_2;
bit<16> flex_3;
bit<16> flex_4;
bit<16> flex_5;
}

struct host_info_rx_bytes_t1 {
host_info_rx_bytes_t2 flex_up1;
bit<16> flex_0;
bit<16> flex_1;
bit<16> flex_2;
bit<16> flex_3;
bit<16> flex_4;
bit<16> flex_5;
}

struct host_info_rx_bytes_t {
host_info_rx_bytes_t1 flex_up;
bit<16> flex_0;
bit<16> flex_1;
bit<16> flex_2;
bit<16> flex_3;
bit<16> flex_4;
bit<16> flex_5;
}

struct local_metadata_t {
ethernet_addr_t dst_addr;
ethernet_addr_t src_addr;
}

parser packet_parser(packet_in packet, out headers_t headers, inout local_metadata_t local_metadata, in psa_ingress_parser_input_metadata_t standard_metadata, in empty_metadata_t resub_meta, in empty_metadata_t recirc_meta) {
state start {
transition accept;
}
}
control packet_deparser(packet_out packet, out empty_metadata_t clone_i2e_meta, out empty_metadata_t resubmit_meta, out empty_metadata_t normal_meta, inout headers_t headers, in local_metadata_t local_metadata, in psa_ingress_output_metadata_t istd) {
apply {
}
}

control ingress(inout headers_t headers, inout local_metadata_t local_metadata1, in psa_ingress_input_metadata_t standard_metadata, inout psa_ingress_output_metadata_t ostd) {
action action1(
bit<16> field,
bit<16> field1) {
host_info_rx_bytes_t host_info_rx_bytes;
if (field == 16w1)
host_info_rx_bytes.flex_up.flex_up1.flex_0 = field;
else
host_info_rx_bytes.flex_up.flex_up1.flex_0 = field1;

headers.outer_ethernet.ether_type = host_info_rx_bytes.flex_up.flex_up1.flex_0;
}
action drop(){
ostd.egress_port = (PortId_t)4;
}
table table1 {
key = {
headers.ethernet.dst_addr: exact;
}
actions = {
action1;
drop;
}
const default_action = drop;
size = 1024 * 1024;
}

apply {
table1.apply();
}
}


control egress(inout headers_t headers, inout local_metadata_t local_metadata, in psa_egress_input_metadata_t istd, inout psa_egress_output_metadata_t ostd) {
apply {
}
}

parser egress_parser(packet_in buffer, out headers_t headers, inout local_metadata_t local_metadata, in psa_egress_parser_input_metadata_t istd, in empty_metadata_t normal_meta, in empty_metadata_t clone_i2e_meta, in empty_metadata_t clone_e2e_meta) {
state start {
transition accept;
}
}

control egress_deparser(packet_out packet, out empty_metadata_t clone_e2e_meta, out empty_metadata_t recirculate_meta, inout headers_t headers, in local_metadata_t local_metadata, in psa_egress_output_metadata_t istd, in psa_egress_deparser_input_metadata_t edstd) {
apply {
}
}

IngressPipeline(packet_parser(), ingress(), packet_deparser()) ip;

EgressPipeline(egress_parser(), egress(), egress_deparser()) ep;

PSA_Switch(ip, PacketReplicationEngine(), ep, BufferingQueueingEngine()) main;

129 changes: 129 additions & 0 deletions testdata/p4_16_samples_outputs/psa-dpdk-flatten-local-struct-first.p4
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
#include <core.p4>
#include <bmv2/psa.p4>

struct empty_metadata_t {
}

typedef bit<48> ethernet_addr_t;
header ethernet_t {
ethernet_addr_t dst_addr;
ethernet_addr_t src_addr;
bit<16> ether_type;
}

header ipv4_t {
bit<8> ver_ihl;
bit<8> diffserv;
bit<16> total_len;
bit<16> identification;
bit<16> flags_offset;
bit<8> ttl;
bit<8> protocol;
bit<16> hdr_checksum;
bit<32> src_addr;
bit<32> dst_addr;
}

struct headers_t {
ethernet_t ethernet;
ipv4_t ipv4;
ethernet_t outer_ethernet;
ipv4_t outer_ipv4;
}

struct host_info_rx_bytes_t2 {
bit<16> flex_0;
bit<16> flex_1;
bit<16> flex_2;
bit<16> flex_3;
bit<16> flex_4;
bit<16> flex_5;
}

struct host_info_rx_bytes_t1 {
host_info_rx_bytes_t2 flex_up1;
bit<16> flex_0;
bit<16> flex_1;
bit<16> flex_2;
bit<16> flex_3;
bit<16> flex_4;
bit<16> flex_5;
}

struct host_info_rx_bytes_t {
host_info_rx_bytes_t1 flex_up;
bit<16> flex_0;
bit<16> flex_1;
bit<16> flex_2;
bit<16> flex_3;
bit<16> flex_4;
bit<16> flex_5;
}

struct local_metadata_t {
ethernet_addr_t dst_addr;
ethernet_addr_t src_addr;
}

parser packet_parser(packet_in packet, out headers_t headers, inout local_metadata_t local_metadata, in psa_ingress_parser_input_metadata_t standard_metadata, in empty_metadata_t resub_meta, in empty_metadata_t recirc_meta) {
state start {
transition accept;
}
}

control packet_deparser(packet_out packet, out empty_metadata_t clone_i2e_meta, out empty_metadata_t resubmit_meta, out empty_metadata_t normal_meta, inout headers_t headers, in local_metadata_t local_metadata, in psa_ingress_output_metadata_t istd) {
apply {
}
}

control ingress(inout headers_t headers, inout local_metadata_t local_metadata1, in psa_ingress_input_metadata_t standard_metadata, inout psa_ingress_output_metadata_t ostd) {
action action1(bit<16> field, bit<16> field1) {
host_info_rx_bytes_t host_info_rx_bytes;
if (field == 16w1) {
host_info_rx_bytes.flex_up.flex_up1.flex_0 = field;
} else {
host_info_rx_bytes.flex_up.flex_up1.flex_0 = field1;
}
headers.outer_ethernet.ether_type = host_info_rx_bytes.flex_up.flex_up1.flex_0;
}
action drop() {
ostd.egress_port = (PortId_t)32w4;
}
table table1 {
key = {
headers.ethernet.dst_addr: exact @name("headers.ethernet.dst_addr") ;
}
actions = {
action1();
drop();
}
const default_action = drop();
size = 1048576;
}
apply {
table1.apply();
}
}

control egress(inout headers_t headers, inout local_metadata_t local_metadata, in psa_egress_input_metadata_t istd, inout psa_egress_output_metadata_t ostd) {
apply {
}
}

parser egress_parser(packet_in buffer, out headers_t headers, inout local_metadata_t local_metadata, in psa_egress_parser_input_metadata_t istd, in empty_metadata_t normal_meta, in empty_metadata_t clone_i2e_meta, in empty_metadata_t clone_e2e_meta) {
state start {
transition accept;
}
}

control egress_deparser(packet_out packet, out empty_metadata_t clone_e2e_meta, out empty_metadata_t recirculate_meta, inout headers_t headers, in local_metadata_t local_metadata, in psa_egress_output_metadata_t istd, in psa_egress_deparser_input_metadata_t edstd) {
apply {
}
}

IngressPipeline<headers_t, local_metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t>(packet_parser(), ingress(), packet_deparser()) ip;

EgressPipeline<headers_t, local_metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t>(egress_parser(), egress(), egress_deparser()) ep;

PSA_Switch<headers_t, local_metadata_t, headers_t, local_metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t, empty_metadata_t>(ip, PacketReplicationEngine(), ep, BufferingQueueingEngine()) main;

Loading

0 comments on commit f33523a

Please sign in to comment.