Skip to content

Commit

Permalink
LLVM bump to include upstream verifier performance fix. (#7496)
Browse files Browse the repository at this point in the history
Bump LLVM [1] to include an upstream verifier performance fix [2].

This required two minor fixes to CIRCT:

  * [HW] Qualify types for safer use in other dialects.
  * [ImportVerilog] Fix ternary with diff types, both become Value.

[1]: llvm/llvm-project@5689ccc...c69b8c4
[2]: llvm/llvm-project@7a98071
  • Loading branch information
dtzSiFive authored Aug 9, 2024
1 parent bfed535 commit b3a54e3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions include/circt/Dialect/HW/HWTypes.td
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def HWNonInOutType : DialectType<HWDialect,

def InOutType : DialectType<HWDialect,
CPred<"::circt::hw::type_isa<circt::hw::InOutType>($_self)">,
"InOutType", "InOutType">;
"InOutType", "::circt::hw::InOutType">;

class InOutTypeOf<list<Type> allowedTypes>
: ContainerType<AnyTypeOf<allowedTypes>, CPred<"::circt::hw::type_isa<::circt::hw::InOutType>($_self)">,
Expand All @@ -62,7 +62,7 @@ def StructType : DialectType<HWDialect,
// A handle to refer to circt::hw::UnionType in ODS.
def UnionType : DialectType<HWDialect,
CPred<"::circt::hw::type_isa<circt::hw::UnionType>($_self)">,
"a UnionType", "::circt::hw::TypeAliasOr<hw::UnionType>">;
"a UnionType", "::circt::hw::TypeAliasOr<::circt::hw::UnionType>">;

// A handle to refer to circt::hw::EnumType in ODS.
def EnumType : DialectType<HWDialect,
Expand Down
4 changes: 3 additions & 1 deletion lib/Conversion/ImportVerilog/Expressions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,9 @@ struct RvalueExprVisitor {
isInc ? builder.create<moore::AddOp>(loc, preValue, one).getResult()
: builder.create<moore::SubOp>(loc, preValue, one).getResult();
builder.create<moore::BlockingAssignOp>(loc, arg, postValue);
return isPost ? preValue : postValue;
if (isPost)
return preValue;
return postValue;
}

// Handle unary operators.
Expand Down
2 changes: 1 addition & 1 deletion llvm
Submodule llvm updated 2540 files

0 comments on commit b3a54e3

Please sign in to comment.