Add a fir version check for colored probes

llvm · Jan 24, 2024 · d87caf0 · d87caf0
1 parent ca10d33
commit d87caf0
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 13 deletions.
diff --git a/lib/Dialect/FIRRTL/Import/FIRParser.cpp b/lib/Dialect/FIRRTL/Import/FIRParser.cpp
@@ -934,25 +934,31 @@ ParseResult FIRParser::parseType(FIRRTLType &result, const Twine &message) {
     auto kind = getToken().getKind();
     auto loc = getToken().getLoc();
     consumeToken();
-    FIRRTLType type;
-    SmallVector<StringRef> layers;
 
+    // Inner Type
+    FIRRTLType type;
     if (parseToken(FIRToken::less, "expected '<' in reference type") ||
         parseType(type, "expected probe data type"))
       return failure();
-    while (getToken().getKind() == FIRToken::identifier) {
-      StringRef layer;
-      loc = getToken().getLoc();
-      (void)parseId(layer, "expected layer name");
-      layers.push_back(layer);
-      if (getToken().getKind() == FIRToken::period)
-        consumeToken();
-    }
-    if (!consumeIf(FIRToken::greater)) {
-      emitError(loc, "expected '>' to end reference type");
-      return failure();
+
+    // Probe Color
+    SmallVector<StringRef> layers;
+    if (getToken().getKind() == FIRToken::identifier) {
+      if (requireFeature({3, 2, 0}, "colored probes"))
+        return failure();
+      do {
+        StringRef layer;
+        loc = getToken().getLoc();
+        (void)parseId(layer, "expected layer name");
+        layers.push_back(layer);
+        if (getToken().getKind() == FIRToken::period)
+          consumeToken();
+      } while (getToken().getKind() == FIRToken::identifier);
     }
 
+    if (!consumeIf(FIRToken::greater))
+      return emitError(loc, "expected '>' to end reference type");
+
     bool forceable = kind == FIRToken::kw_RWProbe;
 
     auto innerType = type_dyn_cast<FIRRTLBaseType>(type);

diff --git a/test/Dialect/FIRRTL/parse-errors.fir b/test/Dialect/FIRRTL/parse-errors.fir
@@ -1247,6 +1247,37 @@ circuit Foo:
     FPGA
     FPGA
 
+;// -----
+FIRRTL version 3.1.0
+circuit Foo:
+
+  module Foo:
+    ; expected-error @below {{colored probes are a FIRRTL 3.2.0+ feature, but the specified FIRRTL version was 3.1.0}}
+    output a: Probe<UInt<1>, A>
+
+;// -----
+FIRRTL version 4.0.0
+circuit Foo:
+  layer A bind:
+  module Foo:
+    output a: Probe<
+    ; expected-error @below {{expected probe data type}}
+;// -----
+FIRRTL version 4.0.0
+circuit Foo:
+  layer A bind:
+  module Foo:
+    ; expected-error @below {{expected '<' in reference type}}
+    output a: Probe X
+
+;// -----
+FIRRTL version 4.0.0
+circuit Foo:
+  layer A bind:
+  module Foo:
+    ; expected-error @below {{expected probe data type}}
+    output a: Probe<>
+
 ;// -----
 FIRRTL version 4.0.0
 circuit Foo: