[CIR] Track size_t and int size with module attributes

Author: AdUhTkJm

clang/include/clang/CIR/Dialect/IR/CIRAttrs.td

@@ -122,6 +122,37 @@ def CIR_OptInfoAttr : CIR_Attr<"OptInfo", "opt_info"> {
   let genVerifyDecl = 1;
 }
 
+//===----------------------------------------------------------------------===//
+// TypeSizeAttr
+//===----------------------------------------------------------------------===//
+
+def CIR_TypeSizesAttr : CIR_Attr<"TypeSizes", "type_sizes"> {
+  let summary = "the size of types in bits";
+  let description = [{
+    Attached to a module, to share information between CIR generation and
+    later passes.
+
+    Examples:
+
+    ```mlir
+    // sizeof(int) == 4, sizeof(size_t) == 8
+    module attributes {
+      cir.type_sizes = #cir.type_sizes<
+        int = 32,
+        size_t = 64
+      >
+    } {}
+    ```
+  }];
+
+  let parameters = (ins "unsigned":$intSize, "unsigned":$sizeTypeSize);
+
+  let assemblyFormat = [{
+    `<` `int` `=` $intSize `,` `size_t` `=` $sizeTypeSize `>`
+  }];
+}
+
+
 //===----------------------------------------------------------------------===//
 // BoolAttr
 //===----------------------------------------------------------------------===//

clang/include/clang/CIR/Dialect/IR/CIRDataLayout.h

@@ -35,6 +35,9 @@ class CIRDataLayout {
   // The StructType -> StructLayout map.
   mutable void *LayoutMap = nullptr;
 
+  unsigned intSize;
+  unsigned sizeTypeSize;
+
 public:
   mlir::DataLayout layout;
 
@@ -106,6 +109,10 @@ class CIRDataLayout {
         cir::IntType::get(Ty.getContext(), getPointerTypeSizeInBits(Ty), false);
     return IntTy;
   }
+
+  mlir::Type getIntType(mlir::MLIRContext *ctx) const;
+  mlir::Type getSizeType(mlir::MLIRContext *ctx) const;
+  mlir::Type getPtrDiffType(mlir::MLIRContext *ctx) const;
 };
 
 /// Used to lazily calculate structure layout information for a target machine,

clang/include/clang/CIR/Dialect/IR/CIRDialect.td

@@ -34,6 +34,7 @@ def CIR_Dialect : Dialect {
     // Names of CIR parameter attributes.
     static llvm::StringRef getSExtAttrName() { return "cir.signext"; }
     static llvm::StringRef getZExtAttrName() { return "cir.zeroext"; }
+    static llvm::StringRef getTypeSizesAttrName() { return "cir.type_sizes"; }
     static llvm::StringRef getSOBAttrName() { return "cir.sob"; }
     static llvm::StringRef getLangAttrName() { return "cir.lang"; }
     static llvm::StringRef getTripleAttrName() { return "cir.triple"; }

clang/lib/CIR/CodeGen/CIRGenModule.cpp

@@ -197,6 +197,12 @@ CIRGenModule::CIRGenModule(mlir::MLIRContext &mlirContext,
                      cir::LangAttr::get(&mlirContext, lang));
   theModule->setAttr(cir::CIRDialect::getTripleAttrName(),
                      builder.getStringAttr(getTriple().str()));
+
+  unsigned sizeTypeSize = astContext.getTargetInfo().getMaxPointerWidth();
+  unsigned intSize = astContext.getTargetInfo().getIntWidth();
+  theModule->setAttr(
+      cir::CIRDialect::getTypeSizesAttrName(),
+      cir::TypeSizesAttr::get(&mlirContext, intSize, sizeTypeSize));
   if (CGO.OptimizationLevel > 0 || CGO.OptimizeSize > 0)
     theModule->setAttr(cir::CIRDialect::getOptInfoAttrName(),
                        cir::OptInfoAttr::get(&mlirContext,

clang/lib/CIR/Dialect/IR/CIRDataLayout.cpp

@@ -1,4 +1,5 @@
 #include "clang/CIR/Dialect/IR/CIRDataLayout.h"
+#include "clang/CIR/Dialect/IR/CIRDialect.h"
 #include "clang/CIR/Dialect/IR/CIRTypes.h"
 #include "clang/CIR/MissingFeatures.h"
 #include "llvm/IR/DataLayout.h"
@@ -112,6 +113,12 @@ class StructLayoutMap {
 
 CIRDataLayout::CIRDataLayout(mlir::ModuleOp modOp) : layout{modOp} {
   reset(modOp.getDataLayoutSpec());
+
+  if (auto attr = modOp->getAttr(cir::CIRDialect::getTypeSizesAttrName())) {
+    auto typeSizeAttr = mlir::cast<cir::TypeSizesAttr>(attr);
+    intSize = typeSizeAttr.getIntSize();
+    sizeTypeSize = typeSizeAttr.getSizeTypeSize();
+  }
 }
 
 void CIRDataLayout::reset(mlir::DataLayoutSpecInterface spec) {
@@ -220,3 +227,15 @@ llvm::TypeSize CIRDataLayout::getTypeSizeInBits(mlir::Type Ty) const {
 
   return llvm::TypeSize::getFixed(layout.getTypeSizeInBits(Ty));
 }
+
+mlir::Type CIRDataLayout::getPtrDiffType(mlir::MLIRContext *ctx) const {
+  return cir::IntType::get(ctx, sizeTypeSize, /*signed=*/true);
+}
+
+mlir::Type CIRDataLayout::getSizeType(mlir::MLIRContext *ctx) const {
+  return cir::IntType::get(ctx, sizeTypeSize, /*signed=*/false);
+}
+
+mlir::Type CIRDataLayout::getIntType(mlir::MLIRContext *ctx) const {
+  return cir::IntType::get(ctx, intSize, /*signed=*/true);
+}

clang/test/CIR/CodeGen/attribute-annotate-multiple.cpp

@@ -16,7 +16,7 @@ void foo(int i) __attribute__((annotate("withargfunc", "os", 23 )));
 void bar() __attribute__((annotate("withargfunc", "os", 22))) {
 }
 
-// BEFORE: module @{{.*}}attribute-annotate-multiple.cpp" attributes {cir.lang =
+// BEFORE: module @{{.*}}attribute-annotate-multiple.cpp" attributes {{{.*}}cir.lang =
 
 // BEFORE: cir.global external @a = #cir.ptr<null> : !cir.ptr<!cir.double>
 // BEFORE-SAME: [#cir.annotation<name = "withargs", args = ["21", 12 : i32]>]

clang/test/CIR/CodeGen/dlti.c

@@ -5,6 +5,7 @@ void foo() {}
 
 //      CHECK: module @"{{.*}}dlti.c" attributes {
 //  CHECK-DAG: cir.sob = #cir.signed_overflow_behavior<undefined>,
+//  CHECK-DAG: cir.type_sizes = #cir.type_sizes<int = {{16|32}}, size_t = {{32|64}}>
 //  CHECK-DAG: dlti.dl_spec =
 //  CHECK-DAG:   #dlti.dl_spec<
 //  CHECK-DAG:     i16 = dense<16> : vector<2xi64>,

clang/test/CIR/CodeGen/sourcelocation.cpp

@@ -18,7 +18,7 @@ int s0(int a, int b) {
 // CIR: #loc6 = loc("{{.*}}sourcelocation.cpp":6:19)
 // CIR: #loc21 = loc(fused[#loc3, #loc4])
 // CIR: #loc22 = loc(fused[#loc5, #loc6])
-// CIR: module @"{{.*}}sourcelocation.cpp" attributes {cir.lang = #cir.lang<cxx>, cir.sob = #cir.signed_overflow_behavior<undefined>
+// CIR: module @"{{.*}}sourcelocation.cpp" attributes {{{.*}}cir.lang = #cir.lang<cxx>, {{.*}}cir.sob = #cir.signed_overflow_behavior<undefined>
 // CIR:   cir.func @_Z2s0ii(%arg0: !s32i loc(fused[#loc3, #loc4]), %arg1: !s32i loc(fused[#loc5, #loc6])) -> !s32i
 // CIR:     %0 = cir.alloca !s32i, !cir.ptr<!s32i>, ["a", init] {alignment = 4 : i64} loc(#loc21)
 // CIR:     %1 = cir.alloca !s32i, !cir.ptr<!s32i>, ["b", init] {alignment = 4 : i64} loc(#loc22)