[llvm-branch-commits] [llvm-branch] r346742 - Merging r342946:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Mon Nov 12 22:06:53 2018
New Revision: 346742

URL: http://llvm.org/viewvc/llvm-project?rev=346742&view=rev
Log:
Merging r342946:

------------------------------------------------------------------------
r342946 | smaksimovic | 2018-09-24 23:27:49 -0700 (Mon, 24 Sep 2018) | 6 lines

[mips] Correct MUL pattern for mips64

Guard existing pattern with a predicate, introduce a new one for revision 6.

Differential Revision: https://reviews.llvm.org/D51684

------------------------------------------------------------------------

Modified:
    llvm/branches/release_70/lib/Target/Mips/Mips64InstrInfo.td
    llvm/branches/release_70/lib/Target/Mips/Mips64r6InstrInfo.td

Modified: llvm/branches/release_70/lib/Target/Mips/Mips64InstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/lib/Target/Mips/Mips64InstrInfo.td?rev=346742&r1=346741&r2=346742&view=diff
==============================================================================
--- llvm/branches/release_70/lib/Target/Mips/Mips64InstrInfo.td (original)
+++ llvm/branches/release_70/lib/Target/Mips/Mips64InstrInfo.td Mon Nov 12 22:06:53 2018
@@ -838,7 +838,7 @@ def : MipsPat<(i64 (sext (i32 (sub GPR32
               (SUBu GPR32:$src, GPR32:$src2), sub_32)>;
 def : MipsPat<(i64 (sext (i32 (mul GPR32:$src, GPR32:$src2)))),
               (INSERT_SUBREG (i64 (IMPLICIT_DEF)),
-              (MUL GPR32:$src, GPR32:$src2), sub_32)>;
+              (MUL GPR32:$src, GPR32:$src2), sub_32)>, ISA_MIPS3_NOT_32R6_64R6;
 def : MipsPat<(i64 (sext (i32 (MipsMFHI ACC64:$src)))),
               (INSERT_SUBREG (i64 (IMPLICIT_DEF)),
               (PseudoMFHI ACC64:$src), sub_32)>;

Modified: llvm/branches/release_70/lib/Target/Mips/Mips64r6InstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/lib/Target/Mips/Mips64r6InstrInfo.td?rev=346742&r1=346741&r2=346742&view=diff
==============================================================================
--- llvm/branches/release_70/lib/Target/Mips/Mips64r6InstrInfo.td (original)
+++ llvm/branches/release_70/lib/Target/Mips/Mips64r6InstrInfo.td Mon Nov 12 22:06:53 2018
@@ -301,6 +301,9 @@ def : MipsPat<(select (i32 (seteq i32:$c
 
 // Patterns used for matching away redundant sign extensions.
 // MIPS32 arithmetic instructions sign extend their result implicitly.
+def : MipsPat<(i64 (sext (i32 (mul GPR32:$src, GPR32:$src2)))),
+              (INSERT_SUBREG (i64 (IMPLICIT_DEF)),
+              (MUL_R6 GPR32:$src, GPR32:$src2), sub_32)>, ISA_MIPS64R6;
 def : MipsPat<(i64 (sext (i32 (sdiv GPR32:$src, GPR32:$src2)))),
               (INSERT_SUBREG (i64 (IMPLICIT_DEF)),
               (DIV GPR32:$src, GPR32:$src2), sub_32)>, ISA_MIPS64R6;