https://github.com/OCHyams updated https://github.com/llvm/llvm-project/pull/134650
>From 1a7848740a2b708724d057cd881a3e4db42e96e3 Mon Sep 17 00:00:00 2001 From: Orlando Cazalet-Hyams <orlando.hy...@sony.com> Date: Thu, 3 Apr 2025 22:05:32 +0100 Subject: [PATCH 1/2] [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: https://github.com/llvm/llvm-project/pull/130943 --- clang/lib/CodeGen/CGExpr.cpp | 5 +++-- clang/test/DebugInfo/KeyInstructions/agg.c | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp index ea23455bb9a5e..bae28b45afaa3 100644 --- a/clang/lib/CodeGen/CGExpr.cpp +++ b/clang/lib/CodeGen/CGExpr.cpp @@ -2531,8 +2531,9 @@ void CodeGenFunction::EmitStoreThroughLValue(RValue Src, LValue Dst, llvm::Instruction *Load = Builder.CreateLoad(Dst.getMatrixAddress()); llvm::Value *Vec = Builder.CreateInsertElement(Load, Src.getScalarVal(), Idx, "matins"); - Builder.CreateStore(Vec, Dst.getMatrixAddress(), - Dst.isVolatileQualified()); + auto *I = Builder.CreateStore(Vec, Dst.getMatrixAddress(), + Dst.isVolatileQualified()); + addInstToCurrentSourceAtom(I, Vec); return; } diff --git a/clang/test/DebugInfo/KeyInstructions/agg.c b/clang/test/DebugInfo/KeyInstructions/agg.c index 5cb3a553b6752..6451d44fafc19 100644 --- a/clang/test/DebugInfo/KeyInstructions/agg.c +++ b/clang/test/DebugInfo/KeyInstructions/agg.c @@ -5,6 +5,8 @@ // RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank __attribute__((ext_vector_type(1))) char c; +typedef float m5x5 __attribute__((matrix_type(5, 5))); +m5x5 m; typedef struct { int a, b, c; } Struct; void fun(Struct a) { // CHECK: call void @llvm.memcpy{{.*}}, !dbg [[G1R1:!.*]] @@ -17,9 +19,16 @@ void fun(Struct a) { // CHECK: %vecins = insertelement <1 x i8> %2, i8 0, i32 0, !dbg [[G3R2:!.*]] // CHECK: store <1 x i8> %vecins, ptr @c{{.*}}, !dbg [[G3R1:!.*]] c[0] = 0; + +// CHECK: %3 = load <25 x float>, ptr @m, align 4 +// CHECK: %matins = insertelement <25 x float> %3, float 0.000000e+00, i64 0, !dbg [[G4R2:!.*]] +// CHECK: store <25 x float> %matins, ptr @m{{.*}}, !dbg [[G4R1:!.*]] + m[0][0] = 0; } // CHECK: [[G1R1]] = !DILocation({{.*}}, atomGroup: 1, atomRank: 1) // CHECK: [[G2R1]] = !DILocation({{.*}}, atomGroup: 2, atomRank: 1) // CHECK: [[G3R2]] = !DILocation({{.*}}, atomGroup: 3, atomRank: 2) // CHECK: [[G3R1]] = !DILocation({{.*}}, atomGroup: 3, atomRank: 1) +// CHECK: [[G4R2]] = !DILocation({{.*}}, atomGroup: 4, atomRank: 2) +// CHECK: [[G4R1]] = !DILocation({{.*}}, atomGroup: 4, atomRank: 1) >From 2cbfe629d899cb45a56708e2560528bd3f496ef6 Mon Sep 17 00:00:00 2001 From: Orlando Cazalet-Hyams <orlando.hy...@sony.com> Date: Wed, 21 May 2025 16:00:41 +0100 Subject: [PATCH 2/2] cc1 --- clang/test/DebugInfo/KeyInstructions/agg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/test/DebugInfo/KeyInstructions/agg.c b/clang/test/DebugInfo/KeyInstructions/agg.c index 6451d44fafc19..33b3a0141a0f1 100644 --- a/clang/test/DebugInfo/KeyInstructions/agg.c +++ b/clang/test/DebugInfo/KeyInstructions/agg.c @@ -1,7 +1,7 @@ -// RUN: %clang_cc1 -triple x86_64-linux-gnu -gkey-instructions -x c++ %s -debug-info-kind=line-tables-only -emit-llvm -o - \ +// RUN: %clang_cc1 -triple x86_64-linux-gnu -gkey-instructions -x c++ %s -debug-info-kind=line-tables-only -emit-llvm -o - -fenable-matrix \ // RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank -// RUN: %clang_cc1 -triple x86_64-linux-gnu -gkey-instructions -x c %s -debug-info-kind=line-tables-only -emit-llvm -o - \ +// RUN: %clang_cc1 -triple x86_64-linux-gnu -gkey-instructions -x c %s -debug-info-kind=line-tables-only -emit-llvm -o - -fenable-matrix \ // RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank __attribute__((ext_vector_type(1))) char c; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
