[FIRRTL] Add integer shift left parser support

llvm · Oct 3, 2024 · f8b866b · f8b866b
1 parent 001d806
commit f8b866b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/lib/Dialect/FIRRTL/Import/FIRParser.cpp b/lib/Dialect/FIRRTL/Import/FIRParser.cpp
@@ -2384,6 +2384,7 @@ ParseResult FIRStmtParser::parsePrimExp(Value &result) {
  case FIRToken::lp_integer_add:
  case FIRToken::lp_integer_mul:
  case FIRToken::lp_integer_shr:
+ case FIRToken::lp_integer_shl:
  if (requireFeature({4, 0, 0}, "Integer arithmetic expressions", loc))
  return failure();
  break;

diff --git a/lib/Dialect/FIRRTL/Import/FIRTokenKinds.def b/lib/Dialect/FIRRTL/Import/FIRTokenKinds.def
@@ -223,6 +223,7 @@ TOK_LPKEYWORD_PRIM(xorr, XorRPrimOp, 1)
 TOK_LPKEYWORD_PRIM(integer_add, IntegerAddOp, 2)
 TOK_LPKEYWORD_PRIM(integer_mul, IntegerMulOp, 2)
 TOK_LPKEYWORD_PRIM(integer_shr, IntegerShrOp, 2)
+TOK_LPKEYWORD_PRIM(integer_shl, IntegerShlOp, 2)
 
 #undef TOK_MARKER
 #undef TOK_IDENTIFIER

diff --git a/test/Dialect/FIRRTL/parse-basic.fir b/test/Dialect/FIRRTL/parse-basic.fir
@@ -1657,6 +1657,7 @@ circuit IntegerArithmetic :
  output c : Integer
  output d : Integer
  output e : Integer
+ output f : Integer
 
  ; CHECK: [[C:%.+]] = firrtl.integer.add %a, %b
  ; CHECK: firrtl.propassign %c, [[C]]
@@ -1670,6 +1671,10 @@ circuit IntegerArithmetic :
  ; CHECK: firrtl.propassign %e, [[E]]
  propassign e, integer_shr(a, b)
 
+ ; CHECK: [[F:%.+]] = firrtl.integer.shl %a, %b
+ ; CHECK: firrtl.propassign %f, [[F]]
+ propassign f, integer_shl(a, b)
+
 ;// -----
 FIRRTL version 4.0.0
 

diff --git a/test/Dialect/FIRRTL/parse-errors.fir b/test/Dialect/FIRRTL/parse-errors.fir
@@ -1047,6 +1047,17 @@ circuit Top:
  ; expected-error @below {{Integer arithmetic expressions are a FIRRTL 4.0.0+ feature, but the specified FIRRTL version was 3.1.0}}
  propassign c, integer_shr(a, b)
 
+;// -----
+FIRRTL version 3.1.0
+
+circuit Top:
+ module Top:
+ input a : Integer
+ input b : Integer
+ output c : Integer
+ ; expected-error @below {{Integer arithmetic expressions are a FIRRTL 4.0.0+ feature, but the specified FIRRTL version was 3.1.0}}
+ propassign c, integer_shl(a, b)
+
 ;// -----
 FIRRTL version 4.0.0