Skip to content

[SPIR-V] Ensure that OpExtInst instructions generated by NonSemantic_Shader_DebugInfo_100 are not mixed up with other OpExtInst instructions #107007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2024
Merged

[SPIR-V] Ensure that OpExtInst instructions generated by NonSemantic_Shader_DebugInfo_100 are not mixed up with other OpExtInst instructions #107007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,10 @@ void SPIRVModuleAnalysis::processOtherInstrs(const Module &M) {
const unsigned OpCode = MI.getOpcode();
if (OpCode == SPIRV::OpString) {
collectOtherInstr(MI, MAI, SPIRV::MB_DebugStrings, IS);
} else if (OpCode == SPIRV::OpExtInst) {
} else if (OpCode == SPIRV::OpExtInst && MI.getOperand(2).isImm() &&
MI.getOperand(2).getImm() ==
SPIRV::InstructionSet::
NonSemantic_Shader_DebugInfo_100) {
MachineOperand Ins = MI.getOperand(3);
namespace NS = SPIRV::NonSemanticExtInst;
static constexpr int64_t GlobalNonSemanticDITy[] = {
Expand Down
36 changes: 36 additions & 0 deletions llvm/test/CodeGen/SPIRV/debug-info/no-misplaced-opextinst.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
; This test is to ensure that OpExtInst generated by NonSemantic_Shader_DebugInfo_100
; are not mixed up with other OpExtInst instructions.
; The code of the test is a reproducer, because "lgamma" has the same code (35)
; inside OpenCL_std as DebugSource inside NonSemantic_Shader_DebugInfo_100.

; RUN: llc -O0 -mtriple=spirv64-unknown-unknown %s -o - | FileCheck %s
; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv64-unknown-unknown %s -o - -filetype=obj | spirv-val %}

; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s
; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown %s -o - -filetype=obj | spirv-val %}

; CHECK: %[[#Ocl:]] = OpExtInstImport "OpenCL.std"
; CHECK: OpName %[[#Fun:]] "__devicelib_lgammaf"
; CHECK: %[[#Fun]] = OpFunction %[[#]] None %[[#]]
; CHECK: OpFunctionParameter
; CHECK: %[[#]] = OpExtInst %[[#]] %[[#Ocl]] lgamma %[[#]]

define weak_odr dso_local spir_kernel void @foo() {
entry:
%r = tail call spir_func noundef float @lgammaf(float noundef 0x7FF8000000000000)
ret void
}

define weak dso_local spir_func float @lgammaf(float noundef %x) {
entry:
%call = tail call spir_func float @__devicelib_lgammaf(float noundef %x)
ret float %call
}

define weak dso_local spir_func float @__devicelib_lgammaf(float noundef %x) {
entry:
%call = tail call spir_func noundef float @_Z18__spirv_ocl_lgammaf(float noundef %x)
ret float %call
}

declare dso_local spir_func noundef float @_Z18__spirv_ocl_lgammaf(float noundef)
Loading