Remove @likely/@unlikely when constfolding if statements

- warn if @unlikely is always taken.
p4lang · Dec 12, 2024 · 05e10e9 · 05e10e9
1 parent 34982a1
commit 05e10e9
Show file tree

Hide file tree

Showing 7 changed files with 129 additions and 2 deletions.
diff --git a/frontends/common/constantFolding.cpp b/frontends/common/constantFolding.cpp
@@ -1108,15 +1108,36 @@ const IR::Node *DoConstantFolding::postorder(IR::SelectExpression *expression) {
     return result;
 }
 
+class FilterLikelyAnnot : public Transform {
+    IR::Statement *preorder(IR::Statement *stmt) {
+        prune();
+        return stmt;
+    }
+    IR::BlockStatement *preorder(IR::BlockStatement *stmt) {
+        prune();
+        visit(stmt->annotations, "annotations");
+        return stmt;
+    }
+    IR::Annotation *preorder(IR::Annotation *annot) {
+        prune();
+        if (annot->name == IR::Annotation::likelyAnnotation) return nullptr;
+        if (annot->name == IR::Annotation::unlikelyAnnotation) {
+            warning(ErrorType::WARN_IGNORE, "ignoring %1% on always taken statement", annot);
+            return nullptr;
+        }
+        return annot;
+    }
+};
+
 const IR::Node *DoConstantFolding::postorder(IR::IfStatement *ifstmt) {
     if (auto cond = ifstmt->condition->to<IR::BoolLiteral>()) {
         if (cond->value) {
-            return ifstmt->ifTrue;
+            return ifstmt->ifTrue->apply(FilterLikelyAnnot());
         } else {
             if (ifstmt->ifFalse == nullptr) {
                 return new IR::EmptyStatement(ifstmt->srcInfo);
             } else {
-                return ifstmt->ifFalse;
+                return ifstmt->ifFalse->apply(FilterLikelyAnnot());
             }
         }
     }

diff --git a/testdata/p4_16_samples/annotation-likely.p4 b/testdata/p4_16_samples/annotation-likely.p4
@@ -0,0 +1,22 @@
+#include <core.p4>
+
+struct Headers {
+    bit<8> a;
+    bit<8> b;
+}
+
+control ingress(inout Headers h) {
+    apply {
+        if (true) @likely {
+            h.a = 0;
+        }
+        if (true) @unlikely {
+            h.b = 0;
+        }
+    }
+}
+
+control c<T>(inout T d);
+package top<T>(c<T> _c);
+
+top(ingress()) main;
diff --git a/testdata/p4_16_samples_outputs/annotation-likely-first.p4 b/testdata/p4_16_samples_outputs/annotation-likely-first.p4
@@ -0,0 +1,17 @@
+#include <core.p4>
+
+struct Headers {
+    bit<8> a;
+    bit<8> b;
+}
+
+control ingress(inout Headers h) {
+    apply {
+        h.a = 8w0;
+        h.b = 8w0;
+    }
+}
+
+control c<T>(inout T d);
+package top<T>(c<T> _c);
+top<Headers>(ingress()) main;
diff --git a/testdata/p4_16_samples_outputs/annotation-likely-frontend.p4 b/testdata/p4_16_samples_outputs/annotation-likely-frontend.p4
@@ -0,0 +1,17 @@
+#include <core.p4>
+
+struct Headers {
+    bit<8> a;
+    bit<8> b;
+}
+
+control ingress(inout Headers h) {
+    apply {
+        h.a = 8w0;
+        h.b = 8w0;
+    }
+}
+
+control c<T>(inout T d);
+package top<T>(c<T> _c);
+top<Headers>(ingress()) main;
diff --git a/testdata/p4_16_samples_outputs/annotation-likely-midend.p4 b/testdata/p4_16_samples_outputs/annotation-likely-midend.p4
@@ -0,0 +1,26 @@
+#include <core.p4>
+
+struct Headers {
+    bit<8> a;
+    bit<8> b;
+}
+
+control ingress(inout Headers h) {
+    @hidden action annotationlikely11() {
+        h.a = 8w0;
+        h.b = 8w0;
+    }
+    @hidden table tbl_annotationlikely11 {
+        actions = {
+            annotationlikely11();
+        }
+        const default_action = annotationlikely11();
+    }
+    apply {
+        tbl_annotationlikely11.apply();
+    }
+}
+
+control c<T>(inout T d);
+package top<T>(c<T> _c);
+top<Headers>(ingress()) main;
diff --git a/testdata/p4_16_samples_outputs/annotation-likely.p4 b/testdata/p4_16_samples_outputs/annotation-likely.p4
@@ -0,0 +1,21 @@
+#include <core.p4>
+
+struct Headers {
+    bit<8> a;
+    bit<8> b;
+}
+
+control ingress(inout Headers h) {
+    apply {
+        if (true) @likely {
+            h.a = 0;
+        }
+        if (true) @unlikely {
+            h.b = 0;
+        }
+    }
+}
+
+control c<T>(inout T d);
+package top<T>(c<T> _c);
+top(ingress()) main;
diff --git a/testdata/p4_16_samples_outputs/annotation-likely.p4-stderr b/testdata/p4_16_samples_outputs/annotation-likely.p4-stderr
@@ -0,0 +1,3 @@
+annotation-likely.p4(13): [--Wwarn=ignore] warning: ignoring @unlikely on always taken statement
+        if (true) @unlikely {
+                  ^