From 069e1dd861fffaaececc3483901cd17471550828 Mon Sep 17 00:00:00 2001 From: Craig Topper Date: Wed, 24 Jan 2018 05:32:51 +0000 Subject: [PATCH] [X86] Move 'Y' to correct place in FMA4 regular expression in Znver1 scheduler model. I think these instructions used to be named differently and the regular expression reflected that. I guess we must have correct itinerary information that made this not matter for the scheduler test? llvm-svn: 323305 --- llvm/lib/Target/X86/X86ScheduleZnver1.td | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm/lib/Target/X86/X86ScheduleZnver1.td b/llvm/lib/Target/X86/X86ScheduleZnver1.td index e295f175519e..6e765dc77b1a 100644 --- a/llvm/lib/Target/X86/X86ScheduleZnver1.td +++ b/llvm/lib/Target/X86/X86ScheduleZnver1.td @@ -1619,10 +1619,10 @@ def ZnWriteFMADDr : SchedWriteRes<[ZnFPU03]> { } def : InstRW<[ZnWriteFMADDr], (instregex - "VF(N?)M(ADD|SUB|ADDSUB|SUBADD)P(S|D)(213|132|231)(Y)?r", + "VF(N?)M(ADD|SUB|ADDSUB|SUBADD)P(S|D)(213|132|231)(Y?)r", "VF(N?)M(ADD|SUB)(132|231|213)S(S|D)r", "VF(N?)M(ADD|SUB)S(S|D)4rr(_REV|_Int)?", - "VF(N?)M(ADD|SUB)P(S|D)4rr(Y)?(_REV)?")>; + "VF(N?)M(ADD|SUB)P(S|D)4(Y?)rr(_REV)?")>; // v,v,m. def ZnWriteFMADDm : SchedWriteRes<[ZnAGU, ZnFPU03]> { @@ -1631,10 +1631,10 @@ def ZnWriteFMADDm : SchedWriteRes<[ZnAGU, ZnFPU03]> { } def : InstRW<[ZnWriteFMADDm], (instregex - "VF(N?)M(ADD|SUB|ADDSUB|SUBADD)(213|132|231)P(S|D)(Y)?m", + "VF(N?)M(ADD|SUB|ADDSUB|SUBADD)(213|132|231)P(S|D)(Y?)m", "VF(N?)M(ADD|SUB)(132|231|213)S(S|D)m", "VF(N?)M(ADD|SUB)S(S|D)4(rm|mr)(_Int)?", - "VF(N?)M(ADD|SUB)P(S|D)4(rm|mr)(Y)?")>; + "VF(N?)M(ADD|SUB)P(S|D)4(Y?)(rm|mr)")>; // v,m,i. def ZnWriteROUNDm : SchedWriteRes<[ZnAGU, ZnFPU3]> {