OM support float and bool property (#4590)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: SpriteOvO

circtpanamabinding/includeFunctions.txt

@@ -21,13 +21,17 @@ mlirModuleGetOperation
 mlirOperationStateGet
 mlirNamedAttributeGet
 mlirAttributeIsAInteger
+mlirAttributeIsAFloat
+mlirAttributeIsABool
 mlirAttributeIsAString
 mlirIntegerAttrGet
 mlirIntegerAttrGetValueInt
 mlirIntegerAttrGetValueSInt
 mlirIntegerAttrGetValueUInt
 mlirFloatAttrDoubleGet
+mlirFloatAttrGetValueDouble
 mlirBoolAttrGet
+mlirBoolAttrGetValue
 mlirStringAttrGet
 mlirStringAttrGetValue
 mlirArrayAttrGet

lit/tests/Property/Good.sc

@@ -62,6 +62,15 @@ class PropertyTest extends Module {
   // SFT-FIRRTL-NEXT: propassign b, List<List<Integer>>(List<Integer>(Integer(456)))
   a := Property(Seq[Seq[Int]](Seq(123)))
   b := Property(Seq[Seq[Int]](Seq(456)))
+
+  // SFC-FIRRTL: output f : Double
+  // SFC-FIRRTL: output bool : Bool
+  val f = IO(Output(Property[Double]()))
+  val bool = IO(Output(Property[Boolean]()))
+  // SFC-FIRRTL: propassign f, Double(1.23)
+  // SFC-FIRRTL: propassign bool, Bool(true)
+  f := Property(1.23)
+  bool := Property(true)
 }
 
 args.head match {
@@ -78,6 +87,8 @@ args.head match {
 
     // CHECK-NEXT: .a => { [ [ 123 ] ] }
     // CHECK-NEXT: .b => { [ [ 456 ] ] }
+    // CHECK-NEXT: .bool => { true }
+    // CHECK-NEXT: .f => { 1.23 }
     // CHECK-NEXT: .p => { OMReferenceTarget:~PropertyTest|PropertyTest>i }
     obj.foreachField((name, value) => println(s".$name => { ${value.toString} }"))
 

panamalib/src/PanamaCIRCT.scala

@@ -211,6 +211,8 @@ class PanamaCIRCT {
 
   def mlirBoolAttrGet(value: Boolean) = MlirAttribute(CAPI.mlirBoolAttrGet(arena, mlirCtx, if (value) 1 else 0))
 
+  def mlirBoolAttrGetValue(attr: MlirAttribute): Boolean = CAPI.mlirBoolAttrGetValue(attr.get)
+
   def mlirStringAttrGet(string: String) = MlirAttribute(CAPI.mlirStringAttrGet(arena, mlirCtx, newString(string).get))
 
   def mlirStringAttrGetValue(attr: MlirAttribute): String = {
@@ -220,6 +222,10 @@ class PanamaCIRCT {
 
   def mlirAttributeIsAInteger(attr: MlirAttribute): Boolean = CAPI.mlirAttributeIsAInteger(attr.get)
 
+  def mlirAttributeIsAFloat(attr: MlirAttribute): Boolean = CAPI.mlirAttributeIsAFloat(attr.get)
+
+  def mlirAttributeIsABool(attr: MlirAttribute): Boolean = CAPI.mlirAttributeIsABool(attr.get)
+
   def mlirAttributeIsAString(attr: MlirAttribute): Boolean = CAPI.mlirAttributeIsAString(attr.get)
 
   def mlirIntegerAttrGet(tpe: MlirType, value: Long) = MlirAttribute(CAPI.mlirIntegerAttrGet(arena, tpe.get, value))
@@ -234,6 +240,8 @@ class PanamaCIRCT {
     CAPI.mlirFloatAttrDoubleGet(arena, mlirCtx, tpe.get, value)
   )
 
+  def mlirFloatAttrGetValueDouble(attr: MlirAttribute): Double = CAPI.mlirFloatAttrGetValueDouble(attr.get)
+
   def mlirFlatSymbolRefAttrGet(symbol: String) = MlirAttribute(
     CAPI.mlirFlatSymbolRefAttrGet(arena, mlirCtx, newString(symbol).get)
   )

panamaom/src/PanamaCIRCTOM.scala

@@ -74,13 +74,27 @@ abstract class PanamaCIRCTOMEvaluatorValue {
     }
   def int: PanamaCIRCTOMEvaluatorValuePrimitiveInteger = intOpt.get
 
+  def floatOpt: Option[PanamaCIRCTOMEvaluatorValuePrimitiveFloat] =
+    this match {
+      case float: PanamaCIRCTOMEvaluatorValuePrimitiveFloat => Some(float)
+      case _ => None
+    }
+  def float: PanamaCIRCTOMEvaluatorValuePrimitiveFloat = floatOpt.get
+
   def stringOpt: Option[PanamaCIRCTOMEvaluatorValuePrimitiveString] =
     this match {
       case string: PanamaCIRCTOMEvaluatorValuePrimitiveString => Some(string)
       case _ => None
     }
   def string: PanamaCIRCTOMEvaluatorValuePrimitiveString = stringOpt.get
 
+  def boolOpt: Option[PanamaCIRCTOMEvaluatorValuePrimitiveBool] =
+    this match {
+      case bool: PanamaCIRCTOMEvaluatorValuePrimitiveBool => Some(bool)
+      case _ => None
+    }
+  def bool: PanamaCIRCTOMEvaluatorValuePrimitiveBool = boolOpt.get
+
   def tupleOpt: Option[PanamaCIRCTOMEvaluatorValueTuple] =
     this match {
       case tuple: PanamaCIRCTOMEvaluatorValueTuple => Some(tuple)
@@ -169,8 +183,12 @@ object PanamaCIRCTOMEvaluatorValuePrimitive {
 
     if (circt.omAttrIsAIntegerAttr(primitive)) {
       new PanamaCIRCTOMEvaluatorValuePrimitiveInteger(circt, value, circt.omIntegerAttrGetInt(primitive))
+    } else if (circt.mlirAttributeIsAFloat(primitive)) {
+      new PanamaCIRCTOMEvaluatorValuePrimitiveFloat(circt, value, primitive)
     } else if (circt.mlirAttributeIsAString(primitive)) {
       new PanamaCIRCTOMEvaluatorValuePrimitiveString(circt, value, primitive)
+    } else if (circt.mlirAttributeIsABool(primitive)) {
+      new PanamaCIRCTOMEvaluatorValuePrimitiveBool(circt, value, primitive)
     } else {
       circt.mlirAttributeDump(primitive)
       throw new Exception("unknown OMEvaluatorValuePrimitive attribute, dumped")
@@ -180,7 +198,9 @@ object PanamaCIRCTOMEvaluatorValuePrimitive {
 abstract class PanamaCIRCTOMEvaluatorValuePrimitive extends PanamaCIRCTOMEvaluatorValue {
   override def toString: String = this match {
     case v: PanamaCIRCTOMEvaluatorValuePrimitiveInteger => v.toString
+    case v: PanamaCIRCTOMEvaluatorValuePrimitiveFloat   => v.toString
     case v: PanamaCIRCTOMEvaluatorValuePrimitiveString  => v.toString
+    case v: PanamaCIRCTOMEvaluatorValuePrimitiveBool    => v.toString
   }
 }
 
@@ -193,6 +213,15 @@ class PanamaCIRCTOMEvaluatorValuePrimitiveInteger private[chisel3] (
   override def toString: String = integer.toString
 }
 
+class PanamaCIRCTOMEvaluatorValuePrimitiveFloat private[chisel3] (
+  val circt:     PanamaCIRCT,
+  val value:     OMEvaluatorValue,
+  val primitive: MlirAttribute)
+    extends PanamaCIRCTOMEvaluatorValuePrimitive {
+  val double:            Double = circt.mlirFloatAttrGetValueDouble(primitive)
+  override def toString: String = double.toString
+}
+
 class PanamaCIRCTOMEvaluatorValuePrimitiveString private[chisel3] (
   val circt:     PanamaCIRCT,
   val value:     OMEvaluatorValue,
@@ -201,6 +230,15 @@ class PanamaCIRCTOMEvaluatorValuePrimitiveString private[chisel3] (
   override def toString: String = circt.mlirStringAttrGetValue(primitive)
 }
 
+class PanamaCIRCTOMEvaluatorValuePrimitiveBool private[chisel3] (
+  val circt:     PanamaCIRCT,
+  val value:     OMEvaluatorValue,
+  val primitive: MlirAttribute)
+    extends PanamaCIRCTOMEvaluatorValuePrimitive {
+  val boolean:           Boolean = circt.mlirBoolAttrGetValue(primitive)
+  override def toString: String = boolean.toString
+}
+
 class PanamaCIRCTOMEvaluatorValueObject private[chisel3] (val circt: PanamaCIRCT, val value: OMEvaluatorValue)
     extends PanamaCIRCTOMEvaluatorValue {
   def apply(name: String): PanamaCIRCTOMEvaluatorValue = field(name)