[PATCH] D59203: [MIPS] [microMIPS] Fix PseudoMTLOHI matching

[Mirko Brkusanin via Phabricator via llvm-commits]

mbrkusanin created this revision.
mbrkusanin added reviewers: petarj, mstojanovic, atanasyan, sdardis.
Herald added a subscriber: arichardson.

On micromips MipsMTLOHI is always matched to PseudoMTLOHI_DSP regardless of +dsp
argument. This patch checks is HasDSP predicate is present for PseudoMTLOHI_DSP
so PseudoMTLOHI_MM can be matched when appropriate.


https://reviews.llvm.org/D59203

Files:
  lib/Target/Mips/MipsDSPInstrInfo.td
  test/CodeGen/Mips/micromips-pseudo-mtlohi-match.ll


Index: test/CodeGen/Mips/micromips-pseudo-mtlohi-match.ll
===================================================================
--- /dev/null
+++ test/CodeGen/Mips/micromips-pseudo-mtlohi-match.ll
@@ -0,0 +1,57 @@
+; NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
+; RUN: llc -stop-before=expand-isel-pseudos -mtriple=mips-linux-gnu -mcpu=mips32r2 -mattr=+micromips < %s |\
+; RUN:   FileCheck %s -check-prefixes=MMR2
+; RUN: llc -stop-before=expand-isel-pseudos -mtriple=mips-linux-gnu -mcpu=mips32r2 -mattr=+dsp,+micromips < %s |\
+; RUN:   FileCheck %s -check-prefixes=MMR2-DSP
+; RUN: llc -stop-before=expand-isel-pseudos -mtriple=mips-linux-gnu -mcpu=mips32r6 -mattr=+micromips < %s |\
+; RUN:   FileCheck %s -check-prefixes=MMR6
+
+define i64 @test(i32 signext %a, i32 signext %b) {
+  ; MMR2-LABEL: name: test
+  ; MMR2: bb.0.entry:
+  ; MMR2:   liveins: $a0, $a1
+  ; MMR2:   [[COPY:%[0-9]+]]:gpr32 = COPY $a1
+  ; MMR2:   [[COPY1:%[0-9]+]]:gpr32 = COPY $a0
+  ; MMR2:   [[LI16_MM:%[0-9]+]]:gprmm16 = LI16_MM 0
+  ; MMR2:   [[LI16_MM1:%[0-9]+]]:gprmm16 = LI16_MM 1
+  ; MMR2:   [[PseudoMTLOHI_MM:%[0-9]+]]:acc64 = PseudoMTLOHI_MM killed [[LI16_MM1]], killed [[LI16_MM]]
+  ; MMR2:   [[PseudoMADD_MM:%[0-9]+]]:acc64 = PseudoMADD_MM [[COPY1]], [[COPY]], [[PseudoMTLOHI_MM]]
+  ; MMR2:   [[PseudoMFHI_MM:%[0-9]+]]:gpr32 = PseudoMFHI_MM [[PseudoMADD_MM]]
+  ; MMR2:   [[PseudoMFLO_MM:%[0-9]+]]:gpr32 = PseudoMFLO_MM [[PseudoMADD_MM]]
+  ; MMR2:   $v0 = COPY [[PseudoMFHI_MM]]
+  ; MMR2:   $v1 = COPY [[PseudoMFLO_MM]]
+  ; MMR2:   RetRA implicit $v0, implicit $v1
+  ; MMR2-DSP-LABEL: name: test
+  ; MMR2-DSP: bb.0.entry:
+  ; MMR2-DSP:   liveins: $a0, $a1
+  ; MMR2-DSP:   [[COPY:%[0-9]+]]:gpr32 = COPY $a1
+  ; MMR2-DSP:   [[COPY1:%[0-9]+]]:gpr32 = COPY $a0
+  ; MMR2-DSP:   [[LI16_MM:%[0-9]+]]:gprmm16 = LI16_MM 0
+  ; MMR2-DSP:   [[LI16_MM1:%[0-9]+]]:gprmm16 = LI16_MM 1
+  ; MMR2-DSP:   [[PseudoMTLOHI_DSP:%[0-9]+]]:acc64dsp = PseudoMTLOHI_DSP killed [[LI16_MM1]], killed [[LI16_MM]]
+  ; MMR2-DSP:   [[MADD_DSP:%[0-9]+]]:acc64dsp = MADD_DSP [[COPY1]], [[COPY]], [[PseudoMTLOHI_DSP]]
+  ; MMR2-DSP:   [[MFHI_DSP:%[0-9]+]]:gpr32 = MFHI_DSP [[MADD_DSP]]
+  ; MMR2-DSP:   [[MFLO_DSP:%[0-9]+]]:gpr32 = MFLO_DSP [[MADD_DSP]]
+  ; MMR2-DSP:   $v0 = COPY [[MFHI_DSP]]
+  ; MMR2-DSP:   $v1 = COPY [[MFLO_DSP]]
+  ; MMR2-DSP:   RetRA implicit $v0, implicit $v1
+  ; MMR6-LABEL: name: test
+  ; MMR6: bb.0.entry:
+  ; MMR6:   liveins: $a0, $a1
+  ; MMR6:   [[COPY:%[0-9]+]]:gpr32 = COPY $a1
+  ; MMR6:   [[COPY1:%[0-9]+]]:gpr32 = COPY $a0
+  ; MMR6:   [[MUL_MMR6_:%[0-9]+]]:gprmm16 = MUL_MMR6 [[COPY1]], [[COPY]]
+  ; MMR6:   [[ADDIUR2_MM:%[0-9]+]]:gprmm16 = ADDIUR2_MM [[MUL_MMR6_]], 1
+  ; MMR6:   [[SLTu_MM:%[0-9]+]]:gprmm16 = SLTu_MM [[ADDIUR2_MM]], [[MUL_MMR6_]]
+  ; MMR6:   [[MUH_MMR6_:%[0-9]+]]:gprmm16 = MUH_MMR6 [[COPY1]], [[COPY]]
+  ; MMR6:   [[ADDU16_MMR6_:%[0-9]+]]:gprmm16 = ADDU16_MMR6 killed [[MUH_MMR6_]], killed [[SLTu_MM]]
+  ; MMR6:   $v0 = COPY [[ADDU16_MMR6_]]
+  ; MMR6:   $v1 = COPY [[ADDIUR2_MM]]
+  ; MMR6:   RetRA implicit $v0, implicit $v1
+entry:
+  %conv = sext i32 %a to i64
+  %conv1 = sext i32 %b to i64
+  %mul = mul nsw i64 %conv, %conv1
+  %add = add nsw i64 %mul, 1
+  ret i64 %add
+}
Index: lib/Target/Mips/MipsDSPInstrInfo.td
===================================================================
--- lib/Target/Mips/MipsDSPInstrInfo.td
+++ lib/Target/Mips/MipsDSPInstrInfo.td
@@ -1313,7 +1313,9 @@
 def PseudoPICK_PH : PseudoPICK<PICK_PH>;
 def PseudoPICK_QB : PseudoPICK<PICK_QB>;
 
-def PseudoMTLOHI_DSP : PseudoMTLOHI<ACC64DSP, GPR32>;
+let AdditionalPredicates = [HasDSP] in {
+  def PseudoMTLOHI_DSP : PseudoMTLOHI<ACC64DSP, GPR32>;
+}
 
 // Patterns.
 class DSPPat<dag pattern, dag result, Predicate pred = HasDSP> :


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D59203.190059.patch
Type: text/x-patch
Size: 3788 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190311/9f527d1f/attachment.bin>