From 3f86364e40e6fe50a5b77f467d43d8b43a08195e Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Tue, 20 Mar 2018 15:44:47 +0000 Subject: [PATCH] [X86][Haswell][Znver1] Fix typo in fldl instregexs Missing comma was casing 2 instregex entries to be concatenated together by mistake. Found while investigating PR35548 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@327992 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86SchedHaswell.td | 2 +- lib/Target/X86/X86ScheduleZnver1.td | 2 +- test/CodeGen/X86/x87-schedule.ll | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/Target/X86/X86SchedHaswell.td b/lib/Target/X86/X86SchedHaswell.td index 468bb97ebcf..13c32760b35 100644 --- a/lib/Target/X86/X86SchedHaswell.td +++ b/lib/Target/X86/X86SchedHaswell.td @@ -437,7 +437,7 @@ def : InstRW<[WriteP01], (instregex "ST_(F|FP)rr")>; def : InstRW<[WriteP01], (instregex "LD_F0")>; // FLDPI FLDL2E etc. -def : InstRW<[Write2P01], (instregex "FLDPI", "FLDL2(T|E)" "FLDL(G|N)2")>; +def : InstRW<[Write2P01], (instregex "FLDPI", "FLDL2(T|E)", "FLDL(G|N)2")>; // FFREE. def : InstRW<[WriteP01], (instregex "FFREE")>; diff --git a/lib/Target/X86/X86ScheduleZnver1.td b/lib/Target/X86/X86ScheduleZnver1.td index 6b867c5c22e..f4787ae4ae9 100644 --- a/lib/Target/X86/X86ScheduleZnver1.td +++ b/lib/Target/X86/X86ScheduleZnver1.td @@ -767,7 +767,7 @@ def : InstRW<[ZnWriteFPU13], (instregex "LD_F0")>; def : InstRW<[ZnWriteFPU3], (instregex "LD_F1")>; // FLDPI FLDL2E etc. -def : InstRW<[ZnWriteFPU3], (instregex "FLDPI", "FLDL2(T|E)" "FLDL(G|N)2")>; +def : InstRW<[ZnWriteFPU3], (instregex "FLDPI", "FLDL2(T|E)", "FLDL(G|N)2")>; def : InstRW<[WriteMicrocoded], (instregex "CMOV(B|BE|E|P|NB|NBE|NE|NP)_F")>; diff --git a/test/CodeGen/X86/x87-schedule.ll b/test/CodeGen/X86/x87-schedule.ll index 09001fba7c8..1d44408f33e 100644 --- a/test/CodeGen/X86/x87-schedule.ll +++ b/test/CodeGen/X86/x87-schedule.ll @@ -2872,9 +2872,9 @@ define void @test_fld1_fldl2e_fldl2t_fldlg2_fldln2_fldpi_fldz() optsize { ; HASWELL: # %bb.0: ; HASWELL-NEXT: #APP ; HASWELL-NEXT: fld1 # sched: [1:?] -; HASWELL-NEXT: fldl2e # sched: [100:0.25] -; HASWELL-NEXT: fldl2t # sched: [100:0.25] -; HASWELL-NEXT: fldln2 # sched: [100:0.25] +; HASWELL-NEXT: fldl2e # sched: [1:0.50] +; HASWELL-NEXT: fldl2t # sched: [1:0.50] +; HASWELL-NEXT: fldln2 # sched: [1:0.50] ; HASWELL-NEXT: fldpi # sched: [1:0.50] ; HASWELL-NEXT: fldz # sched: [1:0.50] ; HASWELL-NEXT: #NO_APP @@ -2932,9 +2932,9 @@ define void @test_fld1_fldl2e_fldl2t_fldlg2_fldln2_fldpi_fldz() optsize { ; ZNVER1: # %bb.0: ; ZNVER1-NEXT: #APP ; ZNVER1-NEXT: fld1 # sched: [11:1.00] -; ZNVER1-NEXT: fldl2e # sched: [100:?] -; ZNVER1-NEXT: fldl2t # sched: [100:?] -; ZNVER1-NEXT: fldln2 # sched: [100:?] +; ZNVER1-NEXT: fldl2e # sched: [11:1.00] +; ZNVER1-NEXT: fldl2t # sched: [11:1.00] +; ZNVER1-NEXT: fldln2 # sched: [11:1.00] ; ZNVER1-NEXT: fldpi # sched: [11:1.00] ; ZNVER1-NEXT: fldz # sched: [8:0.50] ; ZNVER1-NEXT: #NO_APP -- 2.11.0