transfer attribute changes

cucapra · UnsignedByte · Sep 4, 2024 · Aug 27, 2024 · Aug 27, 2024 · Aug 28, 2024
commit ff65552abb5c909741a695c3d2a7fdf496fcbd21
diff --git a/apps/fft/test/rand.json b/apps/fft/test/rand.json
diff --git a/crates/ast/src/attribute.rs b/crates/ast/src/attribute.rs
@@ -1,4 +1,5 @@
 use enum_map::{Enum, EnumMap};
+use fil_utils::GPosIdx;
 use strum_macros::EnumString;
 
 /// An attribute that accepts a numeric value
@@ -21,7 +22,7 @@ pub enum BoolAttr {
 
 /// Represents a single attribute. This is a private enum that is used during
 /// parsing to collect all attributes before creating the [Attributes] struct.
-#[derive(Enum)]
+#[derive(Enum, Clone, Copy)]
 pub enum Attr {
     Bool(BoolAttr),
     Num(NumAttr),
@@ -42,24 +43,29 @@ impl From<NumAttr> for Attr {
 /// A set of attributes attached to a component
 #[derive(Default, Clone)]
 pub struct Attributes {
-    attrs: EnumMap<Attr, Option<u64>>,
+    attrs: EnumMap<Attr, Option<(u64, GPosIdx)>>,
 }
 
 impl Attributes {
-    pub fn new(attrs: impl Iterator<Item = (Attr, u64)>) -> Self {
+    pub fn new(attrs: impl Iterator<Item = (Attr, GPosIdx, u64)>) -> Self {
         Self {
-            attrs: attrs.map(|(attr, v)| (attr, Some(v))).collect(),
+            attrs: attrs.map(|(attr, l, v)| (attr, Some((v, l)))).collect(),
         }
     }
 
     /// Get the value of an attribute.
     pub fn get(&self, attr: impl Into<Attr>) -> Option<u64> {
-        self.attrs[attr.into()]
+        self.attrs[attr.into()].map(|(v, _)| v)
+    }
+
+    /// Get the location of an attribute.
+    pub fn get_loc(&self, attr: impl Into<Attr>) -> Option<GPosIdx> {
+        self.attrs[attr.into()].map(|(_, l)| l)
     }
 
     /// Set the value of an attribute
     pub fn set(&mut self, attr: impl Into<Attr>, value: u64) {
-        self.attrs[attr.into()] = Some(value);
+        self.attrs[attr.into()] = Some((value, GPosIdx::UNKNOWN));
     }
 
     /// Remove an attribute

diff --git a/crates/ast/src/component.rs b/crates/ast/src/component.rs
@@ -1,4 +1,4 @@
-use super::{Attributes, Command, Id, Signature};
+use super::{Command, Id, Signature};
 use fil_gen as gen;
 use gen::GenConfig;
 use std::path::PathBuf;
@@ -36,13 +36,11 @@ pub struct Component {
     pub sig: Signature,
     /// Model for this component
     pub body: Vec<Command>,
-    /// Attributes for this component
-    pub attrs: Attributes,
 }
 
 impl Component {
-    pub fn new(sig: Signature, body: Vec<Command>, attrs: Attributes) -> Self {
-        Self { sig, body, attrs }
+    pub fn new(sig: Signature, body: Vec<Command>) -> Self {
+        Self { sig, body }
     }
 }
 

diff --git a/crates/ast/src/parser.rs b/crates/ast/src/parser.rs
@@ -627,6 +627,7 @@ impl FilamentParser {
         Ok(match_nodes!(
             input.into_children();
             [
+                attributes(attributes),
                 identifier(name),
                 params(params),
                 abstract_var(abstract_vars),
@@ -637,6 +638,7 @@ impl FilamentParser {
                 let (inputs, outputs, interface_signals, unannotated_ports) = io;
                 ast::Signature::new(
                     name,
+                    attributes,
                     params,
                     abstract_vars,
                     unannotated_ports,
@@ -649,6 +651,7 @@ impl FilamentParser {
                  )
             },
             [
+                attributes(attributes),
                 identifier(name),
                 params(params),
                 io(io),
@@ -658,6 +661,7 @@ impl FilamentParser {
                 let (inputs, outputs, interface_signals, unannotated_ports) = io;
                 ast::Signature::new(
                     name,
+                    attributes,
                     params,
                     vec![],
                     unannotated_ports,
@@ -825,20 +829,20 @@ impl FilamentParser {
         Ok(())
     }
 
-    fn attr_bind(input: Node) -> ParseResult<Vec<(ast::Attr, u64)>> {
+    fn attr_bind(input: Node) -> ParseResult<Vec<(ast::Attr, GPosIdx, u64)>> {
         match_nodes!(
             input.clone().into_children();
             [identifier(name)] =>
             ast::BoolAttr::from_str(name.as_ref()).map(
-                |attr| vec![(ast::Attr::Bool(attr), 1)]).map_err(
+                |attr| vec![(ast::Attr::Bool(attr), name.pos(), 1)]).map_err(
                     |_| input.error(format!("Found unknown attribute flag \"{name}\""))),
             [not(_), identifier(name)] =>
             ast::BoolAttr::from_str(name.as_ref()).map(
-                |attr| vec![(ast::Attr::Bool(attr), 0)]).map_err(
+                |attr| vec![(ast::Attr::Bool(attr), name.pos(), 0)]).map_err(
                     |_| input.error(format!("Found unknown attribute flag \"{name}\""))),
             [identifier(name), bitwidth(val)] =>
             ast::NumAttr::from_str(name.as_ref()).map(
-                |attr| vec![(ast::Attr::Num(attr), val)]).map_err(
+                |attr| vec![(ast::Attr::Num(attr), name.pos(), val)]).map_err(
                     |_| input.error(format!("Found unknown numeric attribute \"{name}\""))),
         )
     }
@@ -854,11 +858,10 @@ impl FilamentParser {
         match_nodes!(
             input.into_children();
             [
-                attributes(attributes),
                 signature(sig),
                 command(body)..
             ] => {
-                Ok(ast::Component::new(sig, body.into_iter().flatten().collect(), attributes))
+                Ok(ast::Component::new(sig, body.into_iter().flatten().collect()))
             }
         )
     }

diff --git a/crates/ast/src/signature.rs b/crates/ast/src/signature.rs
@@ -2,6 +2,7 @@ use super::{
     Binding, Expr, Id, InterfaceDef, Loc, OrderConstraint, PortDef, Time,
     TimeSub,
 };
+use crate::Attributes;
 use fil_utils::GPosIdx;
 
 #[derive(Clone)]
@@ -111,6 +112,8 @@ impl SigBind {
 pub struct Signature {
     /// Name of the component
     pub name: Loc<Id>,
+    /// Attributes associated with this component
+    pub attributes: Attributes,
     /// Parameters for the Signature
     pub params: Vec<Loc<ParamBind>>,
     /// Parameters bound in the signature binding. These always have a default value.
@@ -136,6 +139,7 @@ impl Signature {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         name: Loc<Id>,
+        attributes: Attributes,
         params: Vec<Loc<ParamBind>>,
         events: Vec<Loc<EventBind>>,
         unannotated_ports: Vec<(Id, u64)>,
@@ -150,6 +154,7 @@ impl Signature {
         inputs.append(&mut outputs);
         Self {
             name,
+            attributes,
             params,
             sig_bindings,
             events,

diff --git a/crates/ast/src/syntax.pest b/crates/ast/src/syntax.pest
@@ -62,7 +62,7 @@ param_bind = {
 }
 
 signature = {
-  identifier ~ params ~ abstract_var? ~ io ~ sig_bindings ~ constraints
+  attributes ~ "comp" ~ identifier ~ params ~ abstract_var? ~ io ~ sig_bindings ~ constraints
 }
 
 attributes = {
@@ -78,13 +78,14 @@ attr_bind = {
 }
 
 component = {
-  attributes ~ "comp" ~ signature ~ "{" ~ command* ~ "}"
+  signature ~ "{" ~ command* ~ "}"
 }
+
 external = {
-  "extern" ~ string_lit ~ "{" ~  ("comp" ~ signature ~ ";")*  ~ "}"
+  "extern" ~ string_lit ~ "{" ~  (signature ~ ";")*  ~ "}"
 }
 generate = {
-  "generate" ~ "(" ~ identifier ~ ")" ~ "using" ~ string_lit ~ "{" ~  ("comp" ~ signature ~ ";")*  ~ "}"
+  "generate" ~ "(" ~ identifier ~ ")" ~ "using" ~ string_lit ~ "{" ~  (signature ~ ";")*  ~ "}"
 }
 
 comp_or_ext = {

diff --git a/crates/ir/src/from_ast/astconv.rs b/crates/ir/src/from_ast/astconv.rs
@@ -1085,8 +1085,6 @@ struct ComponentTransform {
     typ: TypeInfo,
     /// Signature of the component
     sig: ast::Signature,
-    /// Attributes of the component
-    attrs: ast::Attributes,
 }
 
 /// Convert an [ast::Component] into a source [ComponentTransform]
@@ -1095,7 +1093,6 @@ impl From<ast::Component> for ComponentTransform {
         Self {
             typ: TypeInfo::Source(comp.body),
             sig: comp.sig,
-            attrs: comp.attrs,
         }
     }
 }
@@ -1111,7 +1108,6 @@ impl From<ast::Extern> for ComponentTransform {
         Self {
             typ,
             sig: ast::Signature::default(),
-            attrs: ast::Attributes::default(),
         }
     }
 }
@@ -1150,11 +1146,7 @@ fn try_transform(ns: ast::Namespace) -> BuildRes<ir::Context> {
                 } else {
                     TypeInfo::External(path.clone())
                 };
-                ComponentTransform {
-                    typ,
-                    sig: comp,
-                    attrs: Default::default(),
-                }
+                ComponentTransform { typ, sig: comp }
             })
         })
         // add signatures of components as well as their command bodies
@@ -1180,7 +1172,7 @@ fn try_transform(ns: ast::Namespace) -> BuildRes<ir::Context> {
                     TypeInfo::Source(_) => ir::CompType::Source,
                     TypeInfo::External(_) => ir::CompType::External,
                     TypeInfo::Generated(_) => ir::CompType::Generated,
-                }, comp_ctx.attrs), &sig_map);
+                }, comp_ctx.sig.attributes.clone()), &sig_map);
 
             // enable source information saving if this is main
             if ctx.is_main(idx) {