[llvm] r249415 - Revert r249123 - [mips][microMIPS] Fix an issue with selecting sqrt instruction in LLVM backend

[Daniel Sanders via llvm-commits]

Author: dsanders
Date: Tue Oct  6 10:13:16 2015
New Revision: 249415

URL: http://llvm.org/viewvc/llvm-project?rev=249415&view=rev
Log:
Revert r249123 - [mips][microMIPS] Fix an issue with selecting sqrt instruction in LLVM backend

The author was not credited and most of the commit message is missing. Will re-commit with this fixed.

Removed:
    llvm/trunk/test/CodeGen/Mips/llvm-ir/sqrt.ll
Modified:
    llvm/trunk/lib/Target/Mips/MipsInstrFPU.td

Modified: llvm/trunk/lib/Target/Mips/MipsInstrFPU.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsInstrFPU.td?rev=249415&r1=249414&r2=249415&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsInstrFPU.td (original)
+++ llvm/trunk/lib/Target/Mips/MipsInstrFPU.td Tue Oct  6 10:13:16 2015
@@ -353,8 +353,11 @@ def FNEG_S : MMRel, ABSS_FT<"neg.s", FGR
 defm FABS : ABSS_M<"abs.d", II_ABS, fabs>, ABSS_FM<0x5, 17>;
 defm FNEG : ABSS_M<"neg.d", II_NEG, fneg>, ABSS_FM<0x7, 17>;
 
-def FSQRT_S : MMRel, StdMMR6Rel, ABSS_FT<"sqrt.s", FGR32Opnd, FGR32Opnd,
-              II_SQRT_S, fsqrt>, ABSS_FM<0x4, 16>, ISA_MIPS2;
+let AdditionalPredicates = [NotInMicroMips] in {
+def FSQRT_S : MMRel, ABSS_FT<"sqrt.s", FGR32Opnd, FGR32Opnd, II_SQRT_S, fsqrt>,
+              ABSS_FM<0x4, 16>, ISA_MIPS2;
+}
+
 defm FSQRT : ABSS_M<"sqrt.d", II_SQRT_D, fsqrt>, ABSS_FM<0x4, 17>, ISA_MIPS2;
 
 // The odd-numbered registers are only referenced when doing loads,

Removed: llvm/trunk/test/CodeGen/Mips/llvm-ir/sqrt.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/llvm-ir/sqrt.ll?rev=249414&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/Mips/llvm-ir/sqrt.ll (original)
+++ llvm/trunk/test/CodeGen/Mips/llvm-ir/sqrt.ll (removed)
@@ -1,13 +0,0 @@
-; RUN: llc < %s -march=mipsel -mcpu=mips32r2 -mattr=+micromips | FileCheck %s
-; RUN: llc < %s -march=mips -mcpu=mips32r2 -mattr=+micromips | FileCheck %s
-; RUN: llc < %s -march=mips -mcpu=mips32r6 -mattr=+micromips | FileCheck %s
-
-define float @sqrt_fn(float %value) #0 {
-entry:
-  %sqrtf = tail call float @sqrtf(float %value) #0
-  ret float %sqrtf
-}
-
-declare float @sqrtf(float)
-
-; CHECK: sqrt.s $f0, $f12