Skip to content

[Backport to llvm_release_190] Update OCL nan builtin translation to work with bfloat type #3641

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

Closed
github-actions wants to merge 1 commit into from
+42 −1
Closed

[Backport to llvm_release_190] Update OCL nan builtin translation to work with bfloat type #3641

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
8 changes: 7 additions & 1 deletion lib/SPIRV/SPIRVUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2592,7 +2592,7 @@ class OpenCLStdToSPIRVFriendlyIRMangleInfo : public BuiltinFuncMangleInfo {
public:
OpenCLStdToSPIRVFriendlyIRMangleInfo(OCLExtOpKind ExtOpId,
ArrayRef<Type *> ArgTys, Type *RetTy)
: ExtOpId(ExtOpId), ArgTys(ArgTys) {
: ExtOpId(ExtOpId), ArgTys(ArgTys), RetTy(RetTy) {

std::string Postfix = "";
if (needRetTypePostfix())
Expand All @@ -2608,6 +2608,11 @@ class OpenCLStdToSPIRVFriendlyIRMangleInfo : public BuiltinFuncMangleInfo {
case OpenCLLIB::Vloada_halfn:
case OpenCLLIB::Vloadn:
return true;
case OpenCLLIB::Nan:
// Only add return type mangling for bfloat16 to disambiguate from half
// (both are represented as i16 in LLVM). Float and half use traditional
// naming for backward compatibility.
return RetTy->getScalarType()->isBFloatTy();
default:
return false;
}
Expand Down Expand Up @@ -2644,6 +2649,7 @@ class OpenCLStdToSPIRVFriendlyIRMangleInfo : public BuiltinFuncMangleInfo {
private:
OCLExtOpKind ExtOpId;
ArrayRef<Type *> ArgTys;
Type *RetTy;
};
} // namespace

Expand Down
35 changes: 35 additions & 0 deletions test/transcoding/OpenCL/nan_bfloat.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
; RUN: llvm-spirv %s --spirv-ext=+SPV_KHR_bfloat16 -o %t.spv
; RUN: llvm-spirv %t.spv -to-text -o %t.spt
; RUN: FileCheck < %t.spt %s --check-prefix=CHECK-SPIRV

; RUN: llvm-spirv -r %t.spv --spirv-target-env=SPV-IR -o - | llvm-dis -o %t.rev.ll
; RUN: FileCheck < %t.rev.ll %s --check-prefixes=CHECK-SPV-IR

; Check OpenCL built-in nan translation.
; Verify it's possible to distinguish between bfloat and half versions.

target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64-G1"
target triple = "spir64"

; CHECK-SPIRV: TypeFloat [[#BFLOAT:]] 16 0 {{$}}
; CHECK-SPIRV: TypeFloat [[#HALF:]] 16 {{$}}
; CHECK-SPIRV: ExtInst [[#BFLOAT]] [[#]] [[#]] nan
; CHECK-SPIRV: ExtInst [[#HALF]] [[#]] [[#]] nan

; CHECK-SPV-IR: call spir_func bfloat @_Z22__spirv_ocl_nan_RDF16bt(
; CHECK-SPV-IR: call spir_func half @_Z15__spirv_ocl_nant(

define dso_local spir_kernel void @test_bfloat(ptr addrspace(1) align 2 %a, i16 %b) {
entry:
%call = tail call spir_func bfloat @_Z23__spirv_ocl_nan__RDF16bt(i16 %b)
%call2 = tail call spir_func half @_Z22__spirv_ocl_nan__Rhalft(i16 %b)
ret void
}

declare spir_func bfloat @_Z23__spirv_ocl_nan__RDF16bt(i16)
declare spir_func half @_Z22__spirv_ocl_nan__Rhalft(i16)


!opencl.ocl.version = !{!0}

!0 = !{i32 3, i32 0}
Loading