-
Notifications
You must be signed in to change notification settings - Fork 446
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix up the DPDK and PSA back end, too.
- Loading branch information
Showing
32 changed files
with
522 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
testdata/p4_16_psa_errors_outputs/psa-action-profile2.p4-error
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| psa-action-profile2.p4(59): [--Werror=invalid] error: Expected psa_implementation property value for table MyIC.tbl to resolve to an extern instance: psa_implementation | ||
| psa_implementation = { ap, ap1 }; | ||
| ^^^^^^^^^^^^^^^^^^ | ||
| psa-action-profile2.p4(59): [--Werror=invalid] error: Expected psa_implementation property value for table MyIC.tbl to resolve to an extern instance: psa_implementation | ||
| psa_implementation = { ap, ap1 }; | ||
| ^^^^^^^^^^^^^^^^^^ |
81 changes: 81 additions & 0 deletions
81
testdata/p4_16_psa_errors_outputs/psa-action-profile2.p4.bfrt.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| { | ||
| "schema_version" : "1.0.0", | ||
| "tables" : [ | ||
| { | ||
| "name" : "ip.MyIC.tbl", | ||
| "id" : 39967501, | ||
| "table_type" : "MatchAction_Direct", | ||
| "size" : 1024, | ||
| "annotations" : [], | ||
| "depends_on" : [], | ||
| "has_const_default_action" : false, | ||
| "key" : [ | ||
| { | ||
| "id" : 1, | ||
| "name" : "hdr.ethernet.srcAddr", | ||
| "repeated" : false, | ||
| "annotations" : [], | ||
| "mandatory" : false, | ||
| "match_type" : "Exact", | ||
| "type" : { | ||
| "type" : "bytes", | ||
| "width" : 48 | ||
| } | ||
| } | ||
| ], | ||
| "action_specs" : [ | ||
| { | ||
| "id" : 21257015, | ||
| "name" : "NoAction", | ||
| "action_scope" : "TableAndDefault", | ||
| "annotations" : [], | ||
| "data" : [] | ||
| }, | ||
| { | ||
| "id" : 21832421, | ||
| "name" : "MyIC.a1", | ||
| "action_scope" : "TableAndDefault", | ||
| "annotations" : [], | ||
| "data" : [ | ||
| { | ||
| "id" : 1, | ||
| "name" : "param", | ||
| "repeated" : false, | ||
| "mandatory" : true, | ||
| "read_only" : false, | ||
| "annotations" : [], | ||
| "type" : { | ||
| "type" : "bytes", | ||
| "width" : 48 | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "id" : 23466264, | ||
| "name" : "MyIC.a2", | ||
| "action_scope" : "TableAndDefault", | ||
| "annotations" : [], | ||
| "data" : [ | ||
| { | ||
| "id" : 1, | ||
| "name" : "param", | ||
| "repeated" : false, | ||
| "mandatory" : true, | ||
| "read_only" : false, | ||
| "annotations" : [], | ||
| "type" : { | ||
| "type" : "bytes", | ||
| "width" : 16 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "data" : [], | ||
| "supported_operations" : [], | ||
| "attributes" : ["EntryScope"] | ||
| } | ||
| ], | ||
| "learn_filters" : [] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [--Werror=duplicate] error: Name 'MyIC.counter0' is used for multiple direct counter objects in the P4Info message | ||
| [--Werror=duplicate] error: Found 1 duplicate name(s) in the P4Info |
120 changes: 120 additions & 0 deletions
120
testdata/p4_16_psa_errors_outputs/psa-counter6.p4.bfrt.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| { | ||
| "schema_version" : "1.0.0", | ||
| "tables" : [ | ||
| { | ||
| "name" : "ip.MyIC.tbl", | ||
| "id" : 39967501, | ||
| "table_type" : "MatchAction_Direct", | ||
| "size" : 1024, | ||
| "annotations" : [], | ||
| "depends_on" : [], | ||
| "has_const_default_action" : false, | ||
| "key" : [ | ||
| { | ||
| "id" : 1, | ||
| "name" : "hdr.ethernet.srcAddr", | ||
| "repeated" : false, | ||
| "annotations" : [], | ||
| "mandatory" : false, | ||
| "match_type" : "Exact", | ||
| "type" : { | ||
| "type" : "bytes", | ||
| "width" : 48 | ||
| } | ||
| } | ||
| ], | ||
| "action_specs" : [ | ||
| { | ||
| "id" : 21257015, | ||
| "name" : "NoAction", | ||
| "action_scope" : "TableAndDefault", | ||
| "annotations" : [], | ||
| "data" : [] | ||
| }, | ||
| { | ||
| "id" : 22078320, | ||
| "name" : "MyIC.execute", | ||
| "action_scope" : "TableAndDefault", | ||
| "annotations" : [], | ||
| "data" : [] | ||
| } | ||
| ], | ||
| "data" : [ | ||
| { | ||
| "mandatory" : false, | ||
| "read_only" : false, | ||
| "singleton" : { | ||
| "id" : 65554, | ||
| "name" : "$COUNTER_SPEC_PKTS", | ||
| "repeated" : false, | ||
| "annotations" : [], | ||
| "type" : { | ||
| "type" : "uint64", | ||
| "default_value" : 0 | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "supported_operations" : ["SyncCounters"], | ||
| "attributes" : ["EntryScope"] | ||
| }, | ||
| { | ||
| "name" : "ip.MyIC.tbl2", | ||
| "id" : 47318070, | ||
| "table_type" : "MatchAction_Direct", | ||
| "size" : 1024, | ||
| "annotations" : [], | ||
| "depends_on" : [], | ||
| "has_const_default_action" : false, | ||
| "key" : [ | ||
| { | ||
| "id" : 1, | ||
| "name" : "hdr.ethernet.srcAddr", | ||
| "repeated" : false, | ||
| "annotations" : [], | ||
| "mandatory" : false, | ||
| "match_type" : "Exact", | ||
| "type" : { | ||
| "type" : "bytes", | ||
| "width" : 48 | ||
| } | ||
| } | ||
| ], | ||
| "action_specs" : [ | ||
| { | ||
| "id" : 21257015, | ||
| "name" : "NoAction", | ||
| "action_scope" : "TableAndDefault", | ||
| "annotations" : [], | ||
| "data" : [] | ||
| }, | ||
| { | ||
| "id" : 22078320, | ||
| "name" : "MyIC.execute", | ||
| "action_scope" : "TableAndDefault", | ||
| "annotations" : [], | ||
| "data" : [] | ||
| } | ||
| ], | ||
| "data" : [ | ||
| { | ||
| "mandatory" : false, | ||
| "read_only" : false, | ||
| "singleton" : { | ||
| "id" : 65554, | ||
| "name" : "$COUNTER_SPEC_PKTS", | ||
| "repeated" : false, | ||
| "annotations" : [], | ||
| "type" : { | ||
| "type" : "uint64", | ||
| "default_value" : 0 | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "supported_operations" : ["SyncCounters"], | ||
| "attributes" : ["EntryScope"] | ||
| } | ||
| ], | ||
| "learn_filters" : [] | ||
| } |
3 changes: 3 additions & 0 deletions
3
testdata/p4_16_psa_errors_outputs/psa-example-dpdk-directmeter-err.p4-error
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| psa.p4(670): [--Werror=unexpected] error: dpdk_execute method of meter0 extern can only be invoked from within action of ownertable | ||
| PSA_MeterColor_t dpdk_execute(in bit<32> pkt_len); | ||
| ^^^^^^^^^^^^ |
Oops, something went wrong.