diff --git a/backends/dpdk/backend.cpp b/backends/dpdk/backend.cpp index a6661f915cf..65efb55b58a 100644 --- a/backends/dpdk/backend.cpp +++ b/backends/dpdk/backend.cpp @@ -108,13 +108,15 @@ void DpdkBackend::convert(const IR::ToplevelBlock *tlb) { }; simplify.addDebugHook(hook, true); program = program->apply(simplify); - + ordered_set used_fields; dpdk_program = convertToDpdk->getDpdkProgram(); if (!dpdk_program) return; PassManager post_code_gen = { new EliminateUnusedAction(), new DpdkAsmOptimization, + new CollectUsedMetadataField(used_fields), + new RemoveUnusedMetadataFields(used_fields), }; dpdk_program = dpdk_program->apply(post_code_gen)->to(); diff --git a/backends/dpdk/dpdkAsmOpt.cpp b/backends/dpdk/dpdkAsmOpt.cpp index ce2092d487d..fd217bfc698 100644 --- a/backends/dpdk/dpdkAsmOpt.cpp +++ b/backends/dpdk/dpdkAsmOpt.cpp @@ -163,4 +163,35 @@ const IR::IndexedVector *RemoveLabelAfterLabel::removeLabe } return new_l; } + +const IR::Node* RemoveUnusedMetadataFields::preorder(IR::DpdkAsmProgram *p) { + IR::IndexedVector usedStruct; + bool isMetadataStruct = false; + for (auto st : p->structType) { + if (!isMetadataStruct) { + for (auto anno : st->annotations->annotations) { + if (anno->name == "__metadata__") { + isMetadataStruct = true; + IR::IndexedVector usedMetadataFields; + for (auto field : st->fields) { + if (used_fields.count(field->name.name)) { + usedMetadataFields.push_back(field); + } + } + auto newSt = new IR::DpdkStructType(st->srcInfo, st->name, + st->annotations, usedMetadataFields); + usedStruct.push_back(newSt); + } + } + if (!isMetadataStruct) { + usedStruct.push_back(st); + } + } else { + usedStruct.push_back(st); + } + } + p->structType = usedStruct; + return p; +} + } // namespace DPDK diff --git a/backends/dpdk/dpdkAsmOpt.h b/backends/dpdk/dpdkAsmOpt.h index c3c6119424e..a4cdee10c85 100644 --- a/backends/dpdk/dpdkAsmOpt.h +++ b/backends/dpdk/dpdkAsmOpt.h @@ -135,6 +135,30 @@ class RemoveLabelAfterLabel : public Transform { } }; + +// This pass Collects all metadata struct member used in program +class CollectUsedMetadataField : public Inspector { + ordered_set& used_fields; + public: + explicit CollectUsedMetadataField(ordered_set& used_fields) + : used_fields(used_fields) {} + bool preorder(const IR::Member *m) override { + // metadata struct field used like m. in expressions + if (m->expr->toString() == "m") + used_fields.insert(m->member.toString()); + return true; + } +}; + +// This pass removes all unused fields from metadata struct +class RemoveUnusedMetadataFields : public Transform { + ordered_set& used_fields; + public: + explicit RemoveUnusedMetadataFields(ordered_set& used_fields) + : used_fields(used_fields) {} + const IR::Node* preorder(IR::DpdkAsmProgram *p) override; +}; + // Instructions can only appear in actions and apply block of .spec file. // All these individual passes work on the actions and apply block of .spec file. class DpdkAsmOptimization : public PassRepeated { diff --git a/backends/dpdk/dpdkProgram.cpp b/backends/dpdk/dpdkProgram.cpp index ffe1ad60df0..667723b66da 100644 --- a/backends/dpdk/dpdkProgram.cpp +++ b/backends/dpdk/dpdkProgram.cpp @@ -24,8 +24,7 @@ limitations under the License. namespace DPDK { /* Insert the metadata structure updated with tmp variables created during parser conversion - Add annotations to metadata and header structures and add all the structures to DPDK - structtype. + Add all the structures to DPDK structtype. */ IR::IndexedVector ConvertToDpdkProgram::UpdateHeaderMetadata (IR::P4Program *prog, IR::Type_Struct *metadata) { @@ -34,13 +33,9 @@ IR::IndexedVector ConvertToDpdkProgram::UpdateHeaderMetadata for (auto obj : prog->objects) { if (auto s = obj->to()) { if (s->name.name == structure->local_metadata_type) { - auto *annotations = new IR::Annotations( - {new IR::Annotation(IR::ID("__metadata__"), {})}); - for (auto anno : s->annotations->annotations) - annotations->add(anno); new_objs->push_back(metadata); auto st = new IR::DpdkStructType(s->srcInfo, s->name, - annotations, metadata->fields); + s->annotations, metadata->fields); structType.push_back(st); } else { if (structure->args_struct_map.find(s->name.name) != @@ -49,10 +44,6 @@ IR::IndexedVector ConvertToDpdkProgram::UpdateHeaderMetadata s->annotations, s->fields); structType.push_back(st); } else if (s->name.name == structure->header_type) { - auto *annotations = new IR::Annotations( - {new IR::Annotation(IR::ID("__packet_data__"), {})}); - for (auto anno : s->annotations->annotations) - annotations->add(anno); auto st = new IR::DpdkStructType(s->srcInfo, s->name, s->annotations, s->fields); structType.push_back(st); diff --git a/testdata/p4_16_samples_outputs/pna-action-selector.p4.spec b/testdata/p4_16_samples_outputs/pna-action-selector.p4.spec index a1cae8bdf57..da5deb78323 100644 --- a/testdata/p4_16_samples_outputs/pna-action-selector.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-action-selector.p4.spec @@ -34,26 +34,7 @@ struct tbl_set_group_id_arg_t { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port - bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<16> local_metadata_data bit<32> pna_main_output_metadata_output_port bit<32> MainControlT_as_group_id diff --git a/testdata/p4_16_samples_outputs/pna-add-on-miss.p4.spec b/testdata/p4_16_samples_outputs/pna-add-on-miss.p4.spec index 38b7512fc58..ec1c7011f56 100644 --- a/testdata/p4_16_samples_outputs/pna-add-on-miss.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-add-on-miss.p4.spec @@ -30,26 +30,7 @@ struct next_hop_arg_t { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port - bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<32> pna_main_output_metadata_output_port bit<32> MainControlT_tmp bit<32> MainControlT_tmp_0 diff --git a/testdata/p4_16_samples_outputs/pna-example-SelectByDirection.p4.spec b/testdata/p4_16_samples_outputs/pna-example-SelectByDirection.p4.spec index ee3724f436e..4975fd8ea85 100644 --- a/testdata/p4_16_samples_outputs/pna-example-SelectByDirection.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-example-SelectByDirection.p4.spec @@ -25,26 +25,8 @@ struct next_hop_arg_t { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<32> pna_main_output_metadata_output_port bit<32> MainControlT_key } diff --git a/testdata/p4_16_samples_outputs/pna-example-SelectByDirection1.p4.spec b/testdata/p4_16_samples_outputs/pna-example-SelectByDirection1.p4.spec index 587506cf842..e2a03529675 100644 --- a/testdata/p4_16_samples_outputs/pna-example-SelectByDirection1.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-example-SelectByDirection1.p4.spec @@ -25,26 +25,8 @@ struct next_hop_arg_t { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<32> pna_main_output_metadata_output_port bit<32> MainControlT_tmp } diff --git a/testdata/p4_16_samples_outputs/pna-example-SelectByDirection2.p4.spec b/testdata/p4_16_samples_outputs/pna-example-SelectByDirection2.p4.spec index 147cae76308..c47ac33f21b 100644 --- a/testdata/p4_16_samples_outputs/pna-example-SelectByDirection2.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-example-SelectByDirection2.p4.spec @@ -25,26 +25,8 @@ struct forward_arg_t { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<32> local_metadata_meta bit<32> pna_main_output_metadata_output_port bit<32> MainControlT_addr diff --git a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit.p4.spec b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit.p4.spec index 67d696ca9a3..4db347dd996 100644 --- a/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-example-dpdk-varbit.p4.spec @@ -42,26 +42,7 @@ struct a2_arg_t { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port - bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<32> pna_main_output_metadata_output_port bit<32> MainParserT_parser_tmp bit<32> MainParserT_parser_tmp_0 diff --git a/testdata/p4_16_samples_outputs/pna-example-template.p4.spec b/testdata/p4_16_samples_outputs/pna-example-template.p4.spec index 834675069a5..d3c17ef3233 100644 --- a/testdata/p4_16_samples_outputs/pna-example-template.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-example-template.p4.spec @@ -25,26 +25,7 @@ struct next_hop_arg_t { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port - bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<32> pna_main_output_metadata_output_port } metadata instanceof main_metadata_t diff --git a/testdata/p4_16_samples_outputs/pna-extract-local-header.p4.spec b/testdata/p4_16_samples_outputs/pna-extract-local-header.p4.spec index 1694520e655..409fa9af2ae 100644 --- a/testdata/p4_16_samples_outputs/pna-extract-local-header.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-extract-local-header.p4.spec @@ -6,26 +6,7 @@ struct my_header_t { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port - bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<32> pna_main_output_metadata_output_port } metadata instanceof main_metadata_t diff --git a/testdata/p4_16_samples_outputs/pna-issue3041.p4.spec b/testdata/p4_16_samples_outputs/pna-issue3041.p4.spec index ec19cc59bda..4ecba94be9d 100644 --- a/testdata/p4_16_samples_outputs/pna-issue3041.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-issue3041.p4.spec @@ -40,26 +40,7 @@ struct a2_arg_t { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port - bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<32> pna_main_output_metadata_output_port bit<32> MainParserT_parser_tmp bit<32> MainParserT_parser_tmp_0 diff --git a/testdata/p4_16_samples_outputs/pna-lookahead-structure-bit-field.p4.spec b/testdata/p4_16_samples_outputs/pna-lookahead-structure-bit-field.p4.spec index 4c50a488348..58cb53812f1 100644 --- a/testdata/p4_16_samples_outputs/pna-lookahead-structure-bit-field.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-lookahead-structure-bit-field.p4.spec @@ -14,26 +14,7 @@ struct lookahead_tmp_hdr { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port - bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<8> local_metadata_f1 bit<32> pna_main_output_metadata_output_port } diff --git a/testdata/p4_16_samples_outputs/pna-lookahead-structure.p4.spec b/testdata/p4_16_samples_outputs/pna-lookahead-structure.p4.spec index 16c87af4e30..eb631860db8 100644 --- a/testdata/p4_16_samples_outputs/pna-lookahead-structure.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-lookahead-structure.p4.spec @@ -14,26 +14,7 @@ struct lookahead_tmp_hdr_0 { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port - bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<16> local_metadata__s1_type10 bit<8> local_metadata__s1_type21 bit<32> pna_main_output_metadata_output_port diff --git a/testdata/p4_16_samples_outputs/pna-mux-dismantle.p4.spec b/testdata/p4_16_samples_outputs/pna-mux-dismantle.p4.spec index 8a2f3762b8d..8676789b104 100644 --- a/testdata/p4_16_samples_outputs/pna-mux-dismantle.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-mux-dismantle.p4.spec @@ -54,26 +54,7 @@ struct next_hop_arg_t { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port - bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<1> local_metadata_rng_result1 bit<1> local_metadata_val1 bit<1> local_metadata_val2 diff --git a/testdata/p4_16_samples_outputs/pna-subparser.p4.spec b/testdata/p4_16_samples_outputs/pna-subparser.p4.spec index 4fc51f507f1..1c4c6bddc59 100644 --- a/testdata/p4_16_samples_outputs/pna-subparser.p4.spec +++ b/testdata/p4_16_samples_outputs/pna-subparser.p4.spec @@ -19,26 +19,7 @@ struct ipv4_t { } struct main_metadata_t { - bit<32> pna_pre_input_metadata_input_port - bit<16> pna_pre_input_metadata_parser_error - bit<32> pna_pre_input_metadata_direction - bit<3> pna_pre_input_metadata_pass - bit<8> pna_pre_input_metadata_loopedback - bit<8> pna_pre_output_metadata_decrypt - bit<32> pna_pre_output_metadata_said - bit<16> pna_pre_output_metadata_decrypt_start_offset - bit<32> pna_main_parser_input_metadata_direction - bit<3> pna_main_parser_input_metadata_pass - bit<8> pna_main_parser_input_metadata_loopedback - bit<32> pna_main_parser_input_metadata_input_port - bit<32> pna_main_input_metadata_direction - bit<3> pna_main_input_metadata_pass - bit<8> pna_main_input_metadata_loopedback - bit<64> pna_main_input_metadata_timestamp - bit<16> pna_main_input_metadata_parser_error - bit<8> pna_main_input_metadata_class_of_service bit<32> pna_main_input_metadata_input_port - bit<8> pna_main_output_metadata_class_of_service bit<32> pna_main_output_metadata_output_port } metadata instanceof main_metadata_t diff --git a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.spec b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.spec index 856c1fb4c35..84593f9704d 100644 --- a/testdata/p4_16_samples_outputs/psa-action-profile1.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-action-profile1.p4.spec @@ -39,31 +39,9 @@ struct tbl_set_member_id_arg_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<32> Ingress_ap_member_id } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.spec b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.spec index 7fb8abfc5a0..cedb54a41de 100644 --- a/testdata/p4_16_samples_outputs/psa-action-profile3.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-action-profile3.p4.spec @@ -43,31 +43,9 @@ struct tbl_set_member_id_arg_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<32> Ingress_ap_member_id } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.spec b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.spec index 209a6430fed..68ecca664fd 100644 --- a/testdata/p4_16_samples_outputs/psa-action-profile4.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-action-profile4.p4.spec @@ -43,31 +43,9 @@ struct tbl_set_member_id_arg_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<32> Ingress_ap_member_id } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.spec b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.spec index 7ea9f2c132e..cf47cf10375 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector1.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-action-selector1.p4.spec @@ -39,31 +39,9 @@ struct tbl_set_group_id_arg_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<32> Ingress_as_group_id bit<32> Ingress_as_member_id diff --git a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.spec b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.spec index c07b2df38b8..259462563f1 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-action-selector2.p4.spec @@ -39,31 +39,9 @@ struct tbl_set_group_id_arg_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data1 bit<16> local_metadata_data2 bit<32> Ingress_as_group_id diff --git a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.spec b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.spec index 0270e7f2e6e..f3cd83b7338 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector3.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-action-selector3.p4.spec @@ -34,31 +34,9 @@ struct a2_arg_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data1 bit<16> local_metadata_data2 bit<48> Ingress_tbl_ethernet_srcAddr diff --git a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.spec b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.spec index c35ee309274..4bd30836142 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector4.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-action-selector4.p4.spec @@ -39,31 +39,9 @@ struct tbl_set_group_id_arg_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<32> Ingress_as_group_id bit<32> Ingress_as_member_id diff --git a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.spec b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.spec index 50f25e60ca9..3a7af5a7be2 100644 --- a/testdata/p4_16_samples_outputs/psa-action-selector5.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-action-selector5.p4.spec @@ -39,31 +39,9 @@ struct tbl_set_group_id_arg_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<32> Ingress_as_group_id bit<32> Ingress_as_member_id diff --git a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.spec index 73000a30d2b..44780e2d392 100644 --- a/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-basic-counter-bmv2.p4.spec @@ -27,31 +27,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp } metadata instanceof metadata_t diff --git a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.spec b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.spec index 307fda17f02..9baa9ffbb64 100644 --- a/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-conditional_operator.p4.spec @@ -26,31 +26,9 @@ struct psa_egress_deparser_input_metadata_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<16> Ingress_tmp bit<16> Ingress_tmp_0 diff --git a/testdata/p4_16_samples_outputs/psa-counter1.p4.spec b/testdata/p4_16_samples_outputs/psa-counter1.p4.spec index c63ced00fc9..0c3ded1bf8b 100644 --- a/testdata/p4_16_samples_outputs/psa-counter1.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-counter1.p4.spec @@ -27,31 +27,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-counter2.p4.spec b/testdata/p4_16_samples_outputs/psa-counter2.p4.spec index d5ae5be0e2e..210d4a4d26f 100644 --- a/testdata/p4_16_samples_outputs/psa-counter2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-counter2.p4.spec @@ -28,31 +28,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-counter3.p4.spec b/testdata/p4_16_samples_outputs/psa-counter3.p4.spec index 8068ccc3dac..1eab0576868 100644 --- a/testdata/p4_16_samples_outputs/psa-counter3.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-counter3.p4.spec @@ -28,31 +28,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-counter4.p4.spec b/testdata/p4_16_samples_outputs/psa-counter4.p4.spec index ea4590b3084..70b4f890525 100644 --- a/testdata/p4_16_samples_outputs/psa-counter4.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-counter4.p4.spec @@ -27,31 +27,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.spec b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.spec index c63ced00fc9..0c3ded1bf8b 100644 --- a/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-custom-type-counter-index.p4.spec @@ -27,31 +27,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.spec index 002f07ba383..9420207c6b0 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-1.p4.spec @@ -57,35 +57,12 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_err - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.spec index 71c6c751f0e..878f8cd179f 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode-2.p4.spec @@ -57,36 +57,13 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> IngressParser_parser_tmp bit<8> Ingress_err - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.spec index 6f8beea4e3d..46aca5f973b 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-errorcode.p4.spec @@ -57,35 +57,12 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_hasReturned - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.spec index ccd490e4801..0d89274a762 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err4.p4.spec @@ -58,36 +58,12 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<48> Ingress_tbl_ethernet_srcAddr bit<16> Ingress_tbl_ipv4_totalLen - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.spec index a01a18fc953..474f7df156a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-err5.p4.spec @@ -58,37 +58,13 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_key bit<48> Ingress_tbl_ethernet_srcAddr bit<48> Ingress_tbl_ethernet_dstAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.spec index 7424c5568d6..560cb9e0792 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-lpm-match-valid.p4.spec @@ -58,34 +58,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.spec index 10974953344..01f7ad3779f 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if-1.p4.spec @@ -70,37 +70,13 @@ struct a3_arg_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<16> local_metadata_data1 bit<48> Ingress_tbl_ethernet_srcAddr bit<48> Ingress_foo_ethernet_dstAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof user_meta_t diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.spec index 4d76712b324..4c312edf602 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-if.p4.spec @@ -66,36 +66,12 @@ struct a2_arg_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<16> local_metadata_data1 bit<48> Ingress_tbl_ethernet_srcAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof user_meta_t diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.spec index 173923bfa31..4b38582872a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-1.p4.spec @@ -58,37 +58,13 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_key bit<48> Ingress_tbl_ethernet_srcAddr bit<48> Ingress_tbl_ethernet_dstAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.spec index a01a18fc953..474f7df156a 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-2.p4.spec @@ -58,37 +58,13 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_key bit<48> Ingress_tbl_ethernet_srcAddr bit<48> Ingress_tbl_ethernet_dstAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.spec index 1e4c35e64c9..f80dfd39bc5 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-3.p4.spec @@ -58,35 +58,11 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_key - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.spec index f052a8fdce9..fbc43660a1c 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys-4.p4.spec @@ -58,35 +58,11 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Egress_key - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.spec index 3abca39a75d..002fded2f28 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-mixed-keys.p4.spec @@ -58,37 +58,13 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_key bit<48> Ingress_tbl_ethernet_srcAddr bit<48> Ingress_tbl_ethernet_dstAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.spec index e6748b54467..727b1bc9adc 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-consolidation-switch.p4.spec @@ -66,36 +66,11 @@ struct a2_arg_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data - bit<16> local_metadata_data1 bit<48> Ingress_tbl_ethernet_srcAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof user_meta_t diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.spec index d1298645431..7a6cc844610 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid1.p4.spec @@ -58,37 +58,13 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_tbl_ethernet_isValid bit<48> Ingress_tbl_ethernet_dstAddr bit<48> Ingress_tbl_ethernet_srcAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.spec index cb95deea4b2..7e7ab2d6d3f 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid2.p4.spec @@ -58,39 +58,15 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_tmp bit<8> Ingress_tmp_0 bit<8> Ingress_key bit<48> Ingress_tbl_ethernet_dstAddr bit<48> Ingress_tbl_ethernet_srcAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.spec index 5e805119f1b..890d67a374c 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid3.p4.spec @@ -58,31 +58,9 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_tmp bit<8> Ingress_tmp_0 @@ -91,8 +69,6 @@ struct metadata { bit<8> Ingress_key bit<48> Ingress_tbl_ethernet_dstAddr bit<48> Ingress_tbl_ethernet_srcAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.spec index bcd83e92c96..747fcc85d5d 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid4.p4.spec @@ -58,31 +58,9 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_tmp bit<8> Ingress_tmp_0 @@ -91,8 +69,6 @@ struct metadata { bit<8> Ingress_key bit<48> Ingress_tbl_ethernet_dstAddr bit<48> Ingress_tbl_ethernet_srcAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.spec index d291c392dd8..17bea932793 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid5.p4.spec @@ -58,38 +58,14 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_tmp bit<8> Ingress_key bit<48> Ingress_tbl_ethernet_dstAddr bit<48> Ingress_tbl_ethernet_srcAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.spec index 4a6ecdade74..4ceab7b10f4 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid6.p4.spec @@ -58,31 +58,9 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_tmp bit<8> Ingress_tmp_0 @@ -90,8 +68,6 @@ struct metadata { bit<8> Ingress_key bit<48> Ingress_tbl_ethernet_dstAddr bit<48> Ingress_tbl_ethernet_srcAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.spec b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.spec index e62da028715..193d8787e32 100644 --- a/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-dpdk-table-key-isValid7.p4.spec @@ -58,37 +58,13 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data bit<8> Ingress_tbl_ethernet_isValid bit<8> Ingress_tbl_tcp_isValid bit<8> Ingress_tbl_ipv4_isValid - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.spec index 3630137ba72..0e96b01528f 100644 --- a/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-drop-all-bmv2.p4.spec @@ -41,31 +41,9 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof metadata_t diff --git a/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.spec index 50293f077e4..942aa4752b0 100644 --- a/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-drop-all-corrected-bmv2.p4.spec @@ -41,31 +41,9 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof metadata_t diff --git a/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.spec index 55802b69ba1..888e548bb05 100644 --- a/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-e2e-cloning-basic-bmv2.p4.spec @@ -26,28 +26,13 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service bit<32> psa_egress_input_metadata_egress_port bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port bit<8> psa_egress_output_metadata_clone bit<16> psa_egress_output_metadata_clone_session_id bit<8> psa_egress_output_metadata_drop diff --git a/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.spec index 4bf54bc562a..3ea029dbfb0 100644 --- a/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-end-of-ingress-test-bmv2.p4.spec @@ -34,31 +34,15 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service bit<32> psa_egress_input_metadata_egress_port bit<32> psa_egress_input_metadata_packet_path bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp bit<1> Ingress_tmp_0 bit<48> Ingress_tmp_1 diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.spec b/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.spec index f396261bc9f..d2272cdd409 100644 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-counter.p4.spec @@ -29,31 +29,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.spec b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.spec index 8a4108cd4db..7ca80363a27 100644 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-externs.p4.spec @@ -50,32 +50,9 @@ struct execute_arg_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop - bit<32> local_metadata_port_in bit<32> local_metadata_port_out bit<32> Ingress_color_out bit<32> Ingress_color_in diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.spec b/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.spec index c65aaf518df..1b0b44485de 100644 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-local-variable.p4.spec @@ -26,31 +26,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.spec b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.spec index e27012ad65d..6834f5d80c1 100644 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter.p4.spec @@ -46,32 +46,9 @@ struct execute_arg_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop - bit<32> local_metadata_port_in bit<32> local_metadata_port_out bit<32> Ingress_tmp bit<32> Ingress_color_out diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.spec b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.spec index 8d98bf0400b..dce75b6265f 100644 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-meter1.p4.spec @@ -46,32 +46,9 @@ struct execute_arg_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop - bit<32> local_metadata_port_in bit<32> local_metadata_port_out bit<32> Ingress_color_out bit<32> Ingress_color_in diff --git a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.spec index aeb2582c321..280ea57946c 100644 --- a/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-dpdk-varbit-bmv2.p4.spec @@ -76,31 +76,10 @@ header IngressParser_parser_lookahead_tmp instanceof lookahead_tmp_hdr header IngressParser_parser_lookahead_tmp_0 instanceof lookahead_tmp_hdr_0 struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<8> IngressParser_parser_tmp bit<32> IngressParser_parser_tmp_0 bit<32> IngressParser_parser_tmp_1 diff --git a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.spec b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.spec index 230c39a576c..f56af6b94bd 100644 --- a/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-incremental-checksum.p4.spec @@ -65,31 +65,10 @@ struct forward_arg_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<32> local_metadata__fwd_metadata_old_srcAddr0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.spec b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.spec index 1bbd5023ac0..477145ec9c1 100644 --- a/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-logical-operations.p4.spec @@ -20,31 +20,9 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> local_metadata_meta bit<48> local_metadata_meta2 bit<48> local_metadata_meta3 diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.spec b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.spec index 3211a69d768..18a6e21d3ee 100644 --- a/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-mask-range.p4.spec @@ -57,34 +57,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.spec b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.spec index 610cba60278..ee377766283 100644 --- a/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-mask-range1.p4.spec @@ -59,38 +59,11 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data - bit<8> local_metadata_tmpMask bit<16> Ingress_tmpMask - bit<16> tmpMask - bit<8> tmpMask_0 - bit<16> tmpMask_1 - bit<8> tmpMask_2 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.spec index 26e44f6c9db..c569ce7127c 100644 --- a/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-register2-bmv2.p4.spec @@ -42,31 +42,9 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<80> Ingress_tmp bit<80> Ingress_tmp_0 bit<32> Ingress_tmp_1 diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.spec b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.spec index a493ac0c90d..cd53a496d74 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-1.p4.spec @@ -56,33 +56,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data - bit<16> tmpMask } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.spec b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.spec index 1a26e55001f..fe2c673fdea 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-mask.p4.spec @@ -57,34 +57,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.spec b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.spec index 0dc17d309b0..c8e05f19402 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple-wc.p4.spec @@ -56,33 +56,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data - bit<8> tmpMask } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.spec b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.spec index 41a65713f77..efc921a0555 100644 --- a/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-select_tuple.p4.spec @@ -56,33 +56,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data - bit<8> tmpMask } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.spec b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.spec index ab553ab6663..597b2936fa3 100644 --- a/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-example-switch-with-constant-expr.p4.spec @@ -20,31 +20,9 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> local_metadata_meta } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.spec index 04d191f6b04..365e5046b9e 100644 --- a/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-fwd-bmv2.p4.spec @@ -26,31 +26,9 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof metadata diff --git a/testdata/p4_16_samples_outputs/psa-header-stack.p4.spec b/testdata/p4_16_samples_outputs/psa-header-stack.p4.spec index f4f4c882685..00d5c29fddd 100644 --- a/testdata/p4_16_samples_outputs/psa-header-stack.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-header-stack.p4.spec @@ -33,31 +33,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY_M { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY_M diff --git a/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.spec index 3685e88200e..8f02ce74928 100644 --- a/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-i2e-cloning-basic-bmv2.p4.spec @@ -26,31 +26,13 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service bit<8> psa_ingress_output_metadata_clone bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp } metadata instanceof metadata_t diff --git a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.spec b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.spec index 026ed8d609d..43b504710f5 100644 --- a/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-idle-timeout.p4.spec @@ -36,31 +36,9 @@ struct a2_arg_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-isvalid.p4.spec b/testdata/p4_16_samples_outputs/psa-isvalid.p4.spec index 2f3c1c4408f..23a69b51a78 100644 --- a/testdata/p4_16_samples_outputs/psa-isvalid.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-isvalid.p4.spec @@ -26,31 +26,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY_M { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY_M diff --git a/testdata/p4_16_samples_outputs/psa-meter4.p4.spec b/testdata/p4_16_samples_outputs/psa-meter4.p4.spec index ea4590b3084..70b4f890525 100644 --- a/testdata/p4_16_samples_outputs/psa-meter4.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-meter4.p4.spec @@ -27,31 +27,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-meter5.p4.spec b/testdata/p4_16_samples_outputs/psa-meter5.p4.spec index ea4590b3084..70b4f890525 100644 --- a/testdata/p4_16_samples_outputs/psa-meter5.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-meter5.p4.spec @@ -27,31 +27,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.spec index d81788b8088..cccf5a1f2b9 100644 --- a/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-multicast-basic-2-bmv2.p4.spec @@ -33,31 +33,15 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port bit<8> psa_egress_input_metadata_class_of_service bit<32> psa_egress_input_metadata_egress_port bit<32> psa_egress_input_metadata_packet_path bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp bit<1> Ingress_tmp_0 bit<16> Egress_tmp diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.spec index ae3f7d29905..dc9cb5baa7e 100644 --- a/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-multicast-basic-bmv2.p4.spec @@ -26,31 +26,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp } metadata instanceof metadata_t diff --git a/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.spec index d98cee8e1b9..fd1fb0614ae 100644 --- a/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-multicast-basic-corrected-bmv2.p4.spec @@ -26,31 +26,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp } metadata instanceof metadata_t diff --git a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.spec index d5f5fd51ab6..38e59cc43f0 100644 --- a/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-recirculate-no-meta-bmv2.p4.spec @@ -33,31 +33,13 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service bit<32> psa_egress_input_metadata_egress_port bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<4> Ingress_tmp bit<48> Ingress_tmp_0 bit<32> Ingress_int_packet_path diff --git a/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.spec index 9e6add15f32..eab05dbc671 100644 --- a/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-register-complex-bmv2.p4.spec @@ -27,31 +27,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp bit<48> Ingress_tmp_0 bit<48> Ingress_tmp_1 diff --git a/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.spec index a07ad97ff69..e3736396909 100644 --- a/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-register-read-write-2-bmv2.p4.spec @@ -37,31 +37,10 @@ header ethernet instanceof ethernet_t header output_data instanceof output_data_t struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp bit<8> Ingress_tmp_0 bit<48> Ingress_tmp_1 diff --git a/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.spec index ca190397d65..1f4740dae9c 100644 --- a/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-register-read-write-bmv2.p4.spec @@ -27,31 +27,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp bit<48> Ingress_tmp_0 } diff --git a/testdata/p4_16_samples_outputs/psa-register1.p4.spec b/testdata/p4_16_samples_outputs/psa-register1.p4.spec index 697ed67b39b..8b0c64ddc23 100644 --- a/testdata/p4_16_samples_outputs/psa-register1.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-register1.p4.spec @@ -31,31 +31,9 @@ struct execute_register_arg_t { } struct EMPTY { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY diff --git a/testdata/p4_16_samples_outputs/psa-register2.p4.spec b/testdata/p4_16_samples_outputs/psa-register2.p4.spec index 7a24f51979a..44c4836102d 100644 --- a/testdata/p4_16_samples_outputs/psa-register2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-register2.p4.spec @@ -31,31 +31,9 @@ struct execute_register_arg_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data } metadata instanceof user_meta_t diff --git a/testdata/p4_16_samples_outputs/psa-register3.p4.spec b/testdata/p4_16_samples_outputs/psa-register3.p4.spec index 3ae5afc3608..59bd9ea2ff0 100644 --- a/testdata/p4_16_samples_outputs/psa-register3.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-register3.p4.spec @@ -31,31 +31,9 @@ struct execute_register_arg_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data } metadata instanceof user_meta_t diff --git a/testdata/p4_16_samples_outputs/psa-remove-header.p4.spec b/testdata/p4_16_samples_outputs/psa-remove-header.p4.spec index 7cb2d9195c4..525c9c9ed89 100644 --- a/testdata/p4_16_samples_outputs/psa-remove-header.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-remove-header.p4.spec @@ -26,31 +26,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY_M { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY_M diff --git a/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.spec index ba0ec030442..85ebb653dc8 100644 --- a/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-resubmit-bmv2.p4.spec @@ -33,31 +33,12 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp } metadata instanceof metadata_t diff --git a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.spec b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.spec index 5d94b0f4501..0fb2f33432e 100644 --- a/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-switch-expression-without-default.p4.spec @@ -66,37 +66,12 @@ struct a2_arg_t { } struct user_meta_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<16> local_metadata_data - bit<16> local_metadata_data1 bit<16> Ingress_tmp bit<48> Ingress_tbl_ethernet_srcAddr - bit<16> tmpMask - bit<8> tmpMask_0 } metadata instanceof user_meta_t diff --git a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.spec b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.spec index 151a615dff9..affe6aa5f0b 100644 --- a/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-table-hit-miss.p4.spec @@ -26,31 +26,9 @@ struct psa_egress_deparser_input_metadata_t { } struct EMPTY_M { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof EMPTY_M diff --git a/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.spec index e8c022ed99d..0246e7e4256 100644 --- a/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-top-level-assignments-bmv2.p4.spec @@ -26,31 +26,9 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit - bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop } metadata instanceof metadata_t diff --git a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.spec index 49b6be9ba3b..94fc1c8fc86 100644 --- a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-bmv2.p4.spec @@ -33,31 +33,15 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port bit<8> psa_egress_input_metadata_class_of_service bit<32> psa_egress_input_metadata_egress_port bit<32> psa_egress_input_metadata_packet_path bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp bit<1> Ingress_tmp_0 bit<16> Egress_tmp diff --git a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.spec b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.spec index 98208f7f91a..a2d2f12fca4 100644 --- a/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.spec +++ b/testdata/p4_16_samples_outputs/psa-unicast-or-drop-corrected-bmv2.p4.spec @@ -26,31 +26,10 @@ struct psa_egress_deparser_input_metadata_t { } struct metadata_t { - bit<32> psa_ingress_parser_input_metadata_ingress_port - bit<32> psa_ingress_parser_input_metadata_packet_path - bit<32> psa_egress_parser_input_metadata_egress_port - bit<32> psa_egress_parser_input_metadata_packet_path bit<32> psa_ingress_input_metadata_ingress_port - bit<32> psa_ingress_input_metadata_packet_path - bit<64> psa_ingress_input_metadata_ingress_timestamp - bit<16> psa_ingress_input_metadata_parser_error - bit<8> psa_ingress_output_metadata_class_of_service - bit<8> psa_ingress_output_metadata_clone - bit<16> psa_ingress_output_metadata_clone_session_id bit<8> psa_ingress_output_metadata_drop - bit<8> psa_ingress_output_metadata_resubmit bit<32> psa_ingress_output_metadata_multicast_group bit<32> psa_ingress_output_metadata_egress_port - bit<8> psa_egress_input_metadata_class_of_service - bit<32> psa_egress_input_metadata_egress_port - bit<32> psa_egress_input_metadata_packet_path - bit<16> psa_egress_input_metadata_instance - bit<64> psa_egress_input_metadata_egress_timestamp - bit<16> psa_egress_input_metadata_parser_error - bit<32> psa_egress_deparser_input_metadata_egress_port - bit<8> psa_egress_output_metadata_clone - bit<16> psa_egress_output_metadata_clone_session_id - bit<8> psa_egress_output_metadata_drop bit<48> Ingress_tmp } metadata instanceof metadata_t