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

Bump LLVM to dd74d3117de0fd96383beeb4b4b913efcb9f4328 (#3492) 

Co-authored-by: Mike Urbach <mikeurbach@gmail.com>
This commit is contained in:
Andrew Lenharth 2022-07-09 08:21:17 -05:00 committed by GitHub
parent 7afcbf844b
commit 95b52fb6ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/nightlyIntegrationTests.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
name: Build and Test
runs-on: ubuntu-18.04
container:
image: ghcr.io/circt/images/circt-integration-test:v10.2
image: ghcr.io/circt/images/circt-integration-test:v10.3
strategy:
fail-fast: false
matrix:

2
.github/workflows/shortIntegrationTests.yml vendored
View File

@ -23,7 +23,7 @@ jobs:
name: Build and Test
runs-on: ubuntu-18.04
container:
image: ghcr.io/circt/images/circt-integration-test:v10.2
image: ghcr.io/circt/images/circt-integration-test:v10.3
strategy:
# Keep the 'matrix' strategy with one data point to make it obvious that
# this is one point in the overall matrix.

29
include/circt/Dialect/Moore/MooreTypes.h
View File

@ -812,7 +812,8 @@ protected:
/// A packed unsized dimension, like `[]`.
class PackedUnsizedDim : public Type::TypeBase<PackedUnsizedDim, PackedDim,
detail::UnsizedDimStorage> {
detail::UnsizedDimStorage,
::mlir::TypeTrait::IsMutable> {
public:
static PackedUnsizedDim get(PackedType inner);
@ -822,8 +823,9 @@ protected:
};
/// A packed range dimension, like `[a:b]`.
class PackedRangeDim : public Type::TypeBase<PackedRangeDim, PackedDim,
detail::RangeDimStorage> {
class PackedRangeDim
: public Type::TypeBase<PackedRangeDim, PackedDim, detail::RangeDimStorage,
::mlir::TypeTrait::IsMutable> {
public:
static PackedRangeDim get(PackedType inner, Range range);
@ -895,7 +897,8 @@ protected:
/// An unpacked unsized dimension, like `[]`.
class UnpackedUnsizedDim
: public Type::TypeBase<UnpackedUnsizedDim, UnpackedDim,
detail::UnsizedDimStorage> {
detail::UnsizedDimStorage,
::mlir::TypeTrait::IsMutable> {
public:
static UnpackedUnsizedDim get(UnpackedType inner);
@ -906,7 +909,8 @@ protected:
/// An unpacked array dimension, like `[a]`.
class UnpackedArrayDim : public Type::TypeBase<UnpackedArrayDim, UnpackedDim,
detail::SizedDimStorage> {
detail::SizedDimStorage,
::mlir::TypeTrait::IsMutable> {
public:
static UnpackedArrayDim get(UnpackedType inner, unsigned size);
@ -920,7 +924,8 @@ protected:
/// An unpacked range dimension, like `[a:b]`.
class UnpackedRangeDim : public Type::TypeBase<UnpackedRangeDim, UnpackedDim,
detail::RangeDimStorage> {
detail::RangeDimStorage,
::mlir::TypeTrait::IsMutable> {
public:
static UnpackedRangeDim get(UnpackedType inner, Range range);
@ -956,7 +961,8 @@ protected:
///
/// See IEEE 1800-2017 §7.8 "Associative arrays".
class UnpackedAssocDim : public Type::TypeBase<UnpackedAssocDim, UnpackedDim,
detail::AssocDimStorage> {
detail::AssocDimStorage,
::mlir::TypeTrait::IsMutable> {
public:
static UnpackedAssocDim get(UnpackedType inner, UnpackedType indexType = {});
@ -971,7 +977,8 @@ protected:
/// An unpacked queue dimension with optional bound, like `[$]` or `[$:a]`.
class UnpackedQueueDim : public Type::TypeBase<UnpackedQueueDim, UnpackedDim,
detail::SizedDimStorage> {
detail::SizedDimStorage,
::mlir::TypeTrait::IsMutable> {
public:
static UnpackedQueueDim get(UnpackedType inner,
Optional<unsigned> bound = {});
@ -1105,7 +1112,8 @@ inline llvm::raw_ostream &operator<<(llvm::raw_ostream &os,
/// A packed struct.
class PackedStructType : public Type::TypeBase<PackedStructType, PackedType,
detail::StructTypeStorage> {
detail::StructTypeStorage,
::mlir::TypeTrait::IsMutable> {
public:
static PackedStructType get(StructKind kind, ArrayRef<StructMember> members,
StringAttr name, Location loc,
@ -1140,7 +1148,8 @@ protected:
/// An unpacked struct.
class UnpackedStructType
: public Type::TypeBase<UnpackedStructType, UnpackedType,
detail::StructTypeStorage> {
detail::StructTypeStorage,
::mlir::TypeTrait::IsMutable> {
public:
static UnpackedStructType get(StructKind kind, ArrayRef<StructMember> members,
StringAttr name, Location loc);

5
include/circt/Dialect/SV/SVTypeDecl.td
View File

@ -116,6 +116,7 @@ def ModportDirection : I32EnumAttr<"ModportDirection",
"Defines direction in a modport",
[ModportDirectionInput, ModportDirectionOutput, ModportDirectionInOut]> {
let genSpecializedAttr = 0;
let cppNamespace = "::circt::sv";
}
def ModportDirectionAttr : EnumAttr<SVDialect, ModportDirection,
@ -132,6 +133,10 @@ def ModportStruct : SV_Attr<"ModportStruct", "mod_port"> {
"mlir::FlatSymbolRefAttr":$signal);
let assemblyFormat = "`<` struct(params) `>`";
let builders = [
AttrOrTypeBuilder<(ins "ModportDirection":$dir, "mlir::FlatSymbolRefAttr":$sig)>
];
}
def ModportStructArrayAttr : TypedArrayAttrBase<ModportStruct,

6
lib/Dialect/SV/SVOps.cpp
View File

@ -1783,6 +1783,12 @@ LogicalResult GenerateCaseOp::verify() {
return success();
}
ModportStructAttr ModportStructAttr::get(MLIRContext *context,
ModportDirection direction,
FlatSymbolRefAttr signal) {
return get(context, ModportDirectionAttr::get(context, direction), signal);
}
//===----------------------------------------------------------------------===//
// TableGen generated logic.
//===----------------------------------------------------------------------===//

2
llvm

@ -1 +1 @@
Subproject commit cb69ba4faaf1de207b363b5198d33e29d0375e5d
Subproject commit dd74d3117de0fd96383beeb4b4b913efcb9f4328