port attributes

Author: UnsignedByte

crates/ast/src/control.rs

@@ -1,6 +1,7 @@
 use super::{
     Binding, Expr, Id, Implication, Loc, OrderConstraint, Range, Time,
 };
+use fil_utils::PortAttrs;
 use struct_variant::struct_variant;
 
 #[derive(Clone)]
@@ -365,11 +366,13 @@ pub struct Bundle {
     pub name: Loc<Id>,
     /// Type of the bundle
     pub typ: BundleType,
+    /// Attributes associated with the bundle
+    pub attrs: PortAttrs,
 }
 
 impl Bundle {
-    pub fn new(name: Loc<Id>, typ: BundleType) -> Self {
-        Self { name, typ }
+    pub fn new(name: Loc<Id>, typ: BundleType, attrs: PortAttrs) -> Self {
+        Self { name, typ, attrs }
     }
 
     /// Resolve expressions in the Bundle

crates/ast/src/parser.rs

@@ -719,7 +719,7 @@ impl FilamentParser {
     fn bundle_def(input: Node) -> ParseResult<ast::Bundle> {
         match_nodes!(
             input.clone().into_children();
-            [identifier(name), expr(sizes).., bundle_typ((params, range, width))] => {
+            [attributes(attrs), identifier(name), expr(sizes).., bundle_typ((params, range, width))] => {
                 let sizes = sizes.collect_vec();
                 // If no size is specified, treat this is as one dimensional bundle with size 1.
                 let (sizes, s_len) = if sizes.is_empty() {
@@ -739,7 +739,7 @@ impl FilamentParser {
                     params.push(Loc::unknown(ast::Id::from(format!("_{i}"))));
                 });
 
-                Ok(ast::Bundle::new(name, ast::BundleType::new(params, sizes, range, width)))
+                Ok(ast::Bundle::new(name, ast::BundleType::new(params, sizes, range, width), attrs))
             }
         )
     }

crates/ast/src/syntax.pest

@@ -175,7 +175,7 @@ bundle_typ = {
 
 // Bundle definition
 bundle_def = {
-  identifier ~ ("[" ~ expr ~ "]")* ~ ":" ~ bundle_typ
+  attributes ~ identifier ~ ("[" ~ expr ~ "]")* ~ ":" ~ bundle_typ
 }
 
 // Ports

crates/filament/src/ir_passes/bundle_elim.rs

@@ -69,6 +69,7 @@ impl BundleElim {
             width,
             live,
             info,
+            attrs,
         } = comp.get(pidx).clone();
 
         let Liveness { idxs, lens, range } = live;
@@ -152,6 +153,7 @@ impl BundleElim {
                     owner,
                     info, // duplicate the info
                     width,
+                    attrs: attrs.clone(),
                 });
 
                 // Fill in the live idxs with a new dummy index

crates/filament/src/ir_passes/mono/monosig.rs

@@ -800,6 +800,7 @@ impl MonoSig {
             width,
             live,
             info,
+            attrs,
         } = underlying.get(port);
 
         let inv = match owner {
@@ -820,6 +821,7 @@ impl MonoSig {
             width: *width,      // placeholder
             live: live.clone(), // placeholder
             info: info.get(),
+            attrs: attrs.clone(),
         });
 
         // Overwrite the value in the port map if any. This is okay because this

crates/ir/src/from_ast/astconv.rs

@@ -440,6 +440,7 @@ impl<'prog> BuildCtx<'prog> {
                     liveness,
                     bitwidth,
                 },
+            attrs,
         } = pd;
 
         let info = self.comp().add(ir::Info::port(
@@ -473,6 +474,7 @@ impl<'prog> BuildCtx<'prog> {
             owner,
             live,
             info,
+            attrs,
         };
 
         // Defines helper variable here due to lifetime issues

crates/ir/src/structure.rs

@@ -3,6 +3,7 @@ use super::{
     InstIdx, InvIdx, ParamIdx, PortIdx, Subst, TimeIdx, TimeSub,
 };
 use fil_ast::Op;
+use fil_utils::PortAttrs;
 use itertools::Itertools;
 use std::fmt;
 
@@ -142,6 +143,7 @@ pub struct Port {
     pub width: ExprIdx,
     pub live: Liveness,
     pub info: InfoIdx,
+    pub attrs: PortAttrs,
 }
 impl Port {
     /// Check if this is an invoke defined port

crates/utils/src/attr/mod.rs

@@ -6,6 +6,7 @@ mod types;
 pub use attributes::Attributes;
 pub use ctx::AttrCtx;
 pub use store::AttrStore;
-pub use types::comp_attrs::{
-    Attrs as CompAttrs, Bool as CompBool, Num as CompNum,
+pub use types::{
+    comp_attrs::{Attrs as CompAttrs, Bool as CompBool, Num as CompNum},
+    port_attrs::{Attrs as PortAttrs, Bool as PortBool, Num as PortNum},
 };

crates/utils/src/attr/types.rs

@@ -13,3 +13,9 @@ attr_set! {
     numeric {
     };
 }
+
+attr_set! {
+    port_attrs;
+    flag {};
+    numeric {};
+}

crates/utils/src/lib.rs

@@ -8,7 +8,10 @@ mod math;
 mod position;
 mod reporter;
 
-pub use attr::{AttrCtx, AttrStore, Attributes, CompAttrs, CompBool, CompNum};
+pub use attr::{
+    AttrCtx, AttrStore, Attributes, CompAttrs, CompBool, CompNum, PortAttrs,
+    PortBool, PortNum,
+};
 pub use errors::{Error, FilamentResult};
 pub use gsym::GSym;
 pub use id::Id;