aarch64: Support conditional unpacked UXT on SVE

This patch extends the conditional UXT patterns from SVE_FULL_I
to SVE_I.  It doesn't matter in this case whether the type suffix
is taken from the element size or the container size.

gcc/
	* config/aarch64/aarch64-sve.md (*cond_uxt<mode>_2): Extend from
	SVE_FULL_I to SVE_I.
	(*cond_uxt<mode>_any): Likewise.

gcc/testsuite/
	* gcc.target/aarch64/sve/cond_uxt_5.c: New test.
	* gcc.target/aarch64/sve/cond_uxt_5_run.c: Likewise.
	* gcc.target/aarch64/sve/cond_uxt_6.c: Likewise.
	* gcc.target/aarch64/sve/cond_uxt_6_run.c: Likewise.
	* gcc.target/aarch64/sve/cond_uxt_7.c: Likewise.
	* gcc.target/aarch64/sve/cond_uxt_7_run.c: Likewise.
	* gcc.target/aarch64/sve/cond_uxt_8.c: Likewise.
	* gcc.target/aarch64/sve/cond_uxt_8_run.c: Likewise.
This commit is contained in:
Richard Sandiford 2021-01-08 10:49:37 +00:00
parent 07fb24a3da
commit f3c5d1fa53
9 changed files with 242 additions and 11 deletions

View File

@ -3135,12 +3135,12 @@
;; The canonical form of this operation is an AND of a constant rather
;; than (zero_extend (truncate ...)).
(define_insn "*cond_uxt<mode>_2"
[(set (match_operand:SVE_FULL_I 0 "register_operand" "=w, ?&w")
(unspec:SVE_FULL_I
[(set (match_operand:SVE_I 0 "register_operand" "=w, ?&w")
(unspec:SVE_I
[(match_operand:<VPRED> 1 "register_operand" "Upl, Upl")
(and:SVE_FULL_I
(match_operand:SVE_FULL_I 2 "register_operand" "0, w")
(match_operand:SVE_FULL_I 3 "aarch64_sve_uxt_immediate"))
(and:SVE_I
(match_operand:SVE_I 2 "register_operand" "0, w")
(match_operand:SVE_I 3 "aarch64_sve_uxt_immediate"))
(match_dup 2)]
UNSPEC_SEL))]
"TARGET_SVE"
@ -3159,13 +3159,13 @@
;; as early-clobber helps to make the instruction more regular to the
;; register allocator.
(define_insn "*cond_uxt<mode>_any"
[(set (match_operand:SVE_FULL_I 0 "register_operand" "=&w, ?&w, ?&w")
(unspec:SVE_FULL_I
[(set (match_operand:SVE_I 0 "register_operand" "=&w, ?&w, ?&w")
(unspec:SVE_I
[(match_operand:<VPRED> 1 "register_operand" "Upl, Upl, Upl")
(and:SVE_FULL_I
(match_operand:SVE_FULL_I 2 "register_operand" "w, w, w")
(match_operand:SVE_FULL_I 3 "aarch64_sve_uxt_immediate"))
(match_operand:SVE_FULL_I 4 "aarch64_simd_reg_or_zero" "0, Dz, w")]
(and:SVE_I
(match_operand:SVE_I 2 "register_operand" "w, w, w")
(match_operand:SVE_I 3 "aarch64_sve_uxt_immediate"))
(match_operand:SVE_I 4 "aarch64_simd_reg_or_zero" "0, Dz, w")]
UNSPEC_SEL))]
"TARGET_SVE && !rtx_equal_p (operands[2], operands[4])"
"@

View File

@ -0,0 +1,33 @@
/* { dg-do compile } */
/* { dg-options "-O2 -ftree-vectorize" } */
#include <stdint.h>
#define DEF_LOOP(TYPE1, TYPE2, CONST, COUNT) \
void __attribute__ ((noipa)) \
test_##CONST##_##TYPE1##_##TYPE2 (TYPE2 *restrict r, \
TYPE1 *restrict a, \
TYPE2 *restrict b) \
{ \
for (int i = 0; i < COUNT; ++i) \
r[i] = a[i] > 20 ? b[i] & CONST : b[i]; \
}
#define TEST_ALL(T) \
T (int32_t, uint16_t, 0xff, 3) \
\
T (int64_t, uint16_t, 0xff, 5) \
T (int64_t, uint32_t, 0xff, 5) \
T (int64_t, uint32_t, 0xffff, 5)
TEST_ALL (DEF_LOOP)
/* { dg-final { scan-assembler {\tld1h\t(z[0-9]+)\.s, p[0-7]/z, \[x2[],][^L]*\tuxtb\t\1\.h, p[0-7]/m, \1\.h\n} } } */
/* { dg-final { scan-assembler {\tld1h\t(z[0-9]+)\.d, p[0-7]/z, \[x2[],][^L]*\tuxtb\t\1\.h, p[0-7]/m, \1\.h\n} } } */
/* { dg-final { scan-assembler {\tld1w\t(z[0-9]+)\.d, p[0-7]/z, \[x2[],][^L]*\tuxtb\t\1\.s, p[0-7]/m, \1\.s\n} } } */
/* { dg-final { scan-assembler {\tld1w\t(z[0-9]+)\.d, p[0-7]/z, \[x2[],][^L]*\tuxth\t\1\.s, p[0-7]/m, \1\.s\n} } } */
/* { dg-final { scan-assembler-not {\tmov\tz[^\n]*z} } } */
/* { dg-final { scan-assembler-not {\tmovprfx\t} } } */
/* { dg-final { scan-assembler-not {\tsel\t} } } */

View File

@ -0,0 +1,26 @@
/* { dg-do run { target { aarch64_sve_hw } } } */
/* { dg-options "-O2 -ftree-vectorize" } */
#include "cond_uxt_5.c"
#define TEST_LOOP(TYPE1, TYPE2, CONST, N) \
{ \
TYPE1 a[N]; \
TYPE2 r[N], b[N]; \
for (int i = 0; i < N; ++i) \
{ \
a[i] = (i & 1 ? -20 - i : 20 + i); \
b[i] = -5 - i; \
asm volatile ("" ::: "memory"); \
} \
test_##CONST##_##TYPE1##_##TYPE2 (r, a, b); \
for (int i = 0; i < N; ++i) \
if (r[i] != (TYPE2) (a[i] > 20 ? b[i] & CONST : b[i])) \
__builtin_abort (); \
}
int main ()
{
TEST_ALL (TEST_LOOP)
return 0;
}

View File

@ -0,0 +1,33 @@
/* { dg-do compile } */
/* { dg-options "-O2 -ftree-vectorize" } */
#include <stdint.h>
#define DEF_LOOP(TYPE1, TYPE2, CONST, COUNT) \
void __attribute__ ((noipa)) \
test_##CONST##_##TYPE1##_##TYPE2 (TYPE2 *restrict r, \
TYPE1 *restrict a, \
TYPE2 *restrict b) \
{ \
for (int i = 0; i < COUNT; ++i) \
r[i] = a[i] > 20 ? b[i] & CONST : a[i]; \
}
#define TEST_ALL(T) \
T (int32_t, uint16_t, 0xff, 3) \
\
T (int64_t, uint16_t, 0xff, 5) \
T (int64_t, uint32_t, 0xff, 5) \
T (int64_t, uint32_t, 0xffff, 5)
TEST_ALL (DEF_LOOP)
/* { dg-final { scan-assembler {\tld1w\t(z[0-9]+)\.s, p[0-7]/z, \[x1[],][^L]*\tld1h\t(z[0-9]+)\.s, p[0-7]/z, \[x2[],][^L]*\tuxtb\t\1\.h, p[0-7]/m, \2\.h\n} } } */
/* { dg-final { scan-assembler {\tld1d\t(z[0-9]+)\.d, p[0-7]/z, \[x1[],][^L]*\tld1h\t(z[0-9]+)\.d, p[0-7]/z, \[x2[],][^L]*\tuxtb\t\1\.h, p[0-7]/m, \2\.h\n} } } */
/* { dg-final { scan-assembler {\tld1d\t(z[0-9]+)\.d, p[0-7]/z, \[x1[],][^L]*\tld1w\t(z[0-9]+)\.d, p[0-7]/z, \[x2[],][^L]*\tuxtb\t\1\.s, p[0-7]/m, \2\.s\n} } } */
/* { dg-final { scan-assembler {\tld1d\t(z[0-9]+)\.d, p[0-7]/z, \[x1[],][^L]*\tld1w\t(z[0-9]+)\.d, p[0-7]/z, \[x2[],][^L]*\tuxth\t\1\.s, p[0-7]/m, \2\.s\n} } } */
/* { dg-final { scan-assembler-not {\tmov\tz[^\n]*z} } } */
/* { dg-final { scan-assembler-not {\tmovprfx\t} } } */
/* { dg-final { scan-assembler-not {\tsel\t} } } */

View File

@ -0,0 +1,26 @@
/* { dg-do run { target { aarch64_sve_hw } } } */
/* { dg-options "-O2 -ftree-vectorize" } */
#include "cond_uxt_6.c"
#define TEST_LOOP(TYPE1, TYPE2, CONST, N) \
{ \
TYPE1 a[N]; \
TYPE2 r[N], b[N]; \
for (int i = 0; i < N; ++i) \
{ \
a[i] = (i & 1 ? -20 - i : 20 + i); \
b[i] = -5 - i; \
asm volatile ("" ::: "memory"); \
} \
test_##CONST##_##TYPE1##_##TYPE2 (r, a, b); \
for (int i = 0; i < N; ++i) \
if (r[i] != (TYPE2) (a[i] > 20 ? b[i] & CONST : a[i])) \
__builtin_abort (); \
}
int main ()
{
TEST_ALL (TEST_LOOP)
return 0;
}

View File

@ -0,0 +1,29 @@
/* { dg-do compile } */
/* { dg-options "-O2 -ftree-vectorize" } */
#include <stdint.h>
#define DEF_LOOP(TYPE1, TYPE2, CONST, COUNT) \
void __attribute__ ((noipa)) \
test_##CONST##_##TYPE1##_##TYPE2 (TYPE2 *restrict r, \
TYPE1 *restrict a, \
TYPE2 *restrict b) \
{ \
for (int i = 0; i < COUNT; ++i) \
r[i] = a[i] > 20 ? b[i] & CONST : 127; \
}
#define TEST_ALL(T) \
T (int32_t, uint16_t, 0xff, 3) \
\
T (int64_t, uint16_t, 0xff, 5) \
T (int64_t, uint32_t, 0xff, 5) \
T (int64_t, uint32_t, 0xffff, 5)
TEST_ALL (DEF_LOOP)
/* { dg-final { scan-assembler-times {\tuxtb\tz[0-9]+\.h, p[0-7]/m, z[0-9]+\.h\n} 2 } } */
/* { dg-final { scan-assembler-times {\tuxtb\tz[0-9]+\.s, p[0-7]/m, z[0-9]+\.s\n} 1 } } */
/* { dg-final { scan-assembler-times {\tuxth\tz[0-9]+\.s, p[0-7]/m, z[0-9]+\.s\n} 1 } } */
/* { dg-final { scan-assembler-not {\tsel\t} } } */

View File

@ -0,0 +1,26 @@
/* { dg-do run { target { aarch64_sve_hw } } } */
/* { dg-options "-O2 -ftree-vectorize" } */
#include "cond_uxt_7.c"
#define TEST_LOOP(TYPE1, TYPE2, CONST, N) \
{ \
TYPE1 a[N]; \
TYPE2 r[N], b[N]; \
for (int i = 0; i < N; ++i) \
{ \
a[i] = (i & 1 ? -20 - i : 20 + i); \
b[i] = -5 - i; \
asm volatile ("" ::: "memory"); \
} \
test_##CONST##_##TYPE1##_##TYPE2 (r, a, b); \
for (int i = 0; i < N; ++i) \
if (r[i] != (TYPE2) (a[i] > 20 ? b[i] & CONST : 127)) \
__builtin_abort (); \
}
int main ()
{
TEST_ALL (TEST_LOOP)
return 0;
}

View File

@ -0,0 +1,32 @@
/* { dg-do compile } */
/* { dg-options "-O2 -ftree-vectorize" } */
#include <stdint.h>
#define DEF_LOOP(TYPE1, TYPE2, CONST, COUNT) \
void __attribute__ ((noipa)) \
test_##CONST##_##TYPE1##_##TYPE2 (TYPE2 *restrict r, \
TYPE1 *restrict a, \
TYPE2 *restrict b) \
{ \
for (int i = 0; i < COUNT; ++i) \
r[i] = a[i] > 20 ? b[i] & CONST : 0; \
}
#define TEST_ALL(T) \
T (int32_t, uint16_t, 0xff, 3) \
\
T (int64_t, uint16_t, 0xff, 5) \
T (int64_t, uint32_t, 0xff, 5) \
T (int64_t, uint32_t, 0xffff, 5)
TEST_ALL (DEF_LOOP)
/* { dg-final { scan-assembler-times {\tuxtb\tz[0-9]+\.h, p[0-7]/m, z[0-9]+\.h\n} 2 } } */
/* { dg-final { scan-assembler-times {\tuxtb\tz[0-9]+\.s, p[0-7]/m, z[0-9]+\.s\n} 1 } } */
/* { dg-final { scan-assembler-times {\tuxth\tz[0-9]+\.s, p[0-7]/m, z[0-9]+\.s\n} 1 } } */
/* { dg-final { scan-assembler {\tmovprfx\tz[^,]*, p[0-7]/z} } } */
/* { dg-final { scan-assembler-not {\tmov\tz[^\n]*z} } } */
/* { dg-final { scan-assembler-not {\tsel\t} } } */

View File

@ -0,0 +1,26 @@
/* { dg-do run { target { aarch64_sve_hw } } } */
/* { dg-options "-O2 -ftree-vectorize" } */
#include "cond_uxt_8.c"
#define TEST_LOOP(TYPE1, TYPE2, CONST, N) \
{ \
TYPE1 a[N]; \
TYPE2 r[N], b[N]; \
for (int i = 0; i < N; ++i) \
{ \
a[i] = (i & 1 ? -20 - i : 20 + i); \
b[i] = -5 - i; \
asm volatile ("" ::: "memory"); \
} \
test_##CONST##_##TYPE1##_##TYPE2 (r, a, b); \
for (int i = 0; i < N; ++i) \
if (r[i] != (TYPE2) (a[i] > 20 ? b[i] & CONST : 0)) \
__builtin_abort (); \
}
int main ()
{
TEST_ALL (TEST_LOOP)
return 0;
}