initial tests with auto keyword for generic inputs/outputs

sylefeb · May 3, 2022 · 4a2c909 · 4a2c909
1 parent 40c9d63
commit 4a2c909
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 5 deletions.
diff --git a/antlr/silice.g4 b/antlr/silice.g4
@@ -134,7 +134,8 @@ RDEFINE             : ':>' ;
 BDEFINE             : '<:>';
 LDEFINEDBL          : '<::' ;
 BDEFINEDBL          : '<::>';
-AUTO                : '<:auto:>' ;
+AUTOBIND            : '<:auto:>' ;
+AUTO                : 'auto' ;
 
 ALWSASSIGNDBL       : '::=' ;
 ALWSASSIGN          : ':=' ;
@@ -196,7 +197,7 @@ memClocks           : (clk0=sclock ',' clk1=sclock) ;
 memModifier         : memClocks | memNoInputLatch | memDelayed | STRING;
 memModifiers        : '<' memModifier (',' memModifier)* ','? '>' ;
 
-type                   : TYPE | (SAMEAS '(' base=IDENTIFIER ('.' member=IDENTIFIER)? ')') ;
+type                   : TYPE | (SAMEAS '(' base=IDENTIFIER ('.' member=IDENTIFIER)? ')') | AUTO;
 declarationWire        : type alwaysAssigned;
 declarationVarInitSet  : '=' (value | UNINITIALIZED) ;
 declarationVarInitCstr : '(' (value | UNINITIALIZED) ')';
@@ -206,7 +207,7 @@ declarationMemory      : (BRAM | BROM | DUALBRAM | SIMPLEDUALBRAM) TYPE name=IDE
 declarationInstance    : blueprint=IDENTIFIER name=IDENTIFIER bpModifiers? ( '(' bpBindingList ')' ) ? ;
 declaration            : declarationVar | declarationInstance | declarationTable | declarationMemory | declarationWire;
 
-bpBinding              : left=IDENTIFIER (LDEFINE | LDEFINEDBL | RDEFINE | BDEFINE | BDEFINEDBL) right=idOrAccess | AUTO;
+bpBinding              : left=IDENTIFIER (LDEFINE | LDEFINEDBL | RDEFINE | BDEFINE | BDEFINEDBL) right=idOrAccess | AUTOBIND;
 bpBindingList          : bpBinding ',' bpBindingList | bpBinding | ;
 
 /* -- io lists -- */

diff --git a/src/Algorithm.cpp b/src/Algorithm.cpp
@@ -1000,7 +1000,7 @@ void Algorithm::getBindings(
   if (bindings == nullptr) return;
   while (bindings != nullptr) {
     if (bindings->bpBinding() != nullptr) {
-      if (bindings->bpBinding()->AUTO() != nullptr) {
+      if (bindings->bpBinding()->AUTOBIND() != nullptr) {
         _autobind = true;
       } else {
         // check if this is a group binding
@@ -1191,7 +1191,7 @@ void Algorithm::gatherTypeNfo(siliceParser::TypeContext *type, t_type_nfo &_nfo,
 {
   if (type->TYPE() != nullptr) {
     splitType(type->TYPE()->getText(), _nfo);
-  } else {
+  } else if (type->SAMEAS() != nullptr) {
     // find base
     std::string base = type->base->getText() + (type->member != nullptr ? "_" + type->member->getText() : "");
     base = translateVIOName(base, &_current->context);
@@ -1216,6 +1216,12 @@ void Algorithm::gatherTypeNfo(siliceParser::TypeContext *type, t_type_nfo &_nfo,
           "no known definition for '%s' (sameas can only be applied to interfaces, groups and simple variables)", type->base->getText().c_str());
       }
     }
+  } else if (type->AUTO() != nullptr) {
+    _nfo.base_type = Parameterized;
+    _nfo.same_as   = "";
+    _nfo.width     = 0;
+  } else {
+    sl_assert(false);
   }
 }
 
@@ -3043,6 +3049,9 @@ void Algorithm::gatherIOs(siliceParser::InOutListContext* inout, t_combinational
       }
       m_Inputs.emplace_back(io);
       m_InputNames.insert(make_pair(io.name, (int)m_Inputs.size() - 1));
+      if (io.type_nfo.base_type == Parameterized) {
+        m_Parameterized.push_back(io.name);
+      }
     } else if (output) {
       t_output_nfo io;
       gatherOutputNfo(output, io, _current, _context);
@@ -3052,6 +3061,9 @@ void Algorithm::gatherIOs(siliceParser::InOutListContext* inout, t_combinational
       }
       m_Outputs.emplace_back(io);
       m_OutputNames.insert(make_pair(io.name, (int)m_Outputs.size() - 1));
+      if (io.type_nfo.base_type == Parameterized) {
+        m_Parameterized.push_back(io.name);
+      }
     } else if (inout) {
       t_inout_nfo io;
       gatherInoutNfo(inout, io, _current, _context);
@@ -3061,6 +3073,9 @@ void Algorithm::gatherIOs(siliceParser::InOutListContext* inout, t_combinational
       }
       m_InOuts.emplace_back(io);
       m_InOutNames.insert(make_pair(io.name, (int)m_InOuts.size() - 1));
+      if (io.type_nfo.base_type == Parameterized) {
+        m_Parameterized.push_back(io.name);
+      }
     } else if (iodef) {
       gatherIoDef(iodef,_current,_context);
     } else if (allouts) {

diff --git a/tests/param1.si b/tests/param1.si
@@ -0,0 +1,13 @@
+algorithm test(
+  input  uint4     a,
+  output sameas(a) b,
+  input  sameas(a) c,
+) {
+  b := a + c;
+}
+
+algorithm main(output int8 leds)
+{
+  uint4 w <: 0;
+  test t(a <: w, b :> leds, c <: w);
+}
diff --git a/tests/param2.si b/tests/param2.si
@@ -0,0 +1,13 @@
+algorithm test(
+  input  auto      a,
+  output sameas(a) b,
+  input  sameas(a) c,
+) {
+  b := a + c;
+}
+
+algorithm main(output int8 leds)
+{
+  uint4 w <: 0;
+  test t(a <: w, b :> leds, c <: w);
+}