Merge branch 'main' into btor2integration

chipsalliance · May 7, 2024 · 728862c · 728862c
2 parents c31176f + 6cd4ce7
commit 728862c
Show file tree

Hide file tree

Showing 10 changed files with 284 additions and 363 deletions.
diff --git a/circtpanamabinding/includeFunctions.txt b/circtpanamabinding/includeFunctions.txt
@@ -5,6 +5,7 @@ mlirGetDialectHandle__firrtl__
 mlirGetDialectHandle__chirrtl__
 mlirGetDialectHandle__sv__
 mlirGetDialectHandle__seq__
+mlirGetDialectHandle__emit__
 mlirDialectHandleLoadDialect
 #mlirStringRefCreate inline function cannot be generated
 mlirStringRefCreateFromCString

diff --git a/circtpanamabinding/jextract-headers.h b/circtpanamabinding/jextract-headers.h
@@ -8,6 +8,7 @@
 #include <circt-c/Dialect/HW.h>
 #include <circt-c/Dialect/SV.h>
 #include <circt-c/Dialect/Seq.h>
+#include <circt-c/Dialect/Emit.h>
 #include <circt-c/Dialect/OM.h>
 #include <circt-c/Firtool/Firtool.h>
 #include <circt-c/ExportFIRRTL.h>

diff --git a/circtpanamabinding/linkLibraries.txt b/circtpanamabinding/linkLibraries.txt
@@ -4,6 +4,7 @@ CIRCTCAPICHIRRTL
 CIRCTCAPIHW
 CIRCTCAPISV
 CIRCTCAPISeq
+CIRCTCAPIEmit
 CIRCTCAPIOM
 CIRCTCAPIFirtool
 CIRCTCAPIExportFIRRTL

diff --git a/lit/tests/Property/DocExample.sc b/lit/tests/Property/DocExample.sc
@@ -94,7 +94,7 @@ args.head match {
     val om = converter.om()
     val evaluator = om.evaluator()
 
-    val top = evaluator.instantiate("Top_Class", Seq(om.newBasePathEmpty))
+    val top = evaluator.instantiate("Top_Class", Seq(om.newBasePathEmpty)).get
 
     // CHECK: .descriptions => { [ obj{.description => { mlirString{"Machine cycle counter."} }, .identifier => { mlirString{"mcycle"} }, .width => { omInteger{64} }}, obj{.description => { mlirString{"Machine instructions-retired counter."} }, .identifier => { mlirString{"minstret"} }, .width => { omInteger{64} }} ] }
     top.foreachField((name, value) => println(s".$name => { ${value.toString} }"))

diff --git a/lit/tests/Property/Good.sc b/lit/tests/Property/Good.sc
@@ -71,7 +71,7 @@ args.head match {
 
     val om = converter.om()
     val evaluator = om.evaluator()
-    val obj = evaluator.instantiate("PropertyTest_Class", Seq(om.newBasePathEmpty))
+    val obj = evaluator.instantiate("PropertyTest_Class", Seq(om.newBasePathEmpty)).get
 
     // CHECK-LABEL: OMReferenceTarget:~PropertyTest|PropertyTest>i
     println(obj.field("p").asInstanceOf[PanamaCIRCTOMEvaluatorValuePath].toString)

diff --git a/panamalib/src/PanamaCIRCT.scala b/panamalib/src/PanamaCIRCT.scala
@@ -23,7 +23,8 @@ class PanamaCIRCT {
       CAPI.mlirGetDialectHandle__firrtl__(arena),
       CAPI.mlirGetDialectHandle__chirrtl__(arena),
       CAPI.mlirGetDialectHandle__sv__(arena),
-      CAPI.mlirGetDialectHandle__seq__(arena)
+      CAPI.mlirGetDialectHandle__seq__(arena),
+      CAPI.mlirGetDialectHandle__emit__(arena)
     ).foreach(CAPI.mlirDialectHandleLoadDialect(arena, _, mlirCtx))
 
     mlirCtx

diff --git a/panamaom/src/PanamaCIRCTOM.scala b/panamaom/src/PanamaCIRCTOM.scala
@@ -17,12 +17,15 @@ class PanamaCIRCTOMEvaluator private[chisel3] (circt: PanamaCIRCT, mlirModule: M
   def instantiate(
     className:    String,
     actualParams: Seq[PanamaCIRCTOMEvaluatorValue]
-  ): PanamaCIRCTOMEvaluatorValueObject = {
+  ): Option[PanamaCIRCTOMEvaluatorValueObject] = {
     val params = actualParams.map(_.asInstanceOf[PanamaCIRCTOMEvaluatorValue].value)
 
     val value = circt.omEvaluatorInstantiate(evaluator, className, params)
-    assert(!circt.omEvaluatorObjectIsNull(value))
-    new PanamaCIRCTOMEvaluatorValueObject(circt, value)
+    if (!circt.omEvaluatorObjectIsNull(value)) {
+      Some(new PanamaCIRCTOMEvaluatorValueObject(circt, value))
+    } else {
+      None
+    }
   }
 }