Support for structs in MLIR (phate#1205)

Co-authored-by: HKrogstie <krogstie.havard@gmail.com>
Co-authored-by: Nico Reissmann <nico.reissmann@gmail.com>

Author: 3 people

jlm/mlir/backend/JlmToMlirConverter.cpp

@@ -1046,6 +1046,35 @@ JlmToMlirConverter::ConvertType(const rvsdg::Type & type)
   {
     return Builder_->getType<::mlir::NoneType>();
   }
+  else if (auto structType = dynamic_cast<const llvm::StructType *>(&type))
+  {
+    std::vector<::mlir::Type> elements;
+    for (size_t i = 0; i < structType->numElements(); i++)
+    {
+      elements.push_back(ConvertType(*structType->getElementType(i)));
+    }
+
+    if (structType->IsLiteral())
+    {
+      return ::mlir::LLVM::LLVMStructType::getLiteral(
+          Builder_->getContext(),
+          elements,
+          structType->IsPacked());
+    }
+    else
+    {
+      auto mlirStructType = ::mlir::LLVM::LLVMStructType::getIdentified(
+          Builder_->getContext(),
+          structType->GetName());
+      if (mlirStructType.isInitialized())
+        return mlirStructType;
+      if (mlirStructType.setBody(elements, structType->IsPacked()).failed())
+      {
+        throw util::Error("Not able to set the body of struct in the MLIR backend.");
+      }
+      return mlirStructType;
+    }
+  }
   else
   {
     auto message = util::strfmt("Type conversion not implemented: ", type.debug_string());

jlm/mlir/frontend/MlirToJlmConverter.cpp

@@ -1202,6 +1202,35 @@ MlirToJlmConverter::ConvertType(const ::mlir::Type & type)
     // RVSDG does not support indices, which are modeled as integers
     return rvsdg::BitType::Create(MlirToJlmConverter::GetIndexBitWidth());
   }
+  else if (auto structType = ::mlir::dyn_cast<::mlir::LLVM::LLVMStructType>(type))
+  {
+    if (StructTypeMap_.HasKey(&structType))
+    {
+      return StructTypeMap_.LookupKey(&structType);
+    }
+
+    std::vector<std::shared_ptr<const rvsdg::Type>> types;
+    for (auto element : structType.getBody())
+    {
+      types.push_back(ConvertType(element));
+    }
+
+    std::shared_ptr<const llvm::StructType> jlmStructType;
+    if (structType.isIdentified())
+    {
+      jlmStructType = jlm::llvm::StructType::CreateIdentified(
+          structType.getName().str(),
+          types,
+          structType.isPacked());
+    }
+    else
+    {
+      jlmStructType = jlm::llvm::StructType::CreateLiteral(types, structType.isPacked());
+    }
+
+    StructTypeMap_.Insert(&structType, jlmStructType);
+    return jlmStructType;
+  }
   else
   {
     type.dump();

jlm/mlir/frontend/MlirToJlmConverter.hpp

@@ -14,6 +14,7 @@
 #include <jlm/rvsdg/bitstring/constant.hpp>
 #include <jlm/rvsdg/gamma.hpp>
 #include <jlm/rvsdg/theta.hpp>
+#include <jlm/util/BijectiveMap.hpp>
 
 #include <JLM/JLMDialect.h>
 #include <JLM/JLMOps.h>
@@ -227,7 +228,7 @@ class MlirToJlmConverter final
    * \param type The MLIR type to be converted.
    * \result The converted RVSDG type.
    */
-  static std::shared_ptr<const rvsdg::Type>
+  std::shared_ptr<const rvsdg::Type>
   ConvertType(const ::mlir::Type & type);
 
   /**
@@ -247,6 +248,8 @@ class MlirToJlmConverter final
   }
 
   std::unique_ptr<::mlir::MLIRContext> Context_;
+  util::BijectiveMap<::mlir::LLVM::LLVMStructType *, std::shared_ptr<const llvm::StructType>>
+      StructTypeMap_;
 };
 
 } // namespace jlm::mlir