[RTGTest] Switch to new immediate types

Author: maerhart

include/circt-c/Dialect/RTGTest.h

@@ -37,39 +37,6 @@ MLIR_CAPI_EXPORTED bool rtgtestTypeIsAIntegerRegister(MlirType type);
 /// Creates an RTGTest IntegerRegisterType in the context.
 MLIR_CAPI_EXPORTED MlirType rtgtestIntegerRegisterTypeGet(MlirContext ctxt);
 
-// Immediates.
-//===----------------------------------------------------------------------===//
-
-/// If the type is an RTGTest Imm5Type.
-MLIR_CAPI_EXPORTED bool rtgtestTypeIsAImm5(MlirType type);
-
-/// Creates an RTGTest Imm5 type in the context.
-MLIR_CAPI_EXPORTED MlirType rtgtestImm5TypeGet(MlirContext ctxt);
-
-/// If the type is an RTGTest Imm12Type.
-MLIR_CAPI_EXPORTED bool rtgtestTypeIsAImm12(MlirType type);
-
-/// Creates an RTGTest Imm12 type in the context.
-MLIR_CAPI_EXPORTED MlirType rtgtestImm12TypeGet(MlirContext ctxt);
-
-/// If the type is an RTGTest Imm13Type.
-MLIR_CAPI_EXPORTED bool rtgtestTypeIsAImm13(MlirType type);
-
-/// Creates an RTGTest Imm13 type in the context.
-MLIR_CAPI_EXPORTED MlirType rtgtestImm13TypeGet(MlirContext ctxt);
-
-/// If the type is an RTGTest Imm21Type.
-MLIR_CAPI_EXPORTED bool rtgtestTypeIsAImm21(MlirType type);
-
-/// Creates an RTGTest Imm21 type in the context.
-MLIR_CAPI_EXPORTED MlirType rtgtestImm21TypeGet(MlirContext ctxt);
-
-/// If the type is an RTGTest Imm32Type.
-MLIR_CAPI_EXPORTED bool rtgtestTypeIsAImm32(MlirType type);
-
-/// Creates an RTGTest Imm32 type in the context.
-MLIR_CAPI_EXPORTED MlirType rtgtestImm32TypeGet(MlirContext ctxt);
-
 //===----------------------------------------------------------------------===//
 // Attribute API.
 //===----------------------------------------------------------------------===//
@@ -279,59 +246,6 @@ MLIR_CAPI_EXPORTED bool rtgtestAttrIsARegT6(MlirAttribute attr);
 /// Creates an RTGTest RegT6 attribute in the context.
 MLIR_CAPI_EXPORTED MlirAttribute rtgtestRegT6AttrGet(MlirContext ctxt);
 
-// Immediates.
-//===----------------------------------------------------------------------===//
-
-/// If the attribute is an RTGTest Imm5Attr.
-MLIR_CAPI_EXPORTED bool rtgtestAttrIsAImm5(MlirAttribute attr);
-
-/// Creates an RTGTest Imm5 attribute in the context.
-MLIR_CAPI_EXPORTED MlirAttribute rtgtestImm5AttrGet(MlirContext ctxt,
-                                                    unsigned value);
-
-/// Returns the value represented by the Imm5 attribute.
-MLIR_CAPI_EXPORTED unsigned rtgtestImm5AttrGetValue(MlirAttribute attr);
-
-/// If the attribute is an RTGTest Imm12Attr.
-MLIR_CAPI_EXPORTED bool rtgtestAttrIsAImm12(MlirAttribute attr);
-
-/// Creates an RTGTest Imm12 attribute in the context.
-MLIR_CAPI_EXPORTED MlirAttribute rtgtestImm12AttrGet(MlirContext ctxt,
-                                                     unsigned value);
-
-/// Returns the value represented by the Imm12 attribute.
-MLIR_CAPI_EXPORTED unsigned rtgtestImm12AttrGetValue(MlirAttribute attr);
-
-/// If the attribute is an RTGTest Imm13Attr.
-MLIR_CAPI_EXPORTED bool rtgtestAttrIsAImm13(MlirAttribute attr);
-
-/// Creates an RTGTest Imm13 attribute in the context.
-MLIR_CAPI_EXPORTED MlirAttribute rtgtestImm13AttrGet(MlirContext ctxt,
-                                                     unsigned value);
-
-/// Returns the value represented by the Imm13 attribute.
-MLIR_CAPI_EXPORTED unsigned rtgtestImm13AttrGetValue(MlirAttribute attr);
-
-/// If the attribute is an RTGTest Imm21Attr.
-MLIR_CAPI_EXPORTED bool rtgtestAttrIsAImm21(MlirAttribute attr);
-
-/// Creates an RTGTest Imm21 attribute in the context.
-MLIR_CAPI_EXPORTED MlirAttribute rtgtestImm21AttrGet(MlirContext ctxt,
-                                                     unsigned value);
-
-/// Returns the value represented by the Imm21 attribute.
-MLIR_CAPI_EXPORTED unsigned rtgtestImm21AttrGetValue(MlirAttribute attr);
-
-/// If the attribute is an RTGTest Imm32Attr.
-MLIR_CAPI_EXPORTED bool rtgtestAttrIsAImm32(MlirAttribute attr);
-
-/// Creates an RTGTest Imm32 attribute in the context.
-MLIR_CAPI_EXPORTED MlirAttribute rtgtestImm32AttrGet(MlirContext ctxt,
-                                                     unsigned value);
-
-/// Returns the value represented by the Imm32 attribute.
-MLIR_CAPI_EXPORTED unsigned rtgtestImm32AttrGetValue(MlirAttribute attr);
-
 #ifdef __cplusplus
 }
 #endif

include/circt/Dialect/RTG/IR/RTGAttributes.h

@@ -14,6 +14,16 @@
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/BuiltinAttributes.h"
 
+namespace circt {
+namespace rtg {
+namespace detail {
+
+struct ImmediateAttrStorage;
+
+} // namespace detail
+} // namespace rtg
+} // namespace circt
+
 #define GET_ATTRDEF_CLASSES
 #include "circt/Dialect/RTG/IR/RTGAttributes.h.inc"
 

include/circt/Dialect/RTG/IR/RTGAttributes.td

@@ -21,43 +21,6 @@ include "mlir/IR/Interfaces.td"
 class RTGAttrDef<string name, list<Trait> traits = []> 
   : AttrDef<RTGDialect, name, traits>;
 
-class ImmediateAttrBase<int width> : RTGAttrDef<"Imm" # width, [
-  DeclareAttrInterfaceMethods<TypedAttrInterface>,
-]> {
-  let summary = "represents a " # width # "-bit immediate value";
-
-  let mnemonic = "imm" # width;
-  let parameters = (ins "uint32_t":$value);
-
-  let assemblyFormat = "`<` $value `>`";
-
-  let extraClassDeclaration = [{
-    llvm::APInt getAPInt() const {
-      return llvm::APInt(}] # width # [{, getValue());
-    }
-  }];
-
-  let extraClassDefinition = [{
-    Type $cppClass::getType() const {
-      return Imm}] # width # [{Type::get(getContext());
-    }
-
-    LogicalResult $cppClass::verify(
-      ::llvm::function_ref<::mlir::InFlightDiagnostic()> emitError,
-      uint32_t value) {
-
-      if (32 - llvm::countl_zero(value) > }] # width # [{)
-        return emitError() << "cannot represent " << value << " with }] #
-          width # [{ bits";
-
-      return success();
-    }
-  }];
-
-  let genVerifyDecl = 1;
-}
-
-
 def DefaultContextAttr : RTGAttrDef<"DefaultContext", [
   DeclareAttrInterfaceMethods<ContextResourceAttrInterface>,
 ]> {
@@ -94,6 +57,7 @@ def ImmediateAttr : RTGISAAttrDef<"Immediate", [
   let parameters = (ins "llvm::APInt":$value);
 
   let hasCustomAssemblyFormat = true;
+  let genStorageClass = false;
 }
 
 #endif // CIRCT_DIALECT_RTG_IR_RTGATTRIBUTES_TD

include/circt/Dialect/RTG/IR/RTGTypes.td

@@ -157,9 +157,4 @@ class ImmediateOfWidth<int width> : Type<
   "a " # width # "-bit immediate">,
   BuildableType<"::circt::rtg::ImmediateType::get($_builder.getContext(), " # width # ")">;
 
-class ImmTypeBase<int width> : TypeDef<RTGDialect, "Imm" # width, []> {
-  let summary = "represents a " # width # "-bit immediate";
-  let mnemonic = "imm" # width;
-}
-
 #endif // CIRCT_DIALECT_RTG_IR_RTGTYPES_TD

include/circt/Dialect/RTGTest/IR/RTGTestAttributes.td

@@ -36,14 +36,6 @@ def CPUAttr : RTGTestAttrDef<"CPU", [ContextResourceAttrInterface]> {
   }];
 }
 
-let dialect = RTGTestDialect in {
-def Imm5  : ImmediateAttrBase<5>;
-def Imm12 : ImmediateAttrBase<12>;
-def Imm13 : ImmediateAttrBase<13>;
-def Imm21 : ImmediateAttrBase<21>;
-def Imm32 : ImmediateAttrBase<32>;
-}
-
 class IntegerRegisterAttrBase<string cppName, string name, int classIndex>
   : RTGTestAttrDef<cppName, [RegisterAttrInterface]> {
 

include/circt/Dialect/RTGTest/IR/RTGTestOps.h

@@ -13,6 +13,7 @@
 #ifndef CIRCT_DIALECT_RTGTEST_IR_RTGTESTOPS_H
 #define CIRCT_DIALECT_RTGTEST_IR_RTGTESTOPS_H
 
+#include "circt/Dialect/RTG/IR/RTGAttributes.h"
 #include "circt/Dialect/RTG/IR/RTGISAAssemblyOpInterfaces.h"
 #include "circt/Dialect/RTG/IR/RTGOpInterfaces.h"
 #include "circt/Dialect/RTG/IR/RTGOps.h"