From 69239a98b69eefc70e68d82282b62583f6e92e10 Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Wed, 6 Nov 2013 17:36:04 +0000 Subject: [PATCH] R600: Fix LowerUDIVREM git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194153 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/R600/AMDGPUISelLowering.cpp | 10 +++++----- test/CodeGen/R600/udiv.ll | 21 +++++++++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/lib/Target/R600/AMDGPUISelLowering.cpp b/lib/Target/R600/AMDGPUISelLowering.cpp index 0f3119d93eb..36de4829219 100644 --- a/lib/Target/R600/AMDGPUISelLowering.cpp +++ b/lib/Target/R600/AMDGPUISelLowering.cpp @@ -625,13 +625,13 @@ SDValue AMDGPUTargetLowering::LowerUDIVREM(SDValue Op, SDValue Remainder_GE_Den = DAG.getSelectCC(DL, Remainder, Den, DAG.getConstant(-1, VT), DAG.getConstant(0, VT), - ISD::SETGE); - // Remainder_GE_Zero = (Remainder >= 0 ? -1 : 0) - SDValue Remainder_GE_Zero = DAG.getSelectCC(DL, Remainder, - DAG.getConstant(0, VT), + ISD::SETUGE); + // Remainder_GE_Zero = (Num >= Num_S_Remainder ? -1 : 0) + SDValue Remainder_GE_Zero = DAG.getSelectCC(DL, Num, + Num_S_Remainder, DAG.getConstant(-1, VT), DAG.getConstant(0, VT), - ISD::SETGE); + ISD::SETUGE); // Tmp1 = Remainder_GE_Den & Remainder_GE_Zero SDValue Tmp1 = DAG.getNode(ISD::AND, DL, VT, Remainder_GE_Den, Remainder_GE_Zero); diff --git a/test/CodeGen/R600/udiv.ll b/test/CodeGen/R600/udiv.ll index 19c0185adfb..53713217a1c 100644 --- a/test/CodeGen/R600/udiv.ll +++ b/test/CodeGen/R600/udiv.ll @@ -1,13 +1,26 @@ ;RUN: llc < %s -march=r600 -mcpu=redwood | FileCheck --check-prefix=EG-CHECK %s ;RUN: llc < %s -march=r600 -mcpu=verde -verify-machineinstrs | FileCheck --check-prefix=SI-CHECK %s +;EG-CHECK-LABEL: @test +;EG-CHECK-NOT: SETGE_INT +;EG-CHECK: CF_END + +define void @test(i32 addrspace(1)* %out, i32 addrspace(1)* %in) { + %b_ptr = getelementptr i32 addrspace(1)* %in, i32 1 + %a = load i32 addrspace(1) * %in + %b = load i32 addrspace(1) * %b_ptr + %result = udiv i32 %a, %b + store i32 %result, i32 addrspace(1)* %out + ret void +} + ;The code generated by udiv is long and complex and may frequently change. ;The goal of this test is to make sure the ISel doesn't fail when it gets ;a v4i32 udiv -;EG-CHECK: @test2 +;EG-CHECK-LABEL: @test2 ;EG-CHECK: CF_END -;SI-CHECK: @test2 +;SI-CHECK-LABEL: @test2 ;SI-CHECK: S_ENDPGM define void @test2(<2 x i32> addrspace(1)* %out, <2 x i32> addrspace(1)* %in) { @@ -19,9 +32,9 @@ define void @test2(<2 x i32> addrspace(1)* %out, <2 x i32> addrspace(1)* %in) { ret void } -;EG-CHECK: @test4 +;EG-CHECK-LABEL: @test4 ;EG-CHECK: CF_END -;SI-CHECK: @test4 +;SI-CHECK-LABEL: @test4 ;SI-CHECK: S_ENDPGM define void @test4(<4 x i32> addrspace(1)* %out, <4 x i32> addrspace(1)* %in) { -- 2.34.1