More modifications required to make the code work with ...

... the recent annotations infra changes Signed-off-by: Andy Fingerhut <andy_fingerhut@alum.wustl.edu>
p4lang · jafingerhut · Oct 7, 2024 · Oct 7, 2024 · Oct 8, 2024 · Oct 8, 2024
commit c3feb19495c661a060f9daaf88ca7aa38dced88b
diff --git a/frontends/p4/duplicateActionControlPlaneNameCheck.cpp b/frontends/p4/duplicateActionControlPlaneNameCheck.cpp
@@ -40,53 +40,40 @@ void DuplicateActionControlPlaneNameCheck::checkForDuplicateName(cstring name,
 }
 
 const IR::Node *DuplicateActionControlPlaneNameCheck::postorder(IR::P4Action *action) {
-    // Actions declared at the top level that the developer did not
-    // write a @name annotation for it, should be included in the
-    // duplicate name check.  They do not yet have a @name annotation
-    // by the time this pass executes, so this method will handle
-    // such actions.
-    if (findContext<IR::P4Control>() == nullptr) {
-        auto nameAnno = action->getAnnotation(IR::Annotation::nameAnnotation);
-        if (!nameAnno) {
-            // name is what this top-level action's @name annotation
-            // will be, after LocalizeAllActions pass adds one.
-            cstring name = "." + action->name;
-            checkForDuplicateName(name, action);
-        }
-    }
-    return action;
-}
+    bool topLevel = findContext<IR::P4Control>() == nullptr;
+    auto nameAnno = action->getAnnotation(IR::Annotation::nameAnnotation);
+    if (!nameAnno && topLevel) {
+        // Actions declared at the top level that the developer did not
+        // write a @name annotation for it, should be included in the
+        // duplicate name check.  They do not yet have a @name annotation
+        // by the time this pass executes, so this method will handle
+        // such actions.
 
-const IR::Node *DuplicateActionControlPlaneNameCheck::postorder(IR::Annotation *annotation) {
-    if (annotation->name != IR::Annotation::nameAnnotation) return annotation;
-    // The node the annotation belongs to
-    CHECK_NULL(getContext()->parent);
-    auto *annotatedNode = getContext()->parent->node;
-    CHECK_NULL(annotatedNode);
-    // We are only interested in name annotations on actions here, as
-    // the P4Runtime API control plane generation code already checks
-    // for duplicate control plane names for other kinds of objects.
-    if (!annotatedNode->is<IR::P4Action>()) {
-        return annotation;
-    }
-    cstring name = annotation->getName();
-    if (!name.startsWith(".")) {
-        // Create a fully hierarchical name beginning with ".", so we
-        // can compare it against any other @name annotation value
-        // that begins with "." and is equal.
-        if (stack.empty()) {
-            name = absl::StrCat(".", name.string_view());
-        } else {
-            name = absl::StrCat(".",
-                                absl::StrJoin(stack, ".",
-                                              [](std::string *out, cstring s) {
-                                                  absl::StrAppend(out, s.string_view());
-                                              }),
-                                ".", name.string_view());
+        // name is what this top-level action's @name annotation
+        // will be, after LocalizeAllActions pass adds one.
+        cstring name = "." + action->name;
+        checkForDuplicateName(name, action);
+    } else {
+        const auto *e0 = nameAnno->expr.at(0);
-        const auto *e0 = nameAnno->expr.at(0);
+        const auto *e0 = nameAnno->getExpr(0);
-        const auto *e0 = nameAnno->expr.at(0);
+        const auto *e0 = nameAnno->getExpr(0);
+        cstring name = e0->to<IR::StringLiteral>()->value;
+        if (!name.startsWith(".")) {
+            // Create a fully hierarchical name beginning with ".", so we
+            // can compare it against any other @name annotation value
+            // that begins with "." and is equal.
+            if (stack.empty()) {
+                name = absl::StrCat(".", name.string_view());
+            } else {
+                name = absl::StrCat(".",
+                                    absl::StrJoin(stack, ".",
+                                                  [](std::string *out, cstring s) {
+                                                      absl::StrAppend(out, s.string_view());
+                                                  }),
+                                    ".", name.string_view());
+            }
         }
+        checkForDuplicateName(name, action);
     }
-    checkForDuplicateName(name, annotatedNode);
-    return annotation;
+    return action;
 }
 
 }  // namespace P4
diff --git a/frontends/p4/duplicateActionControlPlaneNameCheck.h b/frontends/p4/duplicateActionControlPlaneNameCheck.h
@@ -24,7 +24,7 @@ namespace P4 {
 
 /**
  * This pass does not change anything in the IR.  It only gives an
- * error if it finds two objects with the same hierarchical name.  I
+ * error if it finds two actions with the same hierarchical name.  I
  * am not certain, but it might be that at this point in the front
  * end, the only way such a duplicate can happen is due to @name
  * annotations.  @name annotations are definitely taken into account
@@ -77,13 +77,6 @@ class DuplicateActionControlPlaneNameCheck : public Transform {
     void checkForDuplicateName(cstring name, const IR::Node *node);
 
     const IR::Node *postorder(IR::P4Action *action) override;
-
-    const IR::Node *postorder(IR::Annotation *annotation) override;
-    // Do not change name annotations on parameters
-    const IR::Node *preorder(IR::Parameter *parameter) override {
-        prune();
-        return parameter;
-    }
 };
 
 }  // namespace P4