[CIR][Dialect] Add the datalayout interface to cir.ArrayType and Poin…

…terType Add the interface and the boilerplate methods to propagate the elements. This is the same behavior as we see from llvm's datalayout types.
llvm · Apr 29, 2023 · 6c0d95c · 6c0d95c
1 parent 7cc7d66
commit 6c0d95c
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 7 deletions.
diff --git a/clang/include/clang/CIR/Dialect/IR/CIRTypes.h b/clang/include/clang/CIR/Dialect/IR/CIRTypes.h
@@ -15,6 +15,7 @@
 
 #include "mlir/IR/BuiltinAttributes.h"
 #include "mlir/IR/Types.h"
+#include "mlir/Interfaces/DataLayoutInterfaces.h"
 
 //===----------------------------------------------------------------------===//
 // CIR Dialect Types

diff --git a/clang/include/clang/CIR/Dialect/IR/CIRTypes.td b/clang/include/clang/CIR/Dialect/IR/CIRTypes.td
@@ -14,23 +14,24 @@
 #define MLIR_CIR_DIALECT_CIR_TYPES
 
 include "clang/CIR/Dialect/IR/CIRDialect.td"
+include "mlir/Interfaces/DataLayoutInterfaces.td"
 include "mlir/IR/AttrTypeBase.td"
 
 //===----------------------------------------------------------------------===//
 // CIR Types
 //===----------------------------------------------------------------------===//
 
-class CIR_Type<string name, string typeMnemonic> : TypeDef<CIR_Dialect,
-                                                           name> {
+class CIR_Type<string name, string typeMnemonic, list<Trait> traits = []> :
+    TypeDef<CIR_Dialect, name, traits> {
   let mnemonic = typeMnemonic;
 }
 
 //===----------------------------------------------------------------------===//
 // PointerType
 //===----------------------------------------------------------------------===//
 
-def CIR_PointerType :
-    CIR_Type<"Pointer", "ptr"> {
+def CIR_PointerType : CIR_Type<"Pointer", "ptr",
+    [DeclareTypeInterfaceMethods<DataLayoutTypeInterface>]> {
 
   let summary = "CIR pointer type";
   let description = [{
@@ -112,8 +113,8 @@ def CIR_StructType : CIR_Type<"Struct", "struct"> {
 // ArrayType
 //===----------------------------------------------------------------------===//
 
-def CIR_ArrayType :
-    CIR_Type<"Array", "array"> {
+def CIR_ArrayType : CIR_Type<"Array", "array",
+    [DeclareTypeInterfaceMethods<DataLayoutTypeInterface>]> {
 
   let summary = "CIR array type";
   let description = [{

diff --git a/clang/lib/CIR/Dialect/IR/CIRTypes.cpp b/clang/lib/CIR/Dialect/IR/CIRTypes.cpp
@@ -63,6 +63,24 @@ void PointerType::print(mlir::AsmPrinter &printer) const {
   printer << '>';
 }
 
+unsigned
+PointerType::getTypeSizeInBits(const ::mlir::DataLayout &dataLayout,
+                             ::mlir::DataLayoutEntryListRef params) const {
+  llvm_unreachable("NYI");
+}
+
+unsigned
+PointerType::getABIAlignment(const ::mlir::DataLayout &dataLayout,
+                           ::mlir::DataLayoutEntryListRef params) const {
+  llvm_unreachable("NYI");
+}
+
+unsigned
+PointerType::getPreferredAlignment(const ::mlir::DataLayout &dataLayout,
+                                 ::mlir::DataLayoutEntryListRef params) const {
+  llvm_unreachable("NYI");
+}
+
 Type BoolType::parse(mlir::AsmParser &parser) {
   return get(parser.getContext());
 }
@@ -163,6 +181,24 @@ void ArrayType::print(mlir::AsmPrinter &printer) const {
   printer << '>';
 }
 
+unsigned
+ArrayType::getTypeSizeInBits(const ::mlir::DataLayout &dataLayout,
+                             ::mlir::DataLayoutEntryListRef params) const {
+  return dataLayout.getTypeSizeInBits(getEltType());
+}
+
+unsigned
+ArrayType::getABIAlignment(const ::mlir::DataLayout &dataLayout,
+                           ::mlir::DataLayoutEntryListRef params) const {
+  return dataLayout.getTypeABIAlignment(getEltType());
+}
+
+unsigned
+ArrayType::getPreferredAlignment(const ::mlir::DataLayout &dataLayout,
+                                 ::mlir::DataLayoutEntryListRef params) const {
+  return dataLayout.getTypePreferredAlignment(getEltType());
+}
+
 //===----------------------------------------------------------------------===//
 // CIR Dialect
 //===----------------------------------------------------------------------===//

diff --git a/clang/lib/CIR/Dialect/IR/CMakeLists.txt b/clang/lib/CIR/Dialect/IR/CMakeLists.txt
@@ -13,6 +13,6 @@ add_clang_library(MLIRCIR
   LINK_LIBS PUBLIC
   MLIRIR
   MLIRFuncDialect
-  MLIRLLVMDialect
+  MLIRDataLayoutInterfaces
   MLIRSideEffectInterfaces
   )