From f545cfee523885f67ec9f8e7f89ec1cf9d3b7b39 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Sun, 18 Mar 2018 22:16:54 +0000 Subject: [PATCH] [Mips] Remove duplicate lines from MipsScheduleP5600.td and enable FullInstRWOverlapCheck. This fixes the errors found by the new check added in r327808. llvm-svn: 327813 --- llvm/lib/Target/Mips/MipsScheduleP5600.td | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/llvm/lib/Target/Mips/MipsScheduleP5600.td b/llvm/lib/Target/Mips/MipsScheduleP5600.td index 1466de69d4b0..9223f33f6b5a 100644 --- a/llvm/lib/Target/Mips/MipsScheduleP5600.td +++ b/llvm/lib/Target/Mips/MipsScheduleP5600.td @@ -19,9 +19,6 @@ def MipsP5600Model : SchedMachineModel { HasMips64, HasMips64r2, HasCnMips, InMicroMips, InMips16Mode, HasDSP, HasDSPR2, HasMT]; - - // FIXME: Remove when all errors have been fixed. - let FullInstRWOverlapCheck = 0; } let SchedModel = MipsP5600Model in { @@ -322,23 +319,6 @@ def : InstRW<[P5600WriteMSAShortLogic], (instregex "^LDI_[BHWD]$")>; def : InstRW<[P5600WriteMSAShortLogic], (instregex "^(AND|OR|[XN]OR)_V$")>; def : InstRW<[P5600WriteMSAShortLogic], (instregex "^(AND|OR|[XN]OR)I_B$")>; -// vshf.[bhwd], binsl.[bhwd], binsr.[bhwd], insert.[bhwd], sld?.[bhwd], -// bset.[bhwd], bclr.[bhwd], bneg.[bhwd], bsel_v, bseli_b -def : InstRW<[P5600WriteMSAShortInt], (instregex "^VSHF_[BHWD]$")>; -def : InstRW<[P5600WriteMSAShortInt], (instregex "^(BINSL|BINSLI)_[BHWD]$")>; -def : InstRW<[P5600WriteMSAShortInt], (instregex "^(BINSR|BINSRI)_[BHWD]$")>; -def : InstRW<[P5600WriteMSAShortInt], (instregex "^INSERT_[BHWD]$")>; -def : InstRW<[P5600WriteMSAShortInt], (instregex "^(SLD|SLDI)_[BHWD]$")>; -def : InstRW<[P5600WriteMSAShortInt], (instregex "^(BSET|BSETI)_[BHWD]$")>; -def : InstRW<[P5600WriteMSAShortInt], (instregex "^(BCLR|BCLRI)_[BHWD]$")>; -def : InstRW<[P5600WriteMSAShortInt], (instregex "^(BNEG|BNEGI)_[BHWD]$")>; -def : InstRW<[P5600WriteMSAShortInt], (instregex "^(BSEL_V|BSELI_B)$")>; -def : InstRW<[P5600WriteMSAShortInt], (instregex "^BMN*Z.*$")>; - -// pcnt.[bhwd], sat_s.[bhwd], sat_u.bhwd] -def : InstRW<[P5600WriteMSAOther3], (instregex "^PCNT_[BHWD]$")>; -def : InstRW<[P5600WriteMSAOther3], (instregex "^SAT_(S|U)_[BHWD]$")>; - // fexp2_w, fexp2_d def : InstRW<[P5600WriteFPUS], (instregex "^FEXP2_(W|D)$")>; @@ -425,7 +405,6 @@ def : InstRW<[P5600WriteMSAShortLogic], (instregex "^(SRLR|SRLRI)_[BHWD]$")>; def : InstRW<[P5600WriteMSAShortLogic], (instregex "^(SLL|SLLI)_[BHWD]$")>; def : InstRW<[P5600WriteMSAShortLogic], (instregex "^(PCKEV|PCKOD)_[BHWD]$")>; def : InstRW<[P5600WriteMSAShortLogic], (instregex "^(NLOC|NLZC)_[BHWD]$")>; -def : InstRW<[P5600WriteMSAShortLogic], (instregex "^INSVE_[BHWD]$")>; // Long Pipe // ----------