Skip to content

Commit

Permalink
rebased and updated tests
Browse files Browse the repository at this point in the history
  • Loading branch information
kamleshbhalui committed Nov 10, 2022
1 parent 3891105 commit c307557
Show file tree
Hide file tree
Showing 127 changed files with 127 additions and 127 deletions.
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/psa-action-profile1.p4.spec
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ table ap {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.Ingress_ap_member_id 0x0
table tbl
Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/psa-action-profile3.p4.spec
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ table tbl2 {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.Ingress_ap_member_id 0x0
table tbl
Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/psa-action-profile4.p4.spec
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ table tbl2 {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.Ingress_ap_member_id 0x0
table tbl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ selector as_sel {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.Ingress_as_member_id 0x0
mov m.Ingress_as_group_id 0x0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ selector as_sel {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.Ingress_as_member_id 0x0
mov m.Ingress_as_group_id 0x0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.MyIC_tbl_ethernet_srcAddr h.ethernet.srcAddr
table tbl
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ selector as_sel {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
table tbl
jmpnh LABEL_END
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ selector as_sel {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
table tbl
table as_sel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.psa_ingress_output_metadata_drop 0
mov m.psa_ingress_output_metadata_multicast_group 0x0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
jmpeq LABEL_FALSE m.local_metadata_data 0x0
mov m.Ingress_tmp_0 0x2
Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/psa-counter1.p4.spec
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
table tbl
jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0
Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/psa-counter2.p4.spec
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
table tbl
jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0
Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/psa-counter3.p4.spec
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ regarray counter1_0 size 0x400 initval 0x0

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
regadd counter0_0 0x400 1
jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0
Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/psa-counter4.p4.spec
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
table tbl
jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
table tbl
jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h
table tbl
mov m.local_metadata_meta 0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
jmplt LABEL_FALSE h.ethernet.etherType 0x800
mov m.IngressParser_parser_tmp 0x1
Expand Down
2 changes: 1 addition & 1 deletion testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.spec
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ table table1 {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
table table1
jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0
tx m.psa_ingress_output_metadata_egress_port
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ table stub {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.local_metadata_flg 0x2
mov m.psa_ingress_output_metadata_egress_port m.psa_ingress_input_metadata_ingress_port
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ table stub_0 {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.Ingress_flg 0x0
table stub_0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ table stub_0 {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.Ingress_flg 0x0
table stub_0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ table stub {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.psa_ingress_output_metadata_egress_port m.psa_ingress_input_metadata_ingress_port
xor m.psa_ingress_output_metadata_egress_port 0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ table stub {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.psa_ingress_output_metadata_egress_port m.psa_ingress_input_metadata_ingress_port
xor m.psa_ingress_output_metadata_egress_port 0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ table stub {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.psa_ingress_output_metadata_egress_port m.psa_ingress_input_metadata_ingress_port
xor m.psa_ingress_output_metadata_egress_port 0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ table stub {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.psa_ingress_output_metadata_egress_port m.psa_ingress_input_metadata_ingress_port
xor m.psa_ingress_output_metadata_egress_port 0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ table stub {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.psa_ingress_output_metadata_egress_port m.psa_ingress_input_metadata_ingress_port
xor m.psa_ingress_output_metadata_egress_port 0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ table stub {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.psa_ingress_output_metadata_egress_port m.psa_ingress_input_metadata_ingress_port
xor m.psa_ingress_output_metadata_egress_port 0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ table stub {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.psa_ingress_output_metadata_egress_port m.psa_ingress_input_metadata_ingress_port
xor m.psa_ingress_output_metadata_egress_port 0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ table stub {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.local_metadata_flag 0x5
mov m.psa_ingress_output_metadata_egress_port m.psa_ingress_input_metadata_ingress_port
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ table stub {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.psa_ingress_output_metadata_egress_port m.psa_ingress_input_metadata_ingress_port
xor m.psa_ingress_output_metadata_egress_port 0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ table stub {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.psa_ingress_output_metadata_egress_port m.psa_ingress_input_metadata_ingress_port
xor m.psa_ingress_output_metadata_egress_port 0x1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ table bar {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ table bar {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ header tcp instanceof tcp_t

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
jmpneq LABEL_DROP m.psa_ingress_output_metadata_drop 0x0
emit h.ethernet
emit h.ipv4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ table tbl {

apply {
rx m.psa_ingress_input_metadata_ingress_port
mov m.psa_ingress_output_metadata_drop 0x1
mov m.psa_ingress_output_metadata_drop 0x0
extract h.ethernet
mov m.tmpMask h.ethernet.etherType
and m.tmpMask 0xF00
Expand Down
Loading

0 comments on commit c307557

Please sign in to comment.