llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Andy Kaylor (andykaylor) <details> <summary>Changes</summary> This introduces MLIR aliases for ClangIR record types. These are used in the incubator and having skipped over them upstream is causing the tests to diverge. --- Full diff: https://github.com/llvm/llvm-project/pull/136387.diff 6 Files Affected: - (modified) clang/lib/CIR/Dialect/IR/CIRDialect.cpp (+8) - (modified) clang/test/CIR/CodeGen/struct.c (+15-16) - (modified) clang/test/CIR/CodeGen/struct.cpp (+2-3) - (modified) clang/test/CIR/CodeGen/typedef.c (+1-3) - (modified) clang/test/CIR/CodeGen/union.c (+2-3) - (modified) clang/test/CIR/IR/struct.cir (+10-4) ``````````diff diff --git a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp index d2313e75870b4..3e10d16886eb2 100644 --- a/clang/lib/CIR/Dialect/IR/CIRDialect.cpp +++ b/clang/lib/CIR/Dialect/IR/CIRDialect.cpp @@ -33,6 +33,14 @@ struct CIROpAsmDialectInterface : public OpAsmDialectInterface { using OpAsmDialectInterface::OpAsmDialectInterface; AliasResult getAlias(Type type, raw_ostream &os) const final { + if (auto recordType = dyn_cast<cir::RecordType>(type)) { + StringAttr nameAttr = recordType.getName(); + if (!nameAttr) + os << "ty_anon_" << recordType.getKindAsStr(); + else + os << "ty_" << nameAttr.getValue(); + return AliasResult::OverridableAlias; + } if (auto intType = dyn_cast<cir::IntType>(type)) { // We only provide alias for standard integer types (i.e. integer types // whose width is a power of 2 and at least 8). diff --git a/clang/test/CIR/CodeGen/struct.c b/clang/test/CIR/CodeGen/struct.c index 3dc1655e15d2c..e75a2064eca4d 100644 --- a/clang/test/CIR/CodeGen/struct.c +++ b/clang/test/CIR/CodeGen/struct.c @@ -7,11 +7,19 @@ // For LLVM IR checks, the structs are defined before the variables, so these // checks are at the top. +// CIR-DAG: !ty_IncompleteS = !cir.record<struct "IncompleteS" incomplete> +// CIR-DAG: !ty_CompleteS = !cir.record<struct "CompleteS" {!s32i, !s8i}> +// CIR-DAG: !ty_OuterS = !cir.record<struct "OuterS" {!ty_InnerS, !s32i}> +// CIR-DAG: !ty_InnerS = !cir.record<struct "InnerS" {!s32i, !s8i}> +// CIR-DAG: !ty_PackedS = !cir.record<struct "PackedS" packed {!s32i, !s8i}> +// CIR-DAG: !ty_PackedAndPaddedS = !cir.record<struct "PackedAndPaddedS" packed padded {!s32i, !s8i, !u8i}> + // LLVM: %struct.CompleteS = type { i32, i8 } // LLVM: %struct.OuterS = type { %struct.InnerS, i32 } // LLVM: %struct.InnerS = type { i32, i8 } // LLVM: %struct.PackedS = type <{ i32, i8 }> // LLVM: %struct.PackedAndPaddedS = type <{ i32, i8, i8 }> + // OGCG: %struct.CompleteS = type { i32, i8 } // OGCG: %struct.OuterS = type { %struct.InnerS, i32 } // OGCG: %struct.InnerS = type { i32, i8 } @@ -20,8 +28,7 @@ struct IncompleteS *p; -// CIR: cir.global external @p = #cir.ptr<null> : !cir.ptr<!cir.record<struct -// CIR-SAME: "IncompleteS" incomplete>> +// CIR: cir.global external @p = #cir.ptr<null> : !cir.ptr<!ty_IncompleteS> // LLVM: @p = dso_local global ptr null // OGCG: @p = global ptr null, align 8 @@ -30,8 +37,7 @@ struct CompleteS { char b; } cs; -// CIR: cir.global external @cs = #cir.zero : !cir.record<struct -// CIR-SAME: "CompleteS" {!s32i, !s8i}> +// CIR: cir.global external @cs = #cir.zero : !ty_CompleteS // LLVM: @cs = dso_local global %struct.CompleteS zeroinitializer // OGCG: @cs = global %struct.CompleteS zeroinitializer, align 4 @@ -47,8 +53,7 @@ struct OuterS { struct OuterS os; -// CIR: cir.global external @os = #cir.zero : !cir.record<struct -// CIR-SAME: "OuterS" {!cir.record<struct "InnerS" {!s32i, !s8i}>, !s32i}> +// CIR: cir.global external @os = #cir.zero : !ty_OuterS // LLVM: @os = dso_local global %struct.OuterS zeroinitializer // OGCG: @os = global %struct.OuterS zeroinitializer, align 4 @@ -60,8 +65,7 @@ struct PackedS { char a1; } ps; -// CIR: cir.global external @ps = #cir.zero : !cir.record<struct "PackedS" -// CIR-SAME: packed {!s32i, !s8i}> +// CIR: cir.global external @ps = #cir.zero : !ty_PackedS // LLVM: @ps = dso_local global %struct.PackedS zeroinitializer // OGCG: @ps = global %struct.PackedS zeroinitializer, align 1 @@ -70,8 +74,7 @@ struct PackedAndPaddedS { char b1; } __attribute__((aligned(2))) pps; -// CIR: cir.global external @pps = #cir.zero : !cir.record<struct -// CIR-SAME: "PackedAndPaddedS" packed padded {!s32i, !s8i, !u8i}> +// CIR: cir.global external @pps = #cir.zero : !ty_PackedAndPaddedS // LLVM: @pps = dso_local global %struct.PackedAndPaddedS zeroinitializer // OGCG: @pps = global %struct.PackedAndPaddedS zeroinitializer, align 2 @@ -82,9 +85,7 @@ void f(void) { } // CIR: cir.func @f() -// CIR-NEXT: cir.alloca !cir.ptr<!cir.record<struct "IncompleteS" incomplete>>, -// CIR-SAME: !cir.ptr<!cir.ptr<!cir.record<struct -// CIR-SAME: "IncompleteS" incomplete>>>, ["p"] +// CIR-NEXT: cir.alloca !cir.ptr<!ty_IncompleteS>, !cir.ptr<!cir.ptr<!ty_IncompleteS>>, ["p"] {alignment = 8 : i64} // CIR-NEXT: cir.return // LLVM: define void @f() @@ -101,9 +102,7 @@ void f2(void) { } // CIR: cir.func @f2() -// CIR-NEXT: cir.alloca !cir.record<struct "CompleteS" {!s32i, !s8i}>, -// CIR-SAME: !cir.ptr<!cir.record<struct "CompleteS" {!s32i, !s8i}>>, -// CIR-SAME: ["s"] {alignment = 4 : i64} +// CIR-NEXT: cir.alloca !ty_CompleteS, !cir.ptr<!ty_CompleteS>, ["s"] {alignment = 4 : i64} // CIR-NEXT: cir.return // LLVM: define void @f2() diff --git a/clang/test/CIR/CodeGen/struct.cpp b/clang/test/CIR/CodeGen/struct.cpp index 6197340a7d36b..71f8eef43f054 100644 --- a/clang/test/CIR/CodeGen/struct.cpp +++ b/clang/test/CIR/CodeGen/struct.cpp @@ -8,7 +8,7 @@ struct IncompleteS; IncompleteS *p; -// CIR: cir.global external @p = #cir.ptr<null> : !cir.ptr<!cir.record<struct "IncompleteS" incomplete>> +// CIR: cir.global external @p = #cir.ptr<null> : !cir.ptr<!ty_IncompleteS> // LLVM: @p = dso_local global ptr null // OGCG: @p = global ptr null, align 8 @@ -17,8 +17,7 @@ void f(void) { } // CIR: cir.func @f() -// CIR-NEXT: cir.alloca !cir.ptr<!cir.record<struct "IncompleteS" incomplete>>, -// CIR-SAME: !cir.ptr<!cir.ptr<!cir.record<struct "IncompleteS" incomplete>>>, ["p"] +// CIR-NEXT: cir.alloca !cir.ptr<!ty_IncompleteS>, !cir.ptr<!cir.ptr<!ty_IncompleteS>>, ["p"] // CIR-NEXT: cir.return // LLVM: define void @f() diff --git a/clang/test/CIR/CodeGen/typedef.c b/clang/test/CIR/CodeGen/typedef.c index 17fce13abf38a..ad0000730e311 100644 --- a/clang/test/CIR/CodeGen/typedef.c +++ b/clang/test/CIR/CodeGen/typedef.c @@ -11,9 +11,7 @@ void local_typedef(void) { } // CIR: cir.func @local_typedef() -// CIR: cir.alloca !cir.record<struct "Struct" {!s32i}>, -// CIR-SAME: !cir.ptr<!cir.record<struct "Struct" {!s32i}>>, ["s"] -// CIR-SAME: {alignment = 4 : i64} +// CIR: cir.alloca !ty_Struct, !cir.ptr<!ty_Struct>, ["s"] {alignment = 4 : i64} // CIR: cir.return // LLVM: %struct.Struct = type { i32 } diff --git a/clang/test/CIR/CodeGen/union.c b/clang/test/CIR/CodeGen/union.c index 075d0d2315508..c9b8e7e9e2908 100644 --- a/clang/test/CIR/CodeGen/union.c +++ b/clang/test/CIR/CodeGen/union.c @@ -7,7 +7,7 @@ union IncompleteU *p; -// CIR: cir.global external @p = #cir.ptr<null> : !cir.ptr<!cir.record<union "IncompleteU" incomplete>> +// CIR: cir.global external @p = #cir.ptr<null> : !cir.ptr<!ty_IncompleteU> // LLVM: @p = dso_local global ptr null // OGCG: @p = global ptr null, align 8 @@ -16,8 +16,7 @@ void f(void) { } // CIR: cir.func @f() -// CIR-NEXT: cir.alloca !cir.ptr<!cir.record<union "IncompleteU" incomplete>>, -// CIR-SAME: !cir.ptr<!cir.ptr<!cir.record<union "IncompleteU" incomplete>>>, ["p"] +// CIR-NEXT: cir.alloca !cir.ptr<!ty_IncompleteU>, !cir.ptr<!cir.ptr<!ty_IncompleteU>>, ["p"] // CIR-NEXT: cir.return // LLVM: define void @f() diff --git a/clang/test/CIR/IR/struct.cir b/clang/test/CIR/IR/struct.cir index b6ed1d78b354a..ba9c21890e3ed 100644 --- a/clang/test/CIR/IR/struct.cir +++ b/clang/test/CIR/IR/struct.cir @@ -1,9 +1,15 @@ // RUN: cir-opt %s | FileCheck %s +!ty_S = !cir.record<struct "S" incomplete> +!ty_U = !cir.record<union "U" incomplete> + +// CHECK: !ty_S = !cir.record<struct "S" incomplete> +// CHECK: !ty_U = !cir.record<union "U" incomplete> + module { - cir.global external @p1 = #cir.ptr<null> : !cir.ptr<!cir.record<struct "S" incomplete>> - cir.global external @p2 = #cir.ptr<null> : !cir.ptr<!cir.record<union "U" incomplete>> + cir.global external @p1 = #cir.ptr<null> : !cir.ptr<!ty_S> + cir.global external @p2 = #cir.ptr<null> : !cir.ptr<!ty_U> } -// CHECK: cir.global external @p1 = #cir.ptr<null> : !cir.ptr<!cir.record<struct "S" incomplete>> -// CHECK: cir.global external @p2 = #cir.ptr<null> : !cir.ptr<!cir.record<union "U" incomplete>> +// CHECK: cir.global external @p1 = #cir.ptr<null> : !cir.ptr<!ty_S> +// CHECK: cir.global external @p2 = #cir.ptr<null> : !cir.ptr<!ty_U> `````````` </details> https://github.com/llvm/llvm-project/pull/136387 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
