From: Tamar Christina <tamar.christina@arm.com>
To: gcc-patches@gcc.gnu.org
Cc: nd@arm.com, Richard.Earnshaw@arm.com, Marcus.Shawcroft@arm.com,
Kyrylo.Tkachov@arm.com, richard.sandiford@arm.com
Subject: [PATCH]AArch64 Extend umov and sbfx patterns.
Date: Mon, 31 Oct 2022 11:54:11 +0000 [thread overview]
Message-ID: <Y1+3Yxws77tZN9pN@arm.com> (raw)
In-Reply-To: <patch-16485-tamar@arm.com>
[-- Attachment #1: Type: text/plain, Size: 7646 bytes --]
Hi All,
Our zero and sign extend and extract patterns are currently very limited and
only work for the original register size of the instructions. i.e. limited by
GPI patterns. However these instructions extract bits and extend. This means
that any register size can be used as an input as long as the extraction makes
logical sense.
The majority of the attached testcases fail currently to optimize.
Bootstrapped Regtested on aarch64-none-linux-gnu and no issues.
Ok for master?
Thanks,
Tamar
gcc/ChangeLog:
* config/aarch64/aarch64-simd.md (aarch64_get_lane<mode>): Drop reload
penalty.
* config/aarch64/aarch64.md
(*<ANY_EXTEND:optab><GPI:mode>_ashl<SHORT:mode>): Renamed to...
(*<ANY_EXTEND:optab><GPI:mode>_ashl<ALLX:mode>): ...this.
(*zero_extend<GPI:mode>_lshr<SHORT:mode>): Renamed to...
(*zero_extend<GPI:mode>_<optab><ALLX:mode>): ...this.
(*extend<GPI:mode>_ashr<SHORT:mode>): Rename to...
(*extend<GPI:mode>_<optab><ALLX:mode>): ...this.
gcc/testsuite/ChangeLog:
* gcc.target/aarch64/bitmove_1.c: New test.
* gcc.target/aarch64/bitmove_2.c: New test.
--- inline copy of patch --
diff --git a/gcc/config/aarch64/aarch64-simd.md b/gcc/config/aarch64/aarch64-simd.md
index 8bcc9e76b1cad4a2591fb176175db72d7a190d57..23909c62638b49722568da4555b33c71fd21337e 100644
--- a/gcc/config/aarch64/aarch64-simd.md
+++ b/gcc/config/aarch64/aarch64-simd.md
@@ -4259,7 +4259,7 @@ (define_insn "*aarch64_get_lane_zero_extend<GPI:mode><VDQV_L:mode>"
;; Extracting lane zero is split into a simple move when it is between SIMD
;; registers or a store.
(define_insn_and_split "aarch64_get_lane<mode>"
- [(set (match_operand:<VEL> 0 "aarch64_simd_nonimmediate_operand" "=?r, w, Utv")
+ [(set (match_operand:<VEL> 0 "aarch64_simd_nonimmediate_operand" "=r, w, Utv")
(vec_select:<VEL>
(match_operand:VALL_F16_FULL 1 "register_operand" "w, w, w")
(parallel [(match_operand:SI 2 "immediate_operand" "i, i, i")])))]
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
index 85b400489cb382a01b0c469eff2b600a93805e31..3116feda4fe54e2a21dc3f990b6976d216874260 100644
--- a/gcc/config/aarch64/aarch64.md
+++ b/gcc/config/aarch64/aarch64.md
@@ -5629,13 +5629,13 @@ (define_insn "*<optab>si3_insn2_uxtw"
)
(define_insn "*<optab><mode>3_insn"
- [(set (match_operand:SHORT 0 "register_operand" "=r")
- (ASHIFT:SHORT (match_operand:SHORT 1 "register_operand" "r")
+ [(set (match_operand:ALLI 0 "register_operand" "=r")
+ (ASHIFT:ALLI (match_operand:ALLI 1 "register_operand" "r")
(match_operand 2 "const_int_operand" "n")))]
"UINTVAL (operands[2]) < GET_MODE_BITSIZE (<MODE>mode)"
{
operands[3] = GEN_INT (<sizen> - UINTVAL (operands[2]));
- return "<bfshift>\t%w0, %w1, %2, %3";
+ return "<bfshift>\t%<w>0, %<w>1, %2, %3";
}
[(set_attr "type" "bfx")]
)
@@ -5710,40 +5710,40 @@ (define_insn "*extrsi5_insn_di"
[(set_attr "type" "rotate_imm")]
)
-(define_insn "*<ANY_EXTEND:optab><GPI:mode>_ashl<SHORT:mode>"
+(define_insn "*<ANY_EXTEND:optab><GPI:mode>_ashl<ALLX:mode>"
[(set (match_operand:GPI 0 "register_operand" "=r")
(ANY_EXTEND:GPI
- (ashift:SHORT (match_operand:SHORT 1 "register_operand" "r")
+ (ashift:ALLX (match_operand:ALLX 1 "register_operand" "r")
(match_operand 2 "const_int_operand" "n"))))]
- "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<SHORT:MODE>mode)"
+ "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<ALLX:MODE>mode)"
{
- operands[3] = GEN_INT (<SHORT:sizen> - UINTVAL (operands[2]));
+ operands[3] = GEN_INT (<ALLX:sizen> - UINTVAL (operands[2]));
return "<su>bfiz\t%<GPI:w>0, %<GPI:w>1, %2, %3";
}
[(set_attr "type" "bfx")]
)
-(define_insn "*zero_extend<GPI:mode>_lshr<SHORT:mode>"
+(define_insn "*zero_extend<GPI:mode>_<optab><ALLX:mode>"
[(set (match_operand:GPI 0 "register_operand" "=r")
(zero_extend:GPI
- (lshiftrt:SHORT (match_operand:SHORT 1 "register_operand" "r")
- (match_operand 2 "const_int_operand" "n"))))]
- "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<SHORT:MODE>mode)"
+ (LSHIFTRT_ONLY:ALLX (match_operand:ALLX 1 "register_operand" "r")
+ (match_operand 2 "const_int_operand" "n"))))]
+ "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<ALLX:MODE>mode)"
{
- operands[3] = GEN_INT (<SHORT:sizen> - UINTVAL (operands[2]));
+ operands[3] = GEN_INT (<ALLX:sizen> - UINTVAL (operands[2]));
return "ubfx\t%<GPI:w>0, %<GPI:w>1, %2, %3";
}
[(set_attr "type" "bfx")]
)
-(define_insn "*extend<GPI:mode>_ashr<SHORT:mode>"
+(define_insn "*extend<GPI:mode>_<optab><ALLX:mode>"
[(set (match_operand:GPI 0 "register_operand" "=r")
(sign_extend:GPI
- (ashiftrt:SHORT (match_operand:SHORT 1 "register_operand" "r")
- (match_operand 2 "const_int_operand" "n"))))]
- "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<SHORT:MODE>mode)"
+ (ASHIFTRT_ONLY:ALLX (match_operand:ALLX 1 "register_operand" "r")
+ (match_operand 2 "const_int_operand" "n"))))]
+ "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<ALLX:MODE>mode)"
{
- operands[3] = GEN_INT (<SHORT:sizen> - UINTVAL (operands[2]));
+ operands[3] = GEN_INT (<ALLX:sizen> - UINTVAL (operands[2]));
return "sbfx\\t%<GPI:w>0, %<GPI:w>1, %2, %3";
}
[(set_attr "type" "bfx")]
diff --git a/gcc/testsuite/gcc.target/aarch64/bitmove_1.c b/gcc/testsuite/gcc.target/aarch64/bitmove_1.c
new file mode 100644
index 0000000000000000000000000000000000000000..8b0aa8af49cd070928bacc4995a321c7bfde58a6
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/bitmove_1.c
@@ -0,0 +1,76 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-O3 -std=c99" } */
+/* { dg-final { check-function-bodies "**" "" "" { target { le } } } } */
+
+#include <stdint.h>
+
+/*
+** sfoo6:
+** asr x0, x0, 16
+** ret
+*/
+int64_t sfoo6 (int32_t x)
+{
+ return x >> 16;
+}
+
+/*
+** ufoo6:
+** lsr w0, w0, 30
+** ret
+*/
+uint64_t ufoo6 (uint32_t x)
+{
+ return x >> 30;
+}
+
+/*
+** ufoo6s:
+** ubfx w0, w0, 7, 9
+** ret
+*/
+uint32_t ufoo6s (uint16_t x)
+{
+ return x >> 7;
+}
+
+/*
+** ufoo6h:
+** ubfx w0, w0, 4, 4
+** ret
+*/
+uint16_t ufoo6h (uint8_t x)
+{
+ return x >> 4;
+}
+
+/*
+** sfoo62:
+** asr x0, x0, 10
+** ret
+*/
+int64_t sfoo62 (int32_t x)
+{
+ return x >> 10;
+}
+
+/*
+** ufoo62:
+** lsr w0, w0, 10
+** ret
+*/
+uint64_t ufoo62 (uint32_t x)
+{
+ return x >> 10;
+}
+
+/*
+** sfoo63:
+** asr x0, x0, 10
+** ret
+*/
+int64_t sfoo63 (int32_t x)
+{
+ return x >> 10;
+}
+
diff --git a/gcc/testsuite/gcc.target/aarch64/bitmove_2.c b/gcc/testsuite/gcc.target/aarch64/bitmove_2.c
new file mode 100644
index 0000000000000000000000000000000000000000..54b3071a3b4e2001f83337837e712c381683d23a
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/bitmove_2.c
@@ -0,0 +1,76 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-O3 -std=c99" } */
+/* { dg-final { check-function-bodies "**" "" "" { target { le } } } } */
+
+#include <stdint.h>
+
+/*
+** sfoo6:
+** sbfiz x0, x0, 16, 16
+** ret
+*/
+int64_t sfoo6 (int32_t x)
+{
+ return x << 16;
+}
+
+/*
+** ufoo6:
+** lsl w0, w0, 30
+** ret
+*/
+uint64_t ufoo6 (uint32_t x)
+{
+ return x << 30;
+}
+
+/*
+** ufoo6s:
+** ubfiz w0, w0, 7, 16
+** ret
+*/
+uint32_t ufoo6s (uint16_t x)
+{
+ return x << 7;
+}
+
+/*
+** ufoo6h:
+** uxtb w0, w0
+** ubfiz w0, w0, 4, 12
+** ret
+*/
+uint16_t ufoo6h (uint8_t x)
+{
+ return x << 4;
+}
+
+/*
+** sfoo62:
+** sbfiz x0, x0, 10, 22
+** ret
+*/
+int64_t sfoo62 (int32_t x)
+{
+ return x << 10;
+}
+
+/*
+** ufoo62:
+** lsl w0, w0, 10
+** ret
+*/
+uint64_t ufoo62 (uint32_t x)
+{
+ return x << 10;
+}
+
+/*
+** sfoo63:
+** sbfiz x0, x0, 10, 22
+** ret
+*/
+int64_t sfoo63 (int32_t x)
+{
+ return x << 10;
+}
--
[-- Attachment #2: rb16488.patch --]
[-- Type: text/plain, Size: 6526 bytes --]
diff --git a/gcc/config/aarch64/aarch64-simd.md b/gcc/config/aarch64/aarch64-simd.md
index 8bcc9e76b1cad4a2591fb176175db72d7a190d57..23909c62638b49722568da4555b33c71fd21337e 100644
--- a/gcc/config/aarch64/aarch64-simd.md
+++ b/gcc/config/aarch64/aarch64-simd.md
@@ -4259,7 +4259,7 @@ (define_insn "*aarch64_get_lane_zero_extend<GPI:mode><VDQV_L:mode>"
;; Extracting lane zero is split into a simple move when it is between SIMD
;; registers or a store.
(define_insn_and_split "aarch64_get_lane<mode>"
- [(set (match_operand:<VEL> 0 "aarch64_simd_nonimmediate_operand" "=?r, w, Utv")
+ [(set (match_operand:<VEL> 0 "aarch64_simd_nonimmediate_operand" "=r, w, Utv")
(vec_select:<VEL>
(match_operand:VALL_F16_FULL 1 "register_operand" "w, w, w")
(parallel [(match_operand:SI 2 "immediate_operand" "i, i, i")])))]
diff --git a/gcc/config/aarch64/aarch64.md b/gcc/config/aarch64/aarch64.md
index 85b400489cb382a01b0c469eff2b600a93805e31..3116feda4fe54e2a21dc3f990b6976d216874260 100644
--- a/gcc/config/aarch64/aarch64.md
+++ b/gcc/config/aarch64/aarch64.md
@@ -5629,13 +5629,13 @@ (define_insn "*<optab>si3_insn2_uxtw"
)
(define_insn "*<optab><mode>3_insn"
- [(set (match_operand:SHORT 0 "register_operand" "=r")
- (ASHIFT:SHORT (match_operand:SHORT 1 "register_operand" "r")
+ [(set (match_operand:ALLI 0 "register_operand" "=r")
+ (ASHIFT:ALLI (match_operand:ALLI 1 "register_operand" "r")
(match_operand 2 "const_int_operand" "n")))]
"UINTVAL (operands[2]) < GET_MODE_BITSIZE (<MODE>mode)"
{
operands[3] = GEN_INT (<sizen> - UINTVAL (operands[2]));
- return "<bfshift>\t%w0, %w1, %2, %3";
+ return "<bfshift>\t%<w>0, %<w>1, %2, %3";
}
[(set_attr "type" "bfx")]
)
@@ -5710,40 +5710,40 @@ (define_insn "*extrsi5_insn_di"
[(set_attr "type" "rotate_imm")]
)
-(define_insn "*<ANY_EXTEND:optab><GPI:mode>_ashl<SHORT:mode>"
+(define_insn "*<ANY_EXTEND:optab><GPI:mode>_ashl<ALLX:mode>"
[(set (match_operand:GPI 0 "register_operand" "=r")
(ANY_EXTEND:GPI
- (ashift:SHORT (match_operand:SHORT 1 "register_operand" "r")
+ (ashift:ALLX (match_operand:ALLX 1 "register_operand" "r")
(match_operand 2 "const_int_operand" "n"))))]
- "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<SHORT:MODE>mode)"
+ "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<ALLX:MODE>mode)"
{
- operands[3] = GEN_INT (<SHORT:sizen> - UINTVAL (operands[2]));
+ operands[3] = GEN_INT (<ALLX:sizen> - UINTVAL (operands[2]));
return "<su>bfiz\t%<GPI:w>0, %<GPI:w>1, %2, %3";
}
[(set_attr "type" "bfx")]
)
-(define_insn "*zero_extend<GPI:mode>_lshr<SHORT:mode>"
+(define_insn "*zero_extend<GPI:mode>_<optab><ALLX:mode>"
[(set (match_operand:GPI 0 "register_operand" "=r")
(zero_extend:GPI
- (lshiftrt:SHORT (match_operand:SHORT 1 "register_operand" "r")
- (match_operand 2 "const_int_operand" "n"))))]
- "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<SHORT:MODE>mode)"
+ (LSHIFTRT_ONLY:ALLX (match_operand:ALLX 1 "register_operand" "r")
+ (match_operand 2 "const_int_operand" "n"))))]
+ "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<ALLX:MODE>mode)"
{
- operands[3] = GEN_INT (<SHORT:sizen> - UINTVAL (operands[2]));
+ operands[3] = GEN_INT (<ALLX:sizen> - UINTVAL (operands[2]));
return "ubfx\t%<GPI:w>0, %<GPI:w>1, %2, %3";
}
[(set_attr "type" "bfx")]
)
-(define_insn "*extend<GPI:mode>_ashr<SHORT:mode>"
+(define_insn "*extend<GPI:mode>_<optab><ALLX:mode>"
[(set (match_operand:GPI 0 "register_operand" "=r")
(sign_extend:GPI
- (ashiftrt:SHORT (match_operand:SHORT 1 "register_operand" "r")
- (match_operand 2 "const_int_operand" "n"))))]
- "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<SHORT:MODE>mode)"
+ (ASHIFTRT_ONLY:ALLX (match_operand:ALLX 1 "register_operand" "r")
+ (match_operand 2 "const_int_operand" "n"))))]
+ "UINTVAL (operands[2]) < GET_MODE_BITSIZE (<ALLX:MODE>mode)"
{
- operands[3] = GEN_INT (<SHORT:sizen> - UINTVAL (operands[2]));
+ operands[3] = GEN_INT (<ALLX:sizen> - UINTVAL (operands[2]));
return "sbfx\\t%<GPI:w>0, %<GPI:w>1, %2, %3";
}
[(set_attr "type" "bfx")]
diff --git a/gcc/testsuite/gcc.target/aarch64/bitmove_1.c b/gcc/testsuite/gcc.target/aarch64/bitmove_1.c
new file mode 100644
index 0000000000000000000000000000000000000000..8b0aa8af49cd070928bacc4995a321c7bfde58a6
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/bitmove_1.c
@@ -0,0 +1,76 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-O3 -std=c99" } */
+/* { dg-final { check-function-bodies "**" "" "" { target { le } } } } */
+
+#include <stdint.h>
+
+/*
+** sfoo6:
+** asr x0, x0, 16
+** ret
+*/
+int64_t sfoo6 (int32_t x)
+{
+ return x >> 16;
+}
+
+/*
+** ufoo6:
+** lsr w0, w0, 30
+** ret
+*/
+uint64_t ufoo6 (uint32_t x)
+{
+ return x >> 30;
+}
+
+/*
+** ufoo6s:
+** ubfx w0, w0, 7, 9
+** ret
+*/
+uint32_t ufoo6s (uint16_t x)
+{
+ return x >> 7;
+}
+
+/*
+** ufoo6h:
+** ubfx w0, w0, 4, 4
+** ret
+*/
+uint16_t ufoo6h (uint8_t x)
+{
+ return x >> 4;
+}
+
+/*
+** sfoo62:
+** asr x0, x0, 10
+** ret
+*/
+int64_t sfoo62 (int32_t x)
+{
+ return x >> 10;
+}
+
+/*
+** ufoo62:
+** lsr w0, w0, 10
+** ret
+*/
+uint64_t ufoo62 (uint32_t x)
+{
+ return x >> 10;
+}
+
+/*
+** sfoo63:
+** asr x0, x0, 10
+** ret
+*/
+int64_t sfoo63 (int32_t x)
+{
+ return x >> 10;
+}
+
diff --git a/gcc/testsuite/gcc.target/aarch64/bitmove_2.c b/gcc/testsuite/gcc.target/aarch64/bitmove_2.c
new file mode 100644
index 0000000000000000000000000000000000000000..54b3071a3b4e2001f83337837e712c381683d23a
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/bitmove_2.c
@@ -0,0 +1,76 @@
+/* { dg-do compile } */
+/* { dg-additional-options "-O3 -std=c99" } */
+/* { dg-final { check-function-bodies "**" "" "" { target { le } } } } */
+
+#include <stdint.h>
+
+/*
+** sfoo6:
+** sbfiz x0, x0, 16, 16
+** ret
+*/
+int64_t sfoo6 (int32_t x)
+{
+ return x << 16;
+}
+
+/*
+** ufoo6:
+** lsl w0, w0, 30
+** ret
+*/
+uint64_t ufoo6 (uint32_t x)
+{
+ return x << 30;
+}
+
+/*
+** ufoo6s:
+** ubfiz w0, w0, 7, 16
+** ret
+*/
+uint32_t ufoo6s (uint16_t x)
+{
+ return x << 7;
+}
+
+/*
+** ufoo6h:
+** uxtb w0, w0
+** ubfiz w0, w0, 4, 12
+** ret
+*/
+uint16_t ufoo6h (uint8_t x)
+{
+ return x << 4;
+}
+
+/*
+** sfoo62:
+** sbfiz x0, x0, 10, 22
+** ret
+*/
+int64_t sfoo62 (int32_t x)
+{
+ return x << 10;
+}
+
+/*
+** ufoo62:
+** lsl w0, w0, 10
+** ret
+*/
+uint64_t ufoo62 (uint32_t x)
+{
+ return x << 10;
+}
+
+/*
+** sfoo63:
+** sbfiz x0, x0, 10, 22
+** ret
+*/
+int64_t sfoo63 (int32_t x)
+{
+ return x << 10;
+}
next prev parent reply other threads:[~2022-10-31 11:54 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-31 11:53 [PATCH 1/2]middle-end: Add new tbranch optab to add support for bit-test-and-branch operations Tamar Christina
2022-10-31 11:53 ` [PATCH 2/2]AArch64 Support new tbranch optab Tamar Christina
2022-11-14 15:58 ` Tamar Christina
2022-11-15 10:36 ` Richard Sandiford
2022-11-15 10:42 ` Tamar Christina
2022-11-15 10:50 ` Richard Sandiford
2022-11-15 11:00 ` Tamar Christina
2022-11-15 11:14 ` Richard Sandiford
2022-11-15 11:23 ` Tamar Christina
2022-11-15 11:33 ` Richard Sandiford
2022-11-15 11:39 ` Tamar Christina
2022-11-22 13:48 ` Tamar Christina
2022-11-22 14:00 ` Richard Sandiford
2022-11-24 12:18 ` Tamar Christina
2022-12-01 16:44 ` Tamar Christina
2022-12-05 14:06 ` Richard Sandiford
2022-10-31 11:54 ` Tamar Christina [this message]
2022-10-31 12:26 ` [PATCH]AArch64 Extend umov and sbfx patterns Richard Sandiford
2022-11-11 14:42 ` Tamar Christina
2022-11-15 11:10 ` Richard Sandiford
2022-10-31 21:16 ` [PATCH 1/2]middle-end: Add new tbranch optab to add support for bit-test-and-branch operations Jeff Law
2022-11-01 15:53 ` Tamar Christina
2022-11-01 17:00 ` Jeff Law
2022-11-02 9:55 ` Tamar Christina
2022-11-02 11:08 ` Aldy Hernandez
2022-11-05 14:23 ` Richard Biener
2022-11-14 15:56 ` Tamar Christina
2022-11-14 16:22 ` Jeff Law
2022-11-15 7:33 ` Richard Biener
2022-12-01 16:29 ` Tamar Christina
2022-12-02 7:09 ` Richard Biener
2022-12-05 12:00 ` Richard Sandiford
2022-12-05 13:14 ` Richard Sandiford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y1+3Yxws77tZN9pN@arm.com \
--to=tamar.christina@arm.com \
--cc=Kyrylo.Tkachov@arm.com \
--cc=Marcus.Shawcroft@arm.com \
--cc=Richard.Earnshaw@arm.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=nd@arm.com \
--cc=richard.sandiford@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).