[llvm-branch-commits] [clang] [KeyIntsr][Clang] Builtins alloca auto-init atom (PR #134651)
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Apr 7 06:50:55 PDT 2025
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-clang
Author: Orlando Cazalet-Hyams (OCHyams)
<details>
<summary>Changes</summary>
[KeyIntsr][Clang] Builtins alloca auto-init atom
This patch is part of a stack that teaches Clang to generate Key Instructions
metadata for C and C++.
The Key Instructions project is introduced, including a "quick summary" section
at the top which adds context for this PR, here:
https://discourse.llvm.org/t/rfc-improving-is-stmt-placement-for-better-interactive-debugging/82668
The feature is only functional in LLVM if LLVM is built with CMake flag
LLVM_EXPERIMENTAL_KEY_INSTRUCTIONs. Eventually that flag will be removed.
The Clang-side work is demoed here:
https://github.com/llvm/llvm-project/pull/130943
[KeyInstr][Clang] matrix store atom
[KeyInstr][Clang] Store-like builtin atoms
---
Full diff: https://github.com/llvm/llvm-project/pull/134651.diff
2 Files Affected:
- (modified) clang/lib/CodeGen/CGBuiltin.cpp (+23-10)
- (added) clang/test/KeyInstructions/builtin.c (+77)
``````````diff
diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index 91ac7c5847b02..a735d5fa151ac 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -29,6 +29,7 @@
#include "clang/Basic/TargetInfo.h"
#include "clang/Basic/TargetOptions.h"
#include "clang/Frontend/FrontendDiagnostic.h"
+#include "llvm/ADT/ScopeExit.h"
#include "llvm/IR/InlineAsm.h"
#include "llvm/IR/Intrinsics.h"
#include "llvm/IR/IntrinsicsX86.h"
@@ -138,6 +139,7 @@ static void initializeAlloca(CodeGenFunction &CGF, AllocaInst *AI, Value *Size,
if (CGF.CGM.stopAutoInit())
return;
auto *I = CGF.Builder.CreateMemSet(AI, Byte, Size, AlignmentInBytes);
+ CGF.addInstToCurrentSourceAtom(I, nullptr);
I->addAnnotationMetadata("auto-init");
}
@@ -3937,6 +3939,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
Matrix, Dst.emitRawPointer(*this),
Align(Dst.getAlignment().getQuantity()), Stride, IsVolatile,
MatrixTy->getNumRows(), MatrixTy->getNumColumns());
+ addInstToNewSourceAtom(cast<llvm::Instruction>(Result), nullptr);
return RValue::get(Result);
}
@@ -4097,7 +4100,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);
}
@@ -4112,7 +4116,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);
}
@@ -4125,7 +4130,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(
@@ -4141,7 +4147,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);
}
@@ -4162,7 +4169,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);
}
@@ -4188,7 +4196,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);
}
@@ -4199,7 +4208,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:
@@ -4210,7 +4220,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);
+ addInstToNewSourceAtom(I, nullptr);
return RValue::get(Dest, *this);
}
case Builtin::BI__builtin_memset_inline: {
@@ -4222,7 +4233,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: {
@@ -4239,7 +4251,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: {
diff --git a/clang/test/KeyInstructions/builtin.c b/clang/test/KeyInstructions/builtin.c
new file mode 100644
index 0000000000000..5129a4ac2c482
--- /dev/null
+++ b/clang/test/KeyInstructions/builtin.c
@@ -0,0 +1,77 @@
+
+// RUN: %clang -gkey-instructions -x c++ %s -gmlt -gno-column-info -S -emit-llvm -o - -ftrivial-auto-var-init=zero -fenable-matrix -Xclang -disable-llvm-passes \
+// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank
+
+// RUN: %clang -gkey-instructions -x c %s -gmlt -gno-column-info -S -emit-llvm -o - -ftrivial-auto-var-init=zero -fenable-matrix -Xclang -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);
+
+// 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)
``````````
</details>
https://github.com/llvm/llvm-project/pull/134651
More information about the llvm-branch-commits
mailing list