| Message ID | DM3PR1201MB11042D18A0424E36637EDFF38FA90@DM3PR1201MB1104.namprd12.prod.outlook.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Feb 12, 2016 at 5:31 PM, Kumar, Venkataramanan <Venkataramanan.Kumar@amd.com> wrote: > Hi Maintainers, > > Below patch does some minor changes to pipe reservations in znver1.md. > GCC bootstrap completed. > > GCC regression testing underway. Ok for trunk if the testing passes? > > > ChangeLog > ------------- > 2016-02-12 Venkataramanan Kumar <venkataramanan.kumar@amd.com> > > * config/i386/znver1.md > (znver1_pop, znver1_pop_mem, > znver1_load_imov_double_store, > znver1_load_imov_direct_store, > znver1_load_imov_direct_load, > znver1_load_imov_double_load): Add new. > (znver1_insn, znver1_insn_load): Add icmov type. > (znver1_sseavx_fma, > znver1_sseavx_fma_load, > znver1_avx256_fma, > znver1_avx256_fma_load): Fix pipe usage. OK for mainline. Thanks, Uros. > --- Patch --- > diff --git a/gcc/config/i386/znver1.md b/gcc/config/i386/znver1.md > index b7fcf6c..e6babc7 100644 > --- a/gcc/config/i386/znver1.md > +++ b/gcc/config/i386/znver1.md > @@ -102,6 +102,18 @@ > (eq_attr "memory" "both"))) > "znver1-direct,znver1-load,znver1-store") > > +(define_insn_reservation "znver1_pop" 4 > + (and (eq_attr "cpu" "znver1") > + (and (eq_attr "type" "pop") > + (eq_attr "memory" "load"))) > + "znver1-direct,znver1-load") > + > +(define_insn_reservation "znver1_pop_mem" 4 > + (and (eq_attr "cpu" "znver1") > + (and (eq_attr "type" "pop") > + (eq_attr "memory" "both"))) > + "znver1-direct,znver1-load,znver1-store") > + > ;; Leave > (define_insn_reservation "znver1_leave" 1 > (and (eq_attr "cpu" "znver1") > @@ -194,26 +206,52 @@ > (and (eq_attr "cpu" "znver1") > (and (eq_attr "znver1_decode" "double") > (and (eq_attr "type" "imovx") > - (eq_attr "memory" "none,load")))) > + (eq_attr "memory" "none")))) > "znver1-double,znver1-ieu") > > (define_insn_reservation "znver1_load_imov_direct" 1 > (and (eq_attr "cpu" "znver1") > (and (eq_attr "type" "imov,imovx") > - (eq_attr "memory" "none,load"))) > + (eq_attr "memory" "none"))) > "znver1-direct,znver1-ieu") > > +(define_insn_reservation "znver1_load_imov_double_store" 2 > + (and (eq_attr "cpu" "znver1") > + (and (eq_attr "znver1_decode" "double") > + (and (eq_attr "type" "imovx") > + (eq_attr "memory" "store")))) > + "znver1-double,znver1-ieu,znver1-store") > + > +(define_insn_reservation "znver1_load_imov_direct_store" 1 > + (and (eq_attr "cpu" "znver1") > + (and (eq_attr "type" "imov,imovx") > + (eq_attr "memory" "store"))) > + "znver1-direct,znver1-ieu,znver1-store") > + > +(define_insn_reservation "znver1_load_imov_double_load" 6 > + (and (eq_attr "cpu" "znver1") > + (and (eq_attr "znver1_decode" "double") > + (and (eq_attr "type" "imovx") > + (eq_attr "memory" "load")))) > + "znver1-double,znver1-load,znver1-ieu") > + > +(define_insn_reservation "znver1_load_imov_direct_load" 5 > + (and (eq_attr "cpu" "znver1") > + (and (eq_attr "type" "imov,imovx") > + (eq_attr "memory" "load"))) > + "znver1-direct,znver1-load,znver1-ieu") > + > ;; INTEGER/GENERAL instructions > ;; register/imm operands only: ALU, ICMP, NEG, NOT, ROTATE, ISHIFT, TEST > (define_insn_reservation "znver1_insn" 1 > (and (eq_attr "cpu" "znver1") > - (and (eq_attr "type" "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec") > + (and (eq_attr "type" "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec,icmov") > (eq_attr "memory" "none,unknown"))) > "znver1-direct,znver1-ieu") > > (define_insn_reservation "znver1_insn_load" 5 > (and (eq_attr "cpu" "znver1") > - (and (eq_attr "type" "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec") > + (and (eq_attr "type" "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec,icmov") > (eq_attr "memory" "load"))) > "znver1-direct,znver1-load,znver1-ieu") > > @@ -666,28 +704,28 @@ > (and (eq_attr "mode" "SF,DF,V4SF,V2DF") > (and (eq_attr "type" "ssemuladd") > (eq_attr "memory" "none")))) > - "znver1-direct,(znver1-fp0+znver1-fp3)|(znver1-fp1+znver1-fp3)") > + "znver1-direct,znver1-fp0|znver1-fp1") > > (define_insn_reservation "znver1_sseavx_fma_load" 9 > (and (eq_attr "cpu" "znver1") > (and (eq_attr "mode" "SF,DF,V4SF,V2DF") > (and (eq_attr "type" "ssemuladd") > (eq_attr "memory" "load")))) > - "znver1-direct,znver1-load,(znver1-fp0+znver1-fp3)|(znver1-fp1+znver1-fp3)") > + "znver1-direct,znver1-load,znver1-fp0|znver1-fp1") > > (define_insn_reservation "znver1_avx256_fma" 5 > (and (eq_attr "cpu" "znver1") > (and (eq_attr "mode" "V8SF,V4DF") > (and (eq_attr "type" "ssemuladd") > (eq_attr "memory" "none")))) > - "znver1-double,(znver1-fp0+znver1-fp3)|(znver1-fp1+znver1-fp3)") > + "znver1-double,znver1-fp0|znver1-fp1") > > (define_insn_reservation "znver1_avx256_fma_load" 9 > (and (eq_attr "cpu" "znver1") > (and (eq_attr "mode" "V8SF,V4DF") > (and (eq_attr "type" "ssemuladd") > (eq_attr "memory" "load")))) > - "znver1-double,znver1-load,(znver1-fp0+znver1-fp3)|(znver1-fp1+znver1-fp3)") > + "znver1-double,znver1-load,znver1-fp0|znver1-fp1") > > (define_insn_reservation "znver1_sseavx_iadd" 1 > (and (eq_attr "cpu" "znver1") > @@ -970,4 +1008,3 @@ > (and (eq_attr "type" "ssecmp") > (eq_attr "memory" "load")))) > "znver1-double,znver1-load,znver1-fp0|znver1-fp3") > ---End Patch --- > > Regards, > Venkat. >
Hi Uros, > -----Original Message----- > From: Uros Bizjak [mailto:ubizjak@gmail.com] > Sent: Friday, February 12, 2016 11:06 PM > To: Kumar, Venkataramanan > Cc: gcc-patches@gcc.gnu.org > Subject: Re: [Patch X86_64]: Minor changes to znver1 pipe reservations. > > On Fri, Feb 12, 2016 at 5:31 PM, Kumar, Venkataramanan > <Venkataramanan.Kumar@amd.com> wrote: > > Hi Maintainers, > > > > Below patch does some minor changes to pipe reservations in znver1.md. > > GCC bootstrap completed. > > > > GCC regression testing underway. Ok for trunk if the testing passes? > > > > > > ChangeLog > > ------------- > > 2016-02-12 Venkataramanan Kumar <venkataramanan.kumar@amd.com> > > > > * config/i386/znver1.md > > (znver1_pop, znver1_pop_mem, > > znver1_load_imov_double_store, > > znver1_load_imov_direct_store, > > znver1_load_imov_direct_load, > > znver1_load_imov_double_load): Add new. > > (znver1_insn, znver1_insn_load): Add icmov type. > > (znver1_sseavx_fma, > > znver1_sseavx_fma_load, > > znver1_avx256_fma, > > znver1_avx256_fma_load): Fix pipe usage. > > OK for mainline. > Thank you. I up-streamed the patch Ref https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=233409 > Thanks, > Uros. > > > --- Patch --- > > diff --git a/gcc/config/i386/znver1.md b/gcc/config/i386/znver1.md > > index b7fcf6c..e6babc7 100644 > > --- a/gcc/config/i386/znver1.md > > +++ b/gcc/config/i386/znver1.md > > @@ -102,6 +102,18 @@ > > (eq_attr "memory" "both"))) > > "znver1-direct,znver1-load,znver1-store") > > > > +(define_insn_reservation "znver1_pop" 4 > > + (and (eq_attr "cpu" "znver1") > > + (and (eq_attr "type" "pop") > > + (eq_attr "memory" "load"))) > > + "znver1-direct,znver1-load") > > + > > +(define_insn_reservation "znver1_pop_mem" 4 > > + (and (eq_attr "cpu" "znver1") > > + (and (eq_attr "type" "pop") > > + (eq_attr "memory" "both"))) > > + "znver1-direct,znver1-load,znver1-store") > > + > > ;; Leave > > (define_insn_reservation "znver1_leave" 1 > > (and (eq_attr "cpu" "znver1") @@ -194,26 > > +206,52 @@ > > (and (eq_attr "cpu" "znver1") > > (and (eq_attr "znver1_decode" "double") > > (and (eq_attr "type" "imovx") > > - (eq_attr "memory" "none,load")))) > > + (eq_attr "memory" "none")))) > > "znver1-double,znver1-ieu") > > > > (define_insn_reservation "znver1_load_imov_direct" 1 > > (and (eq_attr "cpu" "znver1") > > (and (eq_attr "type" "imov,imovx") > > - (eq_attr "memory" "none,load"))) > > + (eq_attr "memory" "none"))) > > "znver1-direct,znver1-ieu") > > > > +(define_insn_reservation "znver1_load_imov_double_store" 2 > > + (and (eq_attr "cpu" "znver1") > > + (and (eq_attr "znver1_decode" "double") > > + (and (eq_attr "type" "imovx") > > + (eq_attr "memory" "store")))) > > + "znver1-double,znver1-ieu,znver1-store") > > + > > +(define_insn_reservation "znver1_load_imov_direct_store" 1 > > + (and (eq_attr "cpu" "znver1") > > + (and (eq_attr "type" "imov,imovx") > > + (eq_attr "memory" "store"))) > > + > > +"znver1-direct,znver1-ieu,znver1-store") > > + > > +(define_insn_reservation "znver1_load_imov_double_load" 6 > > + (and (eq_attr "cpu" "znver1") > > + (and (eq_attr "znver1_decode" "double") > > + (and (eq_attr "type" "imovx") > > + (eq_attr "memory" "load")))) > > + "znver1-double,znver1-load,znver1-ieu") > > + > > +(define_insn_reservation "znver1_load_imov_direct_load" 5 > > + (and (eq_attr "cpu" "znver1") > > + (and (eq_attr "type" "imov,imovx") > > + (eq_attr "memory" "load"))) > > + "znver1-direct,znver1-load,znver1-ieu") > > + > > ;; INTEGER/GENERAL instructions > > ;; register/imm operands only: ALU, ICMP, NEG, NOT, ROTATE, ISHIFT, > > TEST (define_insn_reservation "znver1_insn" 1 > > (and (eq_attr "cpu" "znver1") > > - (and (eq_attr "type" > "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec") > > + (and (eq_attr "type" > > + "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec,icm > > + ov") > > (eq_attr "memory" "none,unknown"))) > > "znver1-direct,znver1-ieu") > > > > (define_insn_reservation "znver1_insn_load" 5 > > (and (eq_attr "cpu" "znver1") > > - (and (eq_attr "type" > "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec") > > + (and (eq_attr "type" > > + "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec,icm > > + ov") > > (eq_attr "memory" "load"))) > > "znver1-direct,znver1-load,znver1-ieu") > > > > @@ -666,28 +704,28 @@ > > (and (eq_attr "mode" "SF,DF,V4SF,V2DF") > > (and (eq_attr "type" "ssemuladd") > > (eq_attr "memory" "none")))) > > - "znver1-direct,(znver1-fp0+znver1-fp3)|(znver1-fp1+znver1- > fp3)") > > + "znver1-direct,znver1-fp0|znver1-fp1") > > > > (define_insn_reservation "znver1_sseavx_fma_load" 9 > > (and (eq_attr "cpu" "znver1") > > (and (eq_attr "mode" "SF,DF,V4SF,V2DF") > > (and (eq_attr "type" "ssemuladd") > > (eq_attr "memory" "load")))) > > - "znver1-direct,znver1-load,(znver1-fp0+znver1-fp3)|(znver1- > fp1+znver1-fp3)") > > + > > + "znver1-direct,znver1-load,znver1-fp0|znver1-fp1") > > > > (define_insn_reservation "znver1_avx256_fma" 5 > > (and (eq_attr "cpu" "znver1") > > (and (eq_attr "mode" "V8SF,V4DF") > > (and (eq_attr "type" "ssemuladd") > > (eq_attr "memory" "none")))) > > - "znver1-double,(znver1-fp0+znver1-fp3)|(znver1-fp1+znver1- > fp3)") > > + "znver1-double,znver1-fp0|znver1-fp1") > > > > (define_insn_reservation "znver1_avx256_fma_load" 9 > > (and (eq_attr "cpu" "znver1") > > (and (eq_attr "mode" "V8SF,V4DF") > > (and (eq_attr "type" "ssemuladd") > > (eq_attr "memory" "load")))) > > - "znver1-double,znver1-load,(znver1-fp0+znver1- > fp3)|(znver1-fp1+znver1-fp3)") > > + > > + "znver1-double,znver1-load,znver1-fp0|znver1-fp1") > > > > (define_insn_reservation "znver1_sseavx_iadd" 1 > > (and (eq_attr "cpu" "znver1") @@ -970,4 > > +1008,3 @@ > > (and (eq_attr "type" "ssecmp") > > (eq_attr "memory" "load")))) > > > > "znver1-double,znver1-load,znver1-fp0|znver1-fp3") > > ---End Patch --- > > > > Regards, > > Venkat. > > Regards, Venkat.
--- a/gcc/config/i386/znver1.md +++ b/gcc/config/i386/znver1.md @@ -102,6 +102,18 @@ (eq_attr "memory" "both"))) "znver1-direct,znver1-load,znver1-store") +(define_insn_reservation "znver1_pop" 4 + (and (eq_attr "cpu" "znver1") + (and (eq_attr "type" "pop") + (eq_attr "memory" "load"))) + "znver1-direct,znver1-load") + +(define_insn_reservation "znver1_pop_mem" 4 + (and (eq_attr "cpu" "znver1") + (and (eq_attr "type" "pop") + (eq_attr "memory" "both"))) + "znver1-direct,znver1-load,znver1-store") + ;; Leave (define_insn_reservation "znver1_leave" 1 (and (eq_attr "cpu" "znver1") @@ -194,26 +206,52 @@ (and (eq_attr "cpu" "znver1") (and (eq_attr "znver1_decode" "double") (and (eq_attr "type" "imovx") - (eq_attr "memory" "none,load")))) + (eq_attr "memory" "none")))) "znver1-double,znver1-ieu") (define_insn_reservation "znver1_load_imov_direct" 1 (and (eq_attr "cpu" "znver1") (and (eq_attr "type" "imov,imovx") - (eq_attr "memory" "none,load"))) + (eq_attr "memory" "none"))) "znver1-direct,znver1-ieu") +(define_insn_reservation "znver1_load_imov_double_store" 2 + (and (eq_attr "cpu" "znver1") + (and (eq_attr "znver1_decode" "double") + (and (eq_attr "type" "imovx") + (eq_attr "memory" "store")))) + "znver1-double,znver1-ieu,znver1-store") + +(define_insn_reservation "znver1_load_imov_direct_store" 1 + (and (eq_attr "cpu" "znver1") + (and (eq_attr "type" "imov,imovx") + (eq_attr "memory" "store"))) + "znver1-direct,znver1-ieu,znver1-store") + +(define_insn_reservation "znver1_load_imov_double_load" 6 + (and (eq_attr "cpu" "znver1") + (and (eq_attr "znver1_decode" "double") + (and (eq_attr "type" "imovx") + (eq_attr "memory" "load")))) + "znver1-double,znver1-load,znver1-ieu") + +(define_insn_reservation "znver1_load_imov_direct_load" 5 + (and (eq_attr "cpu" "znver1") + (and (eq_attr "type" "imov,imovx") + (eq_attr "memory" "load"))) + "znver1-direct,znver1-load,znver1-ieu") + ;; INTEGER/GENERAL instructions ;; register/imm operands only: ALU, ICMP, NEG, NOT, ROTATE, ISHIFT, TEST (define_insn_reservation "znver1_insn" 1 (and (eq_attr "cpu" "znver1") - (and (eq_attr "type" "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec") + (and (eq_attr "type" "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec,icmov") (eq_attr "memory" "none,unknown"))) "znver1-direct,znver1-ieu") (define_insn_reservation "znver1_insn_load" 5 (and (eq_attr "cpu" "znver1") - (and (eq_attr "type" "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec") + (and (eq_attr "type" "alu,icmp,negnot,rotate,rotate1,ishift,ishift1,test,setcc,incdec,icmov") (eq_attr "memory" "load"))) "znver1-direct,znver1-load,znver1-ieu") @@ -666,28 +704,28 @@ (and (eq_attr "mode" "SF,DF,V4SF,V2DF") (and (eq_attr "type" "ssemuladd") (eq_attr "memory" "none")))) - "znver1-direct,(znver1-fp0+znver1-fp3)|(znver1-fp1+znver1-fp3)") + "znver1-direct,znver1-fp0|znver1-fp1") (define_insn_reservation "znver1_sseavx_fma_load" 9 (and (eq_attr "cpu" "znver1") (and (eq_attr "mode" "SF,DF,V4SF,V2DF") (and (eq_attr "type" "ssemuladd") (eq_attr "memory" "load")))) - "znver1-direct,znver1-load,(znver1-fp0+znver1-fp3)|(znver1-fp1+znver1-fp3)") + "znver1-direct,znver1-load,znver1-fp0|znver1-fp1") (define_insn_reservation "znver1_avx256_fma" 5 (and (eq_attr "cpu" "znver1") (and (eq_attr "mode" "V8SF,V4DF") (and (eq_attr "type" "ssemuladd") (eq_attr "memory" "none")))) - "znver1-double,(znver1-fp0+znver1-fp3)|(znver1-fp1+znver1-fp3)") + "znver1-double,znver1-fp0|znver1-fp1") (define_insn_reservation "znver1_avx256_fma_load" 9 (and (eq_attr "cpu" "znver1") (and (eq_attr "mode" "V8SF,V4DF") (and (eq_attr "type" "ssemuladd") (eq_attr "memory" "load")))) - "znver1-double,znver1-load,(znver1-fp0+znver1-fp3)|(znver1-fp1+znver1-fp3)") + "znver1-double,znver1-load,znver1-fp0|znver1-fp1") (define_insn_reservation "znver1_sseavx_iadd" 1 (and (eq_attr "cpu" "znver1") @@ -970,4 +1008,3 @@ (and (eq_attr "type" "ssecmp") (eq_attr "memory" "load")))) "znver1-double,znver1-load,znver1-fp0|znver1-fp3") ---End Patch ---
Hi Maintainers, Below patch does some minor changes to pipe reservations in znver1.md. GCC bootstrap completed. GCC regression testing underway. Ok for trunk if the testing passes? ChangeLog ------------- 2016-02-12 Venkataramanan Kumar <venkataramanan.kumar@amd.com> * config/i386/znver1.md (znver1_pop, znver1_pop_mem, znver1_load_imov_double_store, znver1_load_imov_direct_store, znver1_load_imov_direct_load, znver1_load_imov_double_load): Add new. (znver1_insn, znver1_insn_load): Add icmov type. (znver1_sseavx_fma, znver1_sseavx_fma_load, znver1_avx256_fma, znver1_avx256_fma_load): Fix pipe usage. --- Patch --- diff --git a/gcc/config/i386/znver1.md b/gcc/config/i386/znver1.md index b7fcf6c..e6babc7 100644 Regards, Venkat.