unique headers and disable field aliases (#10)

* generate only one header instance * disable field aliases until we figure out how to handle multiple aliases to the same standard metadata field
hanw · May 4, 2017 · b7db69a · b7db69a
1 parent 1ad9331
commit b7db69a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/backends/bmv2/backend.cpp b/backends/bmv2/backend.cpp
@@ -478,8 +478,8 @@ void Backend::convert(const IR::ToplevelBlock* tb, CompilerOptions& options) {
         new VisitFunctor([this](){ createActions(actions); }),
         new ConvertControl(this),
         new ConvertDeparser(this),
-        new VisitFunctor([this, metadata_remap_file](){
-            createFieldAliases(metadata_remap_file); }),
+        // new VisitFunctor([this, metadata_remap_file](){
+        //     createFieldAliases(metadata_remap_file); }),
     };
     tb->getMain()->apply(codegen_passes);
 }

diff --git a/backends/bmv2/header.cpp b/backends/bmv2/header.cpp
@@ -265,10 +265,15 @@ bool ConvertHeaders::preorder(const IR::Parameter* param) {
     }
 #else
     auto block = getContext()->parent->node;
+    // keep track of which headers we've already generated the json for
     if (block->is<IR::Type_Control>() || block->is<IR::Type_Parser>()) {
         auto ft = backend->getTypeMap().getType(param->getNode(), true);
         if (ft->is<IR::Type_Struct>()) {
             auto st = ft->to<IR::Type_Struct>();
+            if (visitedHeaders.find(st->getName()) != visitedHeaders.end())
+                return false; // already seen
+            else
+                visitedHeaders.emplace(st->getName());
             LOG1("name " << st->getName());
             LOG1("anno " << st->getAnnotations());
             if (st->getAnnotation("metadata")) {

diff --git a/backends/bmv2/header.h b/backends/bmv2/header.h
@@ -28,6 +28,7 @@ namespace BMV2 {
 
 class ConvertHeaders : public Inspector {
     BMV2::Backend*    backend;
+    std::set<cstring> visitedHeaders;
 
  protected:
     Util::JsonArray* pushNewArray(Util::JsonArray* parent);