https://github.com/OCHyams updated https://github.com/llvm/llvm-project/pull/134643
>From 71a5f65a7ecbd0b1ba3b5e45f0b03fa34484f85a Mon Sep 17 00:00:00 2001 From: Orlando Cazalet-Hyams <orlando.hy...@sony.com> Date: Thu, 3 Apr 2025 18:43:56 +0100 Subject: [PATCH 1/3] [KeyInstr][Clang] Switch stmt 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/CGStmt.cpp | 2 + clang/test/DebugInfo/KeyInstructions/switch.c | 51 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 clang/test/DebugInfo/KeyInstructions/switch.c diff --git a/clang/lib/CodeGen/CGStmt.cpp b/clang/lib/CodeGen/CGStmt.cpp index 3b701116e5e4b..31d64a5a788ee 100644 --- a/clang/lib/CodeGen/CGStmt.cpp +++ b/clang/lib/CodeGen/CGStmt.cpp @@ -2293,6 +2293,8 @@ void CodeGenFunction::EmitSwitchStmt(const SwitchStmt &S) { // failure. llvm::BasicBlock *DefaultBlock = createBasicBlock("sw.default"); SwitchInsn = Builder.CreateSwitch(CondV, DefaultBlock); + addInstToNewSourceAtom(SwitchInsn, CondV); + if (HLSLControlFlowAttr != HLSLControlFlowHintAttr::SpellingNotCalculated) { llvm::MDBuilder MDHelper(CGM.getLLVMContext()); llvm::ConstantInt *BranchHintConstant = diff --git a/clang/test/DebugInfo/KeyInstructions/switch.c b/clang/test/DebugInfo/KeyInstructions/switch.c new file mode 100644 index 0000000000000..cff6b834106e9 --- /dev/null +++ b/clang/test/DebugInfo/KeyInstructions/switch.c @@ -0,0 +1,51 @@ +// RUN: %clang -gkey-instructions -x c++ -std=c++17 %s -gmlt -S -emit-llvm -o - \ +// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank --check-prefixes=CHECK,CHECK-CXX + +// RUN: %clang -gkey-instructions -x c %s -gmlt -S -emit-llvm -o - \ +// RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank + +int g; +void a(int A, int B) { +// CHECK: entry: +// The load gets associated with the branch rather than the store. +// FIXME: Is that the best thing to do? +// CHECK: %0 = load i32, ptr %A.addr{{.*}}, !dbg [[G2R2:!.*]] +// CHECK: store i32 %0, ptr @g{{.*}}, !dbg [[G1R1:!.*]] +// CHECK: switch i32 %0, label %{{.*}} [ +// CHECK: i32 0, label %sw.bb +// CHECK: i32 1, label %sw.bb1 +// CHECK: ], !dbg [[G2R1:!.*]] + switch ((g = A)) { + case 0: break; + case 1: { +// CHECK: sw.bb1: +// CHECK: %1 = load i32, ptr %B.addr{{.*}}, !dbg [[G3R2:!.*]] +// CHECK: switch i32 %1, label %{{.*}} [ +// CHECK: i32 0, label %sw.bb2 +// CHECK: ], !dbg [[G3R1:!.*]] + switch ((B)) { + case 0: { +// Test that assignments in constant-folded switches don't go missing. +// CHECK-CXX: sw.bb2: +// CHECK-CXX: store i32 1, ptr %C{{.*}}, !dbg [[G4R1:!.*]] +#ifdef __cplusplus + switch (const int C = 1; C) { + case 0: break; + case 1: break; + default: break; + } +#endif + } break; + default: break; + } + } break; + default: break; + } +} + +// CHECK: [[G2R2]] = !DILocation({{.*}}, atomGroup: 2, atomRank: 2) +// 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-CXX: [[G4R1]] = !DILocation({{.*}}, atomGroup: 4, atomRank: 1) >From 21266abfda12a5dcb61d1409cd8e7e0e0213b6f3 Mon Sep 17 00:00:00 2001 From: Orlando Cazalet-Hyams <orlando.hy...@sony.com> Date: Wed, 21 May 2025 15:39:37 +0100 Subject: [PATCH 2/3] cc1 --- clang/test/DebugInfo/KeyInstructions/switch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/test/DebugInfo/KeyInstructions/switch.c b/clang/test/DebugInfo/KeyInstructions/switch.c index cff6b834106e9..dbfc4a44d271c 100644 --- a/clang/test/DebugInfo/KeyInstructions/switch.c +++ b/clang/test/DebugInfo/KeyInstructions/switch.c @@ -1,7 +1,7 @@ -// RUN: %clang -gkey-instructions -x c++ -std=c++17 %s -gmlt -S -emit-llvm -o - \ +// RUN: %clang_cc1 -gkey-instructions -x c++ -std=c++17 %s -debug-info-kind=line-tables-only -emit-llvm -o - \ // RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank --check-prefixes=CHECK,CHECK-CXX -// RUN: %clang -gkey-instructions -x c %s -gmlt -S -emit-llvm -o - \ +// RUN: %clang_cc1 -gkey-instructions -x c %s -debug-info-kind=line-tables-only -emit-llvm -o - \ // RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank int g; >From 4e5d14d098e7ff8635df3359b2c5af4ad9951470 Mon Sep 17 00:00:00 2001 From: Orlando Cazalet-Hyams <orlando.hy...@sony.com> Date: Tue, 27 May 2025 11:21:48 +0100 Subject: [PATCH 3/3] triple --- clang/test/DebugInfo/KeyInstructions/switch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clang/test/DebugInfo/KeyInstructions/switch.c b/clang/test/DebugInfo/KeyInstructions/switch.c index dbfc4a44d271c..5142f204ff587 100644 --- a/clang/test/DebugInfo/KeyInstructions/switch.c +++ b/clang/test/DebugInfo/KeyInstructions/switch.c @@ -1,14 +1,14 @@ -// RUN: %clang_cc1 -gkey-instructions -x c++ -std=c++17 %s -debug-info-kind=line-tables-only -emit-llvm -o - \ +// RUN: %clang_cc1 -triple x86_64-linux-gnu -gkey-instructions -x c++ -std=c++17 %s -debug-info-kind=line-tables-only -emit-llvm -o - \ // RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank --check-prefixes=CHECK,CHECK-CXX -// RUN: %clang_cc1 -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 - \ // RUN: | FileCheck %s --implicit-check-not atomGroup --implicit-check-not atomRank int g; void a(int A, int B) { // CHECK: entry: // The load gets associated with the branch rather than the store. -// FIXME: Is that the best thing to do? +// TODO: Associating it with the store may be a better choice. // CHECK: %0 = load i32, ptr %A.addr{{.*}}, !dbg [[G2R2:!.*]] // CHECK: store i32 %0, ptr @g{{.*}}, !dbg [[G1R1:!.*]] // CHECK: switch i32 %0, label %{{.*}} [ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
