Skip to content
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

[CIR][CIRGen] Support for dereferencing void pointers #595

Merged
merged 5 commits into from
May 18, 2024
Merged

[CIR][CIRGen] Support for dereferencing void pointers #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa8dad0
[CIR][CIRGen&LowerToLLVM] Support for dereferencing void pointers
PragmaTwice May 9, 2024
9e096ba
Merge branch 'main' of https://github.com/llvm/clangir into void-ptr-…
PragmaTwice May 10, 2024
dda0d1f
use buildAnyExpr
PragmaTwice May 10, 2024
a606cca
fix codegen & revert lowertollvm
PragmaTwice May 17, 2024
b413961
format
PragmaTwice May 17, 2024
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
15 changes: 12 additions & 3 deletions clang/lib/CIR/CodeGen/CIRGenExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2555,9 +2555,18 @@ mlir::Value CIRGenFunction::buildLoadOfScalar(Address Addr, bool Volatile,
llvm_unreachable("NYI: Special treatment of 3-element vector load");
}

mlir::cir::LoadOp Load = builder.create<mlir::cir::LoadOp>(
Loc, Addr.getElementType(), Addr.getPointer(), /* deref */ false,
Volatile, ::mlir::cir::MemOrderAttr{});
auto Ptr = Addr.getPointer();
auto ElemTy = Addr.getElementType();
if (ElemTy.isa<mlir::cir::VoidType>()) {
ElemTy = mlir::cir::IntType::get(builder.getContext(), 8, true);
auto ElemPtrTy = mlir::cir::PointerType::get(builder.getContext(), ElemTy);
Ptr = builder.create<mlir::cir::CastOp>(Loc, ElemPtrTy,
mlir::cir::CastKind::bitcast, Ptr);
}

mlir::cir::LoadOp Load =
builder.create<mlir::cir::LoadOp>(Loc, ElemTy, Ptr, /* deref */ false,
Volatile, ::mlir::cir::MemOrderAttr{});

if (isNontemporal) {
llvm_unreachable("NYI");
Expand Down
2 changes: 1 addition & 1 deletion clang/lib/CIR/CodeGen/CIRGenStmt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ mlir::LogicalResult CIRGenFunction::buildReturnStmt(const ReturnStmt &S) {
// Make sure not to return anything, but evaluate the expression
// for side effects.
if (RV) {
assert(0 && "not implemented");
buildAnyExpr(RV);
}
} else if (!RV) {
// Do nothing (return value is left uninitialized)
Expand Down
30 changes: 27 additions & 3 deletions clang/test/CIR/CodeGen/pointer-arith-ext.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,33 @@ FP f7(FP a, int b) { return a - b; }
// Similar to f7, just make sure it does not crash.
FP f7_1(FP a, int b) { return (a -= b); }

// FIXME: add support for the remaining ones.
// void f8(void *a, int b) { return *(a + b); }
// void f8_1(void *a, int b) { return a[b]; }
void f8(void *a, int b) { return *(a + b); }
// CIR-LABEL: f8
// CIR: %[[PTR:.*]] = cir.load {{.*}} : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!void>
// CIR: %[[STRIDE:.*]] = cir.load {{.*}} : !cir.ptr<!s32i>, !s32i
// CIR: cir.ptr_stride(%[[PTR]] : !cir.ptr<!void>, %[[STRIDE]] : !s32i)
// CIR: cir.return

// LLVM-LABEL: f8
// LLVM: %[[PTR:.*]] = load ptr, ptr {{.*}}, align 8
// LLVM: %[[TOEXT:.*]] = load i32, ptr {{.*}}, align 4
// LLVM: %[[STRIDE:.*]] = sext i32 %[[TOEXT]] to i64
// LLVM: getelementptr i8, ptr %[[PTR]], i64 %[[STRIDE]]
// LLVM: ret void

void f8_1(void *a, int b) { return a[b]; }
// CIR-LABEL: f8_1
// CIR: %[[PTR:.*]] = cir.load {{.*}} : !cir.ptr<!cir.ptr<!void>>, !cir.ptr<!void>
// CIR: %[[STRIDE:.*]] = cir.load {{.*}} : !cir.ptr<!s32i>, !s32i
// CIR: cir.ptr_stride(%[[PTR]] : !cir.ptr<!void>, %[[STRIDE]] : !s32i)
// CIR: cir.return

// LLVM-LABEL: f8_1
// LLVM: %[[PTR:.*]] = load ptr, ptr {{.*}}, align 8
// LLVM: %[[TOEXT:.*]] = load i32, ptr {{.*}}, align 4
// LLVM: %[[STRIDE:.*]] = sext i32 %[[TOEXT]] to i64
// LLVM: getelementptr i8, ptr %[[PTR]], i64 %[[STRIDE]]
// LLVM: ret void

unsigned char *p(unsigned int x) {
unsigned char *p;
Expand Down
Loading