terapines
/
circt
mirror of https://github.com/llvm/circt.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIRRTL] Fix TagExtractOp's type inference (#8766) 

TagExtractOp's type inference predates adding user-defined encodings for
enums in FIRRTL. This fixes the issue by using the bitwidth helpers
defined on the enumeration type.
This commit is contained in:
Andrew Young 2025-07-23 15:29:56 -07:00 committed by GitHub
parent dbbc952d89
commit 237f744475
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Dialect/FIRRTL/FIRRTLOps.cpp
View File

@ -4863,8 +4863,7 @@ FIRRTLType SubaccessOp::inferReturnType(Type inType, Type indexType,
FIRRTLType TagExtractOp::inferReturnType(FIRRTLType input,
std::optional<Location> loc) {
auto inType = type_cast<FEnumType>(input);
auto i = llvm::Log2_32_Ceil(inType.getNumElements());
return UIntType::get(inType.getContext(), i);
return UIntType::get(inType.getContext(), inType.getTagWidth());
}
ParseResult MultibitMuxOp::parse(OpAsmParser &parser, OperationState &result) {

8
test/Dialect/FIRRTL/parse-basic.fir
View File

@ -961,10 +961,10 @@ circuit MyModule : ; CHECK: firrtl.circuit "MyModule"
; CHECK-LABEL: firrtl.module private @TagExtract
module TagExtract:
input i : {|A, B, C|}
output o : UInt<2>
; CHECK: %0 = firrtl.tagextract %i : !firrtl.enum<A, B, C>
; CHECK: firrtl.matchingconnect %o, %0 : !firrtl.uint<2>
input i : {|A, B, C = 8|}
output o : UInt<4>
; CHECK: [[TAGEXTRACT:%[0-9]+]] = firrtl.tagextract %i : !firrtl.enum<A, B, C = 8>
; CHECK: firrtl.matchingconnect %o, [[TAGEXTRACT]] : !firrtl.uint<4>
connect o, tagExtract(i)
; CHECK-LABEL: module private @RefsChild(