From 1caec99d5d3e68b0f11419d5552a00c5d6d569f5 Mon Sep 17 00:00:00 2001 From: Daniel Sanders Date: Wed, 7 May 2014 12:27:46 +0000 Subject: [PATCH] [mips] Move IsFP64bit/NotFP64bit to the front of the AdditionalPredicates list Summary: This makes it easier to prove a more complicated change in the next commit is non-functional. Reviewers: vmedic Reviewed By: vmedic Differential Revision: http://reviews.llvm.org/D3639 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@208197 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/Mips/MipsInstrFPU.td | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Target/Mips/MipsInstrFPU.td b/lib/Target/Mips/MipsInstrFPU.td index 324b7b65234..9771b390b68 100644 --- a/lib/Target/Mips/MipsInstrFPU.td +++ b/lib/Target/Mips/MipsInstrFPU.td @@ -391,13 +391,13 @@ let AdditionalPredicates = [IsNotNaCl, HasFPIdx] in { def SWXC1 : MMRel, SWXC1_FT<"swxc1", FGR32Opnd, II_SWXC1, store>, SWXC1_FM<8>; } -let AdditionalPredicates = [HasFPIdx, NotFP64bit, NotInMicroMips, +let AdditionalPredicates = [NotFP64bit, HasFPIdx, NotInMicroMips, IsNotNaCl] in { def LDXC1 : LWXC1_FT<"ldxc1", AFGR64Opnd, II_LDXC1, load>, LWXC1_FM<1>; def SDXC1 : SWXC1_FT<"sdxc1", AFGR64Opnd, II_SDXC1, store>, SWXC1_FM<9>; } -let AdditionalPredicates = [HasFPIdx, IsFP64bit], +let AdditionalPredicates = [IsFP64bit, HasFPIdx], DecoderNamespace="Mips64" in { def LDXC164 : LWXC1_FT<"ldxc1", FGR64Opnd, II_LDXC1, load>, LWXC1_FM<1>; def SDXC164 : SWXC1_FT<"sdxc1", FGR64Opnd, II_SDXC1, store>, SWXC1_FM<9>; @@ -442,28 +442,28 @@ let AdditionalPredicates = [HasMips32r2, NoNaNsFPMath] in { MADDS_FM<7, 0>; } -let AdditionalPredicates = [HasMips32r2, NotFP64bit] in { +let AdditionalPredicates = [NotFP64bit, HasMips32r2] in { def MADD_D32 : MMRel, MADDS_FT<"madd.d", AFGR64Opnd, II_MADD_D, fadd>, MADDS_FM<4, 1>; def MSUB_D32 : MMRel, MADDS_FT<"msub.d", AFGR64Opnd, II_MSUB_D, fsub>, MADDS_FM<5, 1>; } -let AdditionalPredicates = [HasMips32r2, NotFP64bit, NoNaNsFPMath] in { +let AdditionalPredicates = [NotFP64bit, HasMips32r2, NoNaNsFPMath] in { def NMADD_D32 : MMRel, NMADDS_FT<"nmadd.d", AFGR64Opnd, II_NMADD_D, fadd>, MADDS_FM<6, 1>; def NMSUB_D32 : MMRel, NMADDS_FT<"nmsub.d", AFGR64Opnd, II_NMSUB_D, fsub>, MADDS_FM<7, 1>; } -let AdditionalPredicates = [HasMips32r2, IsFP64bit], isCodeGenOnly=1 in { +let AdditionalPredicates = [IsFP64bit, HasMips32r2], isCodeGenOnly=1 in { def MADD_D64 : MADDS_FT<"madd.d", FGR64Opnd, II_MADD_D, fadd>, MADDS_FM<4, 1>; def MSUB_D64 : MADDS_FT<"msub.d", FGR64Opnd, II_MSUB_D, fsub>, MADDS_FM<5, 1>; } -let AdditionalPredicates = [HasMips32r2, IsFP64bit, NoNaNsFPMath], +let AdditionalPredicates = [IsFP64bit, HasMips32r2, NoNaNsFPMath], isCodeGenOnly=1 in { def NMADD_D64 : NMADDS_FT<"nmadd.d", FGR64Opnd, II_NMADD_D, fadd>, MADDS_FM<6, 1>;