Skip to content

Commit a237db5

Browse files
seldridgeseldridge
committed
[FIRRTL] Bump "next" FIRRTL version to 4.2.0
Change the next FIRRTL version from 4.1.0 to 4.2.0 now that version 4.1.0 has been released [[1]]. [1]: https://github.com/chipsalliance/firrtl-spec/releases/tag/v4.1.0 Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
1 parent c75ac2c commit a237db5

File tree

7 files changed

+43
-43
lines changed

7 files changed

+43
-43
lines changed

‎include/circt/Dialect/FIRRTL/FIRParser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ constexpr FIRVersion minimumFIRVersion(2, 0, 0);
124124
/// new version of the spec is released, all uses of `nextFIRVersion` in the
125125
/// parser are replaced with the concrete version `{x, y, z}`, and this
126126
/// declaration here is bumped to the next probable version number.
127-
constexpr FIRVersion nextFIRVersion(4, 1, 0);
127+
constexpr FIRVersion nextFIRVersion(4, 2, 0);
128128

129129
/// A marker for parser features that are currently missing from the spec.
130130
///

‎test/CAPI/firrtl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ void testExport(MlirContext ctx) {
5757
(void)result;
5858
assert(mlirLogicalResultIsSuccess(result));
5959

60-
// CHECK: FIRRTL version 4.1.0
60+
// CHECK: FIRRTL version 4.2.0
6161
// CHECK-NEXT: circuit ExportTestSimpleModule :
6262
// CHECK-NEXT: module ExportTestSimpleModule : @[- 2:3]
6363
// CHECK-NEXT: input in_1 : UInt<32> @[- 2:44]

‎test/Dialect/FIRRTL/emit-basic.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Check if printing with very short line length, removing info locators (@[...]), no line is longer than 5x line length.
1313
// RUN: circt-translate --export-firrtl %s --target-line-length=10 | sed -e 's/ @\[.*\]//' | FileCheck %s --implicit-check-not "{{^(.{50})}}" --check-prefix PRETTY
1414

15-
// CHECK-LABEL: FIRRTL version 4.1.0
15+
// CHECK-LABEL: FIRRTL version 4.2.0
1616
// CHECK-LABEL: circuit Foo :
1717
// PRETTY-LABEL: circuit Foo :
1818
firrtl.circuit "Foo" {

‎test/Dialect/FIRRTL/parse-basic.fir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1449,7 +1449,7 @@ circuit Layers:
14491449

14501450
;// -----
14511451
; CHECK-LABEL: firrtl.circuit "BasicProps"
1452-
FIRRTL version 4.1.0
1452+
FIRRTL version 4.2.0
14531453
circuit BasicProps :
14541454
public module BasicProps :
14551455
; CHECK-LABEL: module private @Integer
@@ -1655,7 +1655,7 @@ circuit WireOfProbesAndNames:
16551655
wire probe : Probe<UInt<1>>
16561656

16571657
;// -----
1658-
FIRRTL version 4.1.0
1658+
FIRRTL version 4.2.0
16591659

16601660
; CHECK-LABEL: circuit "AnyRef"
16611661
circuit AnyRef:

‎test/Dialect/FIRRTL/parse-errors.fir

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ circuit invalid_inst :
196196

197197
;// -----
198198

199-
FIRRTL version 4.1.0
199+
FIRRTL version 4.2.0
200200
circuit class_inst :
201201
class some_class :
202202
public module class_inst :
@@ -966,21 +966,21 @@ circuit LayerEmptyOutputDir:
966966

967967
;// -----
968968

969-
FIRRTL version 4.1.0
969+
FIRRTL version 4.2.0
970970
circuit Top:
971971
; expected-error @below {{class cannot be the top of a circuit}}
972972
class Top:
973973

974974
;// -----
975975

976-
FIRRTL version 4.1.0
976+
FIRRTL version 4.2.0
977977
circuit Top:
978978
; expected-error @below {{extclass cannot be the top of a circuit}}
979979
extclass Top:
980980

981981
;// -----
982982

983-
FIRRTL version 4.1.0
983+
FIRRTL version 4.2.0
984984
circuit Top:
985985
public module Top:
986986
class Foo:
@@ -989,7 +989,7 @@ circuit Top:
989989

990990
;// -----
991991

992-
FIRRTL version 4.1.0
992+
FIRRTL version 4.2.0
993993
circuit Top:
994994
public module Top:
995995
extclass Foo:
@@ -1095,23 +1095,23 @@ circuit Top :
10951095
propassign c, list_concat()
10961096

10971097
;// -----
1098-
FIRRTL version 4.1.0
1098+
FIRRTL version 4.2.0
10991099

11001100
circuit Top:
11011101
public module Top:
11021102
; expected-error @below {{unknown class 'Missing'}}
11031103
input in : Inst<Missing>
11041104

11051105
;// -----
1106-
FIRRTL version 4.1.0
1106+
FIRRTL version 4.2.0
11071107

11081108
circuit Top:
11091109
public module Top:
11101110
; expected-error @below {{use of undefined class name 'Missing' in object}}
11111111
object x of Missing
11121112

11131113
;// -----
1114-
FIRRTL version 4.1.0
1114+
FIRRTL version 4.2.0
11151115

11161116
circuit Top:
11171117
class MyClass:
@@ -1127,7 +1127,7 @@ circuit Top:
11271127
FIRRTL version 3.0.0
11281128

11291129
circuit Top:
1130-
; expected-error @below {{classes are a FIRRTL 4.1.0+ feature, but the specified FIRRTL version was 3.0.0}}
1130+
; expected-error @below {{classes are a FIRRTL 4.2.0+ feature, but the specified FIRRTL version was 3.0.0}}
11311131
class MyClass:
11321132
skip
11331133

@@ -1139,15 +1139,15 @@ FIRRTL version 3.0.0
11391139

11401140
circuit Top:
11411141
module Top:
1142-
; expected-error @below {{object statements are a FIRRTL 4.1.0+ feature, but the specified FIRRTL version was 3.0.0}}
1142+
; expected-error @below {{object statements are a FIRRTL 4.2.0+ feature, but the specified FIRRTL version was 3.0.0}}
11431143
object x of MyClass
11441144

11451145
;// -----
11461146
FIRRTL version 3.0.0
11471147

11481148
circuit Top:
11491149
module Top:
1150-
; expected-error @below {{Inst types are a FIRRTL 4.1.0+ feature, but the specified FIRRTL version was 3.0.0}}
1150+
; expected-error @below {{Inst types are a FIRRTL 4.2.0+ feature, but the specified FIRRTL version was 3.0.0}}
11511151
output o: Inst<MyClass>
11521152

11531153
;// -----
@@ -1194,13 +1194,13 @@ circuit LeadingPath:
11941194
FIRRTL version 3.1.0
11951195
circuit PathVersion:
11961196
module PathVersion:
1197-
; expected-error @below {{Paths are a FIRRTL 4.1.0+ feature, but the specified FIRRTL version was 3.1.0}}
1197+
; expected-error @below {{Paths are a FIRRTL 4.2.0+ feature, but the specified FIRRTL version was 3.1.0}}
11981198
output path : Path
11991199
propassign path, path("")
12001200

12011201
;// -----
12021202
; Path operation should have a single string argument.
1203-
FIRRTL version 4.1.0
1203+
FIRRTL version 4.2.0
12041204
circuit BadPathExpr:
12051205
public module BadPathExp:
12061206
output path : Path
@@ -1209,7 +1209,7 @@ circuit BadPathExpr:
12091209

12101210
;// -----
12111211
; Path operation should have a single string argument.
1212-
FIRRTL version 4.1.0
1212+
FIRRTL version 4.2.0
12131213
circuit BadPathExpr:
12141214
public module BadPathExp:
12151215
output path : Path
@@ -1218,7 +1218,7 @@ circuit BadPathExpr:
12181218

12191219
;// -----
12201220
; Path operation should have a single string argument.
1221-
FIRRTL version 4.1.0
1221+
FIRRTL version 4.2.0
12221222
circuit BadPathExpr:
12231223
public module BadPathExp:
12241224
output path : Path
@@ -1231,14 +1231,14 @@ FIRRTL version 3.0.0
12311231

12321232
circuit Top:
12331233
module Top:
1234-
; expected-error @below {{Bools are a FIRRTL 4.1.0+ feature, but the specified FIRRTL version was 3.0.0}}
1234+
; expected-error @below {{Bools are a FIRRTL 4.2.0+ feature, but the specified FIRRTL version was 3.0.0}}
12351235
input in : Bool
12361236
output out : Bool
12371237
propassign out, in
12381238

12391239
;// -----
12401240
; Bool literal must be true or false.
1241-
FIRRTL version 4.1.0
1241+
FIRRTL version 4.2.0
12421242

12431243
circuit Top:
12441244
public module Top:
@@ -1248,7 +1248,7 @@ circuit Top:
12481248

12491249
;// -----
12501250
; Properties can't be const.
1251-
FIRRTL version 4.1.0
1251+
FIRRTL version 4.2.0
12521252

12531253
circuit Top:
12541254
public module Top:
@@ -1260,12 +1260,12 @@ circuit Top:
12601260
FIRRTL version 3.1.0
12611261
circuit AnyRef:
12621262
module AnyRef:
1263-
; expected-error @below {{AnyRef types are a FIRRTL 4.1.0+ feature}}
1263+
; expected-error @below {{AnyRef types are a FIRRTL 4.2.0+ feature}}
12641264
output a : AnyRef
12651265

12661266
;// -----
12671267
; Only objects are valid as AnyRef
1268-
FIRRTL version 4.1.0
1268+
FIRRTL version 4.2.0
12691269
circuit AnyRef:
12701270
public module AnyRef:
12711271
output out : AnyRef
@@ -1274,7 +1274,7 @@ circuit AnyRef:
12741274

12751275
;// -----
12761276
; Only objects are valid as AnyRef in Lists
1277-
FIRRTL version 4.1.0
1277+
FIRRTL version 4.2.0
12781278
circuit AnyRefList:
12791279
public module AnyRefList:
12801280
output list : List<AnyRef>
@@ -1283,7 +1283,7 @@ circuit AnyRefList:
12831283

12841284
;// -----
12851285
; Not Covariant.
1286-
FIRRTL version 4.1.0
1286+
FIRRTL version 4.2.0
12871287
circuit NotCovariant:
12881288
class Class:
12891289

@@ -1296,7 +1296,7 @@ circuit NotCovariant:
12961296

12971297
;// -----
12981298
; Not Contravariant.
1299-
FIRRTL version 4.1.0
1299+
FIRRTL version 4.2.0
13001300
circuit NotContravariant:
13011301
class Class:
13021302

@@ -1309,7 +1309,7 @@ circuit NotContravariant:
13091309

13101310
;// -----
13111311
; Double: must have digit before point.
1312-
FIRRTL version 4.1.0
1312+
FIRRTL version 4.2.0
13131313
circuit DoubleNegPeriod:
13141314
public module DoubleNegPeriod:
13151315
output d : Double
@@ -1318,7 +1318,7 @@ circuit DoubleNegPeriod:
13181318

13191319
;// -----
13201320
; Double: must have digit after point.
1321-
FIRRTL version 4.1.0
1321+
FIRRTL version 4.2.0
13221322
circuit DoublePeriodEnd:
13231323
public module DoublePeriodEnd:
13241324
output d : Double
@@ -1327,7 +1327,7 @@ circuit DoublePeriodEnd:
13271327

13281328
;// -----
13291329
; Double: Not an integer.
1330-
FIRRTL version 4.1.0
1330+
FIRRTL version 4.2.0
13311331
circuit DoubleInteger:
13321332
public module DoubleInteger:
13331333
output d : Double
@@ -1336,7 +1336,7 @@ circuit DoubleInteger:
13361336

13371337
;// -----
13381338
; Double: don't support NaN or inf.
1339-
FIRRTL version 4.1.0
1339+
FIRRTL version 4.2.0
13401340
circuit DoubleNaN:
13411341
public module DoubleNaN:
13421342
output d : Double
@@ -1345,7 +1345,7 @@ circuit DoubleNaN:
13451345

13461346
;// -----
13471347
; Double: Don't support hex.
1348-
FIRRTL version 4.1.0
1348+
FIRRTL version 4.2.0
13491349
circuit DoubleHex:
13501350
public module DoubleHex:
13511351
output d : Double
@@ -1354,7 +1354,7 @@ circuit DoubleHex:
13541354

13551355
;// -----
13561356
; Double: Don't suuport FIRRTL-y radix.
1357-
FIRRTL version 4.1.0
1357+
FIRRTL version 4.2.0
13581358
circuit DoubleRadix:
13591359
public module DoubleRadix:
13601360
output d : Double
@@ -1392,7 +1392,7 @@ circuit RWProbeExprOOB :
13921392

13931393
FIRRTL version 3.9.0
13941394
circuit Foo:
1395-
; expected-error @below {{option groups/instance choices are a FIRRTL 4.1.0+ feature}}
1395+
; expected-error @below {{option groups/instance choices are a FIRRTL 4.2.0+ feature}}
13961396
option Platform:
13971397
FPGA
13981398
ASIC
@@ -1403,14 +1403,14 @@ FIRRTL version 3.9.0
14031403
circuit Foo:
14041404

14051405
module Foo:
1406-
; expected-error @below {{option groups/instance choices are a FIRRTL 4.1.0+ feature}}
1406+
; expected-error @below {{option groups/instance choices are a FIRRTL 4.2.0+ feature}}
14071407
instchoice inst of DefaultTarget Platform :
14081408
FPGA => FPGATarget
14091409
ASIC => ASICTarget
14101410

14111411
;// -----
14121412

1413-
FIRRTL version 4.1.0
1413+
FIRRTL version 4.2.0
14141414
circuit Foo:
14151415
option Platform:
14161416
FPGA
@@ -1428,7 +1428,7 @@ circuit Foo:
14281428

14291429
;// -----
14301430

1431-
FIRRTL version 4.1.0
1431+
FIRRTL version 4.2.0
14321432
circuit Foo:
14331433
option Platform:
14341434
FPGA
@@ -1446,7 +1446,7 @@ circuit Foo:
14461446

14471447
;// -----
14481448

1449-
FIRRTL version 4.1.0
1449+
FIRRTL version 4.2.0
14501450
circuit Foo:
14511451
option Platform:
14521452
FPGA
@@ -1461,7 +1461,7 @@ circuit Foo:
14611461

14621462
;// -----
14631463

1464-
FIRRTL version 4.1.0
1464+
FIRRTL version 4.2.0
14651465
circuit Foo:
14661466
module DefaultTarget:
14671467
module FPGATarget:
@@ -1473,7 +1473,7 @@ circuit Foo:
14731473

14741474
;// -----
14751475

1476-
FIRRTL version 4.1.0
1476+
FIRRTL version 4.2.0
14771477
circuit Foo:
14781478
; expected-error @below {{duplicate option case definition 'FPGA'}}
14791479
option Platform:

‎test/firtool/classes-dedupe.fir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
; RUN: firtool %s -ir-verilog | FileCheck %s
22

3-
FIRRTL version 4.1.0
3+
FIRRTL version 4.2.0
44

55
circuit Test : %[[
66
{

‎test/firtool/instchoice.fir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; RUN: firtool %s --ir-hw --disable-opt --select-instance-choice=Platform=ASIC | FileCheck %s --check-prefix=ASIC
33
; RUN: firtool %s --ir-hw --disable-opt --select-default-for-unspecified-instance-choice | FileCheck %s --check-prefixes=DEFAULT
44

5-
FIRRTL version 4.1.0
5+
FIRRTL version 4.2.0
66
; CHECK: firrtl.circuit "Foo" attributes {select_inst_choice = ["Platform=ASIC"]} {
77
circuit Foo:
88
; CHECK: firrtl.option @Platform

0 commit comments

Comments
 (0)