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

create dpdk specific pna.p4 and extend it #3658

Merged
merged 11 commits into from
Nov 11, 2022
Merged

create dpdk specific pna.p4 and extend it #3658

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
50a23ce
Add dpdk specific pna.p4 and change methods like count and execute
kamleshbhalui Oct 18, 2022
5a8b2d4
change names to resolve ambiguity
kamleshbhalui Oct 20, 2022
4f1c8fa
rename execute to dpdk_execute
kamleshbhalui Oct 20, 2022
e22a36d
Added test and updated readme
kamleshbhalui Nov 2, 2022
0e8b523
update tests
kamleshbhalui Nov 2, 2022
37d5b9e
added comments and improve readme
kamleshbhalui Nov 2, 2022
dab1b25
Added comments in pna.p4 and psa.p4
kamleshbhalui Nov 8, 2022
5f8b648
rebased with main
kamleshbhalui Nov 8, 2022
7ddb1c4
fixed and update testcases
kamleshbhalui Nov 8, 2022
c2a2dc8
replace execute with dpdk_execute
kamleshbhalui Nov 10, 2022
cf29965
rebased and updated tests
kamleshbhalui Nov 10, 2022
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
Prev Previous commit
Next Next commit
fixed and update testcases
  • Loading branch information
@kamleshbhalui
kamleshbhalui committed Nov 11, 2022
commit 7ddb1c41fe2fa2537649f1afda65f984c22c5736
28 changes: 25 additions & 3 deletions backends/dpdk/DpdkXfail.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,29 @@ p4c_add_xfail_reason("dpdk"
)

p4c_add_xfail_reason("dpdk"
"Expected atleast 2 arguments"
testdata/p4_16_samples/psa-meter3.p4
testdata/p4_16_samples/psa-meter7-bmv2.p4
"can only be invoked from within action of ownertable"
testdata/p4_16_samples/psa-example-dpdk-directmeter-err.p4
testdata/p4_16_samples/pna-dpdk-direct-counter-err-3.p4
)
p4c_add_xfail_reason("dpdk"
"execute method not supported"
testdata/p4_16_samples/psa-meter6.p4
)

p4c_add_xfail_reason("dpdk"
"Expected default action .* to have .* method call for .* extern instance"
testdata/p4_16_samples/pna-dpdk-direct-counter-err-1.p4
testdata/p4_16_samples/pna-dpdk-direct-meter-err-4.p4
)

p4c_add_xfail_reason("dpdk"
".* method for different .* instances (.*) called within same action"
testdata/p4_16_samples/pna-dpdk-direct-counter-err-4.p4
testdata/p4_16_samples/pna-dpdk-direct-meter-err-3.p4
)

p4c_add_xfail_reason("dpdk"
"Learner table .* must have all exact match keys"
testdata/p4_16_samples/pna-add-on-miss-err1.p4
testdata/p4_16_samples/pna-dpdk-table-key-consolidation-learner-2.p4
)
2 changes: 1 addition & 1 deletion backends/dpdk/dpdkArch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2526,7 +2526,7 @@ bool CollectDirectCounterMeter::preorder(const IR::P4Table* tbl) {
return false;
}
}
if (!ifMethodFound(defaultActionDecl, "execute", meterExternName)) {
if (!ifMethodFound(defaultActionDecl, "dpdk_execute", meterExternName)) {
if (meterInstance) {
::error(ErrorType::ERR_EXPECTED, "Expected default action %1% to have "
"'execute' method call for DirectMeter extern instance %2%",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'execute' ->'dpdk_execute'

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same name change is required in P4Action preorder

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me now

Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_pna_errors/pna-dpdk-direct-counter-err-3.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

typedef bit<48> EthernetAddress;
const bit<8> ETHERNET_HEADER_LEN = 14;
Expand Down
6 changes: 3 additions & 3 deletions testdata/p4_16_pna_errors/pna-dpdk-direct-meter-err-2.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

typedef bit<48> EthernetAddress;
const bit<8> ETHERNET_HEADER_LEN = 14;
Expand Down Expand Up @@ -80,7 +80,7 @@ control MainControlImpl(
PNA_MeterColor_t color_in = PNA_MeterColor_t.RED;
DirectMeter(PNA_MeterType_t.PACKETS) meter0;
action send() {
out1 = meter0.execute(color_in, 32w1024);
out1 = meter0.dpdk_execute(color_in, 32w1024);
user_meta.port_out = (out1 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0);
}

Expand All @@ -99,7 +99,7 @@ control MainControlImpl(
}

apply {
color_out = meter0.execute(color_in, 32w1024);
color_out = meter0.dpdk_execute(color_in, 32w1024);
user_meta.port_out = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0);
ipv4_host.apply();
}
Expand Down
4 changes: 2 additions & 2 deletions testdata/p4_16_psa_errors/psa-example-dpdk-directmeter-err.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <bmv2/psa.p4>
#include <dpdk/psa.p4>

struct EMPTY { };

Expand Down Expand Up @@ -50,7 +50,7 @@ control MyIC(

DirectMeter(PSA_MeterType_t.BYTES) meter0;
action execute_meter () {
meter0.execute();
meter0.dpdk_execute(32w0);
}
table tbl {
key = {
Expand Down
4 changes: 2 additions & 2 deletions testdata/p4_16_samples/pna-dpdk-direct-meter-learner.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
*/

#include <core.p4>
#include "pna.p4"
#include "dpdk/pna.p4"


typedef bit<48> EthernetAddress;
Expand Down Expand Up @@ -103,7 +103,7 @@ control MainControlImpl(

action add_on_miss_action() {
bit<32> tmp = 0;
color_out = meter0.execute(color_in, 32w1024);
color_out = meter0.dpdk_execute(color_in, 32w1024);
user_meta.port_out = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0);
add_entry(action_name="next_hop", action_params = tmp, expire_time_profile_id = user_meta.timeout);
}
Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/pna-dpdk-direct-counter-err-3-first.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

typedef bit<48> EthernetAddress;
const bit<8> ETHERNET_HEADER_LEN = 8w14;
Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/pna-dpdk-direct-counter-err-3-frontend.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

typedef bit<48> EthernetAddress;
header ethernet_t {
Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/pna-dpdk-direct-counter-err-3-midend.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

header ethernet_t {
bit<48> dstAddr;
Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/pna-dpdk-direct-counter-err-3.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

typedef bit<48> EthernetAddress;
const bit<8> ETHERNET_HEADER_LEN = 14;
Expand Down
6 changes: 3 additions & 3 deletions testdata/p4_16_samples_outputs/pna-dpdk-direct-meter-err-2-first.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

typedef bit<48> EthernetAddress;
const bit<8> ETHERNET_HEADER_LEN = 8w14;
Expand Down Expand Up @@ -62,7 +62,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
PNA_MeterColor_t color_in = PNA_MeterColor_t.RED;
DirectMeter(PNA_MeterType_t.PACKETS) meter0;
action send() {
out1 = meter0.execute(color_in, 32w1024);
out1 = meter0.dpdk_execute(color_in, 32w1024);
user_meta.port_out = (out1 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0);
}
table ipv4_host {
Expand All @@ -77,7 +77,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
pna_direct_meter = meter0;
}
apply {
color_out = meter0.execute(color_in, 32w1024);
color_out = meter0.dpdk_execute(color_in, 32w1024);
user_meta.port_out = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0);
ipv4_host.apply();
}
Expand Down
6 changes: 3 additions & 3 deletions testdata/p4_16_samples_outputs/pna-dpdk-direct-meter-err-2-frontend.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

typedef bit<48> EthernetAddress;
header ethernet_t {
Expand Down Expand Up @@ -60,7 +60,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
@name("MainControlImpl.tmp") bit<32> tmp;
@name("MainControlImpl.meter0") DirectMeter(PNA_MeterType_t.PACKETS) meter0_0;
@name("MainControlImpl.send") action send() {
out1_0 = meter0_0.execute(color_in_0, 32w1024);
out1_0 = meter0_0.dpdk_execute(color_in_0, 32w1024);
if (out1_0 == PNA_MeterColor_t.GREEN) {
tmp = 32w1;
} else {
Expand All @@ -81,7 +81,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
}
apply {
color_in_0 = PNA_MeterColor_t.RED;
meter0_0.execute(color_in_0, 32w1024);
meter0_0.dpdk_execute(color_in_0, 32w1024);
ipv4_host_0.apply();
}
}
Expand Down
6 changes: 3 additions & 3 deletions testdata/p4_16_samples_outputs/pna-dpdk-direct-meter-err-2-midend.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

header ethernet_t {
bit<48> dstAddr;
Expand Down Expand Up @@ -58,7 +58,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
@name("MainControlImpl.color_in") PNA_MeterColor_t color_in_0;
@name("MainControlImpl.meter0") DirectMeter(PNA_MeterType_t.PACKETS) meter0_0;
@name("MainControlImpl.send") action send() {
out1_0 = meter0_0.execute(color_in_0, 32w1024);
out1_0 = meter0_0.dpdk_execute(color_in_0, 32w1024);
user_meta.port_out = (out1_0 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0);
}
@name("MainControlImpl.ipv4_host") table ipv4_host_0 {
Expand All @@ -74,7 +74,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
}
@hidden action pnadpdkdirectmetererr2l80() {
color_in_0 = PNA_MeterColor_t.RED;
meter0_0.execute(PNA_MeterColor_t.RED, 32w1024);
meter0_0.dpdk_execute(PNA_MeterColor_t.RED, 32w1024);
}
@hidden table tbl_pnadpdkdirectmetererr2l80 {
actions = {
Expand Down
6 changes: 3 additions & 3 deletions testdata/p4_16_samples_outputs/pna-dpdk-direct-meter-err-2.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

typedef bit<48> EthernetAddress;
const bit<8> ETHERNET_HEADER_LEN = 14;
Expand Down Expand Up @@ -62,7 +62,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
PNA_MeterColor_t color_in = PNA_MeterColor_t.RED;
DirectMeter(PNA_MeterType_t.PACKETS) meter0;
action send() {
out1 = meter0.execute(color_in, 32w1024);
out1 = meter0.dpdk_execute(color_in, 32w1024);
user_meta.port_out = (out1 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0);
}
table ipv4_host {
Expand All @@ -77,7 +77,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
pna_direct_meter = meter0;
}
apply {
color_out = meter0.execute(color_in, 32w1024);
color_out = meter0.dpdk_execute(color_in, 32w1024);
user_meta.port_out = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0);
ipv4_host.apply();
}
Expand Down
4 changes: 2 additions & 2 deletions testdata/p4_16_samples_outputs/pna-dpdk-direct-meter-learner-first.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

typedef bit<48> EthernetAddress;
header ethernet_t {
Expand Down Expand Up @@ -65,7 +65,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
}
action add_on_miss_action() {
bit<32> tmp = 32w0;
color_out = meter0.execute(color_in, 32w1024);
color_out = meter0.dpdk_execute(color_in, 32w1024);
user_meta.port_out = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0);
add_entry<bit<32>>(action_name = "next_hop", action_params = tmp, expire_time_profile_id = user_meta.timeout);
}
Expand Down
4 changes: 2 additions & 2 deletions testdata/p4_16_samples_outputs/pna-dpdk-direct-meter-learner-frontend.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

typedef bit<48> EthernetAddress;
header ethernet_t {
Expand Down Expand Up @@ -66,7 +66,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
}
@name("MainControlImpl.add_on_miss_action") action add_on_miss_action() {
tmp = 32w0;
color_out_0 = meter0_0.execute(color_in_0, 32w1024);
color_out_0 = meter0_0.dpdk_execute(color_in_0, 32w1024);
if (color_out_0 == PNA_MeterColor_t.GREEN) {
tmp_0 = 32w1;
} else {
Expand Down
4 changes: 2 additions & 2 deletions testdata/p4_16_samples_outputs/pna-dpdk-direct-meter-learner-midend.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

header ethernet_t {
bit<48> dstAddr;
Expand Down Expand Up @@ -67,7 +67,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
send_to_port(vport);
}
@name("MainControlImpl.add_on_miss_action") action add_on_miss_action() {
color_out_0 = meter0_0.execute(color_in_0, 32w1024);
color_out_0 = meter0_0.dpdk_execute(color_in_0, 32w1024);
user_meta.port_out = (color_out_0 == PNA_MeterColor_t.GREEN ? 32w1 : 32w0);
add_entry<bit<32>>(action_name = "next_hop", action_params = 32w0, expire_time_profile_id = user_meta.timeout);
}
Expand Down
4 changes: 2 additions & 2 deletions testdata/p4_16_samples_outputs/pna-dpdk-direct-meter-learner.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <pna.p4>
#include <dpdk/pna.p4>

typedef bit<48> EthernetAddress;
header ethernet_t {
Expand Down Expand Up @@ -65,7 +65,7 @@ control MainControlImpl(inout headers_t hdr, inout main_metadata_t user_meta, in
}
action add_on_miss_action() {
bit<32> tmp = 0;
color_out = meter0.execute(color_in, 32w1024);
color_out = meter0.dpdk_execute(color_in, 32w1024);
user_meta.port_out = (color_out == PNA_MeterColor_t.GREEN ? 32w1 : 32w0);
add_entry(action_name = "next_hop", action_params = tmp, expire_time_profile_id = user_meta.timeout);
}
Expand Down
3 changes: 0 additions & 3 deletions testdata/p4_16_samples_outputs/pna-dpdk-direct-meter-learner.p4.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ struct main_metadata_t {
bit<8> local_metadata_timeout
bit<32> local_metadata_port_out
bit<32> pna_main_output_metadata_output_port
bit<32> table_entry_index
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a valid test for Direct Meter for tables with add_on_miss. These instructions/metadata field shouldn't be removed

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

bit<32> MainControlT_tmp
bit<32> MainControlT_tmp_0
bit<32> MainControlT_color_out
Expand All @@ -56,8 +55,6 @@ action next_hop args instanceof next_hop_arg_t {
}

action add_on_miss_action args none {
entryid m.table_entry_index
meter meter0_0 m.table_entry_index 0x400 m.MainControlT_color_in m.MainControlT_color_out
jmpneq LABEL_FALSE_0 m.MainControlT_color_out 0x1
mov m.MainControlT_tmp_1 0x1
jmp LABEL_END_0
Expand Down
4 changes: 2 additions & 2 deletions testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter-err-first.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <bmv2/psa.p4>
#include <dpdk/psa.p4>

struct EMPTY {
}
Expand Down Expand Up @@ -31,7 +31,7 @@ parser MyEP(packet_in buffer, out EMPTY a, inout EMPTY b, in psa_egress_parser_i
control MyIC(inout headers_t hdr, inout EMPTY b, in psa_ingress_input_metadata_t c, inout psa_ingress_output_metadata_t d) {
DirectMeter(PSA_MeterType_t.BYTES) meter0;
action execute_meter() {
meter0.execute();
meter0.dpdk_execute(32w0);
}
table tbl {
key = {
Expand Down
4 changes: 2 additions & 2 deletions testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter-err-frontend.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <bmv2/psa.p4>
#include <dpdk/psa.p4>

struct EMPTY {
}
Expand Down Expand Up @@ -35,7 +35,7 @@ control MyIC(inout headers_t hdr, inout EMPTY b, in psa_ingress_input_metadata_t
}
@name("MyIC.meter0") DirectMeter(PSA_MeterType_t.BYTES) meter0_0;
@name("MyIC.execute_meter") action execute_meter() {
meter0_0.execute();
meter0_0.dpdk_execute(32w0);
}
@name("MyIC.tbl") table tbl_0 {
key = {
Expand Down
4 changes: 2 additions & 2 deletions testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter-err-midend.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <bmv2/psa.p4>
#include <dpdk/psa.p4>

struct EMPTY {
}
Expand Down Expand Up @@ -34,7 +34,7 @@ control MyIC(inout headers_t hdr, inout EMPTY b, in psa_ingress_input_metadata_t
}
@name("MyIC.meter0") DirectMeter(PSA_MeterType_t.BYTES) meter0_0;
@name("MyIC.execute_meter") action execute_meter() {
meter0_0.execute();
meter0_0.dpdk_execute(32w0);
}
@name("MyIC.tbl") table tbl_0 {
key = {
Expand Down
4 changes: 2 additions & 2 deletions testdata/p4_16_samples_outputs/psa-example-dpdk-directmeter-err.p4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <core.p4>
#include <bmv2/psa.p4>
#include <dpdk/psa.p4>

struct EMPTY {
}
Expand Down Expand Up @@ -31,7 +31,7 @@ parser MyEP(packet_in buffer, out EMPTY a, inout EMPTY b, in psa_egress_parser_i
control MyIC(inout headers_t hdr, inout EMPTY b, in psa_ingress_input_metadata_t c, inout psa_ingress_output_metadata_t d) {
DirectMeter(PSA_MeterType_t.BYTES) meter0;
action execute_meter() {
meter0.execute();
meter0.dpdk_execute(32w0);
}
table tbl {
key = {
Expand Down