@@ -56,9 +56,6 @@ (define_register_constraint "z" "CA_REGS"
(define_register_constraint "wa" "rs6000_constraints[RS6000_CONSTRAINT_wa]"
"Any VSX register if the -mvsx option was used or NO_REGS.")
-(define_register_constraint "wb" "rs6000_constraints[RS6000_CONSTRAINT_wb]"
- "Altivec register if the -mpower9-dform option was used or NO_REGS.")
-
;; NOTE: For compatibility, "wc" is reserved to represent individual CR bits.
;; It is currently used for that purpose in LLVM.
@@ -2508,7 +2508,6 @@ rs6000_debug_reg_global (void)
"f reg_class = %s\n"
"v reg_class = %s\n"
"wa reg_class = %s\n"
- "wb reg_class = %s\n"
"wd reg_class = %s\n"
"we reg_class = %s\n"
"wf reg_class = %s\n"
@@ -2540,7 +2539,6 @@ rs6000_debug_reg_global (void)
reg_class_names[rs6000_constraints[RS6000_CONSTRAINT_f]],
reg_class_names[rs6000_constraints[RS6000_CONSTRAINT_v]],
reg_class_names[rs6000_constraints[RS6000_CONSTRAINT_wa]],
- reg_class_names[rs6000_constraints[RS6000_CONSTRAINT_wb]],
reg_class_names[rs6000_constraints[RS6000_CONSTRAINT_wd]],
reg_class_names[rs6000_constraints[RS6000_CONSTRAINT_we]],
reg_class_names[rs6000_constraints[RS6000_CONSTRAINT_wf]],
@@ -3264,10 +3262,6 @@ rs6000_init_hard_regno_mode_ok (bool global_init_p)
rs6000_constraints[RS6000_CONSTRAINT_wp] = VSX_REGS; /* TFmode */
}
- /* Support for new D-form instructions. */
- if (TARGET_P9_VECTOR)
- rs6000_constraints[RS6000_CONSTRAINT_wb] = ALTIVEC_REGS;
-
/* Support for new direct moves (ISA 3.0 + 64bit). */
if (TARGET_DIRECT_MOVE_128)
rs6000_constraints[RS6000_CONSTRAINT_we] = VSX_REGS;
@@ -1249,7 +1249,6 @@ enum r6000_reg_class_enum {
RS6000_CONSTRAINT_f, /* fpr registers for single values */
RS6000_CONSTRAINT_v, /* Altivec registers */
RS6000_CONSTRAINT_wa, /* Any VSX register */
- RS6000_CONSTRAINT_wb, /* Altivec register if ISA 3.0 vector. */
RS6000_CONSTRAINT_wd, /* VSX register for V2DF */
RS6000_CONSTRAINT_we, /* VSX register if ISA 3.0 vector. */
RS6000_CONSTRAINT_wf, /* VSX register for V4SF */
@@ -477,7 +477,7 @@ (define_mode_attr f64_dm [(DF "wk") (DD "wh")])
(define_mode_attr f64_av [(DF "wv") (DD "wn")])
; Definitions for 64-bit access to ISA 3.0 (power9) vector
-(define_mode_attr f64_p9 [(DF "wb") (DD "wn")])
+(define_mode_attr f64_p9 [(DF "v") (DD "wn")])
; These modes do not fit in integer registers in 32-bit mode.
(define_mode_iterator DIFD [DI DF DD])
@@ -4769,7 +4769,7 @@ (define_expand "extendsfdf2"
})
(define_insn_and_split "*extendsfdf2_fpr"
- [(set (match_operand:DF 0 "gpc_reg_operand" "=d,?d,d,ws,?ws,wu,wb")
+ [(set (match_operand:DF 0 "gpc_reg_operand" "=d,?d,d,ws,?ws,wu,v")
(float_extend:DF (match_operand:SF 1 "reg_or_mem_operand" "0,f,m,0,wy,Z,wY")))]
"TARGET_HARD_FLOAT && !HONOR_SNANS (SFmode)"
"@
@@ -4786,7 +4786,8 @@ (define_insn_and_split "*extendsfdf2_fpr"
emit_note (NOTE_INSN_DELETED);
DONE;
}
- [(set_attr "type" "fp,fpsimple,fpload,fp,fpsimple,fpload,fpload")])
+ [(set_attr "type" "fp,fpsimple,fpload,fp,fpsimple,fpload,fpload")
+ (set_attr "isa" "*,*,*,*,*,*,p9v")])
(define_insn "*extendsfdf2_snan"
[(set (match_operand:DF 0 "gpc_reg_operand" "=d,ws")
@@ -6945,18 +6946,15 @@ (define_insn_and_split "movsi_from_sf"
"=r, r, ?*wI, ?*wH, m,
m, wY, Z, r, ?*wIwH,
wIwH")
-
(unspec:SI [(match_operand:SF 1 "input_operand"
"r, m, Z, Z, r,
- f, wb, wu, wIwH, wIwH,
+ f, v, wu, wIwH, wIwH,
r")]
UNSPEC_SI_FROM_SF))
-
(clobber (match_scratch:V4SF 2
"=X, X, X, X, X,
X, X, X, wIwH, X,
X"))]
-
"TARGET_NO_SF_SUBREG
&& (register_operand (operands[0], SImode)
|| register_operand (operands[1], SFmode))"
@@ -6991,11 +6989,14 @@ (define_insn_and_split "movsi_from_sf"
"*, load, fpload, fpload, store,
fpstore, fpstore, fpstore, mftgpr, fp,
mffgpr")
-
(set_attr "length"
"4, 4, 4, 4, 4,
4, 4, 4, 8, 4,
- 4")])
+ 4")
+ (set_attr "isa"
+ "*, *, *, *, *,
+ *, p9v, *, *, *,
+ *")])
;; movsi_from_sf with zero extension
;;
@@ -7280,11 +7281,11 @@ (define_split
(define_insn "movsf_hardfloat"
[(set (match_operand:SF 0 "nonimmediate_operand"
- "=!r, f, wb, wu, m, wY,
+ "=!r, f, v, wu, m, wY,
Z, m, ww, !r, f, ww,
!r, *c*l, !r, *h")
(match_operand:SF 1 "input_operand"
- "m, m, wY, Z, f, wb,
+ "m, m, wY, Z, f, v,
wu, r, j, j, f, ww,
r, r, *h, 0"))]
"(register_operand (operands[0], SFmode)
@@ -7312,7 +7313,11 @@ (define_insn "movsf_hardfloat"
[(set_attr "type"
"load, fpload, fpload, fpload, fpstore, fpstore,
fpstore, store, veclogical, integer, fpsimple, fpsimple,
- *, mtjmpr, mfjmpr, *")])
+ *, mtjmpr, mfjmpr, *")
+ (set_attr "isa"
+ "*, *, p9v, *, *, p9v,
+ *, *, *, *, *, *,
+ *, *, *, *")])
;; LWZ LFIWZX STW STFIWX MTVSRWZ MFVSRWZ
;; FMR MR MT%0 MF%1 NOP
@@ -7394,18 +7399,15 @@ (define_insn "*mov<mode>_softfloat"
;; STXSIWX GPR->VSX VSX->GPR GPR->GPR
(define_insn_and_split "movsf_from_si"
[(set (match_operand:SF 0 "nonimmediate_operand"
- "=!r, f, wb, wu, m, Z,
+ "=!r, f, v, wu, m, Z,
Z, wy, ?r, !r")
-
(unspec:SF [(match_operand:SI 1 "input_operand"
"m, m, wY, Z, r, f,
wu, r, wy, r")]
UNSPEC_SF_FROM_SI))
-
(clobber (match_scratch:DI 2
"=X, X, X, X, X, X,
X, r, X, X"))]
-
"TARGET_NO_SF_SUBREG
&& (register_operand (operands[0], SFmode)
|| register_operand (operands[1], SImode))"
@@ -7442,7 +7444,10 @@ (define_insn_and_split "movsf_from_si"
4, 12, 4, 4")
(set_attr "type"
"load, fpload, fpload, fpload, store, fpstore,
- fpstore, vecfloat, mffgpr, *")])
+ fpstore, vecfloat, mffgpr, *")
+ (set_attr "isa"
+ "*, *, p9v, *, *, *,
+ *, *, *, *")])
;; Move 64-bit binary/decimal floating point
@@ -7546,12 +7551,10 @@ (define_insn "*mov<mode>_hardfloat32"
"=m, d, d, <f64_p9>, wY,
<f64_av>, Z, <f64_vsx>, <f64_vsx>, !r,
Y, r, !r")
-
(match_operand:FMOVE64 1 "input_operand"
"d, m, d, wY, <f64_p9>,
Z, <f64_av>, <f64_vsx>, <zero_fp>, <zero_fp>,
r, Y, r"))]
-
"! TARGET_POWERPC64 && TARGET_HARD_FLOAT
&& (gpc_reg_operand (operands[0], <MODE>mode)
|| gpc_reg_operand (operands[1], <MODE>mode))"
@@ -7573,12 +7576,15 @@ (define_insn "*mov<mode>_hardfloat32"
"fpstore, fpload, fpsimple, fpload, fpstore,
fpload, fpstore, veclogical, veclogical, two,
store, load, two")
-
(set_attr "size" "64")
(set_attr "length"
"4, 4, 4, 4, 4,
4, 4, 4, 4, 8,
- 8, 8, 8")])
+ 8, 8, 8")
+ (set_attr "isa"
+ "*, *, *, p9v, p9v,
+ *, *, *, *, *,
+ *, *, *")])
;; STW LWZ MR G-const H-const F-const
@@ -7613,13 +7619,11 @@ (define_insn "*mov<mode>_hardfloat64"
<f64_av>, Z, <f64_vsx>, <f64_vsx>, !r,
YZ, r, !r, *c*l, !r,
*h, r, wg, r, <f64_dm>")
-
(match_operand:FMOVE64 1 "input_operand"
"d, m, d, wY, <f64_p9>,
Z, <f64_av>, <f64_vsx>, <zero_fp>, <zero_fp>,
r, YZ, r, r, *h,
0, wg, r, <f64_dm>, r"))]
-
"TARGET_POWERPC64 && TARGET_HARD_FLOAT
&& (gpc_reg_operand (operands[0], <MODE>mode)
|| gpc_reg_operand (operands[1], <MODE>mode))"
@@ -7648,10 +7652,13 @@ (define_insn "*mov<mode>_hardfloat64"
"fpstore, fpload, fpsimple, fpload, fpstore,
fpload, fpstore, veclogical, veclogical, integer,
store, load, *, mtjmpr, mfjmpr,
- *, mftgpr, mffgpr, mftgpr, mffgpr")
-
+ *, mftgpr, mffgpr, mftgpr, mffgpr")
(set_attr "size" "64")
- (set_attr "length" "4")])
+ (set_attr "isa"
+ "*, *, *, p9v, p9v,
+ *, *, *, *, *,
+ *, *, *, *, *,
+ *, *, *, *, *")])
;; STD LD MR MT<SPR> MF<SPR> G-const
;; H-const F-const Special
@@ -8708,16 +8715,14 @@ (define_insn_and_split "reload_gpr_from_vsxsf"
(define_insn "*movdi_internal32"
[(set (match_operand:DI 0 "nonimmediate_operand"
"=Y, r, r, m, ^d, ^d,
- r, wY, Z, ^wb, $wv, ^wi,
+ r, wY, Z, ^v, $wv, ^wi,
wa, wa, wv, wi, *i, wv,
wv")
-
(match_operand:DI 1 "input_operand"
"r, Y, r, ^d, m, ^d,
- IJKnF, ^wb, $wv, wY, Z, ^wi,
+ IJKnF, ^v, $wv, wY, Z, ^wi,
Oj, wM, OjwM, Oj, wM, wS,
wB"))]
-
"! TARGET_POWERPC64
&& (gpc_reg_operand (operands[0], DImode)
|| gpc_reg_operand (operands[1], DImode))"
@@ -8754,7 +8759,7 @@ (define_insn "*movdi_internal32"
4")
(set_attr "isa"
"*, *, *, *, *, *,
- *, *, *, *, *, *,
+ *, p9v, *, p9v, *, *,
p9v, p9v, *, *, *, *,
*")])
@@ -8793,18 +8798,16 @@ (define_split
(define_insn "*movdi_internal64"
[(set (match_operand:DI 0 "nonimmediate_operand"
"=YZ, r, r, r, r, r,
- m, ^d, ^d, wY, Z, $wb,
+ m, ^d, ^d, wY, Z, $v,
$wv, ^wi, wa, wa, wv, wi,
wi, wv, wv, r, *h, *h,
?r, ?wg, ?r, ?wj")
-
(match_operand:DI 1 "input_operand"
"r, YZ, r, I, L, nF,
- ^d, m, ^d, ^wb, $wv, wY,
+ ^d, m, ^d, ^v, $wv, wY,
Z, ^wi, Oj, wM, OjwM, Oj,
wM, wS, wB, *h, r, 0,
wg, r, wj, r"))]
-
"TARGET_POWERPC64
&& (gpc_reg_operand (operands[0], DImode)
|| gpc_reg_operand (operands[1], DImode))"
@@ -8843,7 +8846,6 @@ (define_insn "*movdi_internal64"
fpload, veclogical, vecsimple, vecsimple, vecsimple, veclogical,
veclogical, vecsimple, vecsimple, mfjmpr, mtjmpr, *,
mftgpr, mffgpr, mftgpr, mffgpr")
-
(set_attr "size" "64")
(set_attr "length"
"4, 4, 4, 4, 4, 20,
@@ -8853,7 +8855,7 @@ (define_insn "*movdi_internal64"
4, 4, 4, 4")
(set_attr "isa"
"*, *, *, *, *, *,
- *, *, *, *, *, *,
+ *, *, *, p9v, *, p9v,
*, *, p9v, p9v, *, *,
*, *, *, *, *, *,
*, *, *, *")])
@@ -3280,14 +3280,15 @@ (define_insn_and_split "*vsx_extract_<P:mode>_<VSX_D:mode>_load"
(define_insn "*vsx_extract_<mode>_store"
[(set (match_operand:<VS_scalar> 0 "memory_operand" "=m,Z,wY")
(vec_select:<VS_scalar>
- (match_operand:VSX_D 1 "register_operand" "d,wv,wb")
+ (match_operand:VSX_D 1 "register_operand" "d,wv,v")
(parallel [(match_operand:QI 2 "vsx_scalar_64bit" "wD,wD,wD")])))]
"VECTOR_MEM_VSX_P (<MODE>mode)"
"@
stfd%U0%X0 %1,%0
stxsdx %x1,%y0
stxsd %1,%0"
- [(set_attr "type" "fpstore")])
+ [(set_attr "type" "fpstore")
+ (set_attr "isa" "*,*,p9v")])
;; Variable V2DI/V2DF extract shift
(define_insn "vsx_vslo_<mode>"
@@ -3352,7 +3353,7 @@ (define_insn_and_split "vsx_extract_v4sf"
(set_attr "type" "fp")])
(define_insn_and_split "*vsx_extract_v4sf_<mode>_load"
- [(set (match_operand:SF 0 "register_operand" "=f,wv,wb,?r")
+ [(set (match_operand:SF 0 "register_operand" "=f,wv,v,?r")
(vec_select:SF
(match_operand:V4SF 1 "memory_operand" "m,Z,m,m")
(parallel [(match_operand:QI 2 "const_0_to_3_operand" "n,n,n,n")])))
@@ -3366,7 +3367,8 @@ (define_insn_and_split "*vsx_extract_v4sf_<mode>_load"
operands[3], SFmode);
}
[(set_attr "type" "fpload,fpload,fpload,load")
- (set_attr "length" "8")])
+ (set_attr "length" "8")
+ (set_attr "isa" "*,*,p9v,*")])
;; Variable V4SF extract
(define_insn_and_split "vsx_extract_v4sf_var"
@@ -3246,9 +3246,6 @@ asm ("xsaddqp %x0,%x1,%x2"
@noindent
is incorrect.
-@item wb
-Altivec register if @option{-mcpu=power9} is used or NO_REGS.
-
@item wd
VSX vector register to hold vector double data or NO_REGS.