i386-common.c: Use PROCESSOR_ZNVER2 scheduler for znver2.

	* i386-common.c: Use PROCESSOR_ZNVER2 scheduler for znver2.
	* config/i386/znver1.md: Enable patterns for znver2 and add store
	variants which use extra AGU unit.

From-SVN: r273731

3 files changed, 411 insertions, 176 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 181ecc4..fb9b0ff 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2019-07-23  Jan Hubicka  <hubicka@ucw.cz>
 
+	* i386-common.c: Use PROCESSOR_ZNVER2 scheduler for znver2.
+	* config/i386/znver1.md: Enable patterns for znver2 and add store
+	variants which use extra AGU unit.
+
+2019-07-23  Jan Hubicka  <hubicka@ucw.cz>
+
 	* config/i386/i386-options.c (ix86_option_override_internal): Default
 	PARAM_AVOID_FMA_MAX_BITS to 256 for znver2.
 	* config/i386/x86-tune.def (X86_TUNE_AVOID_256FMA_CHAINS): Set
diff --git a/gcc/common/config/i386/i386-common.c b/gcc/common/config/i386/i386-common.c
index a394f87..1f77f7d 100644
--- a/gcc/common/config/i386/i386-common.c
+++ b/gcc/common/config/i386/i386-common.c
@@ -1760,7 +1760,7 @@ const pta processor_alias_table[] =
       | PTA_RDRND | PTA_MOVBE | PTA_MWAITX | PTA_ADX | PTA_RDSEED
       | PTA_CLZERO | PTA_CLFLUSHOPT | PTA_XSAVEC | PTA_XSAVES
       | PTA_SHA | PTA_LZCNT | PTA_POPCNT},
-  {"znver2", PROCESSOR_ZNVER2, CPU_ZNVER1,
+  {"znver2", PROCESSOR_ZNVER2, CPU_ZNVER2,
     PTA_64BIT | PTA_MMX | PTA_SSE | PTA_SSE2 | PTA_SSE3
       | PTA_SSE4A | PTA_CX16 | PTA_ABM | PTA_SSSE3 | PTA_SSE4_1
       | PTA_SSE4_2 | PTA_AES | PTA_PCLMUL | PTA_AVX | PTA_AVX2
diff --git a/gcc/config/i386/znver1.md b/gcc/config/i386/znver1.md
index c7f49bf..7e3efa8 100644
--- a/gcc/config/i386/znver1.md
+++ b/gcc/config/i386/znver1.md
@@ -17,10 +17,11 @@
 ;; <http://www.gnu.org/licenses/>.
 ;;
 
+
 (define_attr "znver1_decode" "direct,vector,double"
   (const_string "direct"))
 
-;; AMD znver1 Scheduling
+;; AMD znver1 and znver2 Scheduling
 ;; Modeling automatons for zen decoders, integer execution pipes,
 ;; AGU pipes and floating point execution units.
 (define_automaton "znver1, znver1_ieu, znver1_fp, znver1_agu")
@@ -51,13 +52,21 @@
 (define_cpu_unit "znver1-ieu3" "znver1_ieu")
 (define_reservation "znver1-ieu" "znver1-ieu0|znver1-ieu1|znver1-ieu2|znver1-ieu3")
 
-;; 2 AGU pipes.
+;; 2 AGU pipes in znver1 and 3 AGU pipes in znver2
+;; According to CPU diagram last AGU unit is used only for stores.
 (define_cpu_unit "znver1-agu0" "znver1_agu")
 (define_cpu_unit "znver1-agu1" "znver1_agu")
+(define_cpu_unit "znver2-agu2" "znver1_agu")
 (define_reservation "znver1-agu-reserve" "znver1-agu0|znver1-agu1")
+(define_reservation "znver2-store-agu-reserve" "znver1-agu0|znver1-agu1|znver2-agu2")
 
+;; Load is 4 cycles. We do not model reservation of load unit.
+;;(define_reservation "znver1-load" "znver1-agu-reserve, nothing, nothing, nothing")
 (define_reservation "znver1-load" "znver1-agu-reserve")
+;; Store operations differs between znver1 and znver2 because extra AGU
+;; was added.
 (define_reservation "znver1-store" "znver1-agu-reserve")
+(define_reservation "znver2-store" "znver2-store-agu-reserve")
 
 ;; vectorpath (microcoded) instructions are single issue instructions.
 ;; So, they occupy all the integer units.
@@ -65,6 +74,9 @@
 				      +znver1-ieu2+znver1-ieu3
 				      +znver1-agu0+znver1-agu1")
 
+(define_reservation "znver2-ivector" "znver1-ieu0+znver1-ieu1
+				      +znver1-ieu2+znver1-ieu3
+				      +znver1-agu0+znver1-agu1+znver2-agu2")
 ;; Floating point unit 4 FP pipes.
 (define_cpu_unit "znver1-fp0" "znver1_fp")
 (define_cpu_unit "znver1-fp1" "znver1_fp")
@@ -76,6 +88,9 @@
 (define_reservation "znver1-fvector" "znver1-fp0+znver1-fp1
 				      +znver1-fp2+znver1-fp3
 				      +znver1-agu0+znver1-agu1")
+(define_reservation "znver2-fvector" "znver1-fp0+znver1-fp1
+				      +znver1-fp2+znver1-fp3
+				      +znver1-agu0+znver1-agu1+znver2-agu2")
 
 ;; Call instruction
 (define_insn_reservation "znver1_call" 1
@@ -83,27 +98,36 @@
 			      (eq_attr "type" "call,callv"))
 			 "znver1-double,znver1-store,znver1-ieu0|znver1-ieu3")
 
+(define_insn_reservation "znver2_call" 1
+			 (and (eq_attr "cpu" "znver2")
+			      (eq_attr "type" "call,callv"))
+			 "znver1-double,znver2-store,znver1-ieu0|znver1-ieu3")
+
 ;; General instructions
 (define_insn_reservation "znver1_push" 1
 			 (and (eq_attr "cpu" "znver1")
 			      (and (eq_attr "type" "push")
-				   (eq_attr "memory" "none,unknown")))
+				   (eq_attr "memory" "store")))
 			 "znver1-direct,znver1-store")
-
-(define_insn_reservation "znver1_push_store" 1
-			 (and (eq_attr "cpu" "znver1")
+(define_insn_reservation "znver2_push" 1
+			 (and (eq_attr "cpu" "znver2")
 			      (and (eq_attr "type" "push")
 				   (eq_attr "memory" "store")))
 			 "znver1-direct,znver1-store")
 
-(define_insn_reservation "znver1_push_both" 5
+(define_insn_reservation "znver1_push_load" 4
 			 (and (eq_attr "cpu" "znver1")
 			      (and (eq_attr "type" "push")
 				   (eq_attr "memory" "both")))
 			 "znver1-direct,znver1-load,znver1-store")
+(define_insn_reservation "znver2_push_load" 4
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "push")
+				   (eq_attr "memory" "both")))
+			 "znver1-direct,znver1-load,znver2-store")
 
 (define_insn_reservation "znver1_pop" 4
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "pop")
 				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load")
@@ -113,24 +137,33 @@
 			      (and (eq_attr "type" "pop")
 				   (eq_attr "memory" "both")))
 			 "znver1-direct,znver1-load,znver1-store")
+(define_insn_reservation "znver2_pop_mem" 4
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "pop")
+				   (eq_attr "memory" "both")))
+			 "znver1-direct,znver1-load,znver2-store")
 
 ;; Leave
 (define_insn_reservation "znver1_leave" 1
 			 (and (eq_attr "cpu" "znver1")
 			      (eq_attr "type" "leave"))
 			 "znver1-double,znver1-ieu, znver1-store")
+(define_insn_reservation "znver2_leave" 1
+			 (and (eq_attr "cpu" "znver2")
+			      (eq_attr "type" "leave"))
+			 "znver1-double,znver1-ieu, znver2-store")
 
 ;; Integer Instructions or General instructions
 ;; Multiplications
 ;; Reg operands
 (define_insn_reservation "znver1_imul" 3
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "imul")
 				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-ieu1")
 
 (define_insn_reservation "znver1_imul_mem" 7
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "imul")
 				   (eq_attr "memory" "!none")))
 			 "znver1-direct,znver1-load, znver1-ieu1")
@@ -138,28 +171,28 @@
 ;; Divisions
 ;; Reg operands
 (define_insn_reservation "znver1_idiv_DI" 41
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "idiv")
 				   (and (eq_attr "mode" "DI")
 					(eq_attr "memory" "none"))))
 			 "znver1-double,znver1-ieu2*41")
 
 (define_insn_reservation "znver1_idiv_SI" 25
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "idiv")
 				   (and (eq_attr "mode" "SI")
 					(eq_attr "memory" "none"))))
 			 "znver1-double,znver1-ieu2*25")
 
 (define_insn_reservation "znver1_idiv_HI" 17
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "idiv")
 				   (and (eq_attr "mode" "HI")
 					(eq_attr "memory" "none"))))
 			 "znver1-double,znver1-ieu2*17")
 
 (define_insn_reservation "znver1_idiv_QI" 12
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "idiv")
 				   (and (eq_attr "mode" "QI")
 					(eq_attr "memory" "none"))))
@@ -167,28 +200,28 @@
 
 ;; Mem operands
 (define_insn_reservation "znver1_idiv_mem_DI" 45
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "idiv")
 				   (and (eq_attr "mode" "DI")
 					(eq_attr "memory" "none"))))
 			 "znver1-double,znver1-load,znver1-ieu2*41")
 
 (define_insn_reservation "znver1_idiv_mem_SI" 29
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "idiv")
 				   (and (eq_attr "mode" "SI")
 					(eq_attr "memory" "none"))))
 			 "znver1-double,znver1-load,znver1-ieu2*25")
 
 (define_insn_reservation "znver1_idiv_mem_HI" 21
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "idiv")
 				   (and (eq_attr "mode" "HI")
 					(eq_attr "memory" "none"))))
 			 "znver1-double,znver1-load,znver1-ieu2*17")
 
 (define_insn_reservation "znver1_idiv_mem_QI" 16
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "idiv")
 				   (and (eq_attr "mode" "QI")
 					(eq_attr "memory" "none"))))
@@ -201,16 +234,34 @@
 			      (and (eq_attr "type" "str,ishift")
 				   (eq_attr "memory" "both,store")))
 			 "znver1-vector,znver1-ivector")
+
+(define_insn_reservation "znver2_str_ishift" 3
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "ishift")
+				   (eq_attr "memory" "both,store")))
+			 "znver1-vector,znver1-ivector")
+(define_insn_reservation "znver2_str_istr" 19
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "str")
+				   (eq_attr "memory" "both,store")))
+			 "znver1-vector,znver1-ivector")
 ;; MOV - integer moves
 (define_insn_reservation "znver1_load_imov_double" 2
 			 (and (eq_attr "cpu" "znver1")
 			      (and (eq_attr "znver1_decode" "double")
 				   (and (eq_attr "type" "imovx")
 					(eq_attr "memory" "none"))))
-			 "znver1-double,znver1-ieu")
+			 "znver1-double,znver1-ieu|znver1-ieu")
+
+(define_insn_reservation "znver2_load_imov_double" 1
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "znver1_decode" "double")
+				   (and (eq_attr "type" "imovx")
+					(eq_attr "memory" "none"))))
+			 "znver1-double,znver1-ieu|znver1-ieu")
 
 (define_insn_reservation "znver1_load_imov_direct" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "imov,imovx")
 				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-ieu")
@@ -220,7 +271,14 @@
 			      (and (eq_attr "znver1_decode" "double")
 				   (and (eq_attr "type" "imovx")
 					(eq_attr "memory" "store"))))
-			 "znver1-double,znver1-ieu,znver1-store")
+			 "znver1-double,znver1-ieu|znver1-ieu,znver1-store")
+
+(define_insn_reservation "znver2_load_imov_double_store" 1
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "znver1_decode" "double")
+				   (and (eq_attr "type" "imovx")
+					(eq_attr "memory" "store"))))
+			 "znver1-double,znver1-ieu|znver1-ieu,znver2-store")
 
 (define_insn_reservation "znver1_load_imov_direct_store" 1
 			 (and (eq_attr "cpu" "znver1")
@@ -228,15 +286,28 @@
 				   (eq_attr "memory" "store")))
 				   "znver1-direct,znver1-ieu,znver1-store")
 
+(define_insn_reservation "znver2_load_imov_direct_store" 1
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "imov,imovx")
+				   (eq_attr "memory" "store")))
+				   "znver1-direct,znver1-ieu,znver2-store")
+
 (define_insn_reservation "znver1_load_imov_double_load" 5
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "znver1_decode" "double")
 				   (and (eq_attr "type" "imovx")
 					(eq_attr "memory" "load"))))
-			 "znver1-double,znver1-load")
+			 "znver1-double,znver1-load,znver1-ieu|znver1-ieu")
+
+(define_insn_reservation "znver2_load_imov_double_load" 4
+			 (and (eq_attr "cpu" "znver1,znver2")
+			      (and (eq_attr "znver1_decode" "double")
+				   (and (eq_attr "type" "imovx")
+					(eq_attr "memory" "load"))))
+			 "znver1-double,znver1-load,znver1-ieu|znver1-ieu")
 
 (define_insn_reservation "znver1_load_imov_direct_load" 4
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "imov,imovx")
 				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load")
@@ -244,13 +315,13 @@
 ;; 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 "cpu" "znver1,znver2")
 			      (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 "cpu" "znver1,znver2")
 			      (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")
@@ -261,18 +332,35 @@
 				   (eq_attr "memory" "store")))
 			 "znver1-direct,znver1-ieu,znver1-store")
 
+(define_insn_reservation "znver2_insn_store" 1
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "alu,icmp,negnot,rotate,rotate1,ishift1,test,setcc,incdec")
+				   (eq_attr "memory" "store")))
+			 "znver1-direct,znver1-ieu,znver2-store")
+
 (define_insn_reservation "znver1_insn_both" 5
 			 (and (eq_attr "cpu" "znver1")
 			      (and (eq_attr "type" "alu,icmp,negnot,rotate,rotate1,ishift1,test,setcc,incdec")
 				   (eq_attr "memory" "both")))
 			 "znver1-direct,znver1-load,znver1-ieu,znver1-store")
 
+(define_insn_reservation "znver2_insn_both" 5
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "alu,icmp,negnot,rotate,rotate1,ishift1,test,setcc,incdec")
+				   (eq_attr "memory" "both")))
+			 "znver1-direct,znver1-load,znver1-ieu,znver2-store")
+
 ;; Fix me: Other vector type insns keeping latency 6 as of now.
 (define_insn_reservation "znver1_ieu_vector" 6
 			 (and (eq_attr "cpu" "znver1")
 			      (eq_attr "type" "other,str,multi"))
 			 "znver1-vector,znver1-ivector")
 
+(define_insn_reservation "znver2_ieu_vector" 5
+			 (and (eq_attr "cpu" "znver2")
+			      (eq_attr "type" "other,str,multi"))
+			 "znver1-vector,znver2-ivector")
+
 ;; ALU1 register operands.
 (define_insn_reservation "znver1_alu1_vector" 3
 			 (and (eq_attr "cpu" "znver1")
@@ -281,15 +369,22 @@
 					(eq_attr "memory" "none,unknown"))))
 			 "znver1-vector,znver1-ivector")
 
+(define_insn_reservation "znver2_alu1_vector" 3
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "znver1_decode" "vector")
+				   (and (eq_attr "type" "alu1")
+					(eq_attr "memory" "none,unknown"))))
+			 "znver1-vector,znver2-ivector")
+
 (define_insn_reservation "znver1_alu1_double" 2
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "znver1_decode" "double")
 				   (and (eq_attr "type" "alu1")
 					(eq_attr "memory" "none,unknown"))))
 			 "znver1-double,znver1-ieu")
 
 (define_insn_reservation "znver1_alu1_direct" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "znver1_decode" "direct")
 				   (and (eq_attr "type" "alu1")
 					(eq_attr "memory" "none,unknown"))))
@@ -297,7 +392,7 @@
 
 ;; Branches : Fix me need to model conditional branches.
 (define_insn_reservation "znver1_branch" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "ibr")
 				   (eq_attr "memory" "none")))
 			  "znver1-direct")
@@ -309,27 +404,33 @@
 				   (eq_attr "memory" "load")))
 			 "znver1-vector,znver1-ivector")
 
+(define_insn_reservation "znver2_indirect_branch_mem" 6
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "ibr")
+				   (eq_attr "memory" "load")))
+			 "znver1-vector,znver2-ivector")
+
 ;; LEA executes in ALU units with 1 cycle latency.
 (define_insn_reservation "znver1_lea" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (eq_attr "type" "lea"))
 			 "znver1-direct,znver1-ieu")
 
 ;; Other integer instrucions
 (define_insn_reservation "znver1_idirect" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "unit" "integer,unknown")
 				   (eq_attr "memory" "none,unknown")))
 			 "znver1-direct,znver1-ieu")
 
 ;;  Floating point
 (define_insn_reservation "znver1_fp_cmov" 6
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (eq_attr "type" "fcmov"))
 			 "znver1-vector,znver1-fvector")
 
 (define_insn_reservation "znver1_fp_mov_direct_load" 8 
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "znver1_decode" "direct")
 				   (and (eq_attr "type" "fmov")
 					(eq_attr "memory" "load"))))
@@ -341,9 +442,15 @@
 				   (and (eq_attr "type" "fmov")
 					(eq_attr "memory" "store"))))
 			 "znver1-direct,znver1-fp2|znver1-fp3,znver1-store")
+(define_insn_reservation "znver2_fp_mov_direct_store" 5
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "znver1_decode" "direct")
+				   (and (eq_attr "type" "fmov")
+					(eq_attr "memory" "store"))))
+			 "znver1-direct,znver1-fp2|znver1-fp3,znver2-store")
 
 (define_insn_reservation "znver1_fp_mov_double" 4
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "znver1_decode" "double")
 				   (and (eq_attr "type" "fmov")
 					(eq_attr "memory" "none"))))
@@ -356,13 +463,21 @@
 					(eq_attr "memory" "load"))))
 			 "znver1-double,znver1-load,znver1-fp3")
 
+(define_insn_reservation "znver2_fp_mov_double_load" 12
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "znver1_decode" "double")
+				   (and (eq_attr "type" "fmov")
+					(eq_attr "memory" "load"))))
+			 "znver1-double,znver1-load,znver1-fp3")
+
 (define_insn_reservation "znver1_fp_mov_direct" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (eq_attr "type" "fmov"))
 			 "znver1-direct,znver1-fp3")
 
+;; TODO: AGU?
 (define_insn_reservation "znver1_fp_spc_direct" 5
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "fpspc")
 				   (eq_attr "memory" "store")))
 			 "znver1-direct,znver1-fp3,znver1-fp2")
@@ -372,22 +487,27 @@
 			      (and (eq_attr "znver1_decode" "vector")
 				   (eq_attr "type" "fpspc,mmxcvt,sselog1,ssemul,ssemov")))
 			 "znver1-vector,znver1-fvector")
+(define_insn_reservation "znver2_fp_insn_vector" 6
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "znver1_decode" "vector")
+				   (eq_attr "type" "fpspc,mmxcvt,sselog1,ssemul,ssemov")))
+			 "znver1-vector,znver2-fvector")
 
 ;; FABS
 (define_insn_reservation "znver1_fp_fsgn" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (eq_attr "type" "fsgn"))
 			 "znver1-direct,znver1-fp3")
 
 (define_insn_reservation "znver1_fp_fcmp" 2
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "memory" "none")
 				   (and (eq_attr "znver1_decode" "double")
 					(eq_attr "type" "fcmp"))))
 			 "znver1-double,znver1-fp0,znver1-fp2")
 
 (define_insn_reservation "znver1_fp_fcmp_load" 9
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "memory" "none")
 				   (and (eq_attr "znver1_decode" "double")
 					(eq_attr "type" "fcmp"))))
@@ -395,32 +515,32 @@
 
 ;;FADD FSUB FMUL
 (define_insn_reservation "znver1_fp_op_mul" 5
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "fop,fmul")
 				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp0*5")
 
 (define_insn_reservation "znver1_fp_op_mul_load" 12 
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "fop,fmul")
 				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp0*5")
 
 (define_insn_reservation "znver1_fp_op_imul_load" 16
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "fop,fmul")
 				   (and (eq_attr "fp_int_src" "true")
 					(eq_attr "memory" "load"))))
 			"znver1-double,znver1-load,znver1-fp3,znver1-fp0")
 
 (define_insn_reservation "znver1_fp_op_div" 15
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "fdiv")
 				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp3*15")
 
 (define_insn_reservation "znver1_fp_op_div_load" 22
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "fdiv")
 				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp3*15")
@@ -432,56 +552,63 @@
 					(eq_attr "memory" "load"))))
 			 "znver1-double,znver1-load,znver1-fp3*19")
 
+(define_insn_reservation "znver2_fp_op_idiv_load" 26
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "fdiv")
+				   (and (eq_attr "fp_int_src" "true")
+					(eq_attr "memory" "load"))))
+			 "znver1-double,znver1-load,znver1-fp3*19")
+
 ;; MMX, SSE, SSEn.n, AVX, AVX2 instructions
 (define_insn_reservation "znver1_fp_insn" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (eq_attr "type" "mmx"))
 			 "znver1-direct,znver1-fpu")
 
 (define_insn_reservation "znver1_mmx_add" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "mmxadd")
 				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp0|znver1-fp1|znver1-fp3")
 
 (define_insn_reservation "znver1_mmx_add_load" 8
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "mmxadd")
 				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp0|znver1-fp1|znver1-fp3")
 
 (define_insn_reservation "znver1_mmx_cmp" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "mmxcmp")
 				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp0|znver1-fp3")
 
 (define_insn_reservation "znver1_mmx_cmp_load" 8
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "mmxcmp")
 				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp0|znver1-fp3")
 
 (define_insn_reservation "znver1_mmx_cvt_pck_shuf" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "mmxcvt,sseshuf,sseshuf1")
 				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp1|znver1-fp2")
 
 (define_insn_reservation "znver1_mmx_cvt_pck_shuf_load" 8
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "mmxcvt,sseshuf,sseshuf1")
 				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp1|znver1-fp2")
 
 (define_insn_reservation "znver1_mmx_shift_move" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "mmxshft,mmxmov")
 				   (eq_attr "memory" "none")))
  			 "znver1-direct,znver1-fp2")
 
 (define_insn_reservation "znver1_mmx_shift_move_load" 8
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "mmxshft,mmxmov")
 				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp2")
@@ -491,19 +618,25 @@
 			      (and (eq_attr "type" "mmxshft,mmxmov")
 				   (eq_attr "memory" "store,both")))
 			  "znver1-direct,znver1-fp2,znver1-store")
+(define_insn_reservation "znver2_mmx_move_store" 1
+			 (and (eq_attr "cpu" "znver1")
+			      (and (eq_attr "type" "mmxshft,mmxmov")
+				   (eq_attr "memory" "store,both")))
+			  "znver1-direct,znver1-fp2,znver2-store")
 
 (define_insn_reservation "znver1_mmx_mul" 3
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "mmxmul")
 				   (eq_attr "memory" "none")))
 			  "znver1-direct,znver1-fp0*3")
 
 (define_insn_reservation "znver1_mmx_load" 10
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "mmxmul")
 				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp0*3")
 
+;; TODO
 (define_insn_reservation "znver1_avx256_log" 1
 			 (and (eq_attr "cpu" "znver1")
 			      (and (eq_attr "mode" "V8SF,V4DF,OI")
@@ -519,13 +652,13 @@
 			 "znver1-double,znver1-load,znver1-fpu")
 
 (define_insn_reservation "znver1_sse_log" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "sselog")
 				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fpu")
 
 (define_insn_reservation "znver1_sse_log_load" 8
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "sselog")
 				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fpu")
@@ -545,13 +678,13 @@
 			 "znver1-double,znver1-load,znver1-fp1|znver1-fp2")
 
 (define_insn_reservation "znver1_sse_log1" 1
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "sselog1")
 				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp1|znver1-fp2")
 
 (define_insn_reservation "znver1_sse_log1_load" 8
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "type" "sselog1")
 				   (eq_attr "memory" "!none")))
 			 "znver1-direct,znver1-load,znver1-fp1|znver1-fp2")
@@ -566,46 +699,50 @@
 			 "znver1-direct,znver1-fp0|znver1-fp1")
 
 (define_insn_reservation "znver1_sse_comi_load" 8
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "SF,DF,V4SF,V2DF")
-				   (and (eq_attr "prefix" "!vex")
-					(and (eq_attr "prefix_extra" "0")
-					     (and (eq_attr "type" "ssecomi")
-						  (eq_attr "memory" "load"))))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "prefix_extra" "0")
+				   (and (eq_attr "type" "ssecomi")
+					(eq_attr "memory" "load"))))
 			 "znver1-direct,znver1-load,znver1-fp0|znver1-fp1")
 
 (define_insn_reservation "znver1_sse_comi_double" 2
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "V4SF,V2DF,TI")
-				   (and (eq_attr "prefix" "vex")
-					(and (eq_attr "prefix_extra" "0")
-					     (and (eq_attr "type" "ssecomi")
-						  (eq_attr "memory" "none"))))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "V4SF,V2DF,TI"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "prefix" "vex")
+				   (and (eq_attr "prefix_extra" "0")
+					(and (eq_attr "type" "ssecomi")
+					     (eq_attr "memory" "none")))))
 			 "znver1-double,znver1-fp0|znver1-fp1")
 
 (define_insn_reservation "znver1_sse_comi_double_load" 10
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "V4SF,V2DF,TI")
-				   (and (eq_attr "prefix" "vex")
-					(and (eq_attr "prefix_extra" "0")
-					     (and (eq_attr "type" "ssecomi")
-						  (eq_attr "memory" "load"))))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "V4SF,V2DF,TI"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "prefix" "vex")
+				   (and (eq_attr "prefix_extra" "0")
+					(and (eq_attr "type" "ssecomi")
+					     (eq_attr "memory" "load")))))
 			 "znver1-double,znver1-load,znver1-fp0|znver1-fp1")
 
 (define_insn_reservation "znver1_sse_test" 1
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "SF,DF,V4SF,V2DF,TI")
-				   (and (eq_attr "prefix_extra" "1")
-					(and (eq_attr "type" "ssecomi")
-					     (eq_attr "memory" "none")))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF,TI"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "prefix_extra" "1")
+				   (and (eq_attr "type" "ssecomi")
+					(eq_attr "memory" "none"))))
 			 "znver1-direct,znver1-fp1|znver1-fp2")
 
 (define_insn_reservation "znver1_sse_test_load" 8
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "SF,DF,V4SF,V2DF,TI")
-				   (and (eq_attr "prefix_extra" "1")
-					(and (eq_attr "type" "ssecomi")
-					     (eq_attr "memory" "load")))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF,TI"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "prefix_extra" "1")
+				   (and (eq_attr "type" "ssecomi")
+					(eq_attr "memory" "load"))))
 			 "znver1-direct,znver1-load,znver1-fp1|znver1-fp2")
 
 ;; SSE moves
@@ -619,6 +756,14 @@
 					     (eq_attr "memory" "none")))))
 			 "znver1-direct,znver1-ieu0")
 
+(define_insn_reservation "znver2_sse_mov" 1
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "mode" "SI")
+				   (and (eq_attr "isa" "avx")
+					(and (eq_attr "type" "ssemov")
+					     (eq_attr "memory" "none")))))
+			 "znver1-direct,znver1-ieu0")
+
 (define_insn_reservation "znver1_avx_mov" 2
 			 (and (eq_attr "cpu" "znver1")
 			      (and (eq_attr "mode" "TI")
@@ -628,11 +773,21 @@
 						  (eq_attr "memory" "none"))))))
 			 "znver1-direct,znver1-ieu2")
 
+(define_insn_reservation "znver2_avx_mov" 1
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "mode" "TI")
+				   (and (eq_attr "isa" "avx")
+					(and (eq_attr "type" "ssemov")
+					     (and (match_operand:SI 1 "register_operand")
+						  (eq_attr "memory" "none"))))))
+			 "znver1-direct,znver1-ieu2")
+
 (define_insn_reservation "znver1_sseavx_mov" 1
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "SF,DF,V4SF,V2DF,TI")
-				   (and (eq_attr "type" "ssemov")
-					(eq_attr "memory" "none"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF,TI"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "type" "ssemov")
+				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fpu")
 
 (define_insn_reservation "znver1_sseavx_mov_store" 1
@@ -641,12 +796,18 @@
 				   (and (eq_attr "type" "ssemov")
 					(eq_attr "memory" "store"))))
 			"znver1-direct,znver1-fpu,znver1-store")
+(define_insn_reservation "znver2_sseavx_mov_store" 1
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "ssemov")
+				   (eq_attr "memory" "store")))
+			"znver1-direct,znver1-fpu,znver2-store")
 
 (define_insn_reservation "znver1_sseavx_mov_load" 8
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "SF,DF,V4SF,V2DF,TI")
-				   (and (eq_attr "type" "ssemov")
-					(eq_attr "memory" "load"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF,TI"))
+				   (eq_attr "cpu" "znver2"))
+			       (and (eq_attr "type" "ssemov")
+				    (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fpu")
 
 (define_insn_reservation "znver1_avx256_mov" 1
@@ -672,17 +833,19 @@
 
 ;; SSE add
 (define_insn_reservation "znver1_sseavx_add" 3
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "SF,DF,V4SF,V2DF,TI")
-				   (and (eq_attr "type" "sseadd")
-					(eq_attr "memory" "none"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF,TI"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "type" "sseadd")
+				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp2|znver1-fp3")
 
 (define_insn_reservation "znver1_sseavx_add_load" 10
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "SF,DF,V4SF,V2DF,TI")
-				   (and (eq_attr "type" "sseadd")
-					(eq_attr "memory" "load"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF,TI"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "type" "sseadd")
+				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp2|znver1-fp3")
 
 (define_insn_reservation "znver1_avx256_add" 3
@@ -700,17 +863,19 @@
 			 "znver1-double,znver1-load,znver1-fp2|znver1-fp3")
 
 (define_insn_reservation "znver1_sseavx_fma" 5
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "SF,DF,V4SF,V2DF")
-				   (and (eq_attr "type" "ssemuladd")
-					(eq_attr "memory" "none"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "type" "ssemuladd")
+				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp0|znver1-fp1")
 
 (define_insn_reservation "znver1_sseavx_fma_load" 12
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "SF,DF,V4SF,V2DF")
-				   (and (eq_attr "type" "ssemuladd")
-					(eq_attr "memory" "load"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "type" "ssemuladd")
+				   (eq_attr "memory" "load")))
 			"znver1-direct,znver1-load,znver1-fp0|znver1-fp1")
 
 (define_insn_reservation "znver1_avx256_fma" 5
@@ -728,17 +893,19 @@
 			 "znver1-double,znver1-load,znver1-fp0|znver1-fp1")
 
 (define_insn_reservation "znver1_sseavx_iadd" 1
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "DI,TI")
-				   (and (eq_attr "type" "sseiadd")
-					(eq_attr "memory" "none"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "DI,TI"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "type" "sseiadd")
+				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp0|znver1-fp1|znver1-fp3")
 
 (define_insn_reservation "znver1_sseavx_iadd_load" 8
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "DI,TI")
-				   (and (eq_attr "type" "sseiadd")
-					(eq_attr "memory" "load"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "DI,TI"))
+				   (eq_attr "cpu" "znver2"))
+			      (and (eq_attr "type" "sseiadd")
+				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp0|znver1-fp1|znver1-fp3")
 
 (define_insn_reservation "znver1_avx256_iadd" 1
@@ -757,7 +924,7 @@
 
 ;; SSE conversions.
 (define_insn_reservation "znver1_ssecvtsf_si_load" 12
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "mode" "SI")
 				   (and (eq_attr "type" "sseicvt")
 					(and (match_operand:SF 1 "memory_operand")
@@ -771,6 +938,13 @@
 					(and (eq_attr "type" "sseicvt")
 					     (eq_attr "memory" "none")))))
 			 "znver1-double,znver1-fp3,znver1-ieu0")
+(define_insn_reservation "znver2_ssecvtdf_si" 4
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "mode" "SI")
+				   (and (match_operand:DF 1 "register_operand")
+					(and (eq_attr "type" "sseicvt")
+					     (eq_attr "memory" "none")))))
+			 "znver1-double,znver1-fp3,znver1-ieu0")
 
 (define_insn_reservation "znver1_ssecvtdf_si_load" 12
 			 (and (eq_attr "cpu" "znver1")
@@ -780,6 +954,14 @@
 					     (eq_attr "memory" "load")))))
 			 "znver1-double,znver1-load,znver1-fp3,znver1-ieu0")
 
+(define_insn_reservation "znver2_ssecvtdf_si_load" 11
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "mode" "SI")
+				   (and (eq_attr "type" "sseicvt")
+					(and (match_operand:DF 1 "memory_operand")
+					     (eq_attr "memory" "load")))))
+			 "znver1-double,znver1-load,znver1-fp3,znver1-ieu0")
+
 ;; All other used ssecvt fp3 pipes
 ;; Check: Need to revisit this again.
 ;; Some SSE converts may use different pipe combinations.
@@ -789,39 +971,59 @@
 				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp3")
 
+(define_insn_reservation "znver2_ssecvt" 3
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "ssecvt")
+				   (eq_attr "memory" "none")))
+			 "znver1-direct,znver1-fp3")
+
 (define_insn_reservation "znver1_ssecvt_load" 11
 			 (and (eq_attr "cpu" "znver1")
 			      (and (eq_attr "type" "ssecvt")
 				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp3")
 
+(define_insn_reservation "znver2_ssecvt_load" 11
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "ssecvt")
+				   (eq_attr "memory" "load")))
+			 "znver1-direct,znver1-load,znver1-fp3")
+
 ;; SSE div
 (define_insn_reservation "znver1_ssediv_ss_ps" 10
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "V4SF,SF")
-				   (and (eq_attr "type" "ssediv")
-					(eq_attr "memory" "none"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "V4SF,SF"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "V8SF,V4SF,SF")))
+			      (and (eq_attr "type" "ssediv")
+				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp3*10")
 
 (define_insn_reservation "znver1_ssediv_ss_ps_load" 17
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "V4SF,SF")
-				   (and (eq_attr "type" "ssediv")
-			 		(eq_attr "memory" "load"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "V4SF,SF"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "V8SF,V4SF,SF")))
+			      (and (eq_attr "type" "ssediv")
+				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp3*10")
 
 (define_insn_reservation "znver1_ssediv_sd_pd" 13
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "V2DF,DF")
-				   (and (eq_attr "type" "ssediv")
-					(eq_attr "memory" "none"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "V2DF,DF"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "V4DF,V2DF,DF")))
+			      (and (eq_attr "type" "ssediv")
+				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp3*13")
 
 (define_insn_reservation "znver1_ssediv_sd_pd_load" 20
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "V2DF,DF")
-				   (and (eq_attr "type" "ssediv")
-					(eq_attr "memory" "load"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "V2DF,DF"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "V4DF,V2DF,DF")))
+			      (and (eq_attr "type" "ssediv")
+				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp3*13")
 
 (define_insn_reservation "znver1_ssediv_avx256_ps" 12
@@ -853,17 +1055,21 @@
 			 "znver1-double,znver1-load,znver1-fp3*15")
 ;; SSE MUL
 (define_insn_reservation "znver1_ssemul_ss_ps" 3
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "V4SF,SF")
-				   (and (eq_attr "type" "ssemul")
-					(eq_attr "memory" "none"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "V4SF,SF"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "V8SF,V4SF,SF,V4DF,V2DF,DF")))
+			      (and (eq_attr "type" "ssemul")
+				   (eq_attr "memory" "none")))
 			 "znver1-direct,(znver1-fp0|znver1-fp1)*3")
 
 (define_insn_reservation "znver1_ssemul_ss_ps_load" 10 
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "V4SF,SF")
-				   (and (eq_attr "type" "ssemul")
-					(eq_attr "memory" "load"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "V4SF,SF"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "V8SF,V4SF,SF")))
+			      (and (eq_attr "type" "ssemul")
+				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,(znver1-fp0|znver1-fp1)*3")
 
 (define_insn_reservation "znver1_ssemul_avx256_ps" 3
@@ -894,12 +1100,23 @@
 					(eq_attr "memory" "load"))))
 			 "znver1-direct,znver1-load,(znver1-fp0|znver1-fp1)*4")
 
+(define_insn_reservation "znver2_ssemul_sd_pd" 3
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "ssemul")
+				   (eq_attr "memory" "none")))
+			 "znver1-direct,(znver1-fp0|znver1-fp1)*3")
+
+(define_insn_reservation "znver2_ssemul_sd_pd_load" 10
+			 (and (eq_attr "cpu" "znver2")
+			      (and (eq_attr "type" "ssemul")
+				   (eq_attr "memory" "load")))
+			 "znver1-direct,znver1-load,(znver1-fp0|znver1-fp1)*3")
+
 (define_insn_reservation "znver1_ssemul_avx256_pd" 5
 			 (and (eq_attr "cpu" "znver1")
 			      (and (eq_attr "mode" "V4DF")
-				   (and (eq_attr "mode" "V4DF")
-					(and (eq_attr "type" "ssemul")
-					     (eq_attr "memory" "none")))))
+				   (and (eq_attr "type" "ssemul")
+					(eq_attr "memory" "none"))))
 			 "znver1-double,(znver1-fp0|znver1-fp1)*4")
 
 (define_insn_reservation "znver1_ssemul_avx256_pd_load" 12
@@ -911,42 +1128,46 @@
 
 ;;SSE imul
 (define_insn_reservation "znver1_sseimul" 3
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "TI")
-				   (and (eq_attr "type" "sseimul")
-					(eq_attr "memory" "none"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "TI"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "TI,OI")))
+			      (and (eq_attr "type" "sseimul")
+				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp0*3")
 
 (define_insn_reservation "znver1_sseimul_avx256" 4
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "mode" "OI")
 				   (and (eq_attr "type" "sseimul")
 					(eq_attr "memory" "none"))))
 			 "znver1-double,znver1-fp0*4")
 
 (define_insn_reservation "znver1_sseimul_load" 10
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "TI")
-				   (and (eq_attr "type" "sseimul")
-					(eq_attr "memory" "load"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "TI"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "TI,OI")))
+			      (and (eq_attr "type" "sseimul")
+				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp0*3")
 
 (define_insn_reservation "znver1_sseimul_avx256_load" 11
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "mode" "OI")
 				   (and (eq_attr "type" "sseimul")
 					(eq_attr "memory" "load"))))
 			 "znver1-double,znver1-load,znver1-fp0*4")
 
 (define_insn_reservation "znver1_sseimul_di" 3 
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "mode" "DI")
 				   (and (eq_attr "memory" "none")
 					(eq_attr "type" "sseimul"))))
 			 "znver1-direct,znver1-fp0*3")
 
 (define_insn_reservation "znver1_sseimul_load_di" 10 
-			 (and (eq_attr "cpu" "znver1")
+			 (and (eq_attr "cpu" "znver1,znver2")
 			      (and (eq_attr "mode" "DI")
 				   (and (eq_attr "type" "sseimul")
 					(eq_attr "memory" "load"))))
@@ -954,17 +1175,21 @@
 
 ;; SSE compares
 (define_insn_reservation "znver1_sse_cmp" 1
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "SF,DF,V4SF,V2DF")
-				   (and (eq_attr "type" "ssecmp")
-					(eq_attr "memory" "none"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF,V8SF,V4DF")))
+			       (and (eq_attr "type" "ssecmp")
+				    (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp0|znver1-fp1")
 
 (define_insn_reservation "znver1_sse_cmp_load" 8
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "SF,DF,V4SF,V2DF")
-				   (and (eq_attr "type" "ssecmp")
-					(eq_attr "memory" "load"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "SF,DF,V4SF,V2DF,V8SF,V4DF")))
+			      (and (eq_attr "type" "ssecmp")
+				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp0|znver1-fp1")
 
 (define_insn_reservation "znver1_sse_cmp_avx256" 1
@@ -982,17 +1207,21 @@
 			 "znver1-double,znver1-load,znver1-fp0|znver1-fp1")
 
 (define_insn_reservation "znver1_sse_icmp" 1
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "QI,HI,SI,DI,TI")
-				   (and (eq_attr "type" "ssecmp")
-					(eq_attr "memory" "none"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "QI,HI,SI,DI,TI"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "QI,HI,SI,DI,TI,OI")))
+			      (and (eq_attr "type" "ssecmp")
+				   (eq_attr "memory" "none")))
 			 "znver1-direct,znver1-fp0|znver1-fp3")
 
 (define_insn_reservation "znver1_sse_icmp_load" 8
-			 (and (eq_attr "cpu" "znver1")
-			      (and (eq_attr "mode" "QI,HI,SI,DI,TI")
-				   (and (eq_attr "type" "ssecmp")
-					(eq_attr "memory" "load"))))
+			 (and (ior (and (eq_attr "cpu" "znver1")
+			                (eq_attr "mode" "QI,HI,SI,DI,TI"))
+				   (and (eq_attr "cpu" "znver2")
+			                (eq_attr "mode" "QI,HI,SI,DI,TI,OI")))
+			      (and (eq_attr "type" "ssecmp")
+				   (eq_attr "memory" "load")))
 			 "znver1-direct,znver1-load,znver1-fp0|znver1-fp3")
 
 (define_insn_reservation "znver1_sse_icmp_avx256" 1