Add attribute conversion lowering to EmitC

Xilinx · Dec 20, 2024 · 87fe125 · 87fe125
1 parent 5084ab1
commit 87fe125
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp b/mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp
@@ -39,8 +39,14 @@ class ArithConstantOpConversionPattern
     Type newTy = this->getTypeConverter()->convertType(arithConst.getType());
     if (!newTy)
       return rewriter.notifyMatchFailure(arithConst, "type conversion failed");
-    rewriter.replaceOpWithNewOp<emitc::ConstantOp>(arithConst, newTy,
-                                                   adaptor.getValue());
+
+    auto newValueAttr =
+        getTypeConverter()->convertTypeAttribute(newTy, adaptor.getValueAttr());
+
+    rewriter.replaceOpWithNewOp<emitc::ConstantOp>(
+        arithConst, newTy,
+        newValueAttr.has_value() ? newValueAttr.value() : adaptor.getValue());
+
     return success();
   }
 };

diff --git a/mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp b/mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp
@@ -92,9 +92,14 @@ struct ConvertGlobal final : public OpConversionPattern<memref::GlobalOp> {
     if (isa_and_present<UnitAttr>(initialValue))
       initialValue = {};
 
+    auto convertedInitialValue =
+        getTypeConverter()->convertTypeAttribute(resultTy, initialValue);
+
     rewriter.replaceOpWithNewOp<emitc::GlobalOp>(
-        op, operands.getSymName(), resultTy, initialValue, externSpecifier,
-        staticSpecifier, operands.getConstant());
+        op, operands.getSymName(), resultTy,
+        convertedInitialValue.has_value() ? convertedInitialValue.value()
+                                          : initialValue,
+        externSpecifier, staticSpecifier, operands.getConstant());
     return success();
   }
 };