diff --git a/include/circt/Dialect/FIRRTL/FIRRTLAttributes.td b/include/circt/Dialect/FIRRTL/FIRRTLAttributes.td
index 093f93fc5c89..6316219e1e7a 100644
--- a/include/circt/Dialect/FIRRTL/FIRRTLAttributes.td
+++ b/include/circt/Dialect/FIRRTL/FIRRTLAttributes.td
@@ -82,41 +82,59 @@ def AugmentedBundleType : AugmentedType<"AugmentedBundleType"> {
     hasPrefix # [{
       bool isRoot() { return getID() != nullptr; }
     }];
+  let mnemonic = "augmentedBundle";
+  let assemblyFormat = "`<` $underlying `>`";
 }
 
 def AugmentedVectorType : AugmentedType<"AugmentedVectorType"> {
   let summary = "GrandCentral AugmentedVectorType";
   let extraClassDeclaration = defaultClassDeclaration # hasElements;
+  let mnemonic = "augmentedVector";
+  let assemblyFormat = "`<` $underlying `>`";
 }
 
 def AugmentedGroundType : AugmentedType<"AugmentedGroundType"> {
   let summary = "GrandCentral AugmentedGroundType";
   let extraClassDeclaration = hasID # hasName;
+  let mnemonic = "augmentedGround";
+  let assemblyFormat = "`<` $underlying `>`";
 }
 
 def AugmentedStringType : AugmentedType<"AugmentedStringType"> {
   let summary = "GrandCentral AugmentedStringType";
   let extraClassDeclaration = hasName;
+  let mnemonic = "augmentedString";
+  let assemblyFormat = "`<` $underlying `>`";
 }
 def AugmentedBooleanType : AugmentedType<"AugmentedBooleanType"> {
   let summary = "GrandCentral AugmentedBooleanType";
   let extraClassDeclaration = hasName;
+  let mnemonic = "augmentedBoolean";
+  let assemblyFormat = "`<` $underlying `>`";
 }
 def AugmentedIntegerType : AugmentedType<"AugmentedIntegerType"> {
   let summary = "GrandCentral AugmentedIntegerType";
   let extraClassDeclaration = hasName;
+  let mnemonic = "augmentedInteger";
+  let assemblyFormat = "`<` $underlying `>`";
 }
 def AugmentedDoubleType : AugmentedType<"AugmentedDoubleType"> {
   let summary = "GrandCentral AugmentedDoubleType";
   let extraClassDeclaration = hasName;
+  let mnemonic = "augmentedDouble";
+  let assemblyFormat = "`<` $underlying `>`";
 }
 def AugmentedLiteralType : AugmentedType<"AugmentedLiteralType"> {
   let summary = "GrandCentral AugmentedLiteralType";
   let extraClassDeclaration = hasName;
+  let mnemonic = "augmentedLiteral";
+  let assemblyFormat = "`<` $underlying `>`";
 }
 def AugmentedDeletedType : AugmentedType<"AugmentedDeletedType"> {
   let summary = "GrandCentral AugmentedDeletedType";
   let extraClassDeclaration = hasName;
+  let mnemonic = "augmentedDeleted";
+  let assemblyFormat = "`<` $underlying `>`";
 }
 
 
diff --git a/include/circt/Dialect/FIRRTL/FIRRTLTypesImpl.td b/include/circt/Dialect/FIRRTL/FIRRTLTypesImpl.td
index 06c87ce6fbae..13362ae11296 100644
--- a/include/circt/Dialect/FIRRTL/FIRRTLTypesImpl.td
+++ b/include/circt/Dialect/FIRRTL/FIRRTLTypesImpl.td
@@ -47,6 +47,7 @@ def SIntImpl : FIRRTLImplType<"SInt",
     TypeBuilder<(ins)>,
   ];
   let genVerifyDecl = true;
+  let typeName = "firrtl.sint";
   let extraClassDeclaration = [{
     using WidthQualifiedTypeTrait<SIntType>::getWidth;
     using WidthQualifiedTypeTrait<SIntType>::hasWidth;
@@ -66,6 +67,7 @@ def UIntImpl : FIRRTLImplType<"UInt",
     TypeBuilder<(ins)>,
   ];
   let genVerifyDecl = true;
+  let typeName = "firrtl.uint";
   let extraClassDeclaration = [{
     using WidthQualifiedTypeTrait<UIntType>::getWidth;
     using WidthQualifiedTypeTrait<UIntType>::hasWidth;
@@ -78,6 +80,7 @@ def ClockTypeImpl : FIRRTLImplType<"Clock"> {
   let summary = "Clock signal";
   let parameters = (ins "bool":$isConst);
   let storageClass = "FIRRTLBaseTypeStorage";
+  let typeName = "firrtl.clock";
   let builders = [
     TypeBuilder<(ins), [{
       return $_get($_ctxt, false);
@@ -92,6 +95,7 @@ def ResetTypeImpl : FIRRTLImplType<"Reset"> {
   let summary = "Reset Signal";
   let parameters = (ins "bool":$isConst);
   let storageClass = "FIRRTLBaseTypeStorage";
+  let typeName = "firrtl.reset";
   let builders = [
     TypeBuilder<(ins), [{
       return $_get($_ctxt, false);
@@ -106,6 +110,7 @@ def AsyncResetTypeImpl : FIRRTLImplType<"AsyncReset"> {
   let summary = "AsyncReset signal";
   let parameters = (ins "bool":$isConst);
   let storageClass = "FIRRTLBaseTypeStorage";
+  let typeName = "firrtl.asyncreset";
   let builders = [
     TypeBuilder<(ins), [{
       return $_get($_ctxt, false);
@@ -121,6 +126,7 @@ def AnalogTypeImpl : FIRRTLImplType<"Analog",
   let summary = "Analog signal";
   let parameters = (ins "int32_t":$widthOrSentinel, "bool":$isConst);
   let storageClass = "WidthTypeStorage";
+  let typeName = "firrtl.analog";
   let builders = [
     TypeBuilder<(ins "std::optional<int32_t>":$width, CArg<"bool", "false">:$isConst)>,
     TypeBuilder<(ins)>,
@@ -173,6 +179,7 @@ class BaseVectorTypeImpl<string name, string ElementType, list<Trait> traits = [
 }
 
 def FVectorImpl : BaseVectorTypeImpl<"FVector","::circt::firrtl::FIRRTLBaseType"> {
+  let typeName = "firrtl.vector";
   let firrtlExtraClassDeclaration = [{
     /// Return this type with any flip types recursively removed from itself.
     FIRRTLBaseType getPassiveType();
@@ -187,6 +194,7 @@ def FVectorImpl : BaseVectorTypeImpl<"FVector","::circt::firrtl::FIRRTLBaseType"
 
 def OpenVectorImpl : BaseVectorTypeImpl<"OpenVector","::circt::firrtl::FIRRTLType"> {
   let genVerifyDecl = 1;
+  let typeName = "firrtl.openvector";
 }
 
 class BaseBundleTypeImpl<string name, string ElementType, list<Trait> traits = [], string BaseType = ElementType>
@@ -270,6 +278,7 @@ class BaseBundleTypeImpl<string name, string ElementType, list<Trait> traits = [
 }
 
 def BundleImpl : BaseBundleTypeImpl<"Bundle","::circt::firrtl::FIRRTLBaseType"> {
+  let typeName = "firrtl.bundle";
   let firrtlExtraClassDeclaration = [{
     /// Return this type with any flip types recursively removed from itself.
     FIRRTLBaseType getPassiveType();
@@ -283,6 +292,7 @@ def BundleImpl : BaseBundleTypeImpl<"Bundle","::circt::firrtl::FIRRTLBaseType">
 }
 
 def OpenBundleImpl : BaseBundleTypeImpl<"OpenBundle","::circt::firrtl::FIRRTLType"> {
+  let typeName = "firrtl.openbundle";
   let genVerifyDecl = 1;
 }
 
@@ -291,6 +301,7 @@ def FEnumImpl : FIRRTLImplType<"FEnum", [DeclareTypeInterfaceMethods<FieldIDType
   let parameters = (ins "ArrayRef<EnumElement>":$elements, "bool":$isConst);
   let storageClass = "FEnumTypeStorage";
   let genVerifyDecl = true;
+  let typeName = "firrtl.enum";
   let skipDefaultBuilders = true;
   let builders = [
     TypeBuilder<(ins "ArrayRef<EnumElement>":$elements, CArg<"bool", "false">:$isConst)>
@@ -384,6 +395,7 @@ def RefImpl : FIRRTLImplType<"Ref",
   let genAccessors = true;
   let genStorageClass = true;
   let genVerifyDecl = true;
+  let typeName = "firrtl.ref";
 
   let skipDefaultBuilders = true;
   let builders = [
@@ -404,6 +416,7 @@ def BaseTypeAliasImpl : FIRRTLImplType<"BaseTypeAlias", [DeclareTypeInterfaceMet
     (ins  "StringAttr":$name, TypeParameter<"::circt::firrtl::FIRRTLBaseType",
                                             "An inner type">:$innerType);
   let storageClass = "BaseTypeAliasStorage";
+  let typeName = "firrtl.basetypealias";
   let genAccessors = true;
   let skipDefaultBuilders = true;
   let extraClassDeclaration = [{
@@ -451,6 +464,7 @@ def ClassImpl : PropImplType<"Class", [
     ArrayRefParameter<"ClassElement">:$elements
   );
   let genStorageClass = false;
+  let typeName = "firrtl.propClass";
   let genAccessors = false;
   let builders = [
     TypeBuilderWithInferredContext<(ins
@@ -490,18 +504,21 @@ def AnyRefImpl : PropImplType<"AnyRef"> {
     about the referred to object's fields, so subfield access, etc. is illegal.
   }];
   let genStorageClass = true;
+  let typeName = "firrtl.propRef";
 }
 
 def StringImpl : PropImplType<"String"> {
   let summary = "An unlimited length string type. Not representable in hardware.";
   let parameters = (ins);
   let genStorageClass = true;
+  let typeName = "firrtl.propString";
 }
 
 def IntegerImpl : PropImplType<"FInteger"> {
   let summary = "An unlimited length signed integer type.  Not representable in hardware.";
   let parameters = (ins);
   let genStorageClass = true;
+  let typeName = "firrtl.propInt";
 }
 
 def ListImpl : PropImplType<"List"> {
@@ -509,6 +526,7 @@ def ListImpl : PropImplType<"List"> {
   let parameters = (ins TypeParameter<"circt::firrtl::PropertyType", "element type">:$elementType);
   let genStorageClass = true;
   let genAccessors = true;
+  let typeName = "firrtl.propList";
 }
 
 def PathImpl : PropImplType<"Path"> {
@@ -516,18 +534,21 @@ def PathImpl : PropImplType<"Path"> {
   let parameters = (ins);
   let genStorageClass = true;
   let genAccessors = true;
+  let typeName = "firrtl.propPath";
 }
 
 def BoolImpl : PropImplType<"Bool"> {
   let summary = "A boolean property.  Not representable in hardware.";
   let parameters = (ins);
   let genStorageClass = true;
+  let typeName = "firrtl.propBool";
 }
 
 def DoubleImpl : PropImplType<"Double"> {
   let summary = "A double property.  Not representable in hardware.";
   let parameters = (ins);
   let genStorageClass = true;
+  let typeName = "firrtl.propDouble";
 }
 
 #endif // CIRCT_DIALECT_FIRRTL_FIRRTLTYPESIMPL_TD
diff --git a/include/circt/Dialect/Moore/MooreTypes.h b/include/circt/Dialect/Moore/MooreTypes.h
index 125e47395f21..95c1bdbfa56b 100644
--- a/include/circt/Dialect/Moore/MooreTypes.h
+++ b/include/circt/Dialect/Moore/MooreTypes.h
@@ -460,6 +460,8 @@ class VoidType
 public:
   static VoidType get(MLIRContext *context);
 
+  static constexpr StringLiteral name = "moore.void";
+
 protected:
   using Base::Base;
 };
@@ -470,6 +472,8 @@ class StringType
 public:
   static StringType get(MLIRContext *context);
 
+  static constexpr StringLiteral name = "moore.string";
+
 protected:
   using Base::Base;
 };
@@ -480,6 +484,8 @@ class ChandleType
 public:
   static ChandleType get(MLIRContext *context);
 
+  static constexpr StringLiteral name = "moore.chandle";
+
 protected:
   using Base::Base;
 };
@@ -490,6 +496,8 @@ class EventType
 public:
   static EventType get(MLIRContext *context);
 
+  static constexpr StringLiteral name = "moore.event";
+
 protected:
   using Base::Base;
 };
@@ -574,6 +582,8 @@ class IntType
   /// to the user in diagnostics.
   void format(llvm::raw_ostream &os) const;
 
+  static constexpr StringLiteral name = "moore.int";
+
 protected:
   using Base::Base;
 };
@@ -612,6 +622,8 @@ class RealType
   /// Get the size of this type.
   unsigned getBitSize() const { return getBitSize(getKind()); }
 
+  static constexpr StringLiteral name = "moore.real";
+
 protected:
   using Base::Base;
 };
@@ -747,6 +759,9 @@ class UnpackedIndirectType : public IndirectTypeBase<UnpackedType> {
 /// A packed named type. See `NamedTypeBase` for details.
 class PackedNamedType
     : public NamedTypeBase<PackedNamedType, PackedIndirectType> {
+public:
+  static constexpr StringLiteral name = "moore.packed_named";
+
 protected:
   using NamedBase::NamedBase;
 };
@@ -754,12 +769,18 @@ class PackedNamedType
 /// An unpacked named type. See `NamedTypeBase` for details.
 class UnpackedNamedType
     : public NamedTypeBase<UnpackedNamedType, UnpackedIndirectType> {
+public:
+  static constexpr StringLiteral name = "moore.unpacked_named";
+
 protected:
   using NamedBase::NamedBase;
 };
 
 /// A packed named type. See `NamedTypeBase` for details.
 class PackedRefType : public RefTypeBase<PackedRefType, PackedIndirectType> {
+public:
+  static constexpr StringLiteral name = "moore.packed_ref";
+
 protected:
   using RefBase::RefBase;
 };
@@ -767,6 +788,9 @@ class PackedRefType : public RefTypeBase<PackedRefType, PackedIndirectType> {
 /// An unpacked named type. See `NamedTypeBase` for details.
 class UnpackedRefType
     : public RefTypeBase<UnpackedRefType, UnpackedIndirectType> {
+public:
+  static constexpr StringLiteral name = "moore.unpacked_ref";
+
 protected:
   using RefBase::RefBase;
 };
@@ -819,6 +843,8 @@ class PackedUnsizedDim : public Type::TypeBase<PackedUnsizedDim, PackedDim,
 public:
   static PackedUnsizedDim get(PackedType inner);
 
+  static constexpr StringLiteral name = "moore.packed_unsized_dim";
+
 protected:
   using Base::Base;
   friend struct detail::DimStorage;
@@ -844,6 +870,8 @@ class PackedRangeDim
   /// Allow implicit casts from `PackedRangeDim` to the actual range.
   operator Range() const { return getRange(); }
 
+  static constexpr StringLiteral name = "moore.packed_range_dim";
+
 protected:
   using Base::Base;
   friend struct detail::DimStorage;
@@ -904,6 +932,8 @@ class UnpackedUnsizedDim
 public:
   static UnpackedUnsizedDim get(UnpackedType inner);
 
+  static constexpr StringLiteral name = "moore.unpacked_unsized_dim";
+
 protected:
   using Base::Base;
   friend struct detail::DimStorage;
@@ -919,6 +949,8 @@ class UnpackedArrayDim : public Type::TypeBase<UnpackedArrayDim, UnpackedDim,
   /// Get the size of the array, i.e. the `a` in `[a]`.
   unsigned getSize() const;
 
+  static constexpr StringLiteral name = "moore.unpacked_array_dim";
+
 protected:
   using Base::Base;
   friend struct detail::DimStorage;
@@ -944,6 +976,8 @@ class UnpackedRangeDim : public Type::TypeBase<UnpackedRangeDim, UnpackedDim,
   /// Allow implicit casts from `UnpackedRangeDim` to the actual range.
   operator Range() const { return getRange(); }
 
+  static constexpr StringLiteral name = "moore.unpacked_range_dim";
+
 protected:
   using Base::Base;
   friend struct detail::DimStorage;
@@ -972,6 +1006,8 @@ class UnpackedAssocDim : public Type::TypeBase<UnpackedAssocDim, UnpackedDim,
   /// type `T` in a dimension `[T]`, or a null type in a dimension `[*]`.
   UnpackedType getIndexType() const;
 
+  static constexpr StringLiteral name = "moore.unpacked_assoc_dim";
+
 protected:
   using Base::Base;
   friend struct detail::DimStorage;
@@ -989,6 +1025,8 @@ class UnpackedQueueDim : public Type::TypeBase<UnpackedQueueDim, UnpackedDim,
   /// queue is unbounded.
   std::optional<unsigned> getBound() const;
 
+  static constexpr StringLiteral name = "moore.unpacked_queue_dim";
+
 protected:
   using Base::Base;
   friend struct detail::DimStorage;
@@ -1021,6 +1059,8 @@ class EnumType
   /// to the user in diagnostics.
   void format(llvm::raw_ostream &os) const;
 
+  static constexpr StringLiteral name = "moore.enum";
+
 protected:
   using Base::Base;
 };
@@ -1144,6 +1184,8 @@ class PackedStructType : public Type::TypeBase<PackedStructType, PackedType,
   /// definition.
   operator const Struct &() const { return getStruct(); }
 
+  static constexpr StringLiteral name = "moore.packed_struct";
+
 protected:
   using Base::Base;
 };
@@ -1171,6 +1213,8 @@ class UnpackedStructType
   /// definition.
   operator const Struct &() const { return getStruct(); }
 
+  static constexpr StringLiteral name = "moore.unpacked_struct";
+
 protected:
   using Base::Base;
 };
diff --git a/include/circt/Dialect/SystemC/SystemCTypes.h b/include/circt/Dialect/SystemC/SystemCTypes.h
index 84ec4951c6a7..94381dfea633 100644
--- a/include/circt/Dialect/SystemC/SystemCTypes.h
+++ b/include/circt/Dialect/SystemC/SystemCTypes.h
@@ -87,6 +87,8 @@ class IntBaseType
   static IntBaseType get(MLIRContext *context);
   static constexpr StringLiteral getMnemonic() { return "int_base"; }
 
+  static constexpr StringLiteral name = "systemc.int_base";
+
 protected:
   using Base::Base;
 };
@@ -103,6 +105,8 @@ class IntType : public Type::TypeBase<IntType, IntBaseType,
   unsigned getWidth();
   static constexpr StringLiteral getMnemonic() { return "int"; }
 
+  static constexpr StringLiteral name = "systemc.int";
+
 protected:
   using Base::Base;
 };
@@ -122,6 +126,8 @@ class UIntBaseType
 
   static constexpr StringLiteral getMnemonic() { return "uint_base"; }
 
+  static constexpr StringLiteral name = "systemc.uint_base";
+
 protected:
   using Base::Base;
 };
@@ -139,6 +145,8 @@ class UIntType : public Type::TypeBase<UIntType, UIntBaseType,
 
   static constexpr StringLiteral getMnemonic() { return "uint"; }
 
+  static constexpr StringLiteral name = "systemc.uint";
+
 protected:
   using Base::Base;
 };
@@ -158,6 +166,8 @@ class SignedType
 
   static constexpr StringLiteral getMnemonic() { return "signed"; }
 
+  static constexpr StringLiteral name = "systemc.signed";
+
 protected:
   using Base::Base;
 };
@@ -174,6 +184,8 @@ class BigIntType : public Type::TypeBase<BigIntType, SignedType,
   unsigned getWidth();
   static constexpr StringLiteral getMnemonic() { return "bigint"; }
 
+  static constexpr StringLiteral name = "systemc.bigint";
+
 protected:
   using Base::Base;
 };
@@ -193,6 +205,8 @@ class UnsignedType
 
   static constexpr StringLiteral getMnemonic() { return "unsigned"; }
 
+  static constexpr StringLiteral name = "systemc.unsigned";
+
 protected:
   using Base::Base;
 };
@@ -211,6 +225,8 @@ class BigUIntType
 
   static constexpr StringLiteral getMnemonic() { return "biguint"; }
 
+  static constexpr StringLiteral name = "systemc.biguint";
+
 protected:
   using Base::Base;
 };
@@ -232,6 +248,8 @@ class BitVectorBaseType
   static BitVectorBaseType get(MLIRContext *context);
   static constexpr StringLiteral getMnemonic() { return "bv_base"; }
 
+  static constexpr StringLiteral name = "systemc.bv_base";
+
 protected:
   using Base::Base;
 };
@@ -250,6 +268,8 @@ class BitVectorType
 
   static constexpr StringLiteral getMnemonic() { return "bv"; }
 
+  static constexpr StringLiteral name = "systemc.bv";
+
 protected:
   using Base::Base;
 };
@@ -267,6 +287,8 @@ class LogicVectorBaseType
   static LogicVectorBaseType get(MLIRContext *context);
   static constexpr StringLiteral getMnemonic() { return "lv_base"; }
 
+  static constexpr StringLiteral name = "systemc.lv_base";
+
 protected:
   using Base::Base;
 };
@@ -286,6 +308,8 @@ class LogicVectorType
 
   static constexpr StringLiteral getMnemonic() { return "lv"; }
 
+  static constexpr StringLiteral name = "systemc.lv";
+
 protected:
   using Base::Base;
 };
diff --git a/llvm b/llvm
index 668865789620..3dbac2c007c1 160000
--- a/llvm
+++ b/llvm
@@ -1 +1 @@
-Subproject commit 668865789620f390fbad4d7093ed8ca6eb932c31
+Subproject commit 3dbac2c007c114a720300d2a4d79abe9ca1351e7
diff --git a/tools/firtool/firtool.cpp b/tools/firtool/firtool.cpp
index 02c6565e68bc..a6d7d4a8cf69 100644
--- a/tools/firtool/firtool.cpp
+++ b/tools/firtool/firtool.cpp
@@ -594,10 +594,10 @@ static LogicalResult executeFirtool(MLIRContext &context,
 
   // Figure out the input format if unspecified.
   if (inputFormat == InputUnspecified) {
-    if (StringRef(inputFilename).endswith(".fir"))
+    if (StringRef(inputFilename).ends_with(".fir"))
       inputFormat = InputFIRFile;
-    else if (StringRef(inputFilename).endswith(".mlir") ||
-             StringRef(inputFilename).endswith(".mlirbc") ||
+    else if (StringRef(inputFilename).ends_with(".mlir") ||
+             StringRef(inputFilename).ends_with(".mlirbc") ||
              mlir::isBytecode(*input))
       inputFormat = InputMLIRFile;
     else {