[llvm] r221307 - Revert "[mips] Add names and tests for the hardware registers"

Daniel Sanders Daniel.Sanders at imgtec.com
Wed Nov 5 02:02:28 PST 2014


Thanks Rafael.

Vasileios: I see you made $hwr_ulr the canonical name for $29 and changed every instance of $29 in the tests to $hwr_ulr. That wasn't my intention but re-reading my review comment I can see that I didn't explain this, sorry.
The problem with $hwr_ulr being the canonical name is that GAS doesn't accept it at the moment so we still need to print $29 when emitting assembly. When parsing assembly we should accept both $29 and $hwr_ulr.

> -----Original Message-----
> From: llvm-commits-bounces at cs.uiuc.edu [mailto:llvm-commits-
> bounces at cs.uiuc.edu] On Behalf Of Rafael Espindola
> Sent: 04 November 2014 22:15
> To: llvm-commits at cs.uiuc.edu
> Subject: [llvm] r221307 - Revert "[mips] Add names and tests for the
> hardware registers"
> 
> Author: rafael
> Date: Tue Nov  4 16:15:05 2014
> New Revision: 221307
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=221307&view=rev
> Log:
> Revert "[mips] Add names and tests for the hardware registers"
> 
> This reverts commit r221299.
> 
> The tests
> 
>     LLVM :: MC/Disassembler/Mips/mips32.txt
>     LLVM :: MC/Disassembler/Mips/mips32_le.txt
> 
> were failing.
> 
> Removed:
>     llvm/trunk/test/MC/Mips/mips-hwr-register-names.s
> Modified:
>     llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
>     llvm/trunk/lib/Target/Mips/MipsRegisterInfo.td
>     llvm/trunk/test/CodeGen/Mips/tls.ll
>     llvm/trunk/test/MC/Mips/mips-alu-instructions.s
>     llvm/trunk/test/MC/Mips/mips32r2/valid.s
>     llvm/trunk/test/MC/Mips/mips32r6/valid.s
>     llvm/trunk/test/MC/Mips/mips64-alu-instructions.s
>     llvm/trunk/test/MC/Mips/mips64r2/valid.s
>     llvm/trunk/test/MC/Mips/mips64r6/valid.s
> 
> Modified: llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp?rev=22
> 1307&r1=221306&r2=221307&view=diff
> ==========================================================
> ====================
> --- llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp (original)
> +++ llvm/trunk/lib/Target/Mips/AsmParser/MipsAsmParser.cpp Tue Nov  4
> 16:15:05 2014
> @@ -222,8 +222,6 @@ class MipsAsmParser : public MCTargetAsm
> 
>    int matchCPURegisterName(StringRef Symbol);
> 
> -  int matchHWRegsRegisterName(StringRef Symbol);
> -
>    int matchRegisterByNumber(unsigned RegNum, unsigned RegClass);
> 
>    int matchFPURegisterName(StringRef Name);
> @@ -861,14 +859,6 @@ public:
>      return CreateReg(Index, RegKind_FGR, RegInfo, S, E, Parser);
>    }
> 
> -  /// Create a register that is definitely a HWReg.
> -  /// This is typically only used for named registers such as $hwr_cpunum.
> -  static std::unique_ptr<MipsOperand>
> -  createHWRegsReg(unsigned Index, const MCRegisterInfo *RegInfo,
> -                  SMLoc S, SMLoc E, MipsAsmParser &Parser) {
> -    return CreateReg(Index, RegKind_HWRegs, RegInfo, S, E, Parser);
> -  }
> -
>    /// Create a register that is definitely an FCC.
>    /// This is typically only used for named registers such as $fcc0.
>    static std::unique_ptr<MipsOperand>
> @@ -1805,20 +1795,6 @@ int MipsAsmParser::matchCPURegisterName(
>    return CC;
>  }
> 
> -int MipsAsmParser::matchHWRegsRegisterName(StringRef Name) {
> -  int CC;
> -
> -  CC = StringSwitch<unsigned>(Name)
> -           .Case("hwr_cpunum", 0)
> -           .Case("hwr_synci_step", 1)
> -           .Case("hwr_cc", 2)
> -           .Case("hwr_ccres", 3)
> -           .Case("hwr_ulr", 29)
> -           .Default(-1);
> -
> -  return CC;
> -}
> -
>  int MipsAsmParser::matchFPURegisterName(StringRef Name) {
> 
>    if (Name[0] == 'f') {
> @@ -2301,13 +2277,6 @@ MipsAsmParser::matchAnyRegisterNameWitho
>          Index, getContext().getRegisterInfo(), S, getLexer().getLoc(), *this));
>      return MatchOperand_Success;
>    }
> -
> -  Index = matchHWRegsRegisterName(Identifier);
> -  if (Index != -1) {
> -    Operands.push_back(MipsOperand::createHWRegsReg(
> -        Index, getContext().getRegisterInfo(), S, getLexer().getLoc(), *this));
> -    return MatchOperand_Success;
> -  }
> 
>    Index = matchFPURegisterName(Identifier);
>    if (Index != -1) {
> 
> Modified: llvm/trunk/lib/Target/Mips/MipsRegisterInfo.td
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/lib/Target/Mips/MipsRegisterInfo.td?rev=221307&r1=22
> 1306&r2=221307&view=diff
> ==========================================================
> ====================
> --- llvm/trunk/lib/Target/Mips/MipsRegisterInfo.td (original)
> +++ llvm/trunk/lib/Target/Mips/MipsRegisterInfo.td Tue Nov  4 16:15:05
> 2014
> @@ -212,14 +212,8 @@ let Namespace = "Mips" in {
>    // PC register
>    def PC : Register<"pc">;
> 
> -  // Hardware registers
> -  def HWR0 : MipsReg<0, "hwr_cpunum">;
> -  def HWR1 : MipsReg<1, "hwr_synci_step">;
> -  def HWR2 : MipsReg<2, "hwr_cc">;
> -  def HWR3 : MipsReg<3, "hwr_ccres">;
> -  def HWR29 : MipsReg<29, "hwr_ulr">;
> -
> -  foreach I = {4-28,30-31} in
> +  // Hardware register $29
> +  foreach I = 0-31 in
>    def HWR#I : MipsReg<#I, ""#I>;
> 
>    // Accum registers
> 
> Modified: llvm/trunk/test/CodeGen/Mips/tls.ll
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/test/CodeGen/Mips/tls.ll?rev=221307&r1=221306&r2=22
> 1307&view=diff
> ==========================================================
> ====================
> --- llvm/trunk/test/CodeGen/Mips/tls.ll (original)
> +++ llvm/trunk/test/CodeGen/Mips/tls.ll Tue Nov  4 16:15:05 2014
> @@ -23,7 +23,7 @@ entry:
>  ; STATIC-LABEL:   f1:
>  ; STATIC:   lui     $[[R0:[0-9]+]], %tprel_hi(t1)
>  ; STATIC:   addiu   $[[R1:[0-9]+]], $[[R0]], %tprel_lo(t1)
> -; STATIC:   rdhwr   $3, $hwr_ulr
> +; STATIC:   rdhwr   $3, $29
>  ; STATIC:   addu    $[[R2:[0-9]+]], $3, $[[R1]]
>  ; STATIC:   lw      $2, 0($[[R2]])
>  }
> @@ -51,7 +51,7 @@ entry:
>  ; STATIC-LABEL:   f2:
>  ; STATIC:   lui     $[[R0:[0-9]+]], %hi(__gnu_local_gp)
>  ; STATIC:   addiu   $[[GP:[0-9]+]], $[[R0]], %lo(__gnu_local_gp)
> -; STATIC:   rdhwr   $3, $hwr_ulr
> +; STATIC:   rdhwr   $3, $29
>  ; STATIC:   lw      $[[R0:[0-9]+]], %gottprel(t2)($[[GP]])
>  ; STATIC:   addu    $[[R1:[0-9]+]], $3, $[[R0]]
>  ; STATIC:   lw      $2, 0($[[R1]])
> 
> Modified: llvm/trunk/test/MC/Mips/mips-alu-instructions.s
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Mips/mips-
> alu-instructions.s?rev=221307&r1=221306&r2=221307&view=diff
> ==========================================================
> ====================
> --- llvm/trunk/test/MC/Mips/mips-alu-instructions.s (original)
> +++ llvm/trunk/test/MC/Mips/mips-alu-instructions.s Tue Nov  4 16:15:05
> 2014
> @@ -94,7 +94,7 @@
>  # CHECK:  move    $7, $8         # encoding: [0x21,0x38,0x00,0x01]
>  # CHECK:  .set    push
>  # CHECK:  .set    mips32r2
> -# CHECK:  rdhwr   $5, $hwr_ulr
> +# CHECK:  rdhwr   $5, $29
>  # CHECK:  .set    pop            # encoding: [0x3b,0xe8,0x05,0x7c]
>      add    $9,$6,$7
>      add    $9,$6,17767
> 
> Removed: llvm/trunk/test/MC/Mips/mips-hwr-register-names.s
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Mips/mips-
> hwr-register-names.s?rev=221306&view=auto
> ==========================================================
> ====================
> --- llvm/trunk/test/MC/Mips/mips-hwr-register-names.s (original)
> +++ llvm/trunk/test/MC/Mips/mips-hwr-register-names.s (removed)
> @@ -1,199 +0,0 @@
> -# Check the hardware registers
> -#
> -# FIXME: Use the code generator in order to print the .set directives
> -#        instead of the instruction printer.
> -#
> -# RUN: llvm-mc %s -triple=mips-unknown-linux -show-encoding -
> mcpu=mips32r2 | \
> -# RUN:      FileCheck %s
> -        .set noat
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $hwr_cpunum
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x00,0x3b]
> -        rdhwr     $a0,$hwr_cpunum
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $hwr_cpunum
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x00,0x3b]
> -        rdhwr     $a0,$0
> -
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $5, $hwr_synci_step
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x05,0x08,0x3b]
> -        rdhwr     $a1,$hwr_synci_step
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $5, $hwr_synci_step
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x05,0x08,0x3b]
> -        rdhwr     $a1,$1
> -
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $6, $hwr_cc
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x06,0x10,0x3b]
> -        rdhwr     $a2,$hwr_cc
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $6, $hwr_cc
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x06,0x10,0x3b]
> -        rdhwr     $a2,$2
> -
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $7, $hwr_ccres
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x07,0x18,0x3b]
> -        rdhwr     $a3,$hwr_ccres
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $7, $hwr_ccres
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x07,0x18,0x3b]
> -        rdhwr     $a3,$3
> -
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $4
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x20,0x3b]
> -        rdhwr     $a0,$4
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $5
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x28,0x3b]
> -        rdhwr     $a0,$5
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $6
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x30,0x3b]
> -        rdhwr     $a0,$6
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $7
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x38,0x3b]
> -        rdhwr     $a0,$7
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $8
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x40,0x3b]
> -        rdhwr     $a0,$8
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $9
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x48,0x3b]
> -        rdhwr     $a0,$9
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $10
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x50,0x3b]
> -        rdhwr     $a0,$10
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $11
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x58,0x3b]
> -        rdhwr     $a0,$11
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $12
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x60,0x3b]
> -        rdhwr     $a0,$12
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $13
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x68,0x3b]
> -        rdhwr     $a0,$13
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $14
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x70,0x3b]
> -        rdhwr     $a0,$14
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $15
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x78,0x3b]
> -        rdhwr     $a0,$15
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $16
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x80,0x3b]
> -        rdhwr     $a0,$16
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $17
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x88,0x3b]
> -        rdhwr     $a0,$17
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $18
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x90,0x3b]
> -        rdhwr     $a0,$18
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $19
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0x98,0x3b]
> -        rdhwr     $a0,$19
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $20
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xa0,0x3b]
> -        rdhwr     $a0,$20
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $21
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xa8,0x3b]
> -        rdhwr     $a0,$21
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $22
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xb0,0x3b]
> -        rdhwr     $a0,$22
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $23
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xb8,0x3b]
> -        rdhwr     $a0,$23
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $24
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xc0,0x3b]
> -        rdhwr     $a0,$24
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $25
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xc8,0x3b]
> -        rdhwr     $a0,$25
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $26
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xd0,0x3b]
> -        rdhwr     $a0,$26
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $27
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xd8,0x3b]
> -        rdhwr     $a0,$27
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $28
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xe0,0x3b]
> -        rdhwr     $a0,$28
> -
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $hwr_ulr
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xe8,0x3b]
> -        rdhwr     $a0,$hwr_ulr
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $hwr_ulr
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xe8,0x3b]
> -        rdhwr     $a0,$29
> -
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $30
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xf0,0x3b]
> -        rdhwr     $a0,$30
> -        # CHECK:      .set    push
> -        # CHECK-NEXT: .set    mips32r2
> -        # CHECK-NEXT: rdhwr   $4, $31
> -        # CHECK-NEXT: .set    pop             # encoding: [0x7c,0x04,0xf8,0x3b]
> -        rdhwr     $a0,$31
> 
> Modified: llvm/trunk/test/MC/Mips/mips32r2/valid.s
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/test/MC/Mips/mips32r2/valid.s?rev=221307&r1=221306
> &r2=221307&view=diff
> ==========================================================
> ====================
> --- llvm/trunk/test/MC/Mips/mips32r2/valid.s (original)
> +++ llvm/trunk/test/MC/Mips/mips32r2/valid.s Tue Nov  4 16:15:05 2014
> @@ -151,12 +151,7 @@
>          or        $2, 4                # CHECK: ori $2, $2, 4           # encoding:
> [0x34,0x42,0x00,0x04]
>          pause                          # CHECK: pause # encoding:  [0x00,0x00,0x01,0x40]
>          pref      1, 8($5)             # CHECK: pref 1, 8($5)           # encoding:
> [0xcc,0xa1,0x00,0x08]
> -        # FIXME: Use the code generator in order to print the .set directives
> -        #        instead of the instruction printer.
> -        rdhwr     $sp,$11              # CHECK:      .set  push
> -                                       # CHECK-NEXT: .set  mips32r2
> -                                       # CHECK-NEXT: rdhwr $sp, $11
> -                                       # CHECK-NEXT: .set  pop          # encoding:
> [0x7c,0x1d,0x58,0x3b]
> +        rdhwr     $sp,$11
>          rotr      $1,15                # CHECK: rotr $1, $1, 15         # encoding:
> [0x00,0x21,0x0b,0xc2]
>          rotr      $1,$14,15            # CHECK: rotr $1, $14, 15        # encoding:
> [0x00,0x2e,0x0b,0xc2]
>          rotrv     $1,$14,$15           # CHECK: rotrv $1, $14, $15      # encoding:
> [0x01,0xee,0x08,0x46]
> 
> 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=221307&r1=221306
> &r2=221307&view=diff
> ==========================================================
> ====================
> --- llvm/trunk/test/MC/Mips/mips32r6/valid.s (original)
> +++ llvm/trunk/test/MC/Mips/mips32r6/valid.s Tue Nov  4 16:15:05 2014
> @@ -119,12 +119,6 @@
>          msubf.s $f2,$f3,$f4      # CHECK: msubf.s $f2, $f3, $f4  # encoding:
> [0x46,0x04,0x18,0x99]
>          msubf.d $f2,$f3,$f4      # CHECK: msubf.d $f2, $f3, $f4  # encoding:
> [0x46,0x24,0x18,0x99]
>          pref    1, 8($5)         # CHECK: pref 1, 8($5)          # encoding:
> [0x7c,0xa1,0x04,0x35]
> -        # FIXME: Use the code generator in order to print the .set directives
> -        #        instead of the instruction printer.
> -        rdhwr   $sp,$11          # CHECK:      .set  push
> -                                 # CHECK-NEXT: .set  mips32r2
> -                                 # CHECK-NEXT: rdhwr $sp, $11
> -                                 # CHECK-NEXT: .set  pop      # encoding:
> [0x7c,0x1d,0x58,0x3b]
>          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]
>          seleqz  $2,$3,$4         # CHECK: seleqz $2, $3, $4 # encoding:
> [0x00,0x64,0x10,0x35]
> 
> Modified: llvm/trunk/test/MC/Mips/mips64-alu-instructions.s
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/Mips/mips64-
> alu-instructions.s?rev=221307&r1=221306&r2=221307&view=diff
> ==========================================================
> ====================
> --- llvm/trunk/test/MC/Mips/mips64-alu-instructions.s (original)
> +++ llvm/trunk/test/MC/Mips/mips64-alu-instructions.s Tue Nov  4 16:15:05
> 2014
> @@ -87,7 +87,7 @@
>  # CHECK:  move    $7, $8         # encoding: [0x2d,0x38,0x00,0x01]
>  # CHECK:  .set    push
>  # CHECK:  .set    mips32r2
> -# CHECK:  rdhwr   $5, $hwr_ulr
> +# CHECK:  rdhwr   $5, $29
>  # CHECK:  .set    pop            # encoding: [0x3b,0xe8,0x05,0x7c]
> 
>      dadd    $9,$6,$7
> 
> Modified: llvm/trunk/test/MC/Mips/mips64r2/valid.s
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/trunk/test/MC/Mips/mips64r2/valid.s?rev=221307&r1=221306
> &r2=221307&view=diff
> ==========================================================
> ====================
> --- llvm/trunk/test/MC/Mips/mips64r2/valid.s (original)
> +++ llvm/trunk/test/MC/Mips/mips64r2/valid.s Tue Nov  4 16:15:05 2014
> @@ -213,12 +213,7 @@
>          or        $2, 4                # CHECK: ori $2, $2, 4           # encoding:
> [0x34,0x42,0x00,0x04]
>          pause                          # CHECK: pause # encoding:  [0x00,0x00,0x01,0x40]
>          pref      1, 8($5)             # CHECK: pref 1, 8($5)           # encoding:
> [0xcc,0xa1,0x00,0x08]
> -        # FIXME: Use the code generator in order to print the .set directives
> -        #        instead of the instruction printer.
> -        rdhwr     $sp,$11              # CHECK:      .set  push
> -                                       # CHECK-NEXT: .set  mips32r2
> -                                       # CHECK-NEXT: rdhwr $sp, $11
> -                                       # CHECK-NEXT: .set  pop          # encoding:
> [0x7c,0x1d,0x58,0x3b]
> +        rdhwr     $sp,$11
>          rotr      $1,15                # CHECK: rotr $1, $1, 15         # encoding:
> [0x00,0x21,0x0b,0xc2]
>          rotr      $1,$14,15            # CHECK: rotr $1, $14, 15        # encoding:
> [0x00,0x2e,0x0b,0xc2]
>          rotrv     $1,$14,$15           # CHECK: rotrv $1, $14, $15      # encoding:
> [0x01,0xee,0x08,0x46]
> 
> 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=221307&r1=221306
> &r2=221307&view=diff
> ==========================================================
> ====================
> --- llvm/trunk/test/MC/Mips/mips64r6/valid.s (original)
> +++ llvm/trunk/test/MC/Mips/mips64r6/valid.s Tue Nov  4 16:15:05 2014
> @@ -155,12 +155,6 @@
>          seleqz.d $f0, $f2, $f4   # CHECK: seleqz.d $f0, $f2, $f4 # encoding:
> [0x46,0x24,0x10,0x14]
>          selnez.s $f0, $f2, $f4   # CHECK: selnez.s $f0, $f2, $f4 # encoding:
> [0x46,0x04,0x10,0x17]
>          selnez.d $f0, $f2, $f4   # CHECK: selnez.d $f0, $f2, $f4 # encoding:
> [0x46,0x24,0x10,0x17]
> -        # FIXME: Use the code generator in order to print the .set directives
> -        #        instead of the instruction printer.
> -        rdhwr   $sp,$11          # CHECK:      .set  push
> -                                 # CHECK-NEXT: .set  mips32r2
> -                                 # CHECK-NEXT: rdhwr $sp, $11
> -                                 # CHECK-NEXT: .set  pop         # encoding:
> [0x7c,0x1d,0x58,0x3b]
>          rint.s $f2, $f4          # CHECK: rint.s $f2, $f4        # encoding:
> [0x46,0x00,0x20,0x9a]
>          rint.d $f2, $f4          # CHECK: rint.d $f2, $f4        # encoding:
> [0x46,0x20,0x20,0x9a]
>          class.s $f2, $f4         # CHECK: class.s $f2, $f4       # encoding:
> [0x46,0x00,0x20,0x9b]
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits




More information about the llvm-commits mailing list