Rework alloc_module_interface to reuse initialize_interface code and …

…initial stages of Latency annotations
pc2 · Jan 10, 2024 · 8fe2407 · 8fe2407
1 parent c64e01f
commit 8fe2407
Show file tree

Hide file tree

Showing 11 changed files with 136 additions and 123 deletions.
diff --git a/README.md b/README.md
@@ -33,6 +33,7 @@ The main goals of the language are roughly listed below:
 - [ ] Arbitrary FPGA hardware full flow
 - [x] Generative Code
 - [ ] Templates
+
 ### Parsing
 - [x] Basic Tokenizer
 - [x] Basic Syntax Error Reporting
@@ -45,6 +46,8 @@ The main goals of the language are roughly listed below:
 - [x] Can Parse Multiply-Add pipeline
 - [x] Can Parse Blur2 filter
 - [x] If Statements
+- [x] Latency Specifiers
+- [ ] Bound Specifiers
 - [ ] Structs
 - [x] For Loops
 - [ ] Multi-Interface Syntax
@@ -71,6 +74,8 @@ The main goals of the language are roughly listed below:
 - [x] Basic LSP for VSCode integration
 - [x] Syntax Highlighting
 - [x] Error and Warning Reporting
+- [ ] Hover type information
+- [ ] Code completion
 - [ ] Per-Line Resource Utilization Reporting
 
 ### Code Generation

diff --git a/multiply_add.sus b/multiply_add.sus
@@ -360,6 +360,11 @@ module first_bit_idx_6 : bool[6] bits -> int first, bool all_zeros {
 
 }
 
+module multiply_add_with_latencies : int a'0, int b'0, int c'0 -> int r'0 {
+    int tmp'1 = multiply(a, b);
+	reg r = tmp + c;
+}
+
 module first_bit_idx_24 : bool[24] bits -> int first {
 	int[4] offsets;
 	bool[4] was_nonzeros;

diff --git a/src/ast.rs b/src/ast.rs
@@ -44,8 +44,7 @@ pub enum IdentifierType {
     Output,
     Local,
     State,
-    Generative,
-    Virtual // Generated at the interfaces of submodule instantiations
+    Generative
 }
 
 impl From<usize> for Span {
@@ -74,8 +73,9 @@ pub struct SignalDeclaration {
     pub span : Span,
     pub name_token : usize,
     pub typ : SpanTypeExpression,
-    pub name : Box<str>, // File position
-    pub identifier_type : IdentifierType
+    pub name : Box<str>,
+    pub identifier_type : IdentifierType,
+    pub latency_expr : Option<SpanExpression>
 }
 
 #[derive(Debug,Clone,Copy)]

diff --git a/src/codegen_fallback.rs b/src/codegen_fallback.rs
@@ -71,7 +71,7 @@ pub fn gen_verilog_code(md : &Module, instance : &InstantiatedModule) -> String
             // Don't print named inputs and outputs, already did that in interface
             match wire_decl.identifier_type {
                 IdentifierType::Input | IdentifierType::Output => {continue;}
-                IdentifierType::Local | IdentifierType::State | IdentifierType::Generative | IdentifierType::Virtual => {}
+                IdentifierType::Local | IdentifierType::State | IdentifierType::Generative => {}
             }
         }
         let wire_or_reg = if let RealWireDataSource::Multiplexer{is_state: initial_value, sources: _} = &w.source {

diff --git a/src/dev_aid/lsp.rs b/src/dev_aid/lsp.rs
@@ -135,7 +135,6 @@ fn get_semantic_token_type_from_ide_token(tok : &IDEToken) -> u32 {
         IDETokenType::Identifier(IDEIdentifierType::Value(IdentifierType::State)) => 3,
         IDETokenType::Identifier(IDEIdentifierType::Value(IdentifierType::Local)) => 3,
         IDETokenType::Identifier(IDEIdentifierType::Value(IdentifierType::Generative)) => 3,
-        IDETokenType::Identifier(IDEIdentifierType::Value(IdentifierType::Virtual)) => unreachable!(),
         IDETokenType::Identifier(IDEIdentifierType::Constant) => 9, // make it 'OPERATOR'?
         IDETokenType::Identifier(IDEIdentifierType::Unknown) => 2, // make it 'OPERATOR'?
         IDETokenType::Identifier(IDEIdentifierType::Interface) => 7, // FUNCTION

diff --git a/src/dev_aid/syntax_highlighting.rs b/src/dev_aid/syntax_highlighting.rs
@@ -75,7 +75,6 @@ fn pretty_print(file_text : &str, tokens : &[Token], ide_infos : &[IDEToken]) {
             IDETokenType::Identifier(IDEIdentifierType::Value(IdentifierType::Input)) => Style::new().blue().bright(),
             IDETokenType::Identifier(IDEIdentifierType::Value(IdentifierType::Output)) => Style::new().blue().dim(),
             IDETokenType::Identifier(IDEIdentifierType::Value(IdentifierType::Generative)) => Style::new().blue().bright().bold(),
-            IDETokenType::Identifier(IDEIdentifierType::Value(IdentifierType::Virtual)) => unreachable!(),
             IDETokenType::Identifier(IDEIdentifierType::Constant) => Style::new().blue().bold(),
             IDETokenType::Identifier(IDEIdentifierType::Type) => Style::new().magenta().bright(),
             IDETokenType::Identifier(IDEIdentifierType::Interface) => Style::new().yellow(),
@@ -124,18 +123,17 @@ fn walk_name_color(all_objects : &[NamedUUID], links : &Links, result : &mut [ID
                         Instantiation::Wire(w) => {
                             if let &WireSource::WireRead{from_wire} = &w.source {
                                 let decl = module.flattened.instantiations[from_wire].extract_wire_declaration();
-                                if decl.identifier_type == IdentifierType::Virtual {continue;} // Virtual wires don't appear in the program text
+                                if decl.is_remote_declaration.is_some() {continue;} // Virtual wires don't appear in this program text
                                 result[w.span.assert_is_single_token()].typ = IDETokenType::Identifier(IDEIdentifierType::Value(decl.identifier_type));
                             }
                         }
                         Instantiation::WireDeclaration(decl) => {
-                            if decl.identifier_type == IdentifierType::Virtual {continue;} // Virtual wires don't appear in the program text
-                            let Some(name_token) = decl.name_token else {continue};
-                            result[name_token].typ = IDETokenType::Identifier(IDEIdentifierType::Value(decl.identifier_type));
+                            if decl.is_remote_declaration.is_some() {continue;} // Virtual wires don't appear in this program text
+                            result[decl.name_token].typ = IDETokenType::Identifier(IDEIdentifierType::Value(decl.identifier_type));
                         }
                         Instantiation::Connection(conn) => {
                             let decl = module.flattened.instantiations[conn.to.root].extract_wire_declaration();
-                            if decl.identifier_type == IdentifierType::Virtual {continue;} // Virtual wires don't appear in the program text
+                            if decl.is_remote_declaration.is_some() {continue;} // Virtual wires don't appear in this program text
                             result[conn.to.span.0].typ = IDETokenType::Identifier(IDEIdentifierType::Value(decl.identifier_type));
                         }
                         Instantiation::SubModule(_) | Instantiation::IfStatement(_) | Instantiation::ForStatement(_) => {}