Some cleanup

Include.
p4lang · Jul 22, 2022 · 3b84874 · 3b84874
1 parent be5e978
commit 3b84874
Show file tree

Hide file tree

Showing 11 changed files with 276 additions and 225 deletions.
diff --git a/backends/bmv2/common/addMissingIds.cpp b/backends/bmv2/common/addMissingIds.cpp
diff --git a/backends/bmv2/common/addMissingIds.h b/backends/bmv2/common/addMissingIds.h
diff --git a/backends/bmv2/simple_switch/midend.cpp b/backends/bmv2/simple_switch/midend.cpp
@@ -60,6 +60,7 @@ limitations under the License.
 #include "midend/midEndLast.h"
 #include "midend/fillEnumMap.h"
 #include "midend/removeAssertAssume.h"
+#include "control-plane/addMissingIds.h"
 #include "backends/bmv2/simple_switch/options.h"
 
 
@@ -71,6 +72,7 @@ SimpleSwitchMidEnd::SimpleSwitchMidEnd(CompilerOptions& options, std::ostream* o
     if (BMV2::SimpleSwitchContext::get().options().loadIRFromJson == false) {
         auto convertEnums = new P4::ConvertEnums(&refMap, &typeMap, new EnumOn32Bits("v1model.p4"));
         addPasses({
+            new P4::AddMissingIdAnnotations(&refMap, &typeMap),
             options.ndebug ? new P4::RemoveAssertAssume(&refMap, &typeMap) : nullptr,
             new P4::CheckTableSize(),
             new P4::RemoveMiss(&refMap, &typeMap),

diff --git a/backends/bmv2/simple_switch/simpleSwitch.cpp b/backends/bmv2/simple_switch/simpleSwitch.cpp
@@ -21,12 +21,10 @@ limitations under the License.
 #include <algorithm>
 #include <cstring>
 #include <set>
-#include "backends/bmv2/common/addMissingIds.h"
 #include "backends/bmv2/common/annotations.h"
 #include "frontends/p4/fromv1.0/v1model.h"
 #include "frontends/p4/cloner.h"
 #include "midend/flattenLogMsg.h"
-#include "p4/toP4/toP4.h"
 #include "simpleSwitch.h"
 #include "backends/bmv2/simple_switch/options.h"
 
@@ -1224,11 +1222,6 @@ SimpleSwitchBackend::convert(const IR::ToplevelBlock* tlb) {
     main->apply(*parseV1Arch);
     program = toplevel->getProgram();
 
-    program = program->apply(
-        P4::BMV2::AddMissingIdAnnotations(refMap, typeMap, toplevel));
-    P4::ToP4 newEmitter;
-    program->apply(newEmitter);
-
     program->apply(DiscoverStructure(structure));
 
     /// generate error types

diff --git a/control-plane/CMakeLists.txt b/control-plane/CMakeLists.txt
@@ -71,6 +71,7 @@ add_custom_command(OUTPUT ${P4RUNTIME_GEN_SRCS} ${P4RUNTIME_GEN_HDRS}
 #PROTOBUF_GENERATE_PYTHON (P4RUNTIME_GEN_PYTHON P4RUNTIME_INFO_GEN_HDRS ${P4RUNTIME_INFO_PROTO})
 
 set (CONTROLPLANE_SRCS
+  addMissingIds.cpp
   bytestrings.cpp
   flattenHeader.cpp
   p4RuntimeArchHandler.cpp
@@ -86,6 +87,7 @@ set (CONTROLPLANE_SOURCES
   )
 
 set (CONTROLPLANE_HDRS
+  addMissingIds.h
   bytestrings.h
   flattenHeader.h
   p4RuntimeArchHandler.h