jdk-sandbox: comparison src/hotspot/cpu/x86/x86

equal deleted inserted replaced

-:11b9d3a6f31c
+:9978fea8a371
 format %{ %}
 interface(REG_INTER);
 %}
+// Float register operands
+operand vlRegF() %{
+constraint(ALLOC_IN_RC(float_reg_vl));
+match(RegF);
+format %{ %}
+interface(REG_INTER);
+%}
 // Double register operands
 operand regD() %{
 constraint(ALLOC_IN_RC(double_reg));
 match(RegD);
 format %{ %}
 interface(REG_INTER);
 %}
+// Double register operands
+operand vlRegD() %{
+constraint(ALLOC_IN_RC(double_reg_vl));
+match(RegD);
+format %{ %}
+interface(REG_INTER);
+%}
 // Vectors
 operand vecS() %{
-constraint(ALLOC_IN_RC(vectors_reg));
+constraint(ALLOC_IN_RC(vectors_reg_vlbwdq));
 match(VecS);
 format %{ %}
 interface(REG_INTER);
 %}
-operand vecD() %{
+// Vectors
-constraint(ALLOC_IN_RC(vectord_reg));
+operand legVecS() %{
-match(VecD);
+constraint(ALLOC_IN_RC(vectors_reg_legacy));
+match(VecS);
 format %{ %}
 interface(REG_INTER);
 %}
-operand vecX() %{
+operand vecD() %{
-constraint(ALLOC_IN_RC(vectorx_reg));
+constraint(ALLOC_IN_RC(vectord_reg_vlbwdq));
-match(VecX);
+match(VecD);
 format %{ %}
 interface(REG_INTER);
 %}
+operand legVecD() %{
+constraint(ALLOC_IN_RC(vectord_reg_legacy));
+match(VecD);
+format %{ %}
+interface(REG_INTER);
+%}
+operand vecX() %{
+constraint(ALLOC_IN_RC(vectorx_reg_vlbwdq));
+match(VecX);
+format %{ %}
+interface(REG_INTER);
+%}
+operand legVecX() %{
+constraint(ALLOC_IN_RC(vectorx_reg_legacy));
+match(VecX);
+format %{ %}
+interface(REG_INTER);
+%}
 operand vecY() %{
-constraint(ALLOC_IN_RC(vectory_reg));
+constraint(ALLOC_IN_RC(vectory_reg_vlbwdq));
+match(VecY);
+format %{ %}
+interface(REG_INTER);
+%}
+operand legVecY() %{
+constraint(ALLOC_IN_RC(vectory_reg_legacy));
 match(VecY);
 format %{ %}
 interface(REG_INTER);
 %}
 __ movflt($dst$$XMMRegister, $mem$$Address);
 %}
 ins_pipe(pipe_slow); // XXX
 %}
+// Load Float
+instruct MoveF2VL(vlRegF dst, regF src) %{
+match(Set dst src);
+format %{ "movss $dst,$src\t! load float (4 bytes)" %}
+ins_encode %{
+__ movflt($dst$$XMMRegister, $src$$XMMRegister);
+%}
+ins_pipe( fpu_reg_reg );
+%}
+// Load Float
+instruct MoveVL2F(regF dst, vlRegF src) %{
+match(Set dst src);
+format %{ "movss $dst,$src\t! load float (4 bytes)" %}
+ins_encode %{
+__ movflt($dst$$XMMRegister, $src$$XMMRegister);
+%}
+ins_pipe( fpu_reg_reg );
+%}
 // Load Double
 instruct loadD_partial(regD dst, memory mem)
 %{
 predicate(!UseXmmLoadAndClearUpper);
 match(Set dst (LoadD mem));
 format %{ "movsd   $dst, $mem\t# double" %}
 ins_encode %{
 __ movdbl($dst$$XMMRegister, $mem$$Address);
 %}
 ins_pipe(pipe_slow); // XXX
+%}
+// Load Double
+instruct MoveD2VL(vlRegD dst, regD src) %{
+match(Set dst src);
+format %{ "movsd $dst,$src\t! load double (8 bytes)" %}
+ins_encode %{
+__ movdbl($dst$$XMMRegister, $src$$XMMRegister);
+%}
+ins_pipe( fpu_reg_reg );
+%}
+// Load Double
+instruct MoveVL2D(regD dst, vlRegD src) %{
+match(Set dst src);
+format %{ "movsd $dst,$src\t! load double (8 bytes)" %}
+ins_encode %{
+__ movdbl($dst$$XMMRegister, $src$$XMMRegister);
+%}
+ins_pipe( fpu_reg_reg );
 %}
 // Load Effective Address
 instruct leaP8(rRegP dst, indOffset8 mem)
 %{
 %}
 ins_pipe(pipe_slow);
 %}
 instruct string_compareL(rdi_RegP str1, rcx_RegI cnt1, rsi_RegP str2, rdx_RegI cnt2,
-rax_RegI result, regD tmp1, rFlagsReg cr)
+rax_RegI result, legVecS tmp1, rFlagsReg cr)
 %{
 predicate(((StrCompNode*)n)->encoding() == StrIntrinsicNode::LL);
 match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
 effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
 %}
 ins_pipe( pipe_slow );
 %}
 instruct string_compareU(rdi_RegP str1, rcx_RegI cnt1, rsi_RegP str2, rdx_RegI cnt2,
-rax_RegI result, regD tmp1, rFlagsReg cr)
+rax_RegI result, legVecS tmp1, rFlagsReg cr)
 %{
 predicate(((StrCompNode*)n)->encoding() == StrIntrinsicNode::UU);
 match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
 effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
 %}
 ins_pipe( pipe_slow );
 %}
 instruct string_compareLU(rdi_RegP str1, rcx_RegI cnt1, rsi_RegP str2, rdx_RegI cnt2,
-rax_RegI result, regD tmp1, rFlagsReg cr)
+rax_RegI result, legVecS tmp1, rFlagsReg cr)
 %{
 predicate(((StrCompNode*)n)->encoding() == StrIntrinsicNode::LU);
 match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
 effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
 %}
 ins_pipe( pipe_slow );
 %}
 instruct string_compareUL(rsi_RegP str1, rdx_RegI cnt1, rdi_RegP str2, rcx_RegI cnt2,
-rax_RegI result, regD tmp1, rFlagsReg cr)
+rax_RegI result, legVecS tmp1, rFlagsReg cr)
 %{
 predicate(((StrCompNode*)n)->encoding() == StrIntrinsicNode::UL);
 match(Set result (StrComp (Binary str1 cnt1) (Binary str2 cnt2)));
 effect(TEMP tmp1, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL cr);
 ins_pipe( pipe_slow );
 %}
 // fast search of substring with known size.
 instruct string_indexof_conL(rdi_RegP str1, rdx_RegI cnt1, rsi_RegP str2, immI int_cnt2,
-rbx_RegI result, regD vec, rax_RegI cnt2, rcx_RegI tmp, rFlagsReg cr)
+rbx_RegI result, legVecS vec, rax_RegI cnt2, rcx_RegI tmp, rFlagsReg cr)
 %{
 predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::LL));
 match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
 effect(TEMP vec, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, KILL cnt2, KILL tmp, KILL cr);
 ins_pipe( pipe_slow );
 %}
 // fast search of substring with known size.
 instruct string_indexof_conU(rdi_RegP str1, rdx_RegI cnt1, rsi_RegP str2, immI int_cnt2,
-rbx_RegI result, regD vec, rax_RegI cnt2, rcx_RegI tmp, rFlagsReg cr)
+rbx_RegI result, legVecS vec, rax_RegI cnt2, rcx_RegI tmp, rFlagsReg cr)
 %{
 predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UU));
 match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
 effect(TEMP vec, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, KILL cnt2, KILL tmp, KILL cr);
 ins_pipe( pipe_slow );
 %}
 // fast search of substring with known size.
 instruct string_indexof_conUL(rdi_RegP str1, rdx_RegI cnt1, rsi_RegP str2, immI int_cnt2,
-rbx_RegI result, regD vec, rax_RegI cnt2, rcx_RegI tmp, rFlagsReg cr)
+rbx_RegI result, legVecS vec, rax_RegI cnt2, rcx_RegI tmp, rFlagsReg cr)
 %{
 predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UL));
 match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 int_cnt2)));
 effect(TEMP vec, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, KILL cnt2, KILL tmp, KILL cr);
 %}
 ins_pipe( pipe_slow );
 %}
 instruct string_indexofL(rdi_RegP str1, rdx_RegI cnt1, rsi_RegP str2, rax_RegI cnt2,
-rbx_RegI result, regD vec, rcx_RegI tmp, rFlagsReg cr)
+rbx_RegI result, legVecS vec, rcx_RegI tmp, rFlagsReg cr)
 %{
 predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::LL));
 match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
 effect(TEMP vec, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL tmp, KILL cr);
 %}
 ins_pipe( pipe_slow );
 %}
 instruct string_indexofU(rdi_RegP str1, rdx_RegI cnt1, rsi_RegP str2, rax_RegI cnt2,
-rbx_RegI result, regD vec, rcx_RegI tmp, rFlagsReg cr)
+rbx_RegI result, legVecS vec, rcx_RegI tmp, rFlagsReg cr)
 %{
 predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UU));
 match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
 effect(TEMP vec, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL tmp, KILL cr);
 %}
 ins_pipe( pipe_slow );
 %}
 instruct string_indexofUL(rdi_RegP str1, rdx_RegI cnt1, rsi_RegP str2, rax_RegI cnt2,
-rbx_RegI result, regD vec, rcx_RegI tmp, rFlagsReg cr)
+rbx_RegI result, legVecS vec, rcx_RegI tmp, rFlagsReg cr)
 %{
 predicate(UseSSE42Intrinsics && (((StrIndexOfNode*)n)->encoding() == StrIntrinsicNode::UL));
 match(Set result (StrIndexOf (Binary str1 cnt1) (Binary str2 cnt2)));
 effect(TEMP vec, USE_KILL str1, USE_KILL str2, USE_KILL cnt1, USE_KILL cnt2, KILL tmp, KILL cr);
 %}
 ins_pipe( pipe_slow );
 %}
 instruct string_indexofU_char(rdi_RegP str1, rdx_RegI cnt1, rax_RegI ch,
-rbx_RegI result, regD vec1, regD vec2, regD vec3, rcx_RegI tmp, rFlagsReg cr)
+rbx_RegI result, legVecS vec1, legVecS vec2, legVecS vec3, rcx_RegI tmp, rFlagsReg cr)
 %{
 predicate(UseSSE42Intrinsics);
 match(Set result (StrIndexOfChar (Binary str1 cnt1) ch));
 effect(TEMP vec1, TEMP vec2, TEMP vec3, USE_KILL str1, USE_KILL cnt1, USE_KILL ch, TEMP tmp, KILL cr);
 format %{ "String IndexOf char[] $str1,$cnt1,$ch -> $result   // KILL all" %}
 ins_pipe( pipe_slow );
 %}
 // fast string equals
 instruct string_equals(rdi_RegP str1, rsi_RegP str2, rcx_RegI cnt, rax_RegI result,
-regD tmp1, regD tmp2, rbx_RegI tmp3, rFlagsReg cr)
+legVecS tmp1, legVecS tmp2, rbx_RegI tmp3, rFlagsReg cr)
 %{
 match(Set result (StrEquals (Binary str1 str2) cnt));
 effect(TEMP tmp1, TEMP tmp2, USE_KILL str1, USE_KILL str2, USE_KILL cnt, KILL tmp3, KILL cr);
 format %{ "String Equals $str1,$str2,$cnt -> $result    // KILL $tmp1, $tmp2, $tmp3" %}
 ins_pipe( pipe_slow );
 %}
 // fast array equals
 instruct array_equalsB(rdi_RegP ary1, rsi_RegP ary2, rax_RegI result,
-regD tmp1, regD tmp2, rcx_RegI tmp3, rbx_RegI tmp4, rFlagsReg cr)
+legVecS tmp1, legVecS tmp2, rcx_RegI tmp3, rbx_RegI tmp4, rFlagsReg cr)
 %{
 predicate(((AryEqNode*)n)->encoding() == StrIntrinsicNode::LL);
 match(Set result (AryEq ary1 ary2));
 effect(TEMP tmp1, TEMP tmp2, USE_KILL ary1, USE_KILL ary2, KILL tmp3, KILL tmp4, KILL cr);
 %}
 ins_pipe( pipe_slow );
 %}
 instruct array_equalsC(rdi_RegP ary1, rsi_RegP ary2, rax_RegI result,
-regD tmp1, regD tmp2, rcx_RegI tmp3, rbx_RegI tmp4, rFlagsReg cr)
+legVecS tmp1, legVecS tmp2, rcx_RegI tmp3, rbx_RegI tmp4, rFlagsReg cr)
 %{
 predicate(((AryEqNode*)n)->encoding() == StrIntrinsicNode::UU);
 match(Set result (AryEq ary1 ary2));
 effect(TEMP tmp1, TEMP tmp2, USE_KILL ary1, USE_KILL ary2, KILL tmp3, KILL tmp4, KILL cr);
 %}
 ins_pipe( pipe_slow );
 %}
 instruct has_negatives(rsi_RegP ary1, rcx_RegI len, rax_RegI result,
-regD tmp1, regD tmp2, rbx_RegI tmp3, rFlagsReg cr)
+legVecS tmp1, legVecS tmp2, rbx_RegI tmp3, rFlagsReg cr)
 %{
 match(Set result (HasNegatives ary1 len));
 effect(TEMP tmp1, TEMP tmp2, USE_KILL ary1, USE_KILL len, KILL tmp3, KILL cr);
 format %{ "has negatives byte[] $ary1,$len -> $result   // KILL $tmp1, $tmp2, $tmp3" %}
 %}
 ins_pipe( pipe_slow );
 %}
 // fast char[] to byte[] compression
-instruct string_compress(rsi_RegP src, rdi_RegP dst, rdx_RegI len, regD tmp1, regD tmp2, regD tmp3, regD tmp4,
+instruct string_compress(rsi_RegP src, rdi_RegP dst, rdx_RegI len, legVecS tmp1, legVecS tmp2, legVecS tmp3, legVecS tmp4,
 rcx_RegI tmp5, rax_RegI result, rFlagsReg cr) %{
 match(Set result (StrCompressedCopy src (Binary dst len)));
 effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, USE_KILL src, USE_KILL dst, USE_KILL len, KILL tmp5, KILL cr);
 format %{ "String Compress $src,$dst -> $result    // KILL RAX, RCX, RDX" %}
 ins_pipe( pipe_slow );
 %}
 // fast byte[] to char[] inflation
 instruct string_inflate(Universe dummy, rsi_RegP src, rdi_RegP dst, rdx_RegI len,
-regD tmp1, rcx_RegI tmp2, rFlagsReg cr) %{
+legVecS tmp1, rcx_RegI tmp2, rFlagsReg cr) %{
 match(Set dummy (StrInflatedCopy src (Binary dst len)));
 effect(TEMP tmp1, TEMP tmp2, USE_KILL src, USE_KILL dst, USE_KILL len, KILL cr);
 format %{ "String Inflate $src,$dst    // KILL $tmp1, $tmp2" %}
 ins_encode %{
 ins_pipe( pipe_slow );
 %}
 // encode char[] to byte[] in ISO_8859_1
 instruct encode_iso_array(rsi_RegP src, rdi_RegP dst, rdx_RegI len,
-regD tmp1, regD tmp2, regD tmp3, regD tmp4,
+legVecS tmp1, legVecS tmp2, legVecS tmp3, legVecS tmp4,
 rcx_RegI tmp5, rax_RegI result, rFlagsReg cr) %{
 match(Set result (EncodeISOArray src (Binary dst len)));
 effect(TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, USE_KILL src, USE_KILL dst, USE_KILL len, KILL tmp5, KILL cr);
 format %{ "Encode array $src,$dst,$len -> $result    // KILL RCX, RDX, $tmp1, $tmp2, $tmp3, $tmp4, RSI, RDI " %}

changeset 51857	9978fea8a371
parent 51501	535cce23fa8b
child 51996	84743156e780