aarch64: Rename some SME iterators

This patch just renames the iterators SME_READ and SME_WRITE to
SME_READ_HV and SME_WRITE_HV, to distinguish them from other forms
of ZA read and write.

gcc/
	* config/aarch64/iterators.md (SME_READ): Rename to...
	(SME_READ_HV): ...this.
	(SME_WRITE): Rename to...
	(SME_WRITE_HV): ...this.
	* config/aarch64/aarch64-sme.md: Update accordingly.

diff --git a/gcc/config/aarch64/aarch64-sme.md b/gcc/config/aarch64/aarch64-sme.md
index 088bdd8d869d7d3feac73437b53eac50e676f933..525ded44c99fcdba9947d468da381fc6955ce72b 100644 (file)
--- a/gcc/config/aarch64/aarch64-sme.md
+++ b/gcc/config/aarch64/aarch64-sme.md
@@ -662,7 +662,7 @@
           (match_operand:<VPRED> 2 "register_operand" "Upl")
           (match_operand:DI 3 "const_int_operand")
           (match_operand:SI 4 "register_operand" "Ucj")]
-         SME_READ))]
+         SME_READ_HV))]
   "TARGET_STREAMING"
   "mova\t%0.<Vetype>, %2/m, za%3<hv>.<Vetype>[%w4, 0]"
 )
@@ -677,7 +677,7 @@
           (match_operand:DI 3 "const_int_operand")
           (plus:SI (match_operand:SI 4 "register_operand" "Ucj")
                    (match_operand:SI 5 "const_int_operand"))]
-         SME_READ))]
+         SME_READ_HV))]
   "TARGET_STREAMING
    && UINTVAL (operands[5]) < 128 / <elem_bits>"
   "mova\t%0.<Vetype>, %2/m, za%3<hv>.<Vetype>[%w4, %5]"
@@ -692,7 +692,7 @@
           (match_operand:VNx2BI 2 "register_operand" "Upl")
           (match_operand:DI 3 "const_int_operand")
           (match_operand:SI 4 "register_operand" "Ucj")]
-         SME_READ))]
+         SME_READ_HV))]
   "TARGET_STREAMING"
   "mova\t%0.q, %2/m, za%3<hv>.q[%w4, 0]"
 )
@@ -706,7 +706,7 @@
           (match_operand:SI 1 "register_operand" "Ucj")
           (match_operand:<VPRED> 2 "register_operand" "Upl")
           (match_operand:SVE_FULL 3 "register_operand" "w")]
-         SME_WRITE))]
+         SME_WRITE_HV))]
   "TARGET_STREAMING"
   "mova\tza%0<hv>.<Vetype>[%w1, 0], %2/m, %3.<Vetype>"
 )
@@ -721,7 +721,7 @@
                    (match_operand:SI 2 "const_int_operand"))
           (match_operand:<VPRED> 3 "register_operand" "Upl")
           (match_operand:SVE_FULL 4 "register_operand" "w")]
-         SME_WRITE))]
+         SME_WRITE_HV))]
   "TARGET_STREAMING
    && UINTVAL (operands[2]) < 128 / <elem_bits>"
   "mova\tza%0<hv>.<Vetype>[%w1, %2], %3/m, %4.<Vetype>"
@@ -736,7 +736,7 @@
           (match_operand:SI 1 "register_operand" "Ucj")
           (match_operand:VNx2BI 2 "register_operand" "Upl")
           (match_operand:SVE_FULL 3 "register_operand" "w")]
-         SME_WRITE))]
+         SME_WRITE_HV))]
   "TARGET_STREAMING"
   "mova\tza%0<hv>.q[%w1, 0], %2/m, %3.q"
 )
@@ -755,7 +755,7 @@
           (reg:DI SME_STATE_REGNUM)
           (match_operand:DI 1 "const_int_operand")
           (match_operand:SI 2 "register_operand" "Ucj")]
-         SME_READ))]
+         SME_READ_HV))]
   "TARGET_STREAMING_SME2"
   {
     operands[3] = GEN_INT (<vector_count> - 1);
@@ -772,7 +772,7 @@
           (plus:SI
             (match_operand:SI 2 "register_operand" "Ucj")
             (match_operand:SI 3 "const_int_operand"))]
-         SME_READ))]
+         SME_READ_HV))]
   "TARGET_STREAMING_SME2
    && UINTVAL (operands[3]) % <vector_count> == 0
    && UINTVAL (operands[3]) < 128 / <elem_bits>"
@@ -813,7 +813,7 @@
           (match_operand:DI 0 "const_int_operand")
           (match_operand:SI 1 "register_operand" "Ucj")
           (match_operand:SVE_FULLx24 2 "aligned_register_operand" "Uw<vector_count>")]
-         SME_WRITE))]
+         SME_WRITE_HV))]
   "TARGET_STREAMING_SME2"
   {
     operands[3] = GEN_INT (<vector_count> - 1);
@@ -831,7 +831,7 @@
             (match_operand:SI 1 "register_operand" "Ucj")
             (match_operand:SI 2 "const_int_operand"))
           (match_operand:SVE_FULLx24 3 "aligned_register_operand" "Uw<vector_count>")]
-         SME_WRITE))]
+         SME_WRITE_HV))]
   "TARGET_STREAMING_SME2
    && UINTVAL (operands[2]) % <vector_count> == 0
    && UINTVAL (operands[2]) < 128 / <elem_bits>"

diff --git a/gcc/config/aarch64/iterators.md b/gcc/config/aarch64/iterators.md
index 0137700d4890a28edde2568c2b9b28a5bc7f91c7..415713773c9448c4057411d430831fd7832d4408 100644 (file)
--- a/gcc/config/aarch64/iterators.md
+++ b/gcc/config/aarch64/iterators.md
@@ -3641,9 +3641,9 @@
 (define_int_iterator UNSPEC_REVD_ONLY [UNSPEC_REVD])
 
 (define_int_iterator SME_LD1 [UNSPEC_SME_LD1_HOR UNSPEC_SME_LD1_VER])
-(define_int_iterator SME_READ [UNSPEC_SME_READ_HOR UNSPEC_SME_READ_VER])
+(define_int_iterator SME_READ_HV [UNSPEC_SME_READ_HOR UNSPEC_SME_READ_VER])
 (define_int_iterator SME_ST1 [UNSPEC_SME_ST1_HOR UNSPEC_SME_ST1_VER])
-(define_int_iterator SME_WRITE [UNSPEC_SME_WRITE_HOR UNSPEC_SME_WRITE_VER])
+(define_int_iterator SME_WRITE_HV [UNSPEC_SME_WRITE_HOR UNSPEC_SME_WRITE_VER])
 
 (define_int_iterator SME_BINARY_SDI [UNSPEC_SME_ADDHA UNSPEC_SME_ADDVA])