Fixed/namespace tofino

backends/tofino/bf-asm/alloc.h

@@ -7,6 +7,7 @@
 #include <tuple>
 #include <utility>
 
+namespace P4 {
 namespace BFN {
 
 template <class T>
@@ -226,5 +227,5 @@ class Alloc3D : public Alloc3Dbase<T> {
 };
 
 }  // namespace BFN
-
+}
 #endif /* BACKENDS_TOFINO_BF_ASM_ALLOC_H_ */

backends/tofino/bf-p4c/arch/add_t2na_meta.cpp

@@ -18,6 +18,7 @@
 
 #include "backends/tofino/bf-p4c/arch/add_t2na_meta.h"
 
+namespace P4 {
 namespace BFN {
 
 // Check T2NA metadata structures and headers and add missing fields
@@ -75,3 +76,4 @@ void AddT2naMeta::postorder(IR::Type_StructLike *typeStructLike) {
 }
 
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/add_t2na_meta.h

@@ -21,6 +21,7 @@
 
 #include "ir/ir.h"
 
+namespace P4 {
 namespace BFN {
 
 // Check T2NA metadata and add missing
@@ -33,5 +34,5 @@ class AddT2naMeta final : public Modifier {
 };
 
 }  // namespace BFN
-
+}
 #endif /* BF_P4C_ARCH_ADD_T2NA_META_H_ */

backends/tofino/bf-p4c/arch/arch.cpp

@@ -32,6 +32,8 @@
 #include "ir/id.h"
 #include "lib/cstring.h"
 
+
+namespace P4 {
 namespace BFN {
 
 Pipeline::Pipeline(cstring name, const IR::BFN::P4Thread *ingress, const IR::BFN::P4Thread *egress,
@@ -524,3 +526,4 @@ const IR::Node *RestoreParams::postorder(IR::BFN::TnaDeparser *control) {
 }
 
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/arch.h

@@ -49,6 +49,7 @@
 #include "ir/pass_manager.h"
 #include "ir/visitor.h"
 
+namespace P4 {
 namespace BFN {
 
 // An Inspector pass to extract @pkginfo annotation from the P4 program
@@ -484,5 +485,5 @@ class ApplyEvaluator : public PassManager {
 };
 
 }  // namespace BFN
-
+}
 #endif /* BF_P4C_ARCH_ARCH_H_ */

backends/tofino/bf-p4c/arch/bridge_metadata.cpp

@@ -32,6 +32,8 @@
 #include "lib/ordered_map.h"
 #include "lib/ordered_set.h"
 
+
+namespace P4 {
 namespace BFN {
 namespace {
 
@@ -392,3 +394,4 @@ AddTnaBridgeMetadata::AddTnaBridgeMetadata(P4::ReferenceMap *refMap, P4::TypeMap
 }
 
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/bridge_metadata.h

@@ -29,6 +29,7 @@
 #include "lib/ordered_set.h"
 #include "midend/eliminateSerEnums.h"
 
+namespace P4 {
 namespace BFN {
 
 static const cstring META = "meta"_cs;
@@ -44,5 +45,6 @@ struct AddTnaBridgeMetadata : public PassManager {
 };
 
 }  // namespace BFN
+}
 
 #endif /* BF_P4C_ARCH_BRIDGE_METADATA_H_ */

backends/tofino/bf-p4c/arch/check_extern_invocation.cpp

@@ -21,6 +21,7 @@
 #include "backends/tofino/bf-p4c/device.h"
 #include "lib/bitvec.h"
 
+namespace P4 {
 namespace BFN {
 
 void CheckExternInvocationCommon::checkExtern(const P4::ExternMethod *extMethod,
@@ -144,3 +145,4 @@ void CheckT2NAExternInvocation::initPipeConstraints() {
 }
 
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/check_extern_invocation.h

@@ -30,6 +30,7 @@ class ReferenceMap;
 class TypeMap;
 }  // namespace P4
 
+namespace P4 {
 namespace BFN {
 
 class CheckExternInvocationCommon : public P4::CheckExternInvocationCommon {
@@ -69,7 +70,7 @@ class CheckT2NAExternInvocation : public CheckExternInvocationCommon {
         initPipeConstraints();
     }
 };
-
+}
 }  // namespace BFN
 
 #endif /* BF_P4C_ARCH_CHECK_EXTERN_INVOCATION_H_ */

backends/tofino/bf-p4c/arch/collect_bridged_fields.cpp

@@ -26,6 +26,8 @@
 #include "frontends/p4/typeMap.h"
 #include "ir/ir.h"
 
+
+namespace P4 {
 namespace BFN {
 
 int CollectBridgedFields::uid_counter = 0;
@@ -117,7 +119,7 @@ void forAllTouchedFields(const LinearPath &linearPath, P4::TypeMap *typeMap, Fun
 }
 
 }  // namespace
-
+}
 CollectBridgedFields::CollectBridgedFields(P4::ReferenceMap *refMap, P4::TypeMap *typeMap)
     : refMap(refMap), typeMap(typeMap) {
     uid = ++uid_counter;

backends/tofino/bf-p4c/arch/collect_bridged_fields.h

@@ -33,6 +33,7 @@ class ReferenceMap;
 class TypeMap;
 }  // namespace P4
 
+namespace P4 {
 namespace BFN {
 
 using FieldRef = std::pair<cstring, cstring>;
@@ -94,6 +95,6 @@ struct CollectBridgedFields : public Inspector,
     static int uid_counter;
 };
 
-}  // namespace BFN
+}}  // namespace BFN
 
 #endif /* BF_P4C_ARCH_COLLECT_BRIDGED_FIELDS_H_ */

backends/tofino/bf-p4c/arch/collect_hardware_constrained_fields.cpp

@@ -18,6 +18,8 @@
 
 #include "collect_hardware_constrained_fields.h"
 
+
+namespace P4 {
 namespace BFN {
 
 IR::Member *create_member(cstring hdr, cstring member) {
@@ -148,3 +150,4 @@ void AddHardwareConstrainedFields::postorder(IR::BFN::Pipe *pipe) {
 }
 
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/collect_hardware_constrained_fields.h

@@ -27,6 +27,7 @@
 #include "lib/ordered_map.h"
 #include "lib/ordered_set.h"
 
+namespace P4 {
 namespace BFN {
 
 // This class add hardware constrained fields to pipe->thread[gress].hw_constrained_fields. This is
@@ -46,5 +47,5 @@ class CollectHardwareConstrainedFields : public PassManager {
 };
 
 }  // namespace BFN
-
+}
 #endif /* BF_P4C_ARCH_COLLECT_HARDWARE_CONSTRAINED_FIELDS_H_ */

backends/tofino/bf-p4c/arch/fromv1.0/add_metadata_parser_states.cpp

@@ -26,6 +26,7 @@
 #include "backends/tofino/bf-p4c/arch/intrinsic_metadata.h"
 #include "backends/tofino/bf-p4c/arch/remove_set_metadata.h"
 
+namespace P4 {
 namespace BFN {
 
 /// If after translation, both the $phase0 and $resubmit states are still empty,
@@ -96,3 +97,4 @@ AddMetadataParserStates::AddMetadataParserStates(P4::ReferenceMap *refMap, P4::T
 }
 
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/fromv1.0/add_metadata_parser_states.h

@@ -27,6 +27,7 @@ class ReferenceMap;
 class TypeMap;
 }  // namespace P4
 
+namespace P4 {
 namespace BFN {
 
 struct ElimUnusedMetadataStates : Transform {
@@ -50,5 +51,5 @@ struct AddMetadataParserStates : PassManager {
 };
 
 }  // namespace BFN
-
+}
 #endif /* BF_P4C_ARCH_FROMV1_0_ADD_METADATA_PARSER_STATES_H_ */

backends/tofino/bf-p4c/arch/fromv1.0/checksum.cpp

@@ -18,6 +18,7 @@
 
 #include "backends/tofino/bf-p4c/arch/fromv1.0/checksum.h"
 
+namespace P4 {
 namespace BFN {
 namespace V1 {
 
@@ -32,3 +33,4 @@ TranslateParserChecksums::TranslateParserChecksums(ProgramStructure *structure,
 
 }  // namespace V1
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/fromv1.0/mirror.cpp

@@ -29,6 +29,7 @@
 #include "frontends/p4/methodInstance.h"
 #include "ir/annotations.h"
 
+namespace P4 {
 namespace BFN {
 namespace {
 
@@ -309,3 +310,4 @@ FixupMirrorMetadata::FixupMirrorMetadata(P4::ReferenceMap *refMap, P4::TypeMap *
 }
 
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/fromv1.0/mirror.h

@@ -27,6 +27,7 @@ class ReferenceMap;
 class TypeMap;
 }  // namespace P4
 
+namespace P4 {
 namespace BFN {
 
 using FieldListId = std::tuple<gress_t, unsigned, cstring>;
@@ -57,5 +58,5 @@ class FixupMirrorMetadata : public PassManager {
 };
 
 }  // namespace BFN
-
+}
 #endif /* BF_P4C_ARCH_FROMV1_0_MIRROR_H_ */

backends/tofino/bf-p4c/arch/fromv1.0/parser_counter.cpp

@@ -24,6 +24,7 @@
 #include "backends/tofino/bf-p4c/device.h"
 #include "ir/ir.h"
 
+namespace P4 {
 namespace BFN {
 namespace V1 {
 
@@ -284,3 +285,4 @@ ParserCounterSelectionConverter::ParserCounterSelectionConverter() {
 
 }  // namespace V1
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/fromv1.0/parser_counter.h

@@ -21,6 +21,7 @@
 
 #include "backends/tofino/bf-p4c/arch/fromv1.0/v1_converters.h"
 
+namespace P4 {
 namespace BFN {
 namespace V1 {
 
@@ -41,5 +42,5 @@ class ParserCounterSelectionConverter : public PassManager {
 
 }  // namespace V1
 }  // namespace BFN
-
+}
 #endif /* BF_P4C_ARCH_FROMV1_0_PARSER_COUNTER_H_ */

backends/tofino/bf-p4c/arch/fromv1.0/phase0.cpp

@@ -41,6 +41,8 @@
 #include "lib/cstring.h"
 #include "lib/indent.h"
 
+
+namespace P4 {
 namespace BFN {
 
 namespace {
@@ -953,3 +955,4 @@ IR::Node *ConvertPhase0AssignToExtract::preorder(IR::AssignmentStatement *stmt)
 cstring getDefaultPhase0TableKeyName() { return defaultPhase0TableKeyName; }
 
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/fromv1.0/phase0.h

@@ -33,6 +33,7 @@ class TnaProgramStructure;
 }
 }  // namespace P4
 
+namespace P4 {
 namespace BFN {
 
 /**
@@ -201,7 +202,7 @@ class ConvertPhase0 : public PassManager {
 };
 
 cstring getDefaultPhase0TableKeyName();
-
+}
 }  // namespace BFN
-
+}
 #endif /* BF_P4C_ARCH_FROMV1_0_PHASE0_H_ */

backends/tofino/bf-p4c/arch/fromv1.0/resubmit.cpp

@@ -27,6 +27,7 @@
 #include "frontends/p4/methodInstance.h"
 #include "ir/annotations.h"
 
+namespace P4 {
 namespace BFN {
 namespace {
 
@@ -247,3 +248,4 @@ FixupResubmitMetadata::FixupResubmitMetadata(P4::ReferenceMap *refMap, P4::TypeM
 }
 
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/fromv1.0/resubmit.h

@@ -31,6 +31,7 @@ class ReferenceMap;
 class TypeMap;
 }  // namespace P4
 
+namespace P4 {
 namespace BFN {
 
 struct FieldPacking;
@@ -46,5 +47,5 @@ class FixupResubmitMetadata : public PassManager {
 };
 
 }  // namespace BFN
-
+}
 #endif /* BF_P4C_ARCH_FROMV1_0_RESUBMIT_H_ */

backends/tofino/bf-p4c/arch/fromv1.0/v1_converters.cpp

@@ -27,6 +27,8 @@
 #include "lib/ordered_map.h"
 #include "v1_program_structure.h"
 
+
+namespace P4 {
 namespace BFN {
 
 namespace V1 {
@@ -749,3 +751,4 @@ const IR::Node *ParserPriorityConverter::postorder(IR::AssignmentStatement *node
 }  // namespace V1
 
 }  // namespace BFN
+}

backends/tofino/bf-p4c/arch/fromv1.0/v1_converters.h

@@ -27,6 +27,7 @@
 #include "lib/safe_vector.h"
 #include "v1_program_structure.h"
 
+namespace P4 {
 namespace BFN {
 
 namespace V1 {
@@ -300,5 +301,5 @@ class ParserPriorityConverter : public StatementConverter {
 }  // namespace V1
 
 }  // namespace BFN
-
+}
 #endif /* BF_P4C_ARCH_FROMV1_0_V1_CONVERTERS_H_ */

backends/tofino/bf-p4c/arch/fromv1.0/v1_program_structure.cpp

@@ -21,6 +21,8 @@
 #include "backends/tofino/bf-p4c/common/pragma/all_pragmas.h"
 #include "v1_converters.h"
 
+
+namespace P4 {
 namespace BFN {
 
 namespace V1 {
@@ -174,3 +176,4 @@ const IR::P4Program *ProgramStructure::create(const IR::P4Program *program) {
 }  // namespace V1
 
 }  // namespace BFN
+}