[llvm] r208583 - Revert: r208582 - [mips][mips64r6] Add sel.s and sel.d

[Daniel Sanders]

Author: dsanders
Date: Mon May 12 10:43:41 2014
New Revision: 208583

URL: http://llvm.org/viewvc/llvm-project?rev=208583&view=rev
Log:
Revert: r208582 - [mips][mips64r6] Add sel.s and sel.d

Accidentally committed an unreviewed patch. Reverted it.


Modified:
    llvm/trunk/lib/Target/Mips/Mips32r6InstrFormats.td
    llvm/trunk/lib/Target/Mips/Mips32r6InstrInfo.td
    llvm/trunk/test/MC/Mips/mips32r6/valid.s
    llvm/trunk/test/MC/Mips/mips64r6/valid.s

Modified: llvm/trunk/lib/Target/Mips/Mips32r6InstrFormats.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/Mips32r6InstrFormats.td?rev=208583&r1=208582&r2=208583&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/Mips32r6InstrFormats.td (original)
+++ llvm/trunk/lib/Target/Mips/Mips32r6InstrFormats.td Mon May 12 10:43:41 2014
@@ -17,42 +17,6 @@ class MipsR6Inst : MipsInst<(outs), (ins
   let EncodingPredicates = [HasStdEnc];
 }
 
-//===----------------------------------------------------------------------===//
-//
-// Field Values
-//
-//===----------------------------------------------------------------------===//
-
-def OPGROUP_COP1 { bits<6> Value = 0b010001; }
-def OPGROUP_SPECIAL { bits<6> Value = 0b000000; }
-
-class FIELD_FMT<bits<5> Val> {
-  bits<5> Value = Val;
-}
-def FIELD_FMT_S : FIELD_FMT<0b10000>;
-def FIELD_FMT_D : FIELD_FMT<0b10001>;
-
-//===----------------------------------------------------------------------===//
-//
-// Encoding Formats
-//
-//===----------------------------------------------------------------------===//
-
-class COP1_SEL_FM<FIELD_FMT Format> : MipsR6Inst {
-  bits<5> ft;
-  bits<5> fs;
-  bits<5> fd;
-
-  bits<32> Inst;
-
-  let Inst{31-26} = OPGROUP_COP1.Value;
-  let Inst{25-21} = Format.Value;
-  let Inst{20-16} = ft;
-  let Inst{15-11} = fs;
-  let Inst{10-6} = fd;
-  let Inst{5-0} = 0b010000;
-}
-
 class SPECIAL_3R_FM<bits<5> mulop, bits<6> funct> : MipsR6Inst {
   bits<5> rd;
   bits<5> rs;
@@ -60,10 +24,11 @@ class SPECIAL_3R_FM<bits<5> mulop, bits<
 
   bits<32> Inst;
 
-  let Inst{31-26} = OPGROUP_SPECIAL.Value;
+  let Inst{31-26} = 0b00000;
   let Inst{25-21} = rs;
   let Inst{20-16} = rt;
   let Inst{15-11} = rd;
   let Inst{10-6}  = mulop;
   let Inst{5-0}   = funct;
 }
+

Modified: llvm/trunk/lib/Target/Mips/Mips32r6InstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/Mips32r6InstrInfo.td?rev=208583&r1=208582&r2=208583&view=diff
==============================================================================
--- llvm/trunk/lib/Target/Mips/Mips32r6InstrInfo.td (original)
+++ llvm/trunk/lib/Target/Mips/Mips32r6InstrInfo.td Mon May 12 10:43:41 2014
@@ -68,8 +68,6 @@ class MUH_ENC    : SPECIAL_3R_FM<0b00011
 class MUHU_ENC   : SPECIAL_3R_FM<0b00011, 0b011001>;
 class MUL_R6_ENC : SPECIAL_3R_FM<0b00010, 0b011000>;
 class MULU_ENC   : SPECIAL_3R_FM<0b00010, 0b011001>;
-class SEL_D_ENC  : COP1_SEL_FM<FIELD_FMT_D>;
-class SEL_S_ENC  : COP1_SEL_FM<FIELD_FMT_S>;
 
 //===----------------------------------------------------------------------===//
 //
@@ -101,17 +99,6 @@ class MUHU_DESC   : MUL_R6_DESC_BASE<"mu
 class MUL_R6_DESC : MUL_R6_DESC_BASE<"mul", GPR32Opnd>;
 class MULU_DESC   : MUL_R6_DESC_BASE<"mulu", GPR32Opnd>;
 
-class SEL_DESC_BASE<string instr_asm, RegisterOperand FGROpnd> {
-  dag OutOperandList = (outs FGROpnd:$fd);
-  dag InOperandList = (ins FGROpnd:$fd_in, FGROpnd:$fs, FGROpnd:$ft);
-  string AsmString = !strconcat(instr_asm, "\t$fd, $fs, $ft");
-  list<dag> Pattern = [];
-  string Constraints = "$fd_in = $fd";
-}
-
-class SEL_D_DESC : SEL_DESC_BASE<"sel.d", FGR64Opnd>;
-class SEL_S_DESC : SEL_DESC_BASE<"sel.s", FGR32Opnd>;
-
 //===----------------------------------------------------------------------===//
 //
 // Instruction Definitions
@@ -185,5 +172,5 @@ def SELEQZ_S;
 def SELNEZ;
 def SELNEZ_D;
 def SELNEZ_S;
-def SEL_D : SEL_D_ENC, SEL_D_DESC, ISA_MIPS32R6;
-def SEL_S : SEL_S_ENC, SEL_S_DESC, ISA_MIPS32R6;
+def SEL_D;
+def SEL_S;

Modified: llvm/trunk/test/MC/Mips/mips32r6/valid.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Mips/mips32r6/valid.s?rev=208583&r1=208582&r2=208583&view=diff
==============================================================================
--- llvm/trunk/test/MC/Mips/mips32r6/valid.s (original)
+++ llvm/trunk/test/MC/Mips/mips32r6/valid.s Mon May 12 10:43:41 2014
@@ -12,5 +12,3 @@
         muh     $2,$3,$4         # CHECK: muh $2, $3, $4   # encoding: [0x00,0x64,0x10,0xd8]
         mulu    $2,$3,$4         # CHECK: mulu $2, $3, $4  # encoding: [0x00,0x64,0x10,0x99]
         muhu    $2,$3,$4         # CHECK: muhu $2, $3, $4  # encoding: [0x00,0x64,0x10,0xd9]
-        sel.d   $f0,$f1,$f2      # CHECK: sel.d $f0, $f1, $f2 # encoding: [0x46,0x22,0x08,0x10]
-        sel.s   $f0,$f1,$f2      # CHECK: sel.s $f0, $f1, $f2 # encoding: [0x46,0x02,0x08,0x10]

Modified: llvm/trunk/test/MC/Mips/mips64r6/valid.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Mips/mips64r6/valid.s?rev=208583&r1=208582&r2=208583&view=diff
==============================================================================
--- llvm/trunk/test/MC/Mips/mips64r6/valid.s (original)
+++ llvm/trunk/test/MC/Mips/mips64r6/valid.s Mon May 12 10:43:41 2014
@@ -20,5 +20,3 @@
         dmuh    $2,$3,$4         # CHECK: dmuh $2, $3, $4  # encoding: [0x00,0x64,0x10,0xf8]
         dmulu   $2,$3,$4         # CHECK: dmulu $2, $3, $4 # encoding: [0x00,0x64,0x10,0xb9]
         dmuhu   $2,$3,$4         # CHECK: dmuhu $2, $3, $4 # encoding: [0x00,0x64,0x10,0xf9]
-        sel.d   $f0,$f1,$f2      # CHECK: sel.d $f0, $f1, $f2 # encoding: [0x46,0x22,0x08,0x10]
-        sel.s   $f0,$f1,$f2      # CHECK: sel.s $f0, $f1, $f2 # encoding: [0x46,0x02,0x08,0x10]