Skip to content

Commit 7136c2f

Browse files
committed
[KeyInstr][Clang] Assign matrix element 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: llvm#130943
1 parent f2ed610 commit 7136c2f

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

clang/lib/CodeGen/CGExpr.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2480,8 +2480,9 @@ void CodeGenFunction::EmitStoreThroughLValue(RValue Src, LValue Dst,
24802480
llvm::Instruction *Load = Builder.CreateLoad(Dst.getMatrixAddress());
24812481
llvm::Value *Vec =
24822482
Builder.CreateInsertElement(Load, Src.getScalarVal(), Idx, "matins");
2483-
Builder.CreateStore(Vec, Dst.getMatrixAddress(),
2484-
Dst.isVolatileQualified());
2483+
auto *I = Builder.CreateStore(Vec, Dst.getMatrixAddress(),
2484+
Dst.isVolatileQualified());
2485+
addInstToCurrentSourceAtom(I, Vec);
24852486
return;
24862487
}
24872488

clang/test/KeyInstructions/agg.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
// RUN: %clang -gkey-instructions -x c++ %s -gmlt -S -emit-llvm -o - \
1+
// RUN: %clang -gkey-instructions -x c++ %s -gmlt -S -emit-llvm -o - -fenable-matrix \
22
// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank
33

4-
// RUN: %clang -gkey-instructions -x c %s -gmlt -S -emit-llvm -o - \
4+
// RUN: %clang -gkey-instructions -x c %s -gmlt -S -emit-llvm -o - -fenable-matrix \
55
// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank
66

77
__attribute__((ext_vector_type(1))) char c;
8+
typedef float m5x5 __attribute__((matrix_type(5, 5)));
9+
m5x5 m;
810
typedef struct { int a, b, c; } Struct;
911
void fun(Struct a) {
1012
// CHECK: call void @llvm.memcpy{{.*}}, !dbg [[G1R1:!.*]]
@@ -17,9 +19,16 @@ void fun(Struct a) {
1719
// CHECK: %vecins = insertelement <1 x i8> %2, i8 0, i32 0, !dbg [[G3R2:!.*]]
1820
// CHECK: store <1 x i8> %vecins, ptr @c{{.*}}, !dbg [[G3R1:!.*]]
1921
c[0] = 0;
22+
23+
// CHECK: %3 = load <25 x float>, ptr @m, align 4
24+
// CHECK: %matins = insertelement <25 x float> %3, float 0.000000e+00, i64 0, !dbg [[G4R2:!.*]]
25+
// CHECK: store <25 x float> %matins, ptr @m{{.*}}, !dbg [[G4R1:!.*]]
26+
m[0][0] = 0;
2027
}
2128

2229
// CHECK: [[G1R1]] = !DILocation({{.*}}, atomGroup: 1, atomRank: 1)
2330
// CHECK: [[G2R1]] = !DILocation({{.*}}, atomGroup: 2, atomRank: 1)
2431
// CHECK: [[G3R2]] = !DILocation({{.*}}, atomGroup: 3, atomRank: 2)
2532
// CHECK: [[G3R1]] = !DILocation({{.*}}, atomGroup: 3, atomRank: 1)
33+
// CHECK: [[G4R2]] = !DILocation({{.*}}, atomGroup: 4, atomRank: 2)
34+
// CHECK: [[G4R1]] = !DILocation({{.*}}, atomGroup: 4, atomRank: 1)

0 commit comments

Comments
 (0)