Skip to content

[CIR][ThroughMLIR] remove nested memref wrapper for array types #1412

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 1 commit into from
Feb 27, 2025
Merged

[CIR][ThroughMLIR] remove nested memref wrapper for array types #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 8 additions & 1 deletion clang/lib/CIR/Lowering/ThroughMLIR/LowerCIRToMLIR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,14 @@ class CIRAllocaOpLowering : public mlir::OpConversionPattern<cir::AllocaOp> {
if (!mlirType)
return mlir::LogicalResult::failure();

auto memreftype = mlir::MemRefType::get({}, mlirType);
auto memreftype = mlir::dyn_cast<mlir::MemRefType>(mlirType);
if (memreftype && mlir::isa<cir::ArrayType>(adaptor.getAllocaType())) {
// if the type is an array,
// we don't need to wrap with memref.
} else {
memreftype = mlir::MemRefType::get({}, mlirType);
}

rewriter.replaceOpWithNewOp<mlir::memref::AllocaOp>(op, memreftype,
op.getAlignmentAttr());
return mlir::LogicalResult::success();
Expand Down
31 changes: 31 additions & 0 deletions clang/test/CIR/Lowering/ThroughMLIR/array.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -emit-cir %s -o %t.cir
// RUN: FileCheck --input-file=%t.cir %s --check-prefix=CIR
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fclangir -fno-clangir-direct-lowering -emit-mlir %s -o %t.mlir
// RUN: FileCheck --input-file=%t.mlir %s --check-prefix=MLIR

int test_array1() {
// CIR-LABEL: cir.func {{.*}} @test_array1
// CIR: %[[ARRAY:.*]] = cir.alloca !cir.array<!s32i x 3>, !cir.ptr<!cir.array<!s32i x 3>>, ["a"] {alignment = 4 : i64}
// CIR: %{{.*}} = cir.cast(array_to_ptrdecay, %[[ARRAY]] : !cir.ptr<!cir.array<!s32i x 3>>), !cir.ptr<!s32i>

// MLIR-LABEL: func @test_array1
// MLIR: %{{.*}} = memref.alloca() {alignment = 4 : i64} : memref<i32>
// MLIR: %[[ARRAY:.*]] = memref.alloca() {alignment = 4 : i64} : memref<3xi32>
// MLIR: %{{.*}} = memref.load %[[ARRAY]][%{{.*}}] : memref<3xi32>
int a[3];
return a[1];
}

int test_array2() {
// CIR-LABEL: cir.func {{.*}} @test_array2
// CIR: %[[ARRAY:.*]] = cir.alloca !cir.array<!cir.array<!s32i x 4> x 3>, !cir.ptr<!cir.array<!cir.array<!s32i x 4> x 3>>, ["a"] {alignment = 16 : i64}
// CIR: %{{.*}} = cir.cast(array_to_ptrdecay, %[[ARRAY]] : !cir.ptr<!cir.array<!cir.array<!s32i x 4> x 3>>), !cir.ptr<!cir.array<!s32i x 4>>
// CIR: %{{.*}} = cir.cast(array_to_ptrdecay, %{{.*}} : !cir.ptr<!cir.array<!s32i x 4>>), !cir.ptr<!s32i>

// MLIR-LABEL: func @test_array2
// MLIR: %{{.*}} = memref.alloca() {alignment = 4 : i64} : memref<i32>
// MLIR: %[[ARRAY:.*]] = memref.alloca() {alignment = 16 : i64} : memref<3x4xi32>
// MLIR: %{{.*}} = memref.load %[[ARRAY]][%{{.*}}, %{{.*}}] : memref<3x4xi32>
int a[3][4];
return a[1][2];
}
2 changes: 1 addition & 1 deletion clang/test/CIR/Lowering/ThroughMLIR/array.cir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module {

// CHECK: module {
// CHECK: func @foo() {
// CHECK: = memref.alloca() {alignment = 16 : i64} : memref<memref<10xi32>>
// CHECK: = memref.alloca() {alignment = 16 : i64} : memref<10xi32>
// CHECK: return
// CHECK: }
// CHECK: }
Loading