Skip to content

R
riscv-gcc-1
Commit 44cd321e by Pete Steinmetz Committed by Peter Bergner
Options

invoke.texi: Add cpu_type power6x (RS/6000 and PowerPC Options): Add -mmfpgpr. 

	* doc/invoke.texi: Add cpu_type power6x
	(RS/6000 and PowerPC Options): Add -mmfpgpr.
	* config.gcc: Add cpu_type power6x.
	* configure.ac: Add test for mf{t,f}gpr instructions.
	(HAVE_AS_MFPGPR): New.
	* config.in: Regenerate.
	* configure: Regenerate.
	* config/rs6000/aix52.h (ASM_CPU_SPEC): Add power6x.
	* config/rs6000/rs6000.md (define_attr "type"): Add insert_dword,
	shift,trap,var_shift_rotate,cntlz,exts, var_delayed_compare, mffgpr
	and mftgpr attributes.
	(define_attr "cpu"): Add power6.
	Change instruction sequences to use new attributes.
	(floatsidf2,fix_truncdfsi2): use TARGET_MFPGPR.
	(fix_truncdfsi2_mfpgpr): New.
	(floatsidf_ppc64_mfpgpr): New.
	(floatsidf_ppc64): Added !TARGET_MFPGPR condition.
	(movdf_hardfloat64_mfpgpr,movdi_mfpgpr): New.
	(movdf_hardfloat64): Added !TARGET_MFPGPR condition.
	(movdi_internal64): Added !TARGET_MFPGPR and related conditions.
	(fix_truncdfsi2): Use gpc_reg_operand constraint.
	* config/rs6000/{6xx.md,power4.md,8540.md,603.md,mpc.md,
	7xx.md,rios2.md,7450.md,440.md,rios1.md,rs64.md,power5.md,40x.md}:
	Add descriptions for insert_dword, shift,trap,var_shift_rotate,
	cntlz,exts and var_delayed_compare.
	* config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Define
	_ARCH_PWR6X, if features enabled.
	* config/rs6000/rs6000.opt (mmfpgpr): New.
	* config/rs6000/rs6000.c (rs6000_align_branch_targets): New variable.
	(cached_can_issue_more): New variable.
	(processor_costs): Add power6_cost.
	(rs6000_sched_init): New function.
	(is_dispatch_slot_restricted): Deleted.
	(set_to_load_agen): New function.
	(is_load_insn,is_store_insn): New functions.
	(adjacent_mem_locations): New function.
	(insn_must_be_first_in_group): New function.
	(insn_must_be_last_in_group): New function.
	(rs6000_sched_reorder): New function.
	(rs6000_sched_reorder2): New function.
	(TARGET_SCHED_INIT,TARGET_SCHED_REORDER,
	TARGET_SCHED_REORDER2): Define.
	(processor_target_table): Use PROCESSOR_POWER6 for power6.
	Add power6x. Add MASK_MFPGPR for power6x.
	(POWERPC_MASKS): Add MASK_MFPGPR.
	(rs6000_override_options): Set rs6000_always_hint to false
	for power6.  Set rs6000_align_branch_targets. Replace
	rs6000_sched_groups check with rs6000_align_branch_targets.
	Use PROCESSOR_POWER6.
	(last_scheduled_insn): New variable.
	(load_store_pendulum): New variable.
	(rs6000_variable_issue): Set last_scheduled_insn and
	cached_can_issue_more.
	(rs6000_adjust_cost): Add power6 cost adjustments.
	(rs6000_adjust_priority): Replace is_dispatch_slot_restricted
	with insn_must_be_first_in_group. Add power6 priority adjustments.
	(rs6000_issue_rate): Add CPU_POWER6.
	(insn_terminates_group_p): Use insn_must_be_{first,last}_in_group.
	* config/rs6000/rs6000.h (processor_type): Add PROCESSOR_POWER6.
	(TARGET_MFPGPR): New.
	(SECONDARY_MEMORY_NEEDED): Use TARGET_MFPGPR.
	(ASM_CPU_SPEC): Add power6x.
	(SECONDARY_MEMORY_NEEDED): Added mode!=DFmode and mode!=DImode
	conditions.
	* config/rs6000/power6.md: New file.


Co-Authored-By: Peter Bergner <bergner@vnet.ibm.com>

From-SVN: r118396
parent 293be7fd
Showing with 236 additions and 45 deletions
gcc/ChangeLog
2006-11-01 Pete Steinmetz <steinmtz@us.ibm.com>
Peter Bergner <bergner@vnet.ibm.com>
* doc/invoke.texi: Add cpu_type power6x
(RS/6000 and PowerPC Options): Add -mmfpgpr.
* config.gcc: Add cpu_type power6x.
* configure.ac: Add test for mf{t,f}gpr instructions.
(HAVE_AS_MFPGPR): New.
* config.in: Regenerate.
* configure: Regenerate.
* config/rs6000/aix52.h (ASM_CPU_SPEC): Add power6x.
* config/rs6000/rs6000.md (define_attr "type"): Add insert_dword,
shift,trap,var_shift_rotate,cntlz,exts, var_delayed_compare, mffgpr
and mftgpr attributes.
(define_attr "cpu"): Add power6.
Change instruction sequences to use new attributes.
(floatsidf2,fix_truncdfsi2): use TARGET_MFPGPR.
(fix_truncdfsi2_mfpgpr): New.
(floatsidf_ppc64_mfpgpr): New.
(floatsidf_ppc64): Added !TARGET_MFPGPR condition.
(movdf_hardfloat64_mfpgpr,movdi_mfpgpr): New.
(movdf_hardfloat64): Added !TARGET_MFPGPR condition.
(movdi_internal64): Added !TARGET_MFPGPR and related conditions.
(fix_truncdfsi2): Use gpc_reg_operand constraint.
* config/rs6000/{6xx.md,power4.md,8540.md,603.md,mpc.md,
7xx.md,rios2.md,7450.md,440.md,rios1.md,rs64.md,power5.md,40x.md}:
Add descriptions for insert_dword, shift,trap,var_shift_rotate,
cntlz,exts and var_delayed_compare.
* config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Define
_ARCH_PWR6X, if features enabled.
* config/rs6000/rs6000.opt (mmfpgpr): New.
* config/rs6000/rs6000.c (rs6000_align_branch_targets): New variable.
(cached_can_issue_more): New variable.
(processor_costs): Add power6_cost.
(rs6000_sched_init): New function.
(is_dispatch_slot_restricted): Deleted.
(set_to_load_agen): New function.
(is_load_insn,is_store_insn): New functions.
(adjacent_mem_locations): New function.
(insn_must_be_first_in_group): New function.
(insn_must_be_last_in_group): New function.
(rs6000_sched_reorder): New function.
(rs6000_sched_reorder2): New function.
(TARGET_SCHED_INIT,TARGET_SCHED_REORDER,
TARGET_SCHED_REORDER2): Define.
(processor_target_table): Use PROCESSOR_POWER6 for power6.
Add power6x. Add MASK_MFPGPR for power6x.
(POWERPC_MASKS): Add MASK_MFPGPR.
(rs6000_override_options): Set rs6000_always_hint to false
for power6. Set rs6000_align_branch_targets. Replace
rs6000_sched_groups check with rs6000_align_branch_targets.
Use PROCESSOR_POWER6.
(last_scheduled_insn): New variable.
(load_store_pendulum): New variable.
(rs6000_variable_issue): Set last_scheduled_insn and
cached_can_issue_more.
(rs6000_adjust_cost): Add power6 cost adjustments.
(rs6000_adjust_priority): Replace is_dispatch_slot_restricted
with insn_must_be_first_in_group. Add power6 priority adjustments.
(rs6000_issue_rate): Add CPU_POWER6.
(insn_terminates_group_p): Use insn_must_be_{first,last}_in_group.
* config/rs6000/rs6000.h (processor_type): Add PROCESSOR_POWER6.
(TARGET_MFPGPR): New.
(SECONDARY_MEMORY_NEEDED): Use TARGET_MFPGPR.
(ASM_CPU_SPEC): Add power6x.
(SECONDARY_MEMORY_NEEDED): Added mode!=DFmode and mode!=DImode
conditions.
* config/rs6000/power6.md: New file.
2006-11-01 Adam Nemet <anemet@caviumnetworks.com> 2006-11-01 Adam Nemet <anemet@caviumnetworks.com>
* tree-pretty-print.c (dump_generic_node) <INTEGER_CST>: Use * tree-pretty-print.c (dump_generic_node) <INTEGER_CST>: Use
......
gcc/config.gcc
...@@ -303,7 +303,7 @@ powerpc*-*-*) ...@@ -303,7 +303,7 @@ powerpc*-*-*)
extra_headers="ppc-asm.h altivec.h spe.h" extra_headers="ppc-asm.h altivec.h spe.h"
need_64bit_hwint=yes need_64bit_hwint=yes
case x$with_cpu in case x$with_cpu in
xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[3456]|xrs64a) xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[3456]|xpower6x|xrs64a)
cpu_is_64bit=yes cpu_is_64bit=yes
;; ;;
esac esac
...@@ -2870,7 +2870,7 @@ case "${target}" in ...@@ -2870,7 +2870,7 @@ case "${target}" in
eval "with_$which=405" eval "with_$which=405"
;; ;;
"" | common \ "" | common \
| power | power[23456] | powerpc | powerpc64 \ | power | power[23456] | power6x | powerpc | powerpc64 \
| rios | rios1 | rios2 | rsc | rsc1 | rs64a \ | rios | rios1 | rios2 | rsc | rsc1 | rs64a \
| 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \ | 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
| 601 | 602 | 603 | 603e | ec603e | 604 \ | 601 | 602 | 603 | 603e | ec603e | 604 \
......
gcc/config.in
...@@ -233,6 +233,12 @@ ...@@ -233,6 +233,12 @@
#endif #endif
/* Define if your assembler supports mffgpr and mftgpr. */
#ifndef USED_FOR_TARGET
#undef HAVE_AS_MFPGPR
#endif
/* Define if your assembler supports the -no-mul-bug-abort option. */ /* Define if your assembler supports the -no-mul-bug-abort option. */
#ifndef USED_FOR_TARGET #ifndef USED_FOR_TARGET
#undef HAVE_AS_NO_MUL_BUG_ABORT_OPTION #undef HAVE_AS_NO_MUL_BUG_ABORT_OPTION
......
gcc/config/rs6000/40x.md
...@@ -38,7 +38,8 @@ ...@@ -38,7 +38,8 @@
"iu_40x") "iu_40x")
(define_insn_reservation "ppc403-integer" 1 (define_insn_reservation "ppc403-integer" 1
(and (eq_attr "type" "integer,insert_word") (and (eq_attr "type" "integer,insert_word,insert_dword,shift,trap,\
var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "ppc403,ppc405")) (eq_attr "cpu" "ppc403,ppc405"))
"iu_40x") "iu_40x")
...@@ -53,7 +54,8 @@ ...@@ -53,7 +54,8 @@
"iu_40x,iu_40x,iu_40x") "iu_40x,iu_40x,iu_40x")
(define_insn_reservation "ppc403-compare" 3 (define_insn_reservation "ppc403-compare" 3
(and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare") (and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare,\
var_delayed_compare")
(eq_attr "cpu" "ppc403,ppc405")) (eq_attr "cpu" "ppc403,ppc405"))
"iu_40x,nothing,bpu_40x") "iu_40x,nothing,bpu_40x")
......
gcc/config/rs6000/440.md
...@@ -55,7 +55,8 @@ ...@@ -55,7 +55,8 @@
"ppc440_issue,ppc440_l_pipe") "ppc440_issue,ppc440_l_pipe")
(define_insn_reservation "ppc440-integer" 1 (define_insn_reservation "ppc440-integer" 1
(and (eq_attr "type" "integer,insert_word") (and (eq_attr "type" "integer,insert_word,insert_dword,shift,\
trap,var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "ppc440")) (eq_attr "cpu" "ppc440"))
"ppc440_issue,ppc440_i_pipe|ppc440_j_pipe") "ppc440_issue,ppc440_i_pipe|ppc440_j_pipe")
......
gcc/config/rs6000/603.md
...@@ -59,7 +59,8 @@ ...@@ -59,7 +59,8 @@
"lsu_603") "lsu_603")
(define_insn_reservation "ppc603-integer" 1 (define_insn_reservation "ppc603-integer" 1
(and (eq_attr "type" "integer,insert_word") (and (eq_attr "type" "integer,insert_word,insert_dword,shift,trap,\
var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "ppc603")) (eq_attr "cpu" "ppc603"))
"iu_603") "iu_603")
...@@ -90,7 +91,8 @@ ...@@ -90,7 +91,8 @@
"iu_603*37") "iu_603*37")
(define_insn_reservation "ppc603-compare" 3 (define_insn_reservation "ppc603-compare" 3
(and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare") (and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare,\
var_delayed_compare")
(eq_attr "cpu" "ppc603")) (eq_attr "cpu" "ppc603"))
"iu_603,nothing,bpu_603") "iu_603,nothing,bpu_603")
......
gcc/config/rs6000/6xx.md
...@@ -74,7 +74,8 @@ ...@@ -74,7 +74,8 @@
"lsu_6xx") "lsu_6xx")
(define_insn_reservation "ppc604-integer" 1 (define_insn_reservation "ppc604-integer" 1
(and (eq_attr "type" "integer,insert_word") (and (eq_attr "type" "integer,insert_word,insert_dword,shift,trap,\
var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "ppc604,ppc604e,ppc620,ppc630")) (eq_attr "cpu" "ppc604,ppc604e,ppc620,ppc630"))
"iu1_6xx|iu2_6xx") "iu1_6xx|iu2_6xx")
...@@ -139,7 +140,8 @@ ...@@ -139,7 +140,8 @@
"mciu_6xx*36") "mciu_6xx*36")
(define_insn_reservation "ppc604-compare" 3 (define_insn_reservation "ppc604-compare" 3
(and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare") (and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare,\
var_delayed_compare")
(eq_attr "cpu" "ppc604,ppc604e,ppc620,ppc630")) (eq_attr "cpu" "ppc604,ppc604e,ppc620,ppc630"))
"(iu1_6xx|iu2_6xx)") "(iu1_6xx|iu2_6xx)")
......
gcc/config/rs6000/7450.md
...@@ -75,7 +75,8 @@ ...@@ -75,7 +75,8 @@
"ppc7450_du,lsu_7450") "ppc7450_du,lsu_7450")
(define_insn_reservation "ppc7450-integer" 1 (define_insn_reservation "ppc7450-integer" 1
(and (eq_attr "type" "integer,insert_word") (and (eq_attr "type" "integer,insert_word,insert_dword,shift,\
trap,var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "ppc7450")) (eq_attr "cpu" "ppc7450"))
"ppc7450_du,iu1_7450|iu2_7450|iu3_7450") "ppc7450_du,iu1_7450|iu2_7450|iu3_7450")
...@@ -106,7 +107,8 @@ ...@@ -106,7 +107,8 @@
"ppc7450_du,mciu_7450*23") "ppc7450_du,mciu_7450*23")
(define_insn_reservation "ppc7450-compare" 2 (define_insn_reservation "ppc7450-compare" 2
(and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare") (and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare,\
var_delayed_compare")
(eq_attr "cpu" "ppc7450")) (eq_attr "cpu" "ppc7450"))
"ppc7450_du,(iu1_7450|iu2_7450|iu3_7450)") "ppc7450_du,(iu1_7450|iu2_7450|iu3_7450)")
......
gcc/config/rs6000/7xx.md
...@@ -65,7 +65,8 @@ ...@@ -65,7 +65,8 @@
"ppc750_du,lsu_7xx") "ppc750_du,lsu_7xx")
(define_insn_reservation "ppc750-integer" 1 (define_insn_reservation "ppc750-integer" 1
(and (eq_attr "type" "integer,insert_word") (and (eq_attr "type" "integer,insert_word,insert_dword,shift,\
trap,var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "ppc750,ppc7400")) (eq_attr "cpu" "ppc750,ppc7400"))
"ppc750_du,iu1_7xx|iu2_7xx") "ppc750_du,iu1_7xx|iu2_7xx")
...@@ -100,7 +101,8 @@ ...@@ -100,7 +101,8 @@
"ppc750_du,iu1_7xx*19") "ppc750_du,iu1_7xx*19")
(define_insn_reservation "ppc750-compare" 2 (define_insn_reservation "ppc750-compare" 2
(and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare") (and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare,\
var_delayed_compare")
(eq_attr "cpu" "ppc750,ppc7400")) (eq_attr "cpu" "ppc750,ppc7400"))
"ppc750_du,(iu1_7xx|iu2_7xx)") "ppc750_du,(iu1_7xx|iu2_7xx)")
......
gcc/config/rs6000/8540.md
...@@ -85,7 +85,9 @@ ...@@ -85,7 +85,9 @@
;; Simple SU insns ;; Simple SU insns
(define_insn_reservation "ppc8540_su" 1 (define_insn_reservation "ppc8540_su" 1
(and (eq_attr "type" "integer,insert_word,cmp,compare,delayed_compare,fast_compare") (and (eq_attr "type" "integer,insert_word,insert_dword,cmp,compare,\
delayed_compare,var_delayed_compare,fast_compare,\
shift,trap,var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "ppc8540")) (eq_attr "cpu" "ppc8540"))
"ppc8540_decode,ppc8540_issue+ppc8540_su_stage0+ppc8540_retire") "ppc8540_decode,ppc8540_issue+ppc8540_su_stage0+ppc8540_retire")
......
gcc/config/rs6000/aix52.h
...@@ -69,6 +69,7 @@ do { \ ...@@ -69,6 +69,7 @@ do { \
%{mcpu=power5: -m620} \ %{mcpu=power5: -m620} \
%{mcpu=power5+: -m620} \ %{mcpu=power5+: -m620} \
%{mcpu=power6: -m620} \ %{mcpu=power6: -m620} \
%{mcpu=power6x: -m620} \
%{mcpu=powerpc: -mppc} \ %{mcpu=powerpc: -mppc} \
%{mcpu=rs64a: -mppc} \ %{mcpu=rs64a: -mppc} \
%{mcpu=603: -m603} \ %{mcpu=603: -m603} \
......
gcc/config/rs6000/linux64.h
...@@ -58,9 +58,9 @@ extern int dot_symbols; ...@@ -58,9 +58,9 @@ extern int dot_symbols;
#endif #endif
#undef PROCESSOR_DEFAULT #undef PROCESSOR_DEFAULT
#define PROCESSOR_DEFAULT PROCESSOR_POWER4 #define PROCESSOR_DEFAULT PROCESSOR_POWER6
#undef PROCESSOR_DEFAULT64 #undef PROCESSOR_DEFAULT64
#define PROCESSOR_DEFAULT64 PROCESSOR_POWER4 #define PROCESSOR_DEFAULT64 PROCESSOR_POWER6
/* We don't need to generate entries in .fixup, except when /* We don't need to generate entries in .fixup, except when
-mrelocatable or -mrelocatable-lib is given. */ -mrelocatable or -mrelocatable-lib is given. */
......
gcc/config/rs6000/mpc.md
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
"lsu_mpc") "lsu_mpc")
(define_insn_reservation "mpccore-integer" 1 (define_insn_reservation "mpccore-integer" 1
(and (eq_attr "type" "integer,insert_word") (and (eq_attr "type" "integer,insert_word,insert_dword,shift,trap,\
var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "mpccore")) (eq_attr "cpu" "mpccore"))
"iu_mpc") "iu_mpc")
...@@ -69,7 +70,8 @@ ...@@ -69,7 +70,8 @@
"mciu_mpc*6") "mciu_mpc*6")
(define_insn_reservation "mpccore-compare" 3 (define_insn_reservation "mpccore-compare" 3
(and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare") (and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare,\
var_delayed_compare")
(eq_attr "cpu" "mpccore")) (eq_attr "cpu" "mpccore"))
"iu_mpc,nothing,bpu_mpc") "iu_mpc,nothing,bpu_mpc")
......
gcc/config/rs6000/power4.md
...@@ -183,7 +183,8 @@ ...@@ -183,7 +183,8 @@
; Integer latency is 2 cycles ; Integer latency is 2 cycles
(define_insn_reservation "power4-integer" 2 (define_insn_reservation "power4-integer" 2
(and (eq_attr "type" "integer") (and (eq_attr "type" "integer,insert_dword,shift,trap,\
var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "power4")) (eq_attr "cpu" "power4"))
"iq_power4") "iq_power4")
...@@ -220,7 +221,7 @@ ...@@ -220,7 +221,7 @@
"iq_power4") "iq_power4")
(define_insn_reservation "power4-compare" 2 (define_insn_reservation "power4-compare" 2
(and (eq_attr "type" "compare,delayed_compare") (and (eq_attr "type" "compare,delayed_compare,var_delayed_compare")
(eq_attr "cpu" "power4")) (eq_attr "cpu" "power4"))
"(du1_power4+du2_power4,iu1_power4,iu2_power4)\ "(du1_power4+du2_power4,iu1_power4,iu2_power4)\
|(du2_power4+du3_power4,iu2_power4,iu2_power4)\ |(du2_power4+du3_power4,iu2_power4,iu2_power4)\
......
gcc/config/rs6000/power5.md
...@@ -144,7 +144,8 @@ ...@@ -144,7 +144,8 @@
; Integer latency is 2 cycles ; Integer latency is 2 cycles
(define_insn_reservation "power5-integer" 2 (define_insn_reservation "power5-integer" 2
(and (eq_attr "type" "integer") (and (eq_attr "type" "integer,insert_dword,shift,trap,\
var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "power5")) (eq_attr "cpu" "power5"))
"iq_power5") "iq_power5")
...@@ -179,7 +180,7 @@ ...@@ -179,7 +180,7 @@
"iq_power5") "iq_power5")
(define_insn_reservation "power5-compare" 2 (define_insn_reservation "power5-compare" 2
(and (eq_attr "type" "compare,delayed_compare") (and (eq_attr "type" "compare,delayed_compare,var_delayed_compare")
(eq_attr "cpu" "power5")) (eq_attr "cpu" "power5"))
"du1_power5+du2_power5,iu1_power5,iu2_power5") "du1_power5+du2_power5,iu1_power5,iu2_power5")
......
gcc/config/rs6000/rios1.md
...@@ -52,7 +52,8 @@ ...@@ -52,7 +52,8 @@
"iu_rios1+fpu_rios1") "iu_rios1+fpu_rios1")
(define_insn_reservation "rios1-integer" 1 (define_insn_reservation "rios1-integer" 1
(and (eq_attr "type" "integer,insert_word") (and (eq_attr "type" "integer,insert_word,insert_dword,shift,\
trap,var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "rios1,ppc601")) (eq_attr "cpu" "rios1,ppc601"))
"iu_rios1") "iu_rios1")
...@@ -104,12 +105,13 @@ ...@@ -104,12 +105,13 @@
"iu_rios1,nothing*2,bpu_rios1") "iu_rios1,nothing*2,bpu_rios1")
(define_insn_reservation "rios1-delayed_compare" 5 (define_insn_reservation "rios1-delayed_compare" 5
(and (eq_attr "type" "delayed_compare") (and (eq_attr "type" "delayed_compare,var_delayed_compare")
(eq_attr "cpu" "rios1")) (eq_attr "cpu" "rios1"))
"iu_rios1,nothing*3,bpu_rios1") "iu_rios1,nothing*3,bpu_rios1")
(define_insn_reservation "ppc601-compare" 3 (define_insn_reservation "ppc601-compare" 3
(and (eq_attr "type" "cmp,compare,delayed_compare") (and (eq_attr "type" "cmp,compare,delayed_compare,\
var_delayed_compare")
(eq_attr "cpu" "ppc601")) (eq_attr "cpu" "ppc601"))
"iu_rios1,nothing,bpu_rios1") "iu_rios1,nothing,bpu_rios1")
......
gcc/config/rs6000/rios2.md
...@@ -40,7 +40,8 @@ ...@@ -40,7 +40,8 @@
"iu1_rios2|iu2_rios2") "iu1_rios2|iu2_rios2")
(define_insn_reservation "rios2-integer" 1 (define_insn_reservation "rios2-integer" 1
(and (eq_attr "type" "integer,insert_word") (and (eq_attr "type" "integer,insert_word,insert_dword,shift,trap,\
var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "rios2")) (eq_attr "cpu" "rios2"))
"iu1_rios2|iu2_rios2") "iu1_rios2|iu2_rios2")
...@@ -67,7 +68,8 @@ ...@@ -67,7 +68,8 @@
; compare executes on integer unit, but feeds insns which ; compare executes on integer unit, but feeds insns which
; execute on the branch unit. ; execute on the branch unit.
(define_insn_reservation "rios2-compare" 3 (define_insn_reservation "rios2-compare" 3
(and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare") (and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare,\
var_delayed_compare")
(eq_attr "cpu" "rios2")) (eq_attr "cpu" "rios2"))
"(iu1_rios2|iu2_rios2),nothing,bpu_rios2") "(iu1_rios2|iu2_rios2),nothing,bpu_rios2")
......
gcc/config/rs6000/rs6000-c.c
...@@ -106,6 +106,8 @@ rs6000_cpu_cpp_builtins (cpp_reader *pfile) ...@@ -106,6 +106,8 @@ rs6000_cpu_cpp_builtins (cpp_reader *pfile)
builtin_define ("_ARCH_PWR5"); builtin_define ("_ARCH_PWR5");
if (TARGET_FPRND) if (TARGET_FPRND)
builtin_define ("_ARCH_PWR5X"); builtin_define ("_ARCH_PWR5X");
if (TARGET_MFPGPR)
builtin_define ("_ARCH_PWR6X");
if (! TARGET_POWER && ! TARGET_POWER2 && ! TARGET_POWERPC) if (! TARGET_POWER && ! TARGET_POWER2 && ! TARGET_POWERPC)
builtin_define ("_ARCH_COM"); builtin_define ("_ARCH_COM");
if (TARGET_ALTIVEC) if (TARGET_ALTIVEC)
......
gcc/config/rs6000/rs6000.h
...@@ -75,6 +75,7 @@ ...@@ -75,6 +75,7 @@
%{mcpu=power5: -mpower4} \ %{mcpu=power5: -mpower4} \
%{mcpu=power5+: -mpower4} \ %{mcpu=power5+: -mpower4} \
%{mcpu=power6: -mpower4 -maltivec} \ %{mcpu=power6: -mpower4 -maltivec} \
%{mcpu=power6x: -mpower4 -maltivec} \
%{mcpu=powerpc: -mppc} \ %{mcpu=powerpc: -mppc} \
%{mcpu=rios: -mpwr} \ %{mcpu=rios: -mpwr} \
%{mcpu=rios1: -mpwr} \ %{mcpu=rios1: -mpwr} \
...@@ -162,6 +163,14 @@ ...@@ -162,6 +163,14 @@
#define TARGET_FPRND 0 #define TARGET_FPRND 0
#endif #endif
/* Define TARGET_MFPGPR if the target assembler does not support the
mffpr and mftgpr instructions. */
#ifndef HAVE_AS_MFPGPR
#undef TARGET_MFPGPR
#define TARGET_MFPGPR 0
#endif
#ifndef TARGET_SECURE_PLT #ifndef TARGET_SECURE_PLT
#define TARGET_SECURE_PLT 0 #define TARGET_SECURE_PLT 0
#endif #endif
...@@ -212,7 +221,8 @@ enum processor_type ...@@ -212,7 +221,8 @@ enum processor_type
PROCESSOR_PPC7450, PROCESSOR_PPC7450,
PROCESSOR_PPC8540, PROCESSOR_PPC8540,
PROCESSOR_POWER4, PROCESSOR_POWER4,
PROCESSOR_POWER5 PROCESSOR_POWER5,
PROCESSOR_POWER6
}; };
extern enum processor_type rs6000_cpu; extern enum processor_type rs6000_cpu;
...@@ -1109,12 +1119,18 @@ enum reg_class ...@@ -1109,12 +1119,18 @@ enum reg_class
rs6000_secondary_reload_class (CLASS, MODE, IN) rs6000_secondary_reload_class (CLASS, MODE, IN)
/* If we are copying between FP or AltiVec registers and anything /* If we are copying between FP or AltiVec registers and anything
else, we need a memory location. */ else, we need a memory location. The exception is when we are
targeting ppc64 and the move to/from fpr to gpr instructions
#define SECONDARY_MEMORY_NEEDED(CLASS1,CLASS2,MODE) \ are available.*/
((CLASS1) != (CLASS2) && ((CLASS1) == FLOAT_REGS \
|| (CLASS2) == FLOAT_REGS \ #define SECONDARY_MEMORY_NEEDED(CLASS1,CLASS2,MODE) \
|| (CLASS1) == ALTIVEC_REGS \ ((CLASS1) != (CLASS2) && (((CLASS1) == FLOAT_REGS \
&& (!TARGET_MFPGPR || !TARGET_POWERPC64 \
|| ((MODE != DFmode) && (MODE != DImode)))) \
|| ((CLASS2) == FLOAT_REGS \
&& (!TARGET_MFPGPR || !TARGET_POWERPC64 \
|| ((MODE != DFmode) && (MODE != DImode)))) \
|| (CLASS1) == ALTIVEC_REGS \
|| (CLASS2) == ALTIVEC_REGS)) || (CLASS2) == ALTIVEC_REGS))
/* Return the maximum number of consecutive registers /* Return the maximum number of consecutive registers
......
gcc/config/rs6000/rs6000.opt
...@@ -64,6 +64,10 @@ mfprnd ...@@ -64,6 +64,10 @@ mfprnd
Target Report Mask(FPRND) Target Report Mask(FPRND)
Use PowerPC V2.02 floating point rounding instructions Use PowerPC V2.02 floating point rounding instructions
mmfpgpr
Target Report Mask(MFPGPR)
Use extended PowerPC V2.05 move floating point to/from GPR instructions
maltivec maltivec
Target Report Mask(ALTIVEC) Target Report Mask(ALTIVEC)
Use AltiVec instructions Use AltiVec instructions
......
gcc/config/rs6000/rs64.md
...@@ -47,7 +47,8 @@ ...@@ -47,7 +47,8 @@
"lsu_rs64") "lsu_rs64")
(define_insn_reservation "rs64a-integer" 1 (define_insn_reservation "rs64a-integer" 1
(and (eq_attr "type" "integer,insert_word") (and (eq_attr "type" "integer,insert_word,insert_dword,shift,trap,\
var_shift_rotate,cntlz,exts")
(eq_attr "cpu" "rs64a")) (eq_attr "cpu" "rs64a"))
"iu_rs64") "iu_rs64")
...@@ -92,7 +93,8 @@ ...@@ -92,7 +93,8 @@
"mciu_rs64*66") "mciu_rs64*66")
(define_insn_reservation "rs64a-compare" 3 (define_insn_reservation "rs64a-compare" 3
(and (eq_attr "type" "cmp,fast_compare,compare,delayed_compare") (and (eq_attr "type" "cmp,fast_compare,compare,\
delayed_compare,var_delayed_compare")
(eq_attr "cpu" "rs64a")) (eq_attr "cpu" "rs64a"))
"iu_rs64,nothing,bpu_rs64") "iu_rs64,nothing,bpu_rs64")
......
gcc/configure
...@@ -15513,6 +15513,52 @@ _ACEOF ...@@ -15513,6 +15513,52 @@ _ACEOF
fi fi
case $target in case $target in
*-*-aix*) conftest_s=' .machine "pwr6"
.csect .text[PR]
mffgpr 1,3';;
*) conftest_s=' .machine power6
.text
mffgpr 1,3';;
esac
echo "$as_me:$LINENO: checking assembler for move fp gpr support" >&5
echo $ECHO_N "checking assembler for move fp gpr support... $ECHO_C" >&6
if test "${gcc_cv_as_powerpc_mfpgpr+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
gcc_cv_as_powerpc_mfpgpr=no
if test $in_tree_gas = yes; then
if test $gcc_cv_gas_vers -ge `expr \( \( 9 \* 1000 \) + 99 \) \* 1000 + 0`
then gcc_cv_as_powerpc_mfpgpr=yes
fi
elif test x$gcc_cv_as != x; then
echo "$conftest_s" > conftest.s
if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }
then
gcc_cv_as_powerpc_mfpgpr=yes
else
echo "configure: failed program was" >&5
cat conftest.s >&5
fi
rm -f conftest.o conftest.s
fi
fi
echo "$as_me:$LINENO: result: $gcc_cv_as_powerpc_mfpgpr" >&5
echo "${ECHO_T}$gcc_cv_as_powerpc_mfpgpr" >&6
if test $gcc_cv_as_powerpc_mfpgpr = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_AS_MFPGPR 1
_ACEOF
fi
case $target in
*-*-aix*) conftest_s=' .csect .text[PR] *-*-aix*) conftest_s=' .csect .text[PR]
LCF..0: LCF..0:
addis 11,30,_GLOBAL_OFFSET_TABLE_-LCF..0@ha';; addis 11,30,_GLOBAL_OFFSET_TABLE_-LCF..0@ha';;
......
gcc/configure.ac
...@@ -2934,6 +2934,21 @@ foo: nop ...@@ -2934,6 +2934,21 @@ foo: nop
[Define if your assembler supports fprnd.])]) [Define if your assembler supports fprnd.])])
case $target in case $target in
*-*-aix*) conftest_s=' .machine "pwr6"
.csect .text[[PR]]
mffgpr 1,3';;
*) conftest_s=' .machine power6
.text
mffgpr 1,3';;
esac
gcc_GAS_CHECK_FEATURE([move fp gpr support],
gcc_cv_as_powerpc_mfpgpr, [9,99,0],,
[$conftest_s],,
[AC_DEFINE(HAVE_AS_MFPGPR, 1,
[Define if your assembler supports mffgpr and mftgpr.])])
case $target in
*-*-aix*) conftest_s=' .csect .text[[PR]] *-*-aix*) conftest_s=' .csect .text[[PR]]
LCF..0: LCF..0:
addis 11,30,_GLOBAL_OFFSET_TABLE_-LCF..0@ha';; addis 11,30,_GLOBAL_OFFSET_TABLE_-LCF..0@ha';;
......
gcc/doc/invoke.texi
...@@ -656,6 +656,7 @@ See RS/6000 and PowerPC Options. ...@@ -656,6 +656,7 @@ See RS/6000 and PowerPC Options.
-mpowerpc-gpopt -mno-powerpc-gpopt @gol -mpowerpc-gpopt -mno-powerpc-gpopt @gol
-mpowerpc-gfxopt -mno-powerpc-gfxopt @gol -mpowerpc-gfxopt -mno-powerpc-gfxopt @gol
-mmfcrf -mno-mfcrf -mpopcntb -mno-popcntb -mfprnd -mno-fprnd @gol -mmfcrf -mno-mfcrf -mpopcntb -mno-popcntb -mfprnd -mno-fprnd @gol
-mmfpgpr -mno-mfpgpr @gol
-mnew-mnemonics -mold-mnemonics @gol -mnew-mnemonics -mold-mnemonics @gol
-mfull-toc -mminimal-toc -mno-fp-in-toc -mno-sum-in-toc @gol -mfull-toc -mminimal-toc -mno-fp-in-toc -mno-sum-in-toc @gol
-m64 -m32 -mxl-compat -mno-xl-compat -mpe @gol -m64 -m32 -mxl-compat -mno-xl-compat -mpe @gol
...@@ -11253,6 +11254,8 @@ These @samp{-m} options are defined for the IBM RS/6000 and PowerPC: ...@@ -11253,6 +11254,8 @@ These @samp{-m} options are defined for the IBM RS/6000 and PowerPC:
@itemx -mno-popcntb @itemx -mno-popcntb
@itemx -mfprnd @itemx -mfprnd
@itemx -mno-fprnd @itemx -mno-fprnd
@itemx -mmfpgpr
@itemx -mno-mfpgpr
@opindex mpower @opindex mpower
@opindex mno-power @opindex mno-power
@opindex mpower2 @opindex mpower2
...@@ -11271,6 +11274,8 @@ These @samp{-m} options are defined for the IBM RS/6000 and PowerPC: ...@@ -11271,6 +11274,8 @@ These @samp{-m} options are defined for the IBM RS/6000 and PowerPC:
@opindex mno-popcntb @opindex mno-popcntb
@opindex mfprnd @opindex mfprnd
@opindex mno-fprnd @opindex mno-fprnd
@opindex mmfpgpr
@opindex mno-mfpgpr
GCC supports two related instruction set architectures for the GCC supports two related instruction set architectures for the
RS/6000 and PowerPC@. The @dfn{POWER} instruction set are those RS/6000 and PowerPC@. The @dfn{POWER} instruction set are those
instructions supported by the @samp{rios} chip set used in the original instructions supported by the @samp{rios} chip set used in the original
...@@ -11315,6 +11320,10 @@ architecture. ...@@ -11315,6 +11320,10 @@ architecture.
The @option{-mfprnd} option allows GCC to generate the FP round to The @option{-mfprnd} option allows GCC to generate the FP round to
integer instructions implemented on the POWER5+ processor and other integer instructions implemented on the POWER5+ processor and other
processors that support the PowerPC V2.03 architecture. processors that support the PowerPC V2.03 architecture.
The @option{-mmfpgpr} option allows GCC to generate the FP move to/from
general purpose register instructions implemented on the POWER6X
processor and other processors that support the extended PowerPC V2.05
architecture.
The @option{-mpowerpc64} option allows GCC to generate the additional The @option{-mpowerpc64} option allows GCC to generate the additional
64-bit instructions that are found in the full PowerPC64 architecture 64-bit instructions that are found in the full PowerPC64 architecture
...@@ -11357,7 +11366,7 @@ Supported values for @var{cpu_type} are @samp{401}, @samp{403}, ...@@ -11357,7 +11366,7 @@ Supported values for @var{cpu_type} are @samp{401}, @samp{403},
@samp{860}, @samp{970}, @samp{8540}, @samp{ec603e}, @samp{G3}, @samp{860}, @samp{970}, @samp{8540}, @samp{ec603e}, @samp{G3},
@samp{G4}, @samp{G5}, @samp{power}, @samp{power2}, @samp{power3}, @samp{G4}, @samp{G5}, @samp{power}, @samp{power2}, @samp{power3},
@samp{power4}, @samp{power5}, @samp{power5+}, @samp{power6}, @samp{power4}, @samp{power5}, @samp{power5+}, @samp{power6},
@samp{common}, @samp{powerpc}, @samp{powerpc64}, @samp{power6x}, @samp{common}, @samp{powerpc}, @samp{powerpc64},
@samp{rios}, @samp{rios1}, @samp{rios2}, @samp{rsc}, and @samp{rs64}. @samp{rios}, @samp{rios1}, @samp{rios2}, @samp{rsc}, and @samp{rs64}.
@option{-mcpu=common} selects a completely generic processor. Code @option{-mcpu=common} selects a completely generic processor. Code
...@@ -11381,14 +11390,14 @@ following options: @option{-maltivec}, @option{-mfprnd}, ...@@ -11381,14 +11390,14 @@ following options: @option{-maltivec}, @option{-mfprnd},
@option{-mhard-float}, @option{-mmfcrf}, @option{-mmultiple}, @option{-mhard-float}, @option{-mmfcrf}, @option{-mmultiple},
@option{-mnew-mnemonics}, @option{-mpopcntb}, @option{-mpower}, @option{-mnew-mnemonics}, @option{-mpopcntb}, @option{-mpower},
@option{-mpower2}, @option{-mpowerpc64}, @option{-mpowerpc-gpopt}, @option{-mpower2}, @option{-mpowerpc64}, @option{-mpowerpc-gpopt},
@option{-mpowerpc-gfxopt}, @option{-mstring}, @option{-mmulhw}, @option{-mdlmzb}. @option{-mpowerpc-gfxopt}, @option{-mstring}, @option{-mmulhw},
The particular options @option{-mdlmzb}, @option{-mmfpgpr}.
set for any particular CPU will vary between compiler versions, The particular options set for any particular CPU will vary between
depending on what setting seems to produce optimal code for that CPU; compiler versions, depending on what setting seems to produce optimal
it doesn't necessarily reflect the actual hardware's capabilities. If code for that CPU; it doesn't necessarily reflect the actual hardware's
you wish to set an individual option to a particular value, you may capabilities. If you wish to set an individual option to a particular
specify it after the @option{-mcpu} option, like @samp{-mcpu=970 value, you may specify it after the @option{-mcpu} option, like
-mno-altivec}. @samp{-mcpu=970 -mno-altivec}.
On AIX, the @option{-maltivec} and @option{-mpowerpc64} options are On AIX, the @option{-maltivec} and @option{-mpowerpc64} options are
not enabled or disabled by the @option{-mcpu} option at present because not enabled or disabled by the @option{-mcpu} option at present because
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment