Skip to content

[CIR][Lowering] Lower globals with global_view initializer #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 7, 2023
Merged

[CIR][Lowering] Lower globals with global_view initializer #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e1c5cb
[CIR][Lowering] Lower globals with global_view initializer
sitio-couto Aug 2, 2023
66a6ed2
Update on "[CIR][Lowering] Lower globals with global_view initializer"
sitio-couto Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions clang/lib/CIR/Lowering/DirectToLLVM/LowerToLLVM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,6 +1209,15 @@ class CIRGlobalOpLowering
op->getLoc(), lowerCirAttrAsValue(structAttr, op->getLoc(), rewriter,
typeConverter));
return mlir::success();
} else if (auto attr = init.value().dyn_cast<mlir::cir::GlobalViewAttr>()) {
setupRegionInitializedLLVMGlobalOp(op, rewriter);

// Return the address of the global symbol.
auto elementType = typeConverter->convertType(attr.getType());
auto addrOfOp = rewriter.create<mlir::LLVM::AddressOfOp>(
op->getLoc(), elementType, attr.getSymbol());
rewriter.create<mlir::LLVM::ReturnOp>(op->getLoc(), addrOfOp.getResult());
return mlir::success();
} else {
op.emitError() << "usupported initializer '" << init.value() << "'";
return mlir::failure();
Expand Down
11 changes: 9 additions & 2 deletions clang/test/CIR/Lowering/globals.cir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// RUN: cir-opt %s -cir-to-llvm -o - | FileCheck %s -check-prefix=MLIR
// RUN: cir-translate %s -cir-to-llvmir | FileCheck %s -check-prefix=LLVM
// RUN: cir-opt %s -cir-to-llvm -o %t.cir
// RUN: FileCheck --input-file=%t.cir %s -check-prefix=MLIR
// RUN: cir-translate %s -cir-to-llvmir -o %t.ll
// RUN: FileCheck --input-file=%t.ll %s -check-prefix=LLVM

!s16i = !cir.int<s, 16>
!s32i = !cir.int<s, 32>
Expand All @@ -26,6 +28,11 @@ module {
// MLIR: }
// LLVM: @.str = internal constant [8 x i8] c"example\00"
// LLVM: @s = global ptr @.str
cir.global external @aPtr = #cir.global_view<@a> : !cir.ptr<!s32i>
// MLIR: llvm.mlir.global external @aPtr() {addr_space = 0 : i32} : !llvm.ptr<i32> {
// MLIR: %0 = llvm.mlir.addressof @a : !llvm.ptr<i32>
// MLIR: llvm.return %0 : !llvm.ptr<i32>
// MLIR: }
cir.global "private" constant internal @".str1" = #cir.const_array<"example1\00" : !cir.array<!s8i x 9>> : !cir.array<!s8i x 9> {alignment = 1 : i64}
cir.global external @s1 = @".str1": !cir.ptr<!s8i>
cir.global external @s2 = @".str": !cir.ptr<!s8i>
Expand Down