From 48e872230d2a67639b365876958c87bb4637d681 Mon Sep 17 00:00:00 2001 From: Justin Holewinski Date: Mon, 26 Jan 2015 19:11:20 +0000 Subject: [PATCH] [NVPTX] Handle floating-point conversion patterns that are not explicitly ordered or unordered Fixes PR22322 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@227117 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/NVPTX/NVPTXInstrInfo.td | 19 ++++++--- test/CodeGen/NVPTX/bug22322.ll | 62 ++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 test/CodeGen/NVPTX/bug22322.ll diff --git a/lib/Target/NVPTX/NVPTXInstrInfo.td b/lib/Target/NVPTX/NVPTXInstrInfo.td index 2c571c4878a..5b8a169fb96 100644 --- a/lib/Target/NVPTX/NVPTXInstrInfo.td +++ b/lib/Target/NVPTX/NVPTXInstrInfo.td @@ -1659,12 +1659,12 @@ multiclass FSET_FORMAT { (SET_f64ir fpimm:$a, Float64Regs:$b, Mode)>; } -defm FSetGT : FSET_FORMAT; -defm FSetLT : FSET_FORMAT; -defm FSetGE : FSET_FORMAT; -defm FSetLE : FSET_FORMAT; -defm FSetEQ : FSET_FORMAT; -defm FSetNE : FSET_FORMAT; +defm FSetOGT : FSET_FORMAT; +defm FSetOLT : FSET_FORMAT; +defm FSetOGE : FSET_FORMAT; +defm FSetOLE : FSET_FORMAT; +defm FSetOEQ : FSET_FORMAT; +defm FSetONE : FSET_FORMAT; defm FSetUGT : FSET_FORMAT; defm FSetULT : FSET_FORMAT; @@ -1673,6 +1673,13 @@ defm FSetULE : FSET_FORMAT; defm FSetUEQ : FSET_FORMAT; defm FSetUNE : FSET_FORMAT; +defm FSetGT : FSET_FORMAT; +defm FSetLT : FSET_FORMAT; +defm FSetGE : FSET_FORMAT; +defm FSetLE : FSET_FORMAT; +defm FSetEQ : FSET_FORMAT; +defm FSetNE : FSET_FORMAT; + defm FSetNUM : FSET_FORMAT; defm FSetNAN : FSET_FORMAT; diff --git a/test/CodeGen/NVPTX/bug22322.ll b/test/CodeGen/NVPTX/bug22322.ll new file mode 100644 index 00000000000..19ee694e04b --- /dev/null +++ b/test/CodeGen/NVPTX/bug22322.ll @@ -0,0 +1,62 @@ +; RUN: llc < %s -march=nvptx -mcpu=sm_20 | FileCheck %s + +target datalayout = "e-i64:64-v16:16-v32:32-n16:32:64" +target triple = "nvptx64-nvidia-cuda" + +%class.float3 = type { float, float, float } + +; Function Attrs: nounwind +; CHECK-LABEL: some_kernel +define void @some_kernel(%class.float3* nocapture %dst) #0 { +_ZL11compute_vecRK6float3jb.exit: + %ret_vec.sroa.8.i = alloca float, align 4 + %0 = tail call i32 @llvm.ptx.read.ctaid.x() + %1 = tail call i32 @llvm.ptx.read.ntid.x() + %2 = mul nsw i32 %1, %0 + %3 = tail call i32 @llvm.ptx.read.tid.x() + %4 = add nsw i32 %2, %3 + %5 = zext i32 %4 to i64 + %6 = bitcast float* %ret_vec.sroa.8.i to i8* + call void @llvm.lifetime.start(i64 4, i8* %6) + %7 = and i32 %4, 15 + %8 = icmp eq i32 %7, 0 + %9 = select i1 %8, float 0.000000e+00, float -1.000000e+00 + store float %9, float* %ret_vec.sroa.8.i, align 4 +; CHECK: setp.lt.f32 %p{{[0-9]+}}, %f{{[0-9]+}}, 0f00000000 + %10 = fcmp olt float %9, 0.000000e+00 + %ret_vec.sroa.8.i.val = load float* %ret_vec.sroa.8.i, align 4 + %11 = select i1 %10, float 0.000000e+00, float %ret_vec.sroa.8.i.val + call void @llvm.lifetime.end(i64 4, i8* %6) + %12 = getelementptr inbounds %class.float3* %dst, i64 %5, i32 0 + store float 0.000000e+00, float* %12, align 4 + %13 = getelementptr inbounds %class.float3* %dst, i64 %5, i32 1 + store float %11, float* %13, align 4 + %14 = getelementptr inbounds %class.float3* %dst, i64 %5, i32 2 + store float 0.000000e+00, float* %14, align 4 + ret void +} + +; Function Attrs: nounwind readnone +declare i32 @llvm.ptx.read.ctaid.x() #1 + +; Function Attrs: nounwind readnone +declare i32 @llvm.ptx.read.ntid.x() #1 + +; Function Attrs: nounwind readnone +declare i32 @llvm.ptx.read.tid.x() #1 + +; Function Attrs: nounwind +declare void @llvm.lifetime.start(i64, i8* nocapture) #2 + +; Function Attrs: nounwind +declare void @llvm.lifetime.end(i64, i8* nocapture) #2 + +attributes #0 = { nounwind "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="true" "no-nans-fp-math"="true" "stack-protector-buffer-size"="8" "unsafe-fp-math"="true" "use-soft-float"="false" } +attributes #1 = { nounwind readnone } +attributes #2 = { nounwind } + +!nvvm.annotations = !{!0} +!llvm.ident = !{!1} + +!0 = !{void (%class.float3*)* @some_kernel, !"kernel", i32 1} +!1 = !{!"clang version 3.5.1 (tags/RELEASE_351/final)"}