Commit ecdc943a authored by Daniel Sanders's avatar Daniel Sanders
Browse files

Merging r226171: 

------------------------------------------------------------------------
r226171 | dsanders | 2015-01-15 15:41:03 +0000 (Thu, 15 Jan 2015) | 11 lines

[mips] Fix a typo in the compare patterns for MIPS32r6/MIPS64r6.

Summary: The patterns intended for the SETLE node were actually matching the SETLT node.

Reviewers: atanasyan, sstankovic, vmedic

Reviewed By: vmedic

Subscribers: llvm-commits

Differential Revision: http://reviews.llvm.org/D6997
------------------------------------------------------------------------

llvm-svn: 231467
parent c0ab938b

llvm/lib/Target/Mips/Mips32r6InstrInfo.td

+2 −2
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ def : MipsPat<(setge f32:$lhs, f32:$rhs), (CMP_LT_S f32:$rhs, f32:$lhs)>, 
      ISA_MIPS32R6;

def : MipsPat<(setlt f32:$lhs, f32:$rhs), (CMP_LT_S f32:$lhs, f32:$rhs)>,

      ISA_MIPS32R6;

def : MipsPat<(setlt f32:$lhs, f32:$rhs), (CMP_LE_S f32:$lhs, f32:$rhs)>,

def : MipsPat<(setle f32:$lhs, f32:$rhs), (CMP_LE_S f32:$lhs, f32:$rhs)>,

      ISA_MIPS32R6;

def : MipsPat<(setne f32:$lhs, f32:$rhs),

              (NOR (CMP_EQ_S f32:$lhs, f32:$rhs), ZERO)>, ISA_MIPS32R6;
@@ -776,7 +776,7 @@ def : MipsPat<(setge f64:$lhs, f64:$rhs), (CMP_LT_D f64:$rhs, f64:$lhs)>, 
      ISA_MIPS32R6;

def : MipsPat<(setlt f64:$lhs, f64:$rhs), (CMP_LT_D f64:$lhs, f64:$rhs)>,

      ISA_MIPS32R6;

def : MipsPat<(setlt f64:$lhs, f64:$rhs), (CMP_LE_D f64:$lhs, f64:$rhs)>,

def : MipsPat<(setle f64:$lhs, f64:$rhs), (CMP_LE_D f64:$lhs, f64:$rhs)>,

      ISA_MIPS32R6;

def : MipsPat<(setne f64:$lhs, f64:$rhs),

              (NOR (CMP_EQ_D f64:$lhs, f64:$rhs), ZERO)>, ISA_MIPS32R6;

llvm/test/CodeGen/Mips/fcmp.ll

+90 −0
Original line number Diff line number Diff line
@@ -781,3 +781,93 @@ define i32 @true_f64(double %a, double %b) nounwind { 
  %2 = zext i1 %1 to i32

  ret i32 %2

}



; The optimizers sometimes produce setlt instead of setolt/setult.

define float @bug1_f32(float %angle, float %at) #0 {

entry:

; ALL-LABEL: bug1_f32:



; 32-C-DAG:      add.s    $[[T0:f[0-9]+]], $f14, $f12

; 32-C-DAG:      lwc1     $[[T1:f[0-9]+]], %lo($CPI32_0)(

; 32-C-DAG:      c.ole.s  $[[T0]], $[[T1]]

; 32-C-DAG:      bc1t



; 32-CMP-DAG:    add.s    $[[T0:f[0-9]+]], $f14, $f12

; 32-CMP-DAG:    lwc1     $[[T1:f[0-9]+]], %lo($CPI32_0)(

; 32-CMP-DAG:    cmp.le.s $[[T2:f[0-9]+]], $[[T0]], $[[T1]]

; 32-CMP-DAG:    mfc1     $[[T3:[0-9]+]], $[[T2]]

; FIXME: This instruction is redundant.

; 32-CMP-DAG:    andi     $[[T4:[0-9]+]], $[[T3]], 1

; 32-CMP-DAG:    bnez     $[[T4]],



; 64-C-DAG:      add.s    $[[T0:f[0-9]+]], $f13, $f12

; 64-C-DAG:      lwc1     $[[T1:f[0-9]+]], %got_ofst($CPI32_0)(

; 64-C-DAG:      c.ole.s  $[[T0]], $[[T1]]

; 64-C-DAG:      bc1t



; 64-CMP-DAG:    add.s    $[[T0:f[0-9]+]], $f13, $f12

; 64-CMP-DAG:    lwc1     $[[T1:f[0-9]+]], %got_ofst($CPI32_0)(

; 64-CMP-DAG:    cmp.le.s $[[T2:f[0-9]+]], $[[T0]], $[[T1]]

; 64-CMP-DAG:    mfc1     $[[T3:[0-9]+]], $[[T2]]

; FIXME: This instruction is redundant.

; 64-CMP-DAG:    andi     $[[T4:[0-9]+]], $[[T3]], 1

; 64-CMP-DAG:    bnez     $[[T4]],



  %add = fadd fast float %at, %angle

  %cmp = fcmp ogt float %add, 1.000000e+00

  br i1 %cmp, label %if.then, label %if.end



if.then:

  %sub = fadd fast float %add, -1.000000e+00

  br label %if.end



if.end:

  %theta.0 = phi float [ %sub, %if.then ], [ %add, %entry ]

  ret float %theta.0

}



; The optimizers sometimes produce setlt instead of setolt/setult.

define double @bug1_f64(double %angle, double %at) #0 {

entry:

; ALL-LABEL: bug1_f64:



; 32-C-DAG:      add.d    $[[T0:f[0-9]+]], $f14, $f12

; 32-C-DAG:      ldc1     $[[T1:f[0-9]+]], %lo($CPI33_0)(

; 32-C-DAG:      c.ole.d  $[[T0]], $[[T1]]

; 32-C-DAG:      bc1t



; 32-CMP-DAG:    add.d    $[[T0:f[0-9]+]], $f14, $f12

; 32-CMP-DAG:    ldc1     $[[T1:f[0-9]+]], %lo($CPI33_0)(

; 32-CMP-DAG:    cmp.le.d $[[T2:f[0-9]+]], $[[T0]], $[[T1]]

; 32-CMP-DAG:    mfc1     $[[T3:[0-9]+]], $[[T2]]

; FIXME: This instruction is redundant.

; 32-CMP-DAG:    andi     $[[T4:[0-9]+]], $[[T3]], 1

; 32-CMP-DAG:    bnez     $[[T4]],



; 64-C-DAG:      add.d    $[[T0:f[0-9]+]], $f13, $f12

; 64-C-DAG:      ldc1     $[[T1:f[0-9]+]], %got_ofst($CPI33_0)(

; 64-C-DAG:      c.ole.d  $[[T0]], $[[T1]]

; 64-C-DAG:      bc1t



; 64-CMP-DAG:    add.d    $[[T0:f[0-9]+]], $f13, $f12

; 64-CMP-DAG:    ldc1     $[[T1:f[0-9]+]], %got_ofst($CPI33_0)(

; 64-CMP-DAG:    cmp.le.d $[[T2:f[0-9]+]], $[[T0]], $[[T1]]

; 64-CMP-DAG:    mfc1     $[[T3:[0-9]+]], $[[T2]]

; FIXME: This instruction is redundant.

; 64-CMP-DAG:    andi     $[[T4:[0-9]+]], $[[T3]], 1

; 64-CMP-DAG:    bnez     $[[T4]],



  %add = fadd fast double %at, %angle

  %cmp = fcmp ogt double %add, 1.000000e+00

  br i1 %cmp, label %if.then, label %if.end



if.then:

  %sub = fadd fast double %add, -1.000000e+00

  br label %if.end



if.end:

  %theta.0 = phi double [ %sub, %if.then ], [ %add, %entry ]

  ret double %theta.0

}



attributes #0 = { nounwind readnone "no-nans-fp-math"="true" }