Skip to content

[KeyIntsr][Clang] Builtins alloca auto-init atom #134651

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 5 commits into from
May 28, 2025
Merged

[KeyIntsr][Clang] Builtins alloca auto-init atom #134651

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf3a37d
[KeyInstr][Clang] Store-like builtin atoms
OCHyams Apr 4, 2025
56a6cf6
cc1
OCHyams May 21, 2025
9f8f2ef
move test
OCHyams May 28, 2025
ed66898
add missing addInstToNewSourceAtom call (... lost in rebase?)
OCHyams May 28, 2025
bfb1a80
memset val as backup
OCHyams May 28, 2025
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
30 changes: 20 additions & 10 deletions clang/lib/CodeGen/CGBuiltin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4352,7 +4352,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
Value *SizeVal = EmitScalarExpr(E->getArg(1));
EmitNonNullArgCheck(Dest, E->getArg(0)->getType(),
E->getArg(0)->getExprLoc(), FD, 0);
Builder.CreateMemSet(Dest, Builder.getInt8(0), SizeVal, false);
auto *I = Builder.CreateMemSet(Dest, Builder.getInt8(0), SizeVal, false);
addInstToNewSourceAtom(I, nullptr);
return RValue::get(nullptr);
}

Expand All @@ -4367,7 +4368,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
EmitNonNullArgCheck(RValue::get(Dest.emitRawPointer(*this)),
E->getArg(1)->getType(), E->getArg(1)->getExprLoc(), FD,
0);
Builder.CreateMemMove(Dest, Src, SizeVal, false);
auto *I = Builder.CreateMemMove(Dest, Src, SizeVal, false);
addInstToNewSourceAtom(I, nullptr);
return RValue::get(nullptr);
}

Expand All @@ -4380,7 +4382,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
Value *SizeVal = EmitScalarExpr(E->getArg(2));
EmitArgCheck(TCK_Store, Dest, E->getArg(0), 0);
EmitArgCheck(TCK_Load, Src, E->getArg(1), 1);
Builder.CreateMemCpy(Dest, Src, SizeVal, false);
auto *I = Builder.CreateMemCpy(Dest, Src, SizeVal, false);
addInstToNewSourceAtom(I, nullptr);
if (BuiltinID == Builtin::BImempcpy ||
BuiltinID == Builtin::BI__builtin_mempcpy)
return RValue::get(Builder.CreateInBoundsGEP(
Expand All @@ -4396,7 +4399,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
E->getArg(2)->EvaluateKnownConstInt(getContext()).getZExtValue();
EmitArgCheck(TCK_Store, Dest, E->getArg(0), 0);
EmitArgCheck(TCK_Load, Src, E->getArg(1), 1);
Builder.CreateMemCpyInline(Dest, Src, Size);
auto *I = Builder.CreateMemCpyInline(Dest, Src, Size);
addInstToNewSourceAtom(I, nullptr);
return RValue::get(nullptr);
}

Expand All @@ -4417,7 +4421,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
Address Dest = EmitPointerWithAlignment(E->getArg(0));
Address Src = EmitPointerWithAlignment(E->getArg(1));
Value *SizeVal = llvm::ConstantInt::get(Builder.getContext(), Size);
Builder.CreateMemCpy(Dest, Src, SizeVal, false);
auto *I = Builder.CreateMemCpy(Dest, Src, SizeVal, false);
addInstToNewSourceAtom(I, nullptr);
return RValue::get(Dest, *this);
}

Expand All @@ -4443,7 +4448,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
Address Dest = EmitPointerWithAlignment(E->getArg(0));
Address Src = EmitPointerWithAlignment(E->getArg(1));
Value *SizeVal = llvm::ConstantInt::get(Builder.getContext(), Size);
Builder.CreateMemMove(Dest, Src, SizeVal, false);
auto *I = Builder.CreateMemMove(Dest, Src, SizeVal, false);
addInstToNewSourceAtom(I, nullptr);
return RValue::get(Dest, *this);
}

Expand All @@ -4455,7 +4461,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
Value *SizeVal = EmitScalarExpr(E->getArg(2));
EmitArgCheck(TCK_Store, Dest, E->getArg(0), 0);
EmitArgCheck(TCK_Load, Src, E->getArg(1), 1);
Builder.CreateMemMove(Dest, Src, SizeVal, false);
auto *I = Builder.CreateMemMove(Dest, Src, SizeVal, false);
addInstToNewSourceAtom(I, nullptr);
return RValue::get(Dest, *this);
}
case Builtin::BImemset:
Expand All @@ -4466,7 +4473,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
Value *SizeVal = EmitScalarExpr(E->getArg(2));
EmitNonNullArgCheck(Dest, E->getArg(0)->getType(),
E->getArg(0)->getExprLoc(), FD, 0);
Builder.CreateMemSet(Dest, ByteVal, SizeVal, false);
auto *I = Builder.CreateMemSet(Dest, ByteVal, SizeVal, false);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last question, for this (and possibly other memsets) is it possible that the src argument is an instruction, and if so should it be get a rank 2 location?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point - done. The other memsets covered so far look like they all store constants.

addInstToNewSourceAtom(I, nullptr);
return RValue::get(Dest, *this);
}
case Builtin::BI__builtin_memset_inline: {
Expand All @@ -4478,7 +4486,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
EmitNonNullArgCheck(RValue::get(Dest.emitRawPointer(*this)),
E->getArg(0)->getType(), E->getArg(0)->getExprLoc(), FD,
0);
Builder.CreateMemSetInline(Dest, ByteVal, Size);
auto *I = Builder.CreateMemSetInline(Dest, ByteVal, Size);
addInstToNewSourceAtom(I, nullptr);
return RValue::get(nullptr);
}
case Builtin::BI__builtin___memset_chk: {
Expand All @@ -4495,7 +4504,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
Value *ByteVal = Builder.CreateTrunc(EmitScalarExpr(E->getArg(1)),
Builder.getInt8Ty());
Value *SizeVal = llvm::ConstantInt::get(Builder.getContext(), Size);
Builder.CreateMemSet(Dest, ByteVal, SizeVal, false);
auto *I = Builder.CreateMemSet(Dest, ByteVal, SizeVal, false);
addInstToNewSourceAtom(I, nullptr);
return RValue::get(Dest, *this);
}
case Builtin::BI__builtin_wmemchr: {
Expand Down
77 changes: 77 additions & 0 deletions clang/test/KeyInstructions/builtin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@

// RUN: %clang_cc1 -gkey-instructions -x c++ %s -debug-info-kind=line-tables-only -gno-column-info -emit-llvm -o - -ftrivial-auto-var-init=zero -fenable-matrix -disable-llvm-passes \
// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank

// RUN: %clang_cc1 -gkey-instructions -x c %s -debug-info-kind=line-tables-only -gno-column-info -emit-llvm -o - -ftrivial-auto-var-init=zero -fenable-matrix -disable-llvm-passes \
// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank

typedef float m2x2 __attribute__((matrix_type(2, 2)));
m2x2 mat;
float f4[4];
float f8[8];

void fun() {
// CHECK: %a = alloca ptr, align 8
// CHECK: %0 = alloca i8, i64 4{{.*}}, !dbg [[G1R2:!.*]]
// CHECK: call void @llvm.memset{{.*}}, !dbg [[G1R1:!.*]], !annotation
// CHECK: store ptr %0, ptr %a{{.*}}, !dbg [[G1R1:!.*]]
void *a = __builtin_alloca(4);

// CHECK: %1 = alloca i8, i64 4{{.*}}, !dbg [[G2R2:!.*]]
// CHECK: call void @llvm.memset{{.*}}, !dbg [[G2R1:!.*]], !annotation
// CHECK: store ptr %1, ptr %b{{.*}}, !dbg [[G2R1:!.*]]
void *b = __builtin_alloca_with_align(4, 8);
Copy link
Contributor

@SLTozer SLTozer May 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might be misreading/misunderstanding, but is the debug info codegen for these builtins actually changed in this patch? And if so, where/how?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No not changed in this patch, this is more to show that it "just works" with all the moving parts from the other patches. This is an assignment, so we already handle that. There's nothing special we need to do for the __builtin_alloca_with_align call itself.


// CHECK: call void @llvm.matrix.column.major.store.v4f32{{.*}}, !dbg [[G3R1:!.*]]
__builtin_matrix_column_major_store(mat, f4, sizeof(float) * 2);

// CHECK: call void @llvm.memset{{.*}}, !dbg [[G4R1:!.*]]
__builtin_bzero(f4, sizeof(float) * 2);

// CHECK: call void @llvm.memmove{{.*}}, !dbg [[G5R1:!.*]]
__builtin_bcopy(f4, f8, sizeof(float) * 4);

// CHECK: call void @llvm.memcpy{{.*}}, !dbg [[G6R1:!.*]]
__builtin_memcpy(f4, f8, sizeof(float) * 4);

// CHECK: call void @llvm.memcpy{{.*}}, !dbg [[G7R1:!.*]]
__builtin_mempcpy(f4, f8, sizeof(float) * 4);

// CHECK: call void @llvm.memcpy{{.*}}, !dbg [[G8R1:!.*]]
__builtin_memcpy_inline(f4, f8, sizeof(float) * 4);

// CHECK: call void @llvm.memcpy{{.*}}, !dbg [[G9R1:!.*]]
__builtin___memcpy_chk(f4, f8, sizeof(float) * 4, -1);

// CHECK: call void @llvm.memmove{{.*}}, !dbg [[G10R1:!.*]]
__builtin___memmove_chk(f4, f8, sizeof(float) * 4, -1);

// CHECK: call void @llvm.memmove{{.*}}, !dbg [[G11R1:!.*]]
__builtin_memmove(f4, f8, sizeof(float) * 4);

// CHECK: call void @llvm.memset{{.*}}, !dbg [[G12R1:!.*]]
__builtin_memset(f4, 0, sizeof(float) * 4);

// CHECK: call void @llvm.memset{{.*}}, !dbg [[G13R1:!.*]]
__builtin_memset_inline(f4, 0, sizeof(float) * 4);

// CHECK: call void @llvm.memset{{.*}}, !dbg [[G14R1:!.*]]
__builtin___memset_chk(f4, 0, sizeof(float), -1);
}

// CHECK: [[G1R2]] = !DILocation({{.*}}, atomGroup: 1, atomRank: 2)
// CHECK: [[G1R1]] = !DILocation({{.*}}, atomGroup: 1, atomRank: 1)
// CHECK: [[G2R2]] = !DILocation({{.*}}, atomGroup: 2, atomRank: 2)
// CHECK: [[G2R1]] = !DILocation({{.*}}, atomGroup: 2, atomRank: 1)
// CHECK: [[G3R1]] = !DILocation({{.*}}, atomGroup: 3, atomRank: 1)
// CHECK: [[G4R1]] = !DILocation({{.*}}, atomGroup: 4, atomRank: 1)
// CHECK: [[G5R1]] = !DILocation({{.*}}, atomGroup: 5, atomRank: 1)
// CHECK: [[G6R1]] = !DILocation({{.*}}, atomGroup: 6, atomRank: 1)
// CHECK: [[G7R1]] = !DILocation({{.*}}, atomGroup: 7, atomRank: 1)
// CHECK: [[G8R1]] = !DILocation({{.*}}, atomGroup: 8, atomRank: 1)
// CHECK: [[G9R1]] = !DILocation({{.*}}, atomGroup: 9, atomRank: 1)
// CHECK: [[G10R1]] = !DILocation({{.*}}, atomGroup: 10, atomRank: 1)
// CHECK: [[G11R1]] = !DILocation({{.*}}, atomGroup: 11, atomRank: 1)
// CHECK: [[G12R1]] = !DILocation({{.*}}, atomGroup: 12, atomRank: 1)
// CHECK: [[G13R1]] = !DILocation({{.*}}, atomGroup: 13, atomRank: 1)
// CHECK: [[G14R1]] = !DILocation({{.*}}, atomGroup: 14, atomRank: 1)
Loading