[llvm] r311900 - [AMDGPU] Fix regression in AMDGPULibCalls allowing native for doubles

Stanislav Mekhanoshin via llvm-commits llvm-commits at lists.llvm.org
Mon Aug 28 11:00:08 PDT 2017


Author: rampitec
Date: Mon Aug 28 11:00:08 2017
New Revision: 311900

URL: http://llvm.org/viewvc/llvm-project?rev=311900&view=rev
Log:
[AMDGPU] Fix regression in AMDGPULibCalls allowing native for doubles

Under -cl-fast-relaxed-math we could use native_sqrt, but f64 was
allowed to produce HSAIL's nsqrt instruction. HSAIL is not here
and we stick with non-existing native_sqrt(double) as a result.

Add check for f64 to not return native functions and also remove
handling of f64 case for fold_sqrt.

Differential Revision: https://reviews.llvm.org/D37223

Modified:
    llvm/trunk/lib/Target/AMDGPU/AMDGPULibCalls.cpp
    llvm/trunk/test/CodeGen/AMDGPU/simplify-libcalls.ll

Modified: llvm/trunk/lib/Target/AMDGPU/AMDGPULibCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPULibCalls.cpp?rev=311900&r1=311899&r2=311900&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/AMDGPULibCalls.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/AMDGPULibCalls.cpp Mon Aug 28 11:00:08 2017
@@ -1170,6 +1170,8 @@ bool AMDGPULibCalls::fold_fma_mad(CallIn
 
 // Get a scalar native builtin signle argument FP function
 Constant* AMDGPULibCalls::getNativeFunction(Module* M, const FuncInfo& FInfo) {
+  if (getArgType(FInfo) == AMDGPULibFunc::F64 || !HasNative(FInfo.getId()))
+    return nullptr;
   FuncInfo nf = FInfo;
   nf.setPrefix(AMDGPULibFunc::NATIVE);
   return getFunction(M, nf);
@@ -1178,9 +1180,7 @@ Constant* AMDGPULibCalls::getNativeFunct
 // fold sqrt -> native_sqrt (x)
 bool AMDGPULibCalls::fold_sqrt(CallInst *CI, IRBuilder<> &B,
                                const FuncInfo &FInfo) {
-  if ((getArgType(FInfo) == AMDGPULibFunc::F32 ||
-       getArgType(FInfo) == AMDGPULibFunc::F64) &&
-      (getVecSize(FInfo) == 1) &&
+  if (getArgType(FInfo) == AMDGPULibFunc::F32 && (getVecSize(FInfo) == 1) &&
       (FInfo.getPrefix() != AMDGPULibFunc::NATIVE)) {
     if (Constant *FPExpr = getNativeFunction(
         CI->getModule(), AMDGPULibFunc(AMDGPULibFunc::EI_SQRT, FInfo))) {

Modified: llvm/trunk/test/CodeGen/AMDGPU/simplify-libcalls.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/simplify-libcalls.ll?rev=311900&r1=311899&r2=311900&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/simplify-libcalls.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/simplify-libcalls.ll Mon Aug 28 11:00:08 2017
@@ -641,7 +641,18 @@ entry:
   ret void
 }
 
+; GCN-LABEL: {{^}}define amdgpu_kernel void @test_dont_use_native_sqrt_fast_f64
+; GCN: tail call fast double @_Z4sqrtd(double %tmp)
+define amdgpu_kernel void @test_dont_use_native_sqrt_fast_f64(double addrspace(1)* nocapture %a) {
+entry:
+  %tmp = load double, double addrspace(1)* %a, align 8
+  %call = tail call fast double @_Z4sqrtd(double %tmp)
+  store double %call, double addrspace(1)* %a, align 8
+  ret void
+}
+
 declare float @_Z4sqrtf(float)
+declare double @_Z4sqrtd(double)
 
 ; GCN-LABEL: {{^}}define amdgpu_kernel void @test_use_native_rsqrt
 ; GCN-NATIVE: tail call fast float @_Z12native_rsqrtf(float %tmp)




More information about the llvm-commits mailing list