Annotate Frontend Counters with Min and Max Width (#329)

* Added min_width and max_width for counters * Test files changed with annotations added to the counters and indexing by a field
p4lang · Feb 24, 2017 · 45d1b37 · 45d1b37
1 parent e83d11b
commit 45d1b37
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 11,112 deletions.
diff --git a/frontends/p4/fromv1.0/programStructure.cpp b/frontends/p4/fromv1.0/programStructure.cpp
@@ -774,7 +774,7 @@ ProgramStructure::convertTable(const IR::V1Table* table, cstring newName,
         if (action_selector->mode)
             annos = annos->addAnnotation("mode", new IR::StringLiteral(action_selector->mode));
         if (action_selector->type)
-            annos = annos->addAnnotation("type", new IR::StringLiteral(action_selector->mode));
+            annos = annos->addAnnotation("type", new IR::StringLiteral(action_selector->type));
         auto prop = new IR::Property(
             Util::SourceInfo(), IR::ID(v1model.tableAttributes.tableImplementation.Id()),
             annos, propvalue, false);
@@ -1483,6 +1483,12 @@ ProgramStructure::convert(const IR::CounterOrMeter* cm, cstring newName) {
     auto kindarg = counterType(cm);
     args->push_back(kindarg);
     auto annos = addNameAnnotation(cm->name, cm->annotations);
+    if (auto *c = cm->to<IR::Counter>()) {
+        if (c->min_width >= 0)
+            annos = annos->addAnnotation("min_width", new IR::Constant(c->min_width));
+        if (c->max_width >= 0)
+            annos = annos->addAnnotation("max_width", new IR::Constant(c->max_width));
+    }
     auto decl = new IR::Declaration_Instance(
         Util::SourceInfo(), newName, annos, type, args, nullptr);
     return decl;

diff --git a/testdata/p4_14_samples/switch_20160226/acl.p4 b/testdata/p4_14_samples/switch_20160226/acl.p4
@@ -35,7 +35,7 @@ header_type acl_metadata_t {
         if_label : 15;                         /* if label for acls */
         bd_label : 16;                         /* bd label for acls */
         mirror_session_id : 10;                /* mirror session id */
-        acl_stats_index : 32;                  /* acl stats index */
+        acl_stats_index : 16;                  /* acl stats index */
     }
 }
 header_type qos_metadata_t {

diff --git a/testdata/p4_14_samples_outputs/counter5-first.p4 b/testdata/p4_14_samples_outputs/counter5-first.p4
diff --git a/testdata/p4_14_samples_outputs/counter5-frontend.p4 b/testdata/p4_14_samples_outputs/counter5-frontend.p4
@@ -29,7 +29,7 @@ control egress(inout headers hdr, inout metadata meta, inout standard_metadata_t
 }
 
 control ingress(inout headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) {
-    @name("cntDum") counter(32w70000, CounterType.packets) cntDum_0;
+    @name("cntDum") @min_width(64) counter(32w70000, CounterType.packets) cntDum_0;
     @name("act") action act_0(bit<9> port, bit<17> idx) {
         standard_metadata.egress_spec = port;
         cntDum_0.count((bit<32>)idx);

diff --git a/testdata/p4_14_samples_outputs/counter5-midend.p4 b/testdata/p4_14_samples_outputs/counter5-midend.p4
@@ -31,7 +31,7 @@ control egress(inout headers hdr, inout metadata meta, inout standard_metadata_t
 control ingress(inout headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) {
     @name("NoAction") action NoAction_0() {
     }
-    @name("cntDum") counter(32w70000, CounterType.packets) cntDum;
+    @name("cntDum") @min_width(64) counter(32w70000, CounterType.packets) cntDum;
     @name("act") action act_0(bit<9> port, bit<17> idx) {
         standard_metadata.egress_spec = port;
         cntDum.count((bit<32>)idx);

diff --git a/testdata/p4_14_samples_outputs/counter5.p4 b/testdata/p4_14_samples_outputs/counter5.p4
@@ -29,7 +29,7 @@ control egress(inout headers hdr, inout metadata meta, inout standard_metadata_t
 }
 
 control ingress(inout headers hdr, inout metadata meta, inout standard_metadata_t standard_metadata) {
-    @name("cntDum") counter(32w70000, CounterType.packets) cntDum;
+    @name("cntDum") @min_width(64) counter(32w70000, CounterType.packets) cntDum;
     @name("act") action act(bit<9> port, bit<17> idx) {
         standard_metadata.egress_spec = port;
         cntDum.count((bit<32>)idx);