From 8eb631f9238416e4f13e2f222116be7a68570137 Mon Sep 17 00:00:00 2001 From: Mihai Budiu Date: Fri, 21 Jun 2019 15:57:34 -0700 Subject: [PATCH] Report errors for duplicate objects with the same name; fixes #1932 (#1934) * Report errors for duplicate objects with the same name; fixes #1932 * Do not allow two actions with the same name in the same scope --- frontends/p4/validateParsedProgram.cpp | 3 +- testdata/p4_16_errors/issue1580.p4 | 8 +-- testdata/p4_16_errors/issue1932-1.p4 | 21 +++++++ testdata/p4_16_errors/issue1932-2.p4 | 22 ++++++++ testdata/p4_16_errors/issue1932.p4 | 2 + testdata/p4_16_errors_outputs/issue1580.p4 | 6 +- .../issue1932-1.p4-stderr | 7 +++ testdata/p4_16_errors_outputs/issue1932-2.p4 | 55 +++++++++++++++++++ .../issue1932-2.p4-stderr | 6 ++ testdata/p4_16_errors_outputs/issue1932.p4 | 9 +++ .../p4_16_errors_outputs/issue1932.p4-stderr | 6 ++ testdata/p4_16_samples/issue1642-bmv2.p4 | 4 +- testdata/p4_16_samples/issue1653-bmv2.p4 | 4 +- .../p4_16_samples/issue1653-complex-bmv2.p4 | 19 +++---- testdata/p4_16_samples/issue1660-bmv2.p4 | 4 +- testdata/p4_16_samples/issue1670-bmv2.p4 | 4 +- testdata/p4_16_samples/issue383-bmv2.p4 | 14 ++--- testdata/p4_16_samples/issue562-bmv2.p4 | 4 +- .../issue1642-bmv2-first.p4 | 4 +- .../issue1642-bmv2-frontend.p4 | 4 +- .../issue1642-bmv2-midend.p4 | 4 +- .../p4_16_samples_outputs/issue1642-bmv2.p4 | 4 +- .../issue1653-bmv2-first.p4 | 4 +- .../issue1653-bmv2-frontend.p4 | 4 +- .../issue1653-bmv2-midend.p4 | 4 +- .../p4_16_samples_outputs/issue1653-bmv2.p4 | 4 +- .../issue1653-complex-bmv2-first.p4 | 4 +- .../issue1653-complex-bmv2-frontend.p4 | 4 +- .../issue1653-complex-bmv2-midend.p4 | 4 +- .../issue1653-complex-bmv2.p4 | 4 +- .../issue1660-bmv2-first.p4 | 4 +- .../issue1660-bmv2-frontend.p4 | 4 +- .../issue1660-bmv2-midend.p4 | 4 +- .../p4_16_samples_outputs/issue1660-bmv2.p4 | 4 +- .../issue1670-bmv2-first.p4 | 4 +- .../issue1670-bmv2-frontend.p4 | 4 +- .../issue1670-bmv2-midend.p4 | 4 +- .../p4_16_samples_outputs/issue1670-bmv2.p4 | 4 +- .../issue383-bmv2-first.p4 | 4 +- .../issue383-bmv2-frontend.p4 | 4 +- .../issue383-bmv2-midend.p4 | 4 +- .../p4_16_samples_outputs/issue383-bmv2.p4 | 4 +- .../issue562-bmv2-first.p4 | 4 +- .../issue562-bmv2-frontend.p4 | 4 +- .../issue562-bmv2-midend.p4 | 4 +- .../p4_16_samples_outputs/issue562-bmv2.p4 | 4 +- 46 files changed, 219 insertions(+), 91 deletions(-) create mode 100644 testdata/p4_16_errors/issue1932-1.p4 create mode 100644 testdata/p4_16_errors/issue1932-2.p4 create mode 100644 testdata/p4_16_errors/issue1932.p4 create mode 100644 testdata/p4_16_errors_outputs/issue1932-1.p4-stderr create mode 100644 testdata/p4_16_errors_outputs/issue1932-2.p4 create mode 100644 testdata/p4_16_errors_outputs/issue1932-2.p4-stderr create mode 100644 testdata/p4_16_errors_outputs/issue1932.p4 create mode 100644 testdata/p4_16_errors_outputs/issue1932.p4-stderr diff --git a/frontends/p4/validateParsedProgram.cpp b/frontends/p4/validateParsedProgram.cpp index 2cde8ddeda6..178212f273d 100644 --- a/frontends/p4/validateParsedProgram.cpp +++ b/frontends/p4/validateParsedProgram.cpp @@ -225,7 +225,8 @@ void ValidateParsedProgram::postorder(const IR::P4Program* program) { cstring name = decl->getName(); auto existing = declarations.getDeclaration(name); if (existing != nullptr) { - if (!existing->is() || !decl->is()) { + if (!existing->is() || !decl->is() + || typeid(*existing) != typeid(*decl) || decl->is()) { ::error(ErrorType::ERR_DUPLICATE, "%1% duplicates %2%.", decl->getName(), existing->getName()); } diff --git a/testdata/p4_16_errors/issue1580.p4 b/testdata/p4_16_errors/issue1580.p4 index 330baa65aa4..4c58ba8bc98 100644 --- a/testdata/p4_16_errors/issue1580.p4 +++ b/testdata/p4_16_errors/issue1580.p4 @@ -78,13 +78,13 @@ control egress(inout headers_t hdr, inout user_metadata_t meta, apply { } } -control verify_checksum(inout headers_t hdr, inout user_metadata_t meta) { +control verifyChecksum(inout headers_t hdr, inout user_metadata_t meta) { apply { } } -control compute_checksum(inout headers_t hdr, inout user_metadata_t meta) { +control computeChecksum(inout headers_t hdr, inout user_metadata_t meta) { apply { } } -V1Switch(myParser(), verify_checksum(), ingress(), egress(), - compute_checksum(), MyDeparser()) main; +V1Switch(myParser(), verifyChecksum(), ingress(), egress(), + computeChecksum(), MyDeparser()) main; diff --git a/testdata/p4_16_errors/issue1932-1.p4 b/testdata/p4_16_errors/issue1932-1.p4 new file mode 100644 index 00000000000..9759b485414 --- /dev/null +++ b/testdata/p4_16_errors/issue1932-1.p4 @@ -0,0 +1,21 @@ +#include +#include + +header h1_t { bit<8> f1; } +struct headers_t { h1_t h1; } +struct metadata_t { } + +control ingressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { + action foo (in bit<8> x, out bit<8> y) { y = (x >> 2); } + action foo (inout bit<8> x) { x = (x >> 3); } + apply { + foo(hdr.h1.f1); + foo(hdr.h1.f1, hdr.h1.f1); + } +} +parser parserImpl(packet_in packet, out headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { state start { transition accept; } } +control verifyChecksum(inout headers_t hdr, inout metadata_t meta) { apply { } } +control egressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { apply { } } +control updateChecksum(inout headers_t hdr, inout metadata_t meta) { apply { } } +control deparserImpl(packet_out packet, in headers_t hdr) { apply { } } +V1Switch(parserImpl(), verifyChecksum(), ingressImpl(), egressImpl(), updateChecksum(), deparserImpl()) main; diff --git a/testdata/p4_16_errors/issue1932-2.p4 b/testdata/p4_16_errors/issue1932-2.p4 new file mode 100644 index 00000000000..a847387af37 --- /dev/null +++ b/testdata/p4_16_errors/issue1932-2.p4 @@ -0,0 +1,22 @@ +#include +#include + +header h1_t { bit<8> f1; } +struct headers_t { h1_t h1; } +struct metadata_t { } + +action foo (in bit<8> x, out bit<8> y) { y = (x >> 2); } +action foo (inout bit<8> x) { x = (x >> 3); } + +control ingressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { + apply { + foo(hdr.h1.f1); + foo(hdr.h1.f1, hdr.h1.f1); + } +} +parser parserImpl(packet_in packet, out headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { state start { transition accept; } } +control verifyChecksum(inout headers_t hdr, inout metadata_t meta) { apply { } } +control egressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { apply { } } +control updateChecksum(inout headers_t hdr, inout metadata_t meta) { apply { } } +control deparserImpl(packet_out packet, in headers_t hdr) { apply { } } +V1Switch(parserImpl(), verifyChecksum(), ingressImpl(), egressImpl(), updateChecksum(), deparserImpl()) main; diff --git a/testdata/p4_16_errors/issue1932.p4 b/testdata/p4_16_errors/issue1932.p4 new file mode 100644 index 00000000000..d6406f531df --- /dev/null +++ b/testdata/p4_16_errors/issue1932.p4 @@ -0,0 +1,2 @@ +control foo (in bit<8> x, out bit<8> y) { apply { y = x + 7; } } +bool foo() { return true; } diff --git a/testdata/p4_16_errors_outputs/issue1580.p4 b/testdata/p4_16_errors_outputs/issue1580.p4 index 91fa547e9e9..3105176e13f 100644 --- a/testdata/p4_16_errors_outputs/issue1580.p4 +++ b/testdata/p4_16_errors_outputs/issue1580.p4 @@ -63,15 +63,15 @@ control egress(inout headers_t hdr, inout user_metadata_t meta, inout standard_m } } -control verify_checksum(inout headers_t hdr, inout user_metadata_t meta) { +control verifyChecksum(inout headers_t hdr, inout user_metadata_t meta) { apply { } } -control compute_checksum(inout headers_t hdr, inout user_metadata_t meta) { +control computeChecksum(inout headers_t hdr, inout user_metadata_t meta) { apply { } } -V1Switch(myParser(), verify_checksum(), ingress(), egress(), compute_checksum(), MyDeparser()) main; +V1Switch(myParser(), verifyChecksum(), ingress(), egress(), computeChecksum(), MyDeparser()) main; diff --git a/testdata/p4_16_errors_outputs/issue1932-1.p4-stderr b/testdata/p4_16_errors_outputs/issue1932-1.p4-stderr new file mode 100644 index 00000000000..bc491f5f3c4 --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue1932-1.p4-stderr @@ -0,0 +1,7 @@ +issue1932-1.p4(10): [--Werror=legacy] error: foo: Duplicates declaration foo + action foo (inout bit<8> x) { x = (x >> 3); } + ^^^ +issue1932-1.p4(9) + action foo (in bit<8> x, out bit<8> y) { y = (x >> 2); } + ^^^ +error: 1 errors encountered, aborting compilation diff --git a/testdata/p4_16_errors_outputs/issue1932-2.p4 b/testdata/p4_16_errors_outputs/issue1932-2.p4 new file mode 100644 index 00000000000..f3aba980457 --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue1932-2.p4 @@ -0,0 +1,55 @@ +#include +#include + +header h1_t { + bit<8> f1; +} + +struct headers_t { + h1_t h1; +} + +struct metadata_t { +} + +action foo(in bit<8> x, out bit<8> y) { + y = x >> 2; +} +action foo(inout bit<8> x) { + x = x >> 3; +} +control ingressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { + apply { + foo(hdr.h1.f1); + foo(hdr.h1.f1, hdr.h1.f1); + } +} + +parser parserImpl(packet_in packet, out headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { + state start { + transition accept; + } +} + +control verifyChecksum(inout headers_t hdr, inout metadata_t meta) { + apply { + } +} + +control egressImpl(inout headers_t hdr, inout metadata_t meta, inout standard_metadata_t stdmeta) { + apply { + } +} + +control updateChecksum(inout headers_t hdr, inout metadata_t meta) { + apply { + } +} + +control deparserImpl(packet_out packet, in headers_t hdr) { + apply { + } +} + +V1Switch(parserImpl(), verifyChecksum(), ingressImpl(), egressImpl(), updateChecksum(), deparserImpl()) main; + diff --git a/testdata/p4_16_errors_outputs/issue1932-2.p4-stderr b/testdata/p4_16_errors_outputs/issue1932-2.p4-stderr new file mode 100644 index 00000000000..acf86b7aad2 --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue1932-2.p4-stderr @@ -0,0 +1,6 @@ +issue1932-2.p4(9): [--Werror=duplicate] error: foo duplicates foo. +action foo (inout bit<8> x) { x = (x >> 3); } + ^^^ +issue1932-2.p4(8) +action foo (in bit<8> x, out bit<8> y) { y = (x >> 2); } + ^^^ diff --git a/testdata/p4_16_errors_outputs/issue1932.p4 b/testdata/p4_16_errors_outputs/issue1932.p4 new file mode 100644 index 00000000000..71e74aaaaf6 --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue1932.p4 @@ -0,0 +1,9 @@ +control foo(in bit<8> x, out bit<8> y) { + apply { + y = x + 7; + } +} + +bool foo() { + return true; +} diff --git a/testdata/p4_16_errors_outputs/issue1932.p4-stderr b/testdata/p4_16_errors_outputs/issue1932.p4-stderr new file mode 100644 index 00000000000..82eabbb4fb0 --- /dev/null +++ b/testdata/p4_16_errors_outputs/issue1932.p4-stderr @@ -0,0 +1,6 @@ +issue1932.p4(2): [--Werror=duplicate] error: foo duplicates foo. +bool foo() { return true; } + ^^^ +issue1932.p4(1) +control foo (in bit<8> x, out bit<8> y) { apply { y = x + 7; } } + ^^^ diff --git a/testdata/p4_16_samples/issue1642-bmv2.p4 b/testdata/p4_16_samples/issue1642-bmv2.p4 index 43907d1872a..1fc01da9229 100644 --- a/testdata/p4_16_samples/issue1642-bmv2.p4 +++ b/testdata/p4_16_samples/issue1642-bmv2.p4 @@ -52,7 +52,7 @@ control deparser(packet_out b, in parsed_packet_t hdr) { apply { } } -control verify_checksum(inout parsed_packet_t hdr, +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -62,5 +62,5 @@ control compute_checksum(inout parsed_packet_t hdr, apply { } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples/issue1653-bmv2.p4 b/testdata/p4_16_samples/issue1653-bmv2.p4 index edf65b05411..002d907d7b6 100644 --- a/testdata/p4_16_samples/issue1653-bmv2.p4 +++ b/testdata/p4_16_samples/issue1653-bmv2.p4 @@ -59,7 +59,7 @@ control deparser(packet_out b, in parsed_packet_t h) { apply { } } -control verify_checksum(inout parsed_packet_t hdr, +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -69,5 +69,5 @@ control compute_checksum(inout parsed_packet_t hdr, apply { } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples/issue1653-complex-bmv2.p4 b/testdata/p4_16_samples/issue1653-complex-bmv2.p4 index fcdfaa56710..e1a227c2152 100644 --- a/testdata/p4_16_samples/issue1653-complex-bmv2.p4 +++ b/testdata/p4_16_samples/issue1653-complex-bmv2.p4 @@ -31,7 +31,7 @@ struct alt_t { int<8> hashRes; bool useHash; EthTypes type; - bit<7> pad; + bit<7> pad; }; struct row_t { @@ -52,7 +52,7 @@ struct local_metadata_t { struct parsed_packet_t { bitvec_hdr bvh0; - bitvec_hdr bvh1; + bitvec_hdr bvh1; }; parser parse(packet_in pk, out parsed_packet_t h, @@ -72,9 +72,9 @@ control ingress(inout parsed_packet_t h, action do_act() { h.bvh1.row.alt1.valid = 0; - local_metadata.row0.alt0.valid = 0; + local_metadata.row0.alt0.valid = 0; } - + table tns { key = { h.bvh1.row.alt1.valid : exact; @@ -84,7 +84,7 @@ control ingress(inout parsed_packet_t h, do_act; } } - + apply { tns.apply(); @@ -92,7 +92,7 @@ control ingress(inout parsed_packet_t h, // Copy another header's data to local variable. bh.row.alt0.useHash = h.bvh0.row.alt0.useHash; bh.row.alt1.type = EthTypes.IPv4; - h.bvh0.row.alt1.type = bh.row.alt1.type; + h.bvh0.row.alt1.type = bh.row.alt1.type; local_metadata.row0.alt0.useHash = true; clone3(CloneType.I2E, 0, local_metadata.row0); @@ -108,11 +108,11 @@ control egress(inout parsed_packet_t hdr, control deparser(packet_out b, in parsed_packet_t h) { apply { b.emit(h.bvh0); - b.emit(h.bvh1); + b.emit(h.bvh1); } } -control verify_checksum(inout parsed_packet_t hdr, +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -122,6 +122,5 @@ control compute_checksum(inout parsed_packet_t hdr, apply { } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; - diff --git a/testdata/p4_16_samples/issue1660-bmv2.p4 b/testdata/p4_16_samples/issue1660-bmv2.p4 index e069e09a459..45b0518daec 100644 --- a/testdata/p4_16_samples/issue1660-bmv2.p4 +++ b/testdata/p4_16_samples/issue1660-bmv2.p4 @@ -32,7 +32,7 @@ control deparser(packet_out b, in parsed_packet_t h) { apply { } } -control verify_checksum(inout parsed_packet_t hdr, +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -42,5 +42,5 @@ control compute_checksum(inout parsed_packet_t hdr, apply { } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples/issue1670-bmv2.p4 b/testdata/p4_16_samples/issue1670-bmv2.p4 index 3543f130781..712fc681b4a 100644 --- a/testdata/p4_16_samples/issue1670-bmv2.p4 +++ b/testdata/p4_16_samples/issue1670-bmv2.p4 @@ -40,7 +40,7 @@ control deparser(packet_out b, in parsed_packet_t h) { apply { } } -control verify_checksum(inout parsed_packet_t hdr, +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -50,5 +50,5 @@ control compute_checksum(inout parsed_packet_t hdr, apply { } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples/issue383-bmv2.p4 b/testdata/p4_16_samples/issue383-bmv2.p4 index 3e3591370e6..cc5f8586ed0 100644 --- a/testdata/p4_16_samples/issue383-bmv2.p4 +++ b/testdata/p4_16_samples/issue383-bmv2.p4 @@ -46,13 +46,13 @@ struct local_metadata_t { struct parsed_packet_t { bitvec_hdr bvh0; - bitvec_hdr bvh1; + bitvec_hdr bvh1; }; struct tst_t { row_t row0; row_t row1; - col_t col; + col_t col; bitvec_hdr bvh0; bitvec_hdr bvh1; } @@ -76,9 +76,9 @@ control ingress(inout parsed_packet_t h, action do_act() { h.bvh1.row.alt1.valid = 0; - local_metadata.col.bvh.row.alt0.valid = 0; + local_metadata.col.bvh.row.alt0.valid = 0; } - + table tns { key = { h.bvh1.row.alt1.valid : exact; @@ -88,7 +88,7 @@ control ingress(inout parsed_packet_t h, do_act; } } - + apply { tns.apply(); @@ -128,7 +128,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -138,5 +138,5 @@ control compute_checksum(inout parsed_packet_t hdr, apply { } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples/issue562-bmv2.p4 b/testdata/p4_16_samples/issue562-bmv2.p4 index 2609e27debe..36ff7baae99 100644 --- a/testdata/p4_16_samples/issue562-bmv2.p4 +++ b/testdata/p4_16_samples/issue562-bmv2.p4 @@ -45,7 +45,7 @@ control deparser(packet_out b, in parsed_packet_t hdr) { apply { } } -control verify_checksum(inout parsed_packet_t hdr, +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -55,5 +55,5 @@ control compute_checksum(inout parsed_packet_t hdr, apply { } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1642-bmv2-first.p4 b/testdata/p4_16_samples_outputs/issue1642-bmv2-first.p4 index 60390af15fd..59c20d93121 100644 --- a/testdata/p4_16_samples_outputs/issue1642-bmv2-first.p4 +++ b/testdata/p4_16_samples_outputs/issue1642-bmv2-first.p4 @@ -50,7 +50,7 @@ control deparser(packet_out b, in parsed_packet_t hdr) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -60,5 +60,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1642-bmv2-frontend.p4 b/testdata/p4_16_samples_outputs/issue1642-bmv2-frontend.p4 index 60390af15fd..59c20d93121 100644 --- a/testdata/p4_16_samples_outputs/issue1642-bmv2-frontend.p4 +++ b/testdata/p4_16_samples_outputs/issue1642-bmv2-frontend.p4 @@ -50,7 +50,7 @@ control deparser(packet_out b, in parsed_packet_t hdr) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -60,5 +60,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1642-bmv2-midend.p4 b/testdata/p4_16_samples_outputs/issue1642-bmv2-midend.p4 index 45aa59a6cf0..60545508e0f 100644 --- a/testdata/p4_16_samples_outputs/issue1642-bmv2-midend.p4 +++ b/testdata/p4_16_samples_outputs/issue1642-bmv2-midend.p4 @@ -63,7 +63,7 @@ control deparser(packet_out b, in parsed_packet_t hdr) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -73,5 +73,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1642-bmv2.p4 b/testdata/p4_16_samples_outputs/issue1642-bmv2.p4 index 48cd3cc18fb..88560d1a86f 100644 --- a/testdata/p4_16_samples_outputs/issue1642-bmv2.p4 +++ b/testdata/p4_16_samples_outputs/issue1642-bmv2.p4 @@ -50,7 +50,7 @@ control deparser(packet_out b, in parsed_packet_t hdr) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -60,5 +60,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1653-bmv2-first.p4 b/testdata/p4_16_samples_outputs/issue1653-bmv2-first.p4 index 50851c6b346..130309495bd 100644 --- a/testdata/p4_16_samples_outputs/issue1653-bmv2-first.p4 +++ b/testdata/p4_16_samples_outputs/issue1653-bmv2-first.p4 @@ -39,7 +39,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -49,5 +49,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1653-bmv2-frontend.p4 b/testdata/p4_16_samples_outputs/issue1653-bmv2-frontend.p4 index 259c94900f2..05763f43b17 100644 --- a/testdata/p4_16_samples_outputs/issue1653-bmv2-frontend.p4 +++ b/testdata/p4_16_samples_outputs/issue1653-bmv2-frontend.p4 @@ -37,7 +37,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -47,5 +47,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1653-bmv2-midend.p4 b/testdata/p4_16_samples_outputs/issue1653-bmv2-midend.p4 index 5f21c4b9981..0b1994a164f 100644 --- a/testdata/p4_16_samples_outputs/issue1653-bmv2-midend.p4 +++ b/testdata/p4_16_samples_outputs/issue1653-bmv2-midend.p4 @@ -46,7 +46,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -56,5 +56,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1653-bmv2.p4 b/testdata/p4_16_samples_outputs/issue1653-bmv2.p4 index 684eca9d106..1fe50005cdb 100644 --- a/testdata/p4_16_samples_outputs/issue1653-bmv2.p4 +++ b/testdata/p4_16_samples_outputs/issue1653-bmv2.p4 @@ -39,7 +39,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -49,5 +49,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-first.p4 b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-first.p4 index f1e187a1172..be253801eaa 100644 --- a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-first.p4 +++ b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-first.p4 @@ -88,7 +88,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -98,5 +98,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-frontend.p4 b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-frontend.p4 index e1608cb1485..115510a9108 100644 --- a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-frontend.p4 +++ b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-frontend.p4 @@ -89,7 +89,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -99,5 +99,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-midend.p4 b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-midend.p4 index 0d1bdb64916..af2b528fa59 100644 --- a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-midend.p4 +++ b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2-midend.p4 @@ -119,7 +119,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -129,5 +129,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4 b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4 index fa8bfcf6b58..2a728fef972 100644 --- a/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4 +++ b/testdata/p4_16_samples_outputs/issue1653-complex-bmv2.p4 @@ -86,7 +86,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -96,5 +96,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1660-bmv2-first.p4 b/testdata/p4_16_samples_outputs/issue1660-bmv2-first.p4 index 22f7af8f15b..c26d3ad14e7 100644 --- a/testdata/p4_16_samples_outputs/issue1660-bmv2-first.p4 +++ b/testdata/p4_16_samples_outputs/issue1660-bmv2-first.p4 @@ -35,7 +35,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -45,5 +45,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1660-bmv2-frontend.p4 b/testdata/p4_16_samples_outputs/issue1660-bmv2-frontend.p4 index 96f66843065..76266b27ac7 100644 --- a/testdata/p4_16_samples_outputs/issue1660-bmv2-frontend.p4 +++ b/testdata/p4_16_samples_outputs/issue1660-bmv2-frontend.p4 @@ -35,7 +35,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -45,5 +45,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1660-bmv2-midend.p4 b/testdata/p4_16_samples_outputs/issue1660-bmv2-midend.p4 index 1d575d51c13..5f2b44856e0 100644 --- a/testdata/p4_16_samples_outputs/issue1660-bmv2-midend.p4 +++ b/testdata/p4_16_samples_outputs/issue1660-bmv2-midend.p4 @@ -44,7 +44,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -54,5 +54,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1660-bmv2.p4 b/testdata/p4_16_samples_outputs/issue1660-bmv2.p4 index e6e9bc1132c..14b56990679 100644 --- a/testdata/p4_16_samples_outputs/issue1660-bmv2.p4 +++ b/testdata/p4_16_samples_outputs/issue1660-bmv2.p4 @@ -35,7 +35,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -45,5 +45,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1670-bmv2-first.p4 b/testdata/p4_16_samples_outputs/issue1670-bmv2-first.p4 index be297b78082..9b8c36ea898 100644 --- a/testdata/p4_16_samples_outputs/issue1670-bmv2-first.p4 +++ b/testdata/p4_16_samples_outputs/issue1670-bmv2-first.p4 @@ -39,7 +39,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -49,5 +49,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1670-bmv2-frontend.p4 b/testdata/p4_16_samples_outputs/issue1670-bmv2-frontend.p4 index be297b78082..9b8c36ea898 100644 --- a/testdata/p4_16_samples_outputs/issue1670-bmv2-frontend.p4 +++ b/testdata/p4_16_samples_outputs/issue1670-bmv2-frontend.p4 @@ -39,7 +39,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -49,5 +49,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1670-bmv2-midend.p4 b/testdata/p4_16_samples_outputs/issue1670-bmv2-midend.p4 index 7e966ce78f9..6b93dfc6e0f 100644 --- a/testdata/p4_16_samples_outputs/issue1670-bmv2-midend.p4 +++ b/testdata/p4_16_samples_outputs/issue1670-bmv2-midend.p4 @@ -48,7 +48,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -58,5 +58,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue1670-bmv2.p4 b/testdata/p4_16_samples_outputs/issue1670-bmv2.p4 index 11a92a90313..e11708bed1f 100644 --- a/testdata/p4_16_samples_outputs/issue1670-bmv2.p4 +++ b/testdata/p4_16_samples_outputs/issue1670-bmv2.p4 @@ -39,7 +39,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -49,5 +49,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue383-bmv2-first.p4 b/testdata/p4_16_samples_outputs/issue383-bmv2-first.p4 index 8be4d913fa6..b987f44965c 100644 --- a/testdata/p4_16_samples_outputs/issue383-bmv2-first.p4 +++ b/testdata/p4_16_samples_outputs/issue383-bmv2-first.p4 @@ -94,7 +94,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -104,5 +104,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue383-bmv2-frontend.p4 b/testdata/p4_16_samples_outputs/issue383-bmv2-frontend.p4 index cbb27effce0..44c5a73adcb 100644 --- a/testdata/p4_16_samples_outputs/issue383-bmv2-frontend.p4 +++ b/testdata/p4_16_samples_outputs/issue383-bmv2-frontend.p4 @@ -88,7 +88,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -98,5 +98,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue383-bmv2-midend.p4 b/testdata/p4_16_samples_outputs/issue383-bmv2-midend.p4 index 568658202e3..f739d204768 100644 --- a/testdata/p4_16_samples_outputs/issue383-bmv2-midend.p4 +++ b/testdata/p4_16_samples_outputs/issue383-bmv2-midend.p4 @@ -107,7 +107,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -117,5 +117,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue383-bmv2.p4 b/testdata/p4_16_samples_outputs/issue383-bmv2.p4 index 5cb0d91c012..73ef425f0c0 100644 --- a/testdata/p4_16_samples_outputs/issue383-bmv2.p4 +++ b/testdata/p4_16_samples_outputs/issue383-bmv2.p4 @@ -92,7 +92,7 @@ control deparser(packet_out b, in parsed_packet_t h) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -102,5 +102,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue562-bmv2-first.p4 b/testdata/p4_16_samples_outputs/issue562-bmv2-first.p4 index 8c2f2a4e585..31072309247 100644 --- a/testdata/p4_16_samples_outputs/issue562-bmv2-first.p4 +++ b/testdata/p4_16_samples_outputs/issue562-bmv2-first.p4 @@ -43,7 +43,7 @@ control deparser(packet_out b, in parsed_packet_t hdr) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -53,5 +53,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue562-bmv2-frontend.p4 b/testdata/p4_16_samples_outputs/issue562-bmv2-frontend.p4 index 8c2f2a4e585..31072309247 100644 --- a/testdata/p4_16_samples_outputs/issue562-bmv2-frontend.p4 +++ b/testdata/p4_16_samples_outputs/issue562-bmv2-frontend.p4 @@ -43,7 +43,7 @@ control deparser(packet_out b, in parsed_packet_t hdr) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -53,5 +53,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue562-bmv2-midend.p4 b/testdata/p4_16_samples_outputs/issue562-bmv2-midend.p4 index b890ee29cde..a9c9127d6a5 100644 --- a/testdata/p4_16_samples_outputs/issue562-bmv2-midend.p4 +++ b/testdata/p4_16_samples_outputs/issue562-bmv2-midend.p4 @@ -56,7 +56,7 @@ control deparser(packet_out b, in parsed_packet_t hdr) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -66,5 +66,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main; diff --git a/testdata/p4_16_samples_outputs/issue562-bmv2.p4 b/testdata/p4_16_samples_outputs/issue562-bmv2.p4 index dad66b00000..f0f04e5c5aa 100644 --- a/testdata/p4_16_samples_outputs/issue562-bmv2.p4 +++ b/testdata/p4_16_samples_outputs/issue562-bmv2.p4 @@ -43,7 +43,7 @@ control deparser(packet_out b, in parsed_packet_t hdr) { } } -control verify_checksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { +control verifyChecksum(inout parsed_packet_t hdr, inout local_metadata_t local_metadata) { apply { } } @@ -53,5 +53,5 @@ control compute_checksum(inout parsed_packet_t hdr, inout local_metadata_t local } } -V1Switch(parse(), verify_checksum(), ingress(), egress(), compute_checksum(), deparser()) main; +V1Switch(parse(), verifyChecksum(), ingress(), egress(), compute_checksum(), deparser()) main;