Skip to content

Commit 6f671dd

Browse files
sitio-coutolanza
sitio-couto
authored and
lanza
committed
[CIR][Lowering] Deprecate typed LLVM dialect pointers (llvm#271)
Updates the lowering pass to use only opaque pointers. This essentially involves updating the type converter to drop pointee types and explicitly defining the types loaded/stored/GEPed by LLVM operations. The reasons for this are twofold: - LLVM dialect is currently transitioning to deprecate typed pointers, allowing only opaque pointers. The sooner we transition the fewer changes we will have to make. - Opaque pointers greatly simplify lowering self-references, since all self-references in records are wrapped in a pointer.
1 parent d9e0abe commit 6f671dd

File tree

11 files changed

+58
-72
lines changed

11 files changed

+58
-72
lines changed

‎clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ mlir::Value lowerCirAttrAsValue(mlir::Operation *parentOp,
197197
auto loc = parentOp->getLoc();
198198

199199
auto addressOfOp = rewriter.create<mlir::LLVM::AddressOfOp>(
200-
loc, mlir::LLVM::LLVMPointerType::get(sourceSymbol.getContext()),
200+
loc, mlir::LLVM::LLVMPointerType::get(parentOp->getContext()),
201201
sourceSymbol.getSymName());
202202

203203
assert(!globalAttr.getIndices() && "TODO");
@@ -313,7 +313,6 @@ class CIRPtrStrideOpLowering
313313
rewriter.replaceOpWithNewOp<mlir::LLVM::GEPOp>(ptrStrideOp, resultTy,
314314
elementTy, adaptor.getBase(),
315315
adaptor.getStride());
316-
317316
return mlir::success();
318317
}
319318
};
@@ -485,12 +484,12 @@ class CIRCastOpLowering : public mlir::OpConversionPattern<mlir::cir::CastOp> {
485484
matchAndRewrite(mlir::cir::CastOp castOp, OpAdaptor adaptor,
486485
mlir::ConversionPatternRewriter &rewriter) const override {
487486
auto src = adaptor.getSrc();
487+
488488
switch (castOp.getKind()) {
489489
case mlir::cir::CastKind::array_to_ptrdecay: {
490490
const auto ptrTy = castOp.getType().cast<mlir::cir::PointerType>();
491491
auto sourceValue = adaptor.getOperands().front();
492-
auto targetType =
493-
getTypeConverter()->convertType(castOp->getResult(0).getType());
492+
auto targetType = convertTy(ptrTy);
494493
auto elementTy = convertTy(ptrTy.getPointee());
495494
auto offset = llvm::SmallVector<mlir::LLVM::GEPArg>{0};
496495
rewriter.replaceOpWithNewOp<mlir::LLVM::GEPOp>(
@@ -831,17 +830,14 @@ class CIRAllocaLowering
831830
mlir::LogicalResult
832831
matchAndRewrite(mlir::cir::AllocaOp op, OpAdaptor adaptor,
833832
mlir::ConversionPatternRewriter &rewriter) const override {
834-
auto elementTy = getTypeConverter()->convertType(op.getAllocaType());
835-
836833
mlir::Value one = rewriter.create<mlir::LLVM::ConstantOp>(
837834
op.getLoc(), typeConverter->convertType(rewriter.getIndexType()),
838835
rewriter.getIntegerAttr(rewriter.getIndexType(), 1));
839-
836+
auto elementTy = getTypeConverter()->convertType(op.getAllocaType());
840837
auto resultTy = mlir::LLVM::LLVMPointerType::get(getContext());
841-
842838
rewriter.replaceOpWithNewOp<mlir::LLVM::AllocaOp>(
843839
op, resultTy, elementTy, one, op.getAlignmentAttr().getInt());
844-
return mlir::LogicalResult::success();
840+
return mlir::success();
845841
}
846842
};
847843

@@ -1028,9 +1024,9 @@ class CIRVAStartLowering
10281024
mlir::LogicalResult
10291025
matchAndRewrite(mlir::cir::VAStartOp op, OpAdaptor adaptor,
10301026
mlir::ConversionPatternRewriter &rewriter) const override {
1031-
auto i8PtrTy = mlir::LLVM::LLVMPointerType::get(getContext());
1027+
auto opaquePtr = mlir::LLVM::LLVMPointerType::get(getContext());
10321028
auto vaList = rewriter.create<mlir::LLVM::BitcastOp>(
1033-
op.getLoc(), i8PtrTy, adaptor.getOperands().front());
1029+
op.getLoc(), opaquePtr, adaptor.getOperands().front());
10341030
rewriter.replaceOpWithNewOp<mlir::LLVM::VaStartOp>(op, vaList);
10351031
return mlir::success();
10361032
}
@@ -1043,9 +1039,9 @@ class CIRVAEndLowering : public mlir::OpConversionPattern<mlir::cir::VAEndOp> {
10431039
mlir::LogicalResult
10441040
matchAndRewrite(mlir::cir::VAEndOp op, OpAdaptor adaptor,
10451041
mlir::ConversionPatternRewriter &rewriter) const override {
1046-
auto i8PtrTy = mlir::LLVM::LLVMPointerType::get(getContext());
1042+
auto opaquePtr = mlir::LLVM::LLVMPointerType::get(getContext());
10471043
auto vaList = rewriter.create<mlir::LLVM::BitcastOp>(
1048-
op.getLoc(), i8PtrTy, adaptor.getOperands().front());
1044+
op.getLoc(), opaquePtr, adaptor.getOperands().front());
10491045
rewriter.replaceOpWithNewOp<mlir::LLVM::VaEndOp>(op, vaList);
10501046
return mlir::success();
10511047
}
@@ -1059,11 +1055,11 @@ class CIRVACopyLowering
10591055
mlir::LogicalResult
10601056
matchAndRewrite(mlir::cir::VACopyOp op, OpAdaptor adaptor,
10611057
mlir::ConversionPatternRewriter &rewriter) const override {
1062-
auto i8PtrTy = mlir::LLVM::LLVMPointerType::get(getContext());
1058+
auto opaquePtr = mlir::LLVM::LLVMPointerType::get(getContext());
10631059
auto dstList = rewriter.create<mlir::LLVM::BitcastOp>(
1064-
op.getLoc(), i8PtrTy, adaptor.getOperands().front());
1060+
op.getLoc(), opaquePtr, adaptor.getOperands().front());
10651061
auto srcList = rewriter.create<mlir::LLVM::BitcastOp>(
1066-
op.getLoc(), i8PtrTy, adaptor.getOperands().back());
1062+
op.getLoc(), opaquePtr, adaptor.getOperands().back());
10671063
rewriter.replaceOpWithNewOp<mlir::LLVM::VaCopyOp>(op, dstList, srcList);
10681064
return mlir::success();
10691065
}
@@ -1777,7 +1773,8 @@ class CIRGetMemberOpLowering
17771773
// Since the base address is a pointer to an aggregate, the first offset
17781774
// is always zero. The second offset tell us which member it will access.
17791775
llvm::SmallVector<mlir::LLVM::GEPArg, 2> offset{0, op.getIndex()};
1780-
const auto elementTy = getTypeConverter()->convertType(structTy);
1776+
const auto elementTy =
1777+
getTypeConverter()->convertType(structTy.getMembers()[op.getIndex()]);
17811778
rewriter.replaceOpWithNewOp<mlir::LLVM::GEPOp>(op, llResTy, elementTy,
17821779
adaptor.getAddr(), offset);
17831780
return mlir::success();
@@ -1869,7 +1866,8 @@ namespace {
18691866
void prepareTypeConverter(mlir::LLVMTypeConverter &converter,
18701867
mlir::DataLayout &dataLayout) {
18711868
converter.addConversion([&](mlir::cir::PointerType type) -> mlir::Type {
1872-
return mlir::LLVM::LLVMPointerType::get(&converter.getContext());
1869+
// Drop pointee type since LLVM dialect only allows opaque pointers.
1870+
return mlir::LLVM::LLVMPointerType::get(type.getContext());
18731871
});
18741872
converter.addConversion([&](mlir::cir::ArrayType type) -> mlir::Type {
18751873
auto ty = converter.convertType(type.getEltType());

‎clang/test/CIR/Lowering/dot.cir

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ module {
6868
// MLIR-NEXT: %7 = llvm.alloca %6 x f64 {alignment = 8 : i64} : (i64) -> !llvm.ptr
6969
// MLIR-NEXT: %8 = llvm.mlir.constant(1 : index) : i64
7070
// MLIR-NEXT: %9 = llvm.alloca %8 x f64 {alignment = 8 : i64} : (i64) -> !llvm.ptr
71-
// MLIR-NEXT: llvm.store %arg0, %1 : !llvm.ptr
72-
// MLIR-NEXT: llvm.store %arg1, %3 : !llvm.ptr
71+
// MLIR-NEXT: llvm.store %arg0, %1 : !llvm.ptr, !llvm.ptr
72+
// MLIR-NEXT: llvm.store %arg1, %3 : !llvm.ptr, !llvm.ptr
7373
// MLIR-NEXT: llvm.store %arg2, %5 : i32, !llvm.ptr
7474
// MLIR-NEXT: %10 = llvm.mlir.constant(0.000000e+00 : f64) : f64
7575
// MLIR-NEXT: llvm.store %10, %9 : f64, !llvm.ptr
@@ -81,8 +81,8 @@ module {
8181
// MLIR-NEXT: llvm.store %13, %12 : i32, !llvm.ptr
8282
// MLIR-NEXT: llvm.br ^bb2
8383
// MLIR-NEXT: ^bb2: // 2 preds: ^bb1, ^bb6
84-
// MLIR-NEXT: %14 = llvm.load %12 : !llvm.ptr
85-
// MLIR-NEXT: %15 = llvm.load %5 : !llvm.ptr
84+
// MLIR-NEXT: %14 = llvm.load %12 : !llvm.ptr -> i32
85+
// MLIR-NEXT: %15 = llvm.load %5 : !llvm.ptr -> i32
8686
// MLIR-NEXT: %16 = llvm.icmp "slt" %14, %15 : i32
8787
// MLIR-NEXT: %17 = llvm.zext %16 : i1 to i32
8888
// MLIR-NEXT: %18 = llvm.mlir.constant(0 : i32) : i32
@@ -95,31 +95,31 @@ module {
9595
// MLIR-NEXT: ^bb4: // pred: ^bb2
9696
// MLIR-NEXT: llvm.br ^bb7
9797
// MLIR-NEXT: ^bb5: // pred: ^bb3
98-
// MLIR-NEXT: %22 = llvm.load %1 : !llvm.ptr
99-
// MLIR-NEXT: %23 = llvm.load %12 : !llvm.ptr
98+
// MLIR-NEXT: %22 = llvm.load %1 : !llvm.ptr -> !llvm.ptr
99+
// MLIR-NEXT: %23 = llvm.load %12 : !llvm.ptr -> i32
100100
// MLIR-NEXT: %24 = llvm.getelementptr %22[%23] : (!llvm.ptr, i32) -> !llvm.ptr
101-
// MLIR-NEXT: %25 = llvm.load %24 : !llvm.ptr
102-
// MLIR-NEXT: %26 = llvm.load %3 : !llvm.ptr
103-
// MLIR-NEXT: %27 = llvm.load %12 : !llvm.ptr
101+
// MLIR-NEXT: %25 = llvm.load %24 : !llvm.ptr -> f64
102+
// MLIR-NEXT: %26 = llvm.load %3 : !llvm.ptr -> !llvm.ptr
103+
// MLIR-NEXT: %27 = llvm.load %12 : !llvm.ptr -> i32
104104
// MLIR-NEXT: %28 = llvm.getelementptr %26[%27] : (!llvm.ptr, i32) -> !llvm.ptr
105-
// MLIR-NEXT: %29 = llvm.load %28 : !llvm.ptr
105+
// MLIR-NEXT: %29 = llvm.load %28 : !llvm.ptr -> f64
106106
// MLIR-NEXT: %30 = llvm.fmul %25, %29 : f64
107-
// MLIR-NEXT: %31 = llvm.load %9 : !llvm.ptr
107+
// MLIR-NEXT: %31 = llvm.load %9 : !llvm.ptr -> f64
108108
// MLIR-NEXT: %32 = llvm.fadd %31, %30 : f64
109109
// MLIR-NEXT: llvm.store %32, %9 : f64, !llvm.ptr
110110
// MLIR-NEXT: llvm.br ^bb6
111111
// MLIR-NEXT: ^bb6: // pred: ^bb5
112-
// MLIR-NEXT: %33 = llvm.load %12 : !llvm.ptr
112+
// MLIR-NEXT: %33 = llvm.load %12 : !llvm.ptr -> i32
113113
// MLIR-NEXT: %34 = llvm.mlir.constant(1 : i32) : i32
114114
// MLIR-NEXT: %35 = llvm.add %33, %34 : i32
115115
// MLIR-NEXT: llvm.store %35, %12 : i32, !llvm.ptr
116116
// MLIR-NEXT: llvm.br ^bb2
117117
// MLIR-NEXT: ^bb7: // pred: ^bb4
118118
// MLIR-NEXT: llvm.br ^bb8
119119
// MLIR-NEXT: ^bb8: // pred: ^bb7
120-
// MLIR-NEXT: %36 = llvm.load %9 : !llvm.ptr
120+
// MLIR-NEXT: %36 = llvm.load %9 : !llvm.ptr -> f64
121121
// MLIR-NEXT: llvm.store %36, %7 : f64, !llvm.ptr
122-
// MLIR-NEXT: %37 = llvm.load %7 : !llvm.ptr
122+
// MLIR-NEXT: %37 = llvm.load %7 : !llvm.ptr -> f64
123123
// MLIR-NEXT: llvm.return %37 : f64
124124
// MLIR-NEXT: }
125125
// MLIR-NEXT: }

‎clang/test/CIR/Lowering/globals.cir

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,28 +75,26 @@ module {
7575
}
7676
cir.global external @string = #cir.const_array<[#cir.int<119> : !s8i, #cir.int<104> : !s8i, #cir.int<97> : !s8i, #cir.int<116> : !s8i, #cir.int<110> : !s8i, #cir.int<111> : !s8i, #cir.int<119> : !s8i, #cir.int<0> : !s8i]> : !cir.array<!s8i x 8>
7777
// MLIR: llvm.mlir.global external @string(dense<[119, 104, 97, 116, 110, 111, 119, 0]> : tensor<8xi8>) {addr_space = 0 : i32} : !llvm.array<8 x i8>
78-
// LLVM: @string = global [8 x i8] c"whatnow\00"
7978
cir.global external @uint = #cir.const_array<[#cir.int<255> : !u32i]> : !cir.array<!u32i x 1>
8079
// MLIR: llvm.mlir.global external @uint(dense<255> : tensor<1xi32>) {addr_space = 0 : i32} : !llvm.array<1 x i32>
81-
// LLVM: @uint = global [1 x i32] [i32 255]
8280
cir.global external @sshort = #cir.const_array<[#cir.int<11111> : !s16i, #cir.int<22222> : !s16i]> : !cir.array<!s16i x 2>
8381
// MLIR: llvm.mlir.global external @sshort(dense<[11111, 22222]> : tensor<2xi16>) {addr_space = 0 : i32} : !llvm.array<2 x i16>
84-
// LLVM: @sshort = global [2 x i16] [i16 11111, i16 22222]
8582
cir.global external @sint = #cir.const_array<[#cir.int<123> : !s32i, #cir.int<456> : !s32i, #cir.int<789> : !s32i]> : !cir.array<!s32i x 3>
8683
// MLIR: llvm.mlir.global external @sint(dense<[123, 456, 789]> : tensor<3xi32>) {addr_space = 0 : i32} : !llvm.array<3 x i32>
87-
// LLVM: @sint = global [3 x i32] [i32 123, i32 456, i32 789]
8884
cir.global external @ll = #cir.const_array<[#cir.int<999999999> : !s64i, #cir.int<0> : !s64i, #cir.int<0> : !s64i, #cir.int<0> : !s64i]> : !cir.array<!s64i x 4>
8985
// MLIR: llvm.mlir.global external @ll(dense<[999999999, 0, 0, 0]> : tensor<4xi64>) {addr_space = 0 : i32} : !llvm.array<4 x i64>
90-
// LLVM: @ll = global [4 x i64] [i64 999999999, i64 0, i64 0, i64 0]
9186
cir.global external @twoDim = #cir.const_array<[#cir.const_array<[#cir.int<1> : !s32i, #cir.int<2> : !s32i]> : !cir.array<!s32i x 2>, #cir.const_array<[#cir.int<3> : !s32i, #cir.int<4> : !s32i]> : !cir.array<!s32i x 2>]> : !cir.array<!cir.array<!s32i x 2> x 2>
9287
// MLIR: llvm.mlir.global external @twoDim(dense<{{\[\[}}1, 2], [3, 4{{\]\]}}> : tensor<2x2xi32>) {addr_space = 0 : i32} : !llvm.array<2 x array<2 x i32>>
93-
// LLVM: @twoDim = global [2 x [2 x i32{{\]\] \[\[}}2 x i32] [i32 1, i32 2], [2 x i32] [i32 3, i32 4{{\]\]}}
88+
89+
// The following tests check direclty the resulting LLVM IR because the MLIR
90+
// version is two long. Always prefer the MLIR prefix when possible.
9491
cir.global external @nestedTwoDim = #cir.const_struct<{#cir.int<1> : !s32i, #cir.const_array<[#cir.const_array<[#cir.int<2> : !s32i, #cir.int<3> : !s32i]> : !cir.array<!s32i x 2>, #cir.const_array<[#cir.int<4> : !s32i, #cir.int<5> : !s32i]> : !cir.array<!s32i x 2>]> : !cir.array<!cir.array<!s32i x 2> x 2>}> : !ty_22A22
9592
// LLVM: @nestedTwoDim = global %struct.A { i32 1, [2 x [2 x i32{{\]\] \[\[}}2 x i32] [i32 2, i32 3], [2 x i32] [i32 4, i32 5{{\]\]}} }
9693
cir.global external @nestedString = #cir.const_struct<{#cir.const_array<"1\00\00" : !cir.array<!s8i x 3>> : !cir.array<!s8i x 3>, #cir.const_array<"\00\00\00" : !cir.array<!s8i x 3>> : !cir.array<!s8i x 3>, #cir.const_array<"\00\00\00" : !cir.array<!s8i x 3>> : !cir.array<!s8i x 3>}> : !ty_22StringStruct22
9794
// LLVM: @nestedString = global %struct.StringStruct { [3 x i8] c"1\00\00", [3 x i8] zeroinitializer, [3 x i8] zeroinitializer }
9895
cir.global external @nestedStringPtr = #cir.const_struct<{#cir.global_view<@".str"> : !cir.ptr<!s8i>}> : !ty_22StringStructPtr22
9996
// LLVM: @nestedStringPtr = global %struct.StringStructPtr { ptr @.str }
97+
10098
cir.func @_Z11get_globalsv() {
10199
%0 = cir.alloca !cir.ptr<!s8i>, cir.ptr <!cir.ptr<!s8i>>, ["s", init] {alignment = 8 : i64}
102100
%1 = cir.alloca !cir.ptr<!u32i>, cir.ptr <!cir.ptr<!u32i>>, ["u", init] {alignment = 8 : i64}
@@ -107,31 +105,26 @@ module {
107105
%6 = cir.cast(array_to_ptrdecay, %5 : !cir.ptr<!cir.array<!s8i x 8>>), !cir.ptr<!s8i>
108106
// MLIR: %[[RES:[0-9]+]] = llvm.mlir.addressof @string : !llvm.ptr
109107
// MLIR: %{{[0-9]+}} = llvm.getelementptr %[[RES]][0] : (!llvm.ptr) -> !llvm.ptr
110-
// LLVM: store ptr @string, ptr %{{[0-9]+}}
111108
cir.store %6, %0 : !cir.ptr<!s8i>, cir.ptr <!cir.ptr<!s8i>>
112109
%7 = cir.get_global @uint : cir.ptr <!cir.array<!u32i x 1>>
113110
%8 = cir.cast(array_to_ptrdecay, %7 : !cir.ptr<!cir.array<!u32i x 1>>), !cir.ptr<!u32i>
114111
// MLIR: %[[RES:[0-9]+]] = llvm.mlir.addressof @uint : !llvm.ptr
115112
// MLIR: %{{[0-9]+}} = llvm.getelementptr %[[RES]][0] : (!llvm.ptr) -> !llvm.ptr
116-
// LLVM: store ptr @uint, ptr %{{[0-9]+}}
117113
cir.store %8, %1 : !cir.ptr<!u32i>, cir.ptr <!cir.ptr<!u32i>>
118114
%9 = cir.get_global @sshort : cir.ptr <!cir.array<!s16i x 2>>
119115
%10 = cir.cast(array_to_ptrdecay, %9 : !cir.ptr<!cir.array<!s16i x 2>>), !cir.ptr<!s16i>
120116
// MLIR: %[[RES:[0-9]+]] = llvm.mlir.addressof @sshort : !llvm.ptr
121117
// MLIR: %{{[0-9]+}} = llvm.getelementptr %[[RES]][0] : (!llvm.ptr) -> !llvm.ptr
122-
// LLVM: store ptr @sshort, ptr %{{[0-9]+}}
123118
cir.store %10, %2 : !cir.ptr<!s16i>, cir.ptr <!cir.ptr<!s16i>>
124119
%11 = cir.get_global @sint : cir.ptr <!cir.array<!s32i x 3>>
125120
%12 = cir.cast(array_to_ptrdecay, %11 : !cir.ptr<!cir.array<!s32i x 3>>), !cir.ptr<!s32i>
126121
// MLIR: %[[RES:[0-9]+]] = llvm.mlir.addressof @sint : !llvm.ptr
127122
// MLIR: %{{[0-9]+}} = llvm.getelementptr %[[RES]][0] : (!llvm.ptr) -> !llvm.ptr
128-
// LLVM: store ptr @sint, ptr %{{[0-9]+}}
129123
cir.store %12, %3 : !cir.ptr<!s32i>, cir.ptr <!cir.ptr<!s32i>>
130124
%13 = cir.get_global @ll : cir.ptr <!cir.array<!s64i x 4>>
131125
%14 = cir.cast(array_to_ptrdecay, %13 : !cir.ptr<!cir.array<!s64i x 4>>), !cir.ptr<!s64i>
132126
// MLIR: %[[RES:[0-9]+]] = llvm.mlir.addressof @ll : !llvm.ptr
133127
// MLIR: %{{[0-9]+}} = llvm.getelementptr %[[RES]][0] : (!llvm.ptr) -> !llvm.ptr
134-
// LLVM: store ptr @ll, ptr %{{[0-9]+}}
135128
cir.store %14, %4 : !cir.ptr<!s64i>, cir.ptr <!cir.ptr<!s64i>>
136129
cir.return
137130
}

‎clang/test/CIR/Lowering/hello.cir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ module @"/tmp/test.raw" attributes {cir.lang = #cir.lang<c>, cir.sob = #cir.sign
2929
// CHECK: %4 = llvm.call @printf(%3) : (!llvm.ptr) -> i32
3030
// CHECK: %5 = llvm.mlir.constant(0 : i32) : i32
3131
// CHECK: llvm.store %5, %1 : i32, !llvm.ptr
32-
// CHECK: %6 = llvm.load %1 : !llvm.ptr
32+
// CHECK: %6 = llvm.load %1 : !llvm.ptr -> i32
3333
// CHECK: llvm.return %6 : i32
3434
// CHECK: }

‎clang/test/CIR/Lowering/loadstorealloca.cir

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
2-
// RUN: cir-translate %s -cir-to-llvmir | FileCheck %s -check-prefix=LLVM
1+
// RUN: cir-opt %s -cir-to-llvm -o %t.cir
2+
// RUN: FileCheck %s --input-file=%t.cir -check-prefix=MLIR
33
!u32i = !cir.int<u, 32>
44

55
module {
@@ -20,9 +20,3 @@ module {
2020
// MLIR-NEXT: llvm.store %2, %1 : i32, !llvm.ptr
2121
// MLIR-NEXT: %3 = llvm.load %1 : !llvm.ptr -> i32
2222
// MLIR-NEXT: return %3 : i32
23-
24-
// LLVM: define i32 @foo()
25-
// LLVM-NEXT: %1 = alloca i32, i64 1, align 4
26-
// LLVM-NEXT: store i32 1, ptr %1, align 4
27-
// LLVM-NEXT: %2 = load i32, ptr %1, align 4
28-
// LLVM-NEXT: ret i32 %2

‎clang/test/CIR/Lowering/loop.cir

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ module {
3737
// MLIR-NEXT: llvm.br ^bb1
3838
// ============= Condition block =============
3939
// MLIR-NEXT: ^bb1: // 2 preds: ^bb0, ^bb5
40-
// MLIR-NEXT: %3 = llvm.load %1 : !llvm.ptr
40+
// MLIR-NEXT: %3 = llvm.load %1 : !llvm.ptr -> i32
4141
// MLIR-NEXT: %4 = llvm.mlir.constant(10 : i32) : i32
4242
// MLIR-NEXT: %5 = llvm.icmp "slt" %3, %4 : i32
4343
// MLIR-NEXT: %6 = llvm.zext %5 : i1 to i32
@@ -55,7 +55,7 @@ module {
5555
// MLIR-NEXT: llvm.br ^bb5
5656
// ============= Step block =============
5757
// MLIR-NEXT: ^bb5: // pred: ^bb4
58-
// MLIR-NEXT: %11 = llvm.load %1 : !llvm.ptr
58+
// MLIR-NEXT: %11 = llvm.load %1 : !llvm.ptr -> i32
5959
// MLIR-NEXT: %12 = llvm.mlir.constant(1 : i32) : i32
6060
// MLIR-NEXT: %13 = llvm.add %11, %12 : i32
6161
// MLIR-NEXT: llvm.store %13, %1 : i32, !llvm.ptr
@@ -101,7 +101,7 @@ module {
101101
// MLIR-NEXT: llvm.br ^bb2
102102
// ============= Condition block =============
103103
// MLIR-NEXT: ^bb2: // 2 preds: ^bb1, ^bb5
104-
// MLIR-NEXT: %2 = llvm.load %1 : !llvm.ptr
104+
// MLIR-NEXT: %2 = llvm.load %1 : !llvm.ptr -> i32
105105
// MLIR-NEXT: %3 = llvm.mlir.constant(10 : i32) : i32
106106
// MLIR-NEXT: %4 = llvm.icmp "slt" %2, %3 : i32
107107
// MLIR-NEXT: %5 = llvm.zext %4 : i1 to i32
@@ -116,7 +116,7 @@ module {
116116
// MLIR-NEXT: llvm.br ^bb6
117117
// ============= Body block =============
118118
// MLIR-NEXT: ^bb5: // pred: ^bb3
119-
// MLIR-NEXT: %10 = llvm.load %1 : !llvm.ptr
119+
// MLIR-NEXT: %10 = llvm.load %1 : !llvm.ptr -> i32
120120
// MLIR-NEXT: %11 = llvm.mlir.constant(1 : i32) : i32
121121
// MLIR-NEXT: %12 = llvm.add %10, %11 : i32
122122
// MLIR-NEXT: llvm.store %12, %1 : i32, !llvm.ptr
@@ -161,7 +161,7 @@ module {
161161
// MLIR-NEXT: llvm.br ^bb5
162162
// ============= Condition block =============
163163
// MLIR-NEXT: ^bb2:
164-
// MLIR-NEXT: %2 = llvm.load %1 : !llvm.ptr
164+
// MLIR-NEXT: %2 = llvm.load %1 : !llvm.ptr -> i32
165165
// MLIR-NEXT: %3 = llvm.mlir.constant(10 : i32) : i32
166166
// MLIR-NEXT: %4 = llvm.icmp "slt" %2, %3 : i32
167167
// MLIR-NEXT: %5 = llvm.zext %4 : i1 to i32
@@ -176,7 +176,7 @@ module {
176176
// MLIR-NEXT: llvm.br ^bb6
177177
// ============= Body block =============
178178
// MLIR-NEXT: ^bb5:
179-
// MLIR-NEXT: %10 = llvm.load %1 : !llvm.ptr
179+
// MLIR-NEXT: %10 = llvm.load %1 : !llvm.ptr -> i32
180180
// MLIR-NEXT: %11 = llvm.mlir.constant(1 : i32) : i32
181181
// MLIR-NEXT: %12 = llvm.add %10, %11 : i32
182182
// MLIR-NEXT: llvm.store %12, %1 : i32, !llvm.ptr

‎clang/test/CIR/Lowering/scope.cir

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
1+
// RUN: cir-opt %s -cir-to-llvm -o %t.cir
2+
// RUN: FileCheck %s --input-file=%t.cir -check-prefix=MLIR
23
// RUN: cir-translate %s -cir-to-llvmir | FileCheck %s -check-prefix=LLVM
34
!u32i = !cir.int<u, 32>
45

‎clang/test/CIR/Lowering/struct.cir

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// RUN: cir-opt %s -cir-to-llvm -o %t.mlir
22
// RUN: FileCheck --input-file=%t.mlir %s
3+
// XFAIL: *
34

45
!s32i = !cir.int<s, 32>
56
!u8i = !cir.int<u, 8>

‎clang/test/CIR/Lowering/tenary.cir

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: cir-opt %s -cir-to-llvm -reconcile-unrealized-casts -o - | FileCheck %s -check-prefix=MLIR
1+
// RUN: cir-opt %s -cir-to-llvm -reconcile-unrealized-casts -o %t.cir
2+
// RUN: FileCheck %s --input-file=%t.cir -check-prefix=MLIR
23

34
!s32i = !cir.int<s, 32>
45

@@ -29,7 +30,7 @@ cir.func @_Z1xi(%arg0: !s32i) -> !s32i {
2930
// MLIR-NEXT: %2 = llvm.mlir.constant(1 : index) : i64
3031
// MLIR-NEXT: %3 = llvm.alloca %2 x i32 {alignment = 4 : i64} : (i64) -> !llvm.ptr
3132
// MLIR-NEXT: llvm.store %arg0, %1 : i32, !llvm.ptr
32-
// MLIR-NEXT: %4 = llvm.load %1 : !llvm.ptr
33+
// MLIR-NEXT: %4 = llvm.load %1 : !llvm.ptr -> i32
3334
// MLIR-NEXT: %5 = llvm.mlir.constant(0 : i32) : i32
3435
// MLIR-NEXT: %6 = llvm.icmp "sgt" %4, %5 : i32
3536
// MLIR-NEXT: %7 = llvm.zext %6 : i1 to i8
@@ -45,6 +46,6 @@ cir.func @_Z1xi(%arg0: !s32i) -> !s32i {
4546
// MLIR-NEXT: llvm.br ^bb4
4647
// MLIR-NEXT: ^bb4: // pred: ^bb3
4748
// MLIR-NEXT: llvm.store %11, %3 : i32, !llvm.ptr
48-
// MLIR-NEXT: %12 = llvm.load %3 : !llvm.ptr
49+
// MLIR-NEXT: %12 = llvm.load %3 : !llvm.ptr -> i32
4950
// MLIR-NEXT: llvm.return %12 : i32
5051
// MLIR-NEXT: }

0 commit comments

Comments
 (0)