[clang] [llvm] Revert "[HLSL][SPIRV] Add support for -g to generate NonSemantic Debug Info" (PR #188771)
Nick Sarnie via cfe-commits
cfe-commits at lists.llvm.org
Thu Mar 26 08:36:58 PDT 2026
https://github.com/sarnex created https://github.com/llvm/llvm-project/pull/188771
Reverts llvm/llvm-project#187051
Breasks some OpenMP offload tests
>From b87084ebb39175bd0007f5653bfdefe611755303 Mon Sep 17 00:00:00 2001
From: Nick Sarnie <nick.sarnie at intel.com>
Date: Thu, 26 Mar 2026 15:36:37 +0000
Subject: [PATCH] =?UTF-8?q?Revert=20"[HLSL][SPIRV]=20Add=20support=20for?=
=?UTF-8?q?=20-g=20to=20generate=20NonSemantic=20Debug=20Info=20(=E2=80=A6?=
=?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 85049fc357ac3917350b97f4812209d9d00fe808.
---
clang/lib/CodeGen/CGDebugInfo.cpp | 8 ++---
.../CodeGenHLSL/debug/source-language.hlsl | 34 -------------------
llvm/docs/SPIRVUsage.rst | 8 ++---
llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp | 11 +++---
.../debug-info/debug-compilation-unit.ll | 4 +--
.../SPIRV/debug-info/debug-type-basic.ll | 2 +-
.../SPIRV/debug-info/debug-type-pointer.ll | 2 +-
.../hlsl-debug-info-auto-activation.ll | 32 -----------------
.../SPIRV/hlsl-resources/SampleErrorsDebug.ll | 2 +-
llvm/test/CodeGen/SPIRV/llc-pipeline.ll | 2 --
10 files changed, 15 insertions(+), 90 deletions(-)
delete mode 100644 clang/test/CodeGenHLSL/debug/source-language.hlsl
delete mode 100644 llvm/test/CodeGen/SPIRV/debug-info/hlsl-debug-info-auto-activation.ll
diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 449997ed41af0..0fd17b98570fc 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -694,9 +694,7 @@ static llvm::dwarf::SourceLanguage GetSourceLanguage(const CodeGenModule &CGM) {
llvm::dwarf::SourceLanguage LangTag;
if (LO.CPlusPlus) {
- if (LO.HLSL)
- LangTag = llvm::dwarf::DW_LANG_HLSL;
- else if (LO.HIP)
+ if (LO.HIP)
LangTag = llvm::dwarf::DW_LANG_HIP;
else if (LO.ObjC)
LangTag = llvm::dwarf::DW_LANG_ObjC_plus_plus;
@@ -734,9 +732,7 @@ GetDISourceLanguageName(const CodeGenModule &CGM) {
uint32_t LangVersion = 0;
llvm::dwarf::SourceLanguageName LangTag;
if (LO.CPlusPlus) {
- if (LO.HLSL) {
- LangTag = llvm::dwarf::DW_LNAME_HLSL;
- } else if (LO.HIP) {
+ if (LO.HIP) {
LangTag = llvm::dwarf::DW_LNAME_HIP;
} else if (LO.ObjC) {
LangTag = llvm::dwarf::DW_LNAME_ObjC_plus_plus;
diff --git a/clang/test/CodeGenHLSL/debug/source-language.hlsl b/clang/test/CodeGenHLSL/debug/source-language.hlsl
deleted file mode 100644
index f1e63d17724ee..0000000000000
--- a/clang/test/CodeGenHLSL/debug/source-language.hlsl
+++ /dev/null
@@ -1,34 +0,0 @@
-// Verify that HLSL shaders are tagged with DW_LANG_HLSL in the debug compile
-// unit. For DWARFv6, verify the sourceLanguageName field uses DW_LNAME_HLSL.
-
-// DXIL target, DWARFv4
-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -x hlsl -emit-llvm \
-// RUN: -disable-llvm-passes -hlsl-entry main \
-// RUN: -debug-info-kind=standalone -dwarf-version=4 -o - %s \
-// RUN: | FileCheck %s --check-prefix=CHECK-V4
-
-// SPIR-V target, DWARFv4
-// RUN: %clang_cc1 -triple spirv-unknown-vulkan-compute -x hlsl -emit-llvm \
-// RUN: -disable-llvm-passes -hlsl-entry main \
-// RUN: -debug-info-kind=standalone -dwarf-version=4 -o - %s \
-// RUN: | FileCheck %s --check-prefix=CHECK-V4
-
-// DXIL target, DWARFv6
-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -x hlsl -emit-llvm \
-// RUN: -disable-llvm-passes -hlsl-entry main \
-// RUN: -debug-info-kind=standalone -dwarf-version=6 -o - %s \
-// RUN: | FileCheck %s --check-prefix=CHECK-V6
-
-// SPIR-V target, DWARFv6
-// RUN: %clang_cc1 -triple spirv-unknown-vulkan-compute -x hlsl -emit-llvm \
-// RUN: -disable-llvm-passes -hlsl-entry main \
-// RUN: -debug-info-kind=standalone -dwarf-version=6 -o - %s \
-// RUN: | FileCheck %s --check-prefix=CHECK-V6
-
-// CHECK-V4: !DICompileUnit(language: DW_LANG_HLSL,
-// CHECK-V4-NOT: !DICompileUnit(language: DW_LANG_C_plus_plus
-
-// CHECK-V6: !DICompileUnit(sourceLanguageName: DW_LNAME_HLSL,
-// CHECK-V6-NOT: !DICompileUnit(sourceLanguageName: DW_LNAME_C_plus_plus
-
-[numthreads(1, 1, 1)] void main() {}
diff --git a/llvm/docs/SPIRVUsage.rst b/llvm/docs/SPIRVUsage.rst
index 75a477b86da05..9a4478f57e802 100644
--- a/llvm/docs/SPIRVUsage.rst
+++ b/llvm/docs/SPIRVUsage.rst
@@ -33,11 +33,9 @@ Static Compiler Commands
Command: `llc -O1 -mtriple=spirv64-unknown-unknown --spirv-ext=+SPV_ALTERA_arbitrary_precision_integers input.ll -o output.spvt`
Description: Compiles an LLVM IL file to SPIR-V with (`-O1`) optimizations, targeting a 64-bit architecture. It enables the SPV_ALTERA_arbitrary_precision_integers extension.
-3. **Compilation with NonSemantic.Shader.DebugInfo support**
- Command: `llc -g --spirv-ext=+SPV_KHR_non_semantic_info input.ll -o output.spvt`
- Description: Compiles an LLVM IL file to SPIR-V with NonSemantic.Shader.DebugInfo.100 instructions. The ``-g`` flag causes the backend to emit NSDI instructions when the module contains debug metadata. The required SPV_KHR_non_semantic_info extension must be enabled explicitly.
-
- Note: ``--spv-emit-nonsemantic-debug-info`` is a deprecated synonym for ``-g`` and will be removed in a future release.
+3. **Compilation with experimental NonSemantic.Shader.DebugInfo.100 support**
+ Command: `llc --spv-emit-nonsemantic-debug-info --spirv-ext=+SPV_KHR_non_semantic_info input.ll -o output.spvt`
+ Description: Compiles an LLVM IL file to SPIR-V with additional NonSemantic.Shader.DebugInfo.100 instructions. It enables the required SPV_KHR_non_semantic_info extension.
4. **SPIR-V Binary Generation**
Command: `llc -O0 -mtriple=spirv64-unknown-unknown -filetype=obj input.ll -o output.spvt`
diff --git a/llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp b/llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp
index 061bfc21bc447..d618cd8bffde8 100644
--- a/llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp
+++ b/llvm/lib/Target/SPIRV/SPIRVTargetMachine.cpp
@@ -261,15 +261,14 @@ bool SPIRVPassConfig::addRegBankSelect() {
static cl::opt<bool> SPVEnableNonSemanticDI(
"spv-emit-nonsemantic-debug-info",
- cl::desc("Deprecated. Use -g to emit SPIR-V NonSemantic.Shader.DebugInfo "
- "instructions"),
+ cl::desc("Emit SPIR-V NonSemantic.Shader.DebugInfo.100 instructions"),
cl::Optional, cl::init(false));
void SPIRVPassConfig::addPreEmitPass() {
- // The SPIRVEmitNonSemanticDI pass self-activates when the module contains
- // debug info (llvm.dbg.cu). --spv-emit-nonsemantic-debug-info is a
- // deprecated synonym for -g.
- addPass(createSPIRVEmitNonSemanticDIPass(&getTM<SPIRVTargetMachine>()));
+ if (SPVEnableNonSemanticDI ||
+ getSPIRVTargetMachine().getTargetTriple().getVendor() == Triple::AMD) {
+ addPass(createSPIRVEmitNonSemanticDIPass(&getTM<SPIRVTargetMachine>()));
+ }
}
namespace {
diff --git a/llvm/test/CodeGen/SPIRV/debug-info/debug-compilation-unit.ll b/llvm/test/CodeGen/SPIRV/debug-info/debug-compilation-unit.ll
index fd2f46590f103..54eb0e45dccee 100644
--- a/llvm/test/CodeGen/SPIRV/debug-info/debug-compilation-unit.ll
+++ b/llvm/test/CodeGen/SPIRV/debug-info/debug-compilation-unit.ll
@@ -30,8 +30,8 @@
; CHECK-SPIRV: [[debug_source_cpp:%[0-9]+]] = OpExtInst [[type_void]] [[ext_inst_non_semantic]] DebugSource [[filename_str_cpp]]
; CHECK-SPIRV: OpExtInst [[type_void]] [[ext_inst_non_semantic]] DebugCompilationUnit [[debug_info_version]] [[dwarf_version]] [[debug_source_cpp]] [[source_language_cpp]]
-; CHECK-OPTION: OpExtInstImport "NonSemantic.Shader.DebugInfo.100"
-; CHECK-OPTION: OpString "/AAAAAAAAAA/BBBBBBBB/CCCCCCCCC{{[/\\]}}example.c"
+; CHECK-OPTION-NOT: OpExtInstImport "NonSemantic.Shader.DebugInfo.100"
+; CHECK-OPTION-NOT: OpString "/AAAAAAAAAA/BBBBBBBB/CCCCCCCCC{{[/\\]}}example.c"
define spir_func void @foo() {
entry:
diff --git a/llvm/test/CodeGen/SPIRV/debug-info/debug-type-basic.ll b/llvm/test/CodeGen/SPIRV/debug-info/debug-type-basic.ll
index 04aa85008d47c..c678d9ce350a2 100644
--- a/llvm/test/CodeGen/SPIRV/debug-info/debug-type-basic.ll
+++ b/llvm/test/CodeGen/SPIRV/debug-info/debug-type-basic.ll
@@ -82,7 +82,7 @@
; CHECK-SPIRV-DAG: OpExtInst [[type_void]] [[ext_inst_non_semantic]] DebugTypeBasic [[str_float]] [[size_32bit]] [[encoding_float]] [[flag_zero]]
; CHECK-SPIRV-DAG: OpExtInst [[type_void]] [[ext_inst_non_semantic]] DebugTypeBasic [[str_double]] [[size_64bit]] [[encoding_float]] [[flag_zero]]
-; CHECK-OPTION: DebugTypeBasic
+; CHECK-OPTION-NOT: DebugTypeBasic
define spir_func void @test1() !dbg !9 {
entry:
diff --git a/llvm/test/CodeGen/SPIRV/debug-info/debug-type-pointer.ll b/llvm/test/CodeGen/SPIRV/debug-info/debug-type-pointer.ll
index f2d7440ae7a65..9cdcd6db6cde8 100644
--- a/llvm/test/CodeGen/SPIRV/debug-info/debug-type-pointer.ll
+++ b/llvm/test/CodeGen/SPIRV/debug-info/debug-type-pointer.ll
@@ -81,7 +81,7 @@
; CHECK-SPIRV-DAG: [[debug_info_none:%[0-9]+]] = OpExtInst {{%[0-9]+ %[0-9]+}} DebugInfoNone
; CHECK-SPIRV-DAG: OpExtInst {{%[0-9]+ %[0-9]+}} DebugTypePointer [[debug_info_none]] [[i32_5]] [[i32_0]]
-; CHECK-OPTION: DebugTypePointer
+; CHECK-OPTION-NOT: DebugTypePointer
@gi0 = dso_local addrspace(1) global ptr addrspace(4) null, align 4, !dbg !0
@gv0 = dso_local addrspace(1) global ptr addrspace(4) null, align 4, !dbg !5
diff --git a/llvm/test/CodeGen/SPIRV/debug-info/hlsl-debug-info-auto-activation.ll b/llvm/test/CodeGen/SPIRV/debug-info/hlsl-debug-info-auto-activation.ll
deleted file mode 100644
index 1f123dd4b317a..0000000000000
--- a/llvm/test/CodeGen/SPIRV/debug-info/hlsl-debug-info-auto-activation.ll
+++ /dev/null
@@ -1,32 +0,0 @@
-; Verify that the NSDI pass activates automatically when the module contains
-; debug info (llvm.dbg.cu) without requiring --spv-emit-nonsemantic-debug-info.
-; The language constant in DebugCompilationUnit must be 5 (HLSL).
-
-; RUN: llc --verify-machineinstrs --spirv-ext=+SPV_KHR_non_semantic_info \
-; RUN: -O0 -mtriple=spirv64-unknown-unknown %s -o - \
-; RUN: | FileCheck %s
-; RUN: %if spirv-tools %{ llc --verify-machineinstrs \
-; RUN: --spirv-ext=+SPV_KHR_non_semantic_info \
-; RUN: -O0 -mtriple=spirv64-unknown-unknown %s -o - -filetype=obj \
-; RUN: | spirv-val %}
-
-; CHECK: OpExtension "SPV_KHR_non_semantic_info"
-; CHECK: [[ext_inst:%[0-9]+]] = OpExtInstImport "NonSemantic.Shader.DebugInfo.100"
-; CHECK-DAG: [[type_void:%[0-9]+]] = OpTypeVoid
-; CHECK-DAG: [[type_i32:%[0-9]+]] = OpTypeInt 32 0
-; CHECK-DAG: [[lang_hlsl:%[0-9]+]] = OpConstant [[type_i32]] 5
-; CHECK: OpExtInst [[type_void]] [[ext_inst]] DebugCompilationUnit
-; CHECK-SAME: [[lang_hlsl]]
-
-define spir_func void @main() {
-entry:
- ret void
-}
-
-!llvm.dbg.cu = !{!0}
-!llvm.module.flags = !{!2, !3}
-
-!0 = distinct !DICompileUnit(language: DW_LANG_HLSL, file: !1, producer: "clang", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, splitDebugInlining: false, nameTableKind: None)
-!1 = !DIFile(filename: "shader.hlsl", directory: "/src")
-!2 = !{i32 7, !"Dwarf Version", i32 5}
-!3 = !{i32 2, !"Debug Info Version", i32 3}
diff --git a/llvm/test/CodeGen/SPIRV/hlsl-resources/SampleErrorsDebug.ll b/llvm/test/CodeGen/SPIRV/hlsl-resources/SampleErrorsDebug.ll
index b443c70e7b17e..26f7194104e18 100644
--- a/llvm/test/CodeGen/SPIRV/hlsl-resources/SampleErrorsDebug.ll
+++ b/llvm/test/CodeGen/SPIRV/hlsl-resources/SampleErrorsDebug.ll
@@ -1,4 +1,4 @@
-; RUN: not llc -O0 -mtriple=spirv-vulkan-compute --spirv-ext=+SPV_KHR_non_semantic_info %s -o /dev/null 2>&1 | FileCheck %s
+; RUN: not llc -O0 -mtriple=spirv-vulkan-compute %s -o /dev/null 2>&1 | FileCheck %s
; CHECK: error: SampleErrorsDebug.ll:24:10: Non-constant offsets are not supported in sample instructions.
diff --git a/llvm/test/CodeGen/SPIRV/llc-pipeline.ll b/llvm/test/CodeGen/SPIRV/llc-pipeline.ll
index 3b256f1a3a2dc..6d9f02ba909c8 100644
--- a/llvm/test/CodeGen/SPIRV/llc-pipeline.ll
+++ b/llvm/test/CodeGen/SPIRV/llc-pipeline.ll
@@ -78,7 +78,6 @@
; SPIRV-O0-NEXT: Analyze Machine Code For Garbage Collection
; SPIRV-O0-NEXT: Insert fentry calls
; SPIRV-O0-NEXT: Insert XRay ops
-; SPIRV-O0-NEXT: SPIRV NonSemantic.Shader.DebugInfo.100 emitter
; SPIRV-O0-NEXT: Machine Sanitizer Binary Metadata
; SPIRV-O0-NEXT: Lazy Machine Block Frequency Analysis
; SPIRV-O0-NEXT: Machine Optimization Remark Emitter
@@ -218,7 +217,6 @@
; SPIRV-Opt-NEXT: Analyze Machine Code For Garbage Collection
; SPIRV-Opt-NEXT: Insert fentry calls
; SPIRV-Opt-NEXT: Insert XRay ops
-; SPIRV-Opt-NEXT: SPIRV NonSemantic.Shader.DebugInfo.100 emitter
; SPIRV-Opt-NEXT: Machine Sanitizer Binary Metadata
; SPIRV-Opt-NEXT: Lazy Machine Block Frequency Analysis
; SPIRV-Opt-NEXT: Machine Optimization Remark Emitter
More information about the cfe-commits
mailing list