From: Xiong Hu Luo <luo...@linux.vnet.ibm.com>
Backport r268834 of "Add support for the vec_sbox_be, vec_cipher_be etc."
from mainline to gcc-8-branch.
Regression-tested on Linux POWER8 LE. Backport patch for gcc-8-branch
already got approved and commited. OK for gcc-7-branch?
gcc/ChangeLog:
2019-03-05 Xiong Hu Luo <luo...@linux.ibm.com>
Backport of r268834 from mainline to gcc-7-branch.
2019-02-13 Xiong Hu Luo <luo...@linux.vnet.ibm.com>
* config/rs6000/altivec.h (vec_sbox_be, vec_cipher_be,
vec_cipherlast_be, vec_ncipher_be, vec_ncipherlast_be): New #defines.
* config/rs6000/crypto.md (CR_vqdi): New define_mode_iterator.
(crypto_vsbox_<mode>, crypto_<CR_insn>_<mode>): New define_insns.
* config/rs6000/rs6000-builtin.def (VSBOX_BE): New BU_CRYPTO_1.
(VCIPHER_BE, VCIPHERLAST_BE, VNCIPHER_BE, VNCIPHERLAST_BE):
New BU_CRYPTO_2.
* config/rs6000/rs6000.c (builtin_function_type)
<CRYPTO_BUILTIN_VSBOX_BE, CRYPTO_BUILTIN_VCIPHER_BE,
CRYPTO_BUILTIN_VCIPHERLAST_BE, CRYPTO_BUILTIN_VNCIPHER_BE,
CRYPTO_BUILTIN_VNCIPHERLAST_BE>: New switch options.
* doc/extend.texi (vec_sbox_be, vec_cipher_be, vec_cipherlast_be,
vec_ncipher_be, vec_ncipherlast_be): New builtin functions.
gcc/testsuite/ChangeLog:
2019-03-05 Xiong Hu Luo <luo...@linux.ibm.com>
Backport of r268834 from mainline to gcc-7-branch.
2019-01-23 Xiong Hu Luo <luo...@linux.vnet.ibm.com>
* gcc.target/powerpc/crypto-builtin-1.c
(crypto1_be, crypto2_be, crypto3_be, crypto4_be, crypto5_be):
New testcases.
---
gcc/config/rs6000/altivec.h | 5 +++
gcc/config/rs6000/crypto.md | 17 ++++++----
gcc/config/rs6000/rs6000-builtin.def | 19 ++++++++---
gcc/config/rs6000/rs6000.c | 5 +++
gcc/doc/extend.texi | 13 ++++++++
.../gcc.target/powerpc/crypto-builtin-1.c | 38 ++++++++++++++++++----
6 files changed, 79 insertions(+), 18 deletions(-)
diff --git a/gcc/config/rs6000/altivec.h b/gcc/config/rs6000/altivec.h
index e04c3a5..a89e4a0 100644
--- a/gcc/config/rs6000/altivec.h
+++ b/gcc/config/rs6000/altivec.h
@@ -388,6 +388,11 @@
#define vec_vsubuqm __builtin_vec_vsubuqm
#define vec_vupkhsw __builtin_vec_vupkhsw
#define vec_vupklsw __builtin_vec_vupklsw
+#define vec_sbox_be __builtin_crypto_vsbox_be
+#define vec_cipher_be __builtin_crypto_vcipher_be
+#define vec_cipherlast_be __builtin_crypto_vcipherlast_be
+#define vec_ncipher_be __builtin_crypto_vncipher_be
+#define vec_ncipherlast_be __builtin_crypto_vncipherlast_be
#endif
#ifdef __POWER9_VECTOR__
diff --git a/gcc/config/rs6000/crypto.md b/gcc/config/rs6000/crypto.md
index 5892f891..316f5aa 100644
--- a/gcc/config/rs6000/crypto.md
+++ b/gcc/config/rs6000/crypto.md
@@ -48,6 +48,9 @@
;; Iterator for VSHASIGMAD/VSHASIGMAW
(define_mode_iterator CR_hash [V4SI V2DI])
+;; Iterator for VSBOX/VCIPHER/VNCIPHER/VCIPHERLAST/VNCIPHERLAST
+(define_mode_iterator CR_vqdi [V16QI V2DI])
+
;; Iterator for the other crypto functions
(define_int_iterator CR_code [UNSPEC_VCIPHER
UNSPEC_VNCIPHER
@@ -60,10 +63,10 @@
(UNSPEC_VNCIPHERLAST "vncipherlast")])
;; 2 operand crypto instructions
-(define_insn "crypto_<CR_insn>"
- [(set (match_operand:V2DI 0 "register_operand" "=v")
- (unspec:V2DI [(match_operand:V2DI 1 "register_operand" "v")
- (match_operand:V2DI 2 "register_operand" "v")]
+(define_insn "crypto_<CR_insn>_<mode>"
+ [(set (match_operand:CR_vqdi 0 "register_operand" "=v")
+ (unspec:CR_vqdi [(match_operand:CR_vqdi 1 "register_operand" "v")
+ (match_operand:CR_vqdi 2 "register_operand" "v")]
CR_code))]
"TARGET_CRYPTO"
"<CR_insn> %0,%1,%2"
@@ -90,9 +93,9 @@
[(set_attr "type" "vecperm")])
;; 1 operand crypto instruction
-(define_insn "crypto_vsbox"
- [(set (match_operand:V2DI 0 "register_operand" "=v")
- (unspec:V2DI [(match_operand:V2DI 1 "register_operand" "v")]
+(define_insn "crypto_vsbox_<mode>"
+ [(set (match_operand:CR_vqdi 0 "register_operand" "=v")
+ (unspec:CR_vqdi [(match_operand:CR_vqdi 1 "register_operand" "v")]
UNSPEC_VSBOX))]
"TARGET_CRYPTO"
"vsbox %0,%1"
diff --git a/gcc/config/rs6000/rs6000-builtin.def
b/gcc/config/rs6000/rs6000-builtin.def
index 2cc07c6..ff134eb 100644
--- a/gcc/config/rs6000/rs6000-builtin.def
+++ b/gcc/config/rs6000/rs6000-builtin.def
@@ -2233,13 +2233,22 @@ BU_FLOAT128_1 (FABSQ, "fabsq", CONST,
abskf2)
BU_FLOAT128_2 (COPYSIGNQ, "copysignq", CONST, copysignkf3)
/* 1 argument crypto functions. */
-BU_CRYPTO_1 (VSBOX, "vsbox", CONST, crypto_vsbox)
+BU_CRYPTO_1 (VSBOX, "vsbox", CONST, crypto_vsbox_v2di)
+BU_CRYPTO_1 (VSBOX_BE, "vsbox_be", CONST, crypto_vsbox_v16qi)
/* 2 argument crypto functions. */
-BU_CRYPTO_2 (VCIPHER, "vcipher", CONST, crypto_vcipher)
-BU_CRYPTO_2 (VCIPHERLAST, "vcipherlast", CONST, crypto_vcipherlast)
-BU_CRYPTO_2 (VNCIPHER, "vncipher", CONST, crypto_vncipher)
-BU_CRYPTO_2 (VNCIPHERLAST, "vncipherlast", CONST, crypto_vncipherlast)
+BU_CRYPTO_2 (VCIPHER, "vcipher", CONST, crypto_vcipher_v2di)
+BU_CRYPTO_2 (VCIPHER_BE, "vcipher_be", CONST, crypto_vcipher_v16qi)
+BU_CRYPTO_2 (VCIPHERLAST, "vcipherlast",
+ CONST, crypto_vcipherlast_v2di)
+BU_CRYPTO_2 (VCIPHERLAST_BE, "vcipherlast_be",
+ CONST, crypto_vcipherlast_v16qi)
+BU_CRYPTO_2 (VNCIPHER, "vncipher", CONST, crypto_vncipher_v2di)
+BU_CRYPTO_2 (VNCIPHER_BE, "vncipher_be", CONST, crypto_vncipher_v16qi)
+BU_CRYPTO_2 (VNCIPHERLAST, "vncipherlast",
+ CONST, crypto_vncipherlast_v2di)
+BU_CRYPTO_2 (VNCIPHERLAST_BE, "vncipherlast_be",
+ CONST, crypto_vncipherlast_v16qi)
BU_CRYPTO_2A (VPMSUMB, "vpmsumb", CONST, crypto_vpmsumb)
BU_CRYPTO_2A (VPMSUMH, "vpmsumh", CONST, crypto_vpmsumh)
BU_CRYPTO_2A (VPMSUMW, "vpmsumw", CONST, crypto_vpmsumw)
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index f31a8b8..7bfeba3 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -18818,6 +18818,7 @@ builtin_function_type (machine_mode mode_ret,
machine_mode mode_arg0,
{
/* unsigned 1 argument functions. */
case CRYPTO_BUILTIN_VSBOX:
+ case CRYPTO_BUILTIN_VSBOX_BE:
case P8V_BUILTIN_VGBBD:
case MISC_BUILTIN_CDTBCD:
case MISC_BUILTIN_CBCDTD:
@@ -18831,9 +18832,13 @@ builtin_function_type (machine_mode mode_ret,
machine_mode mode_arg0,
case ALTIVEC_BUILTIN_VMULOUB:
case ALTIVEC_BUILTIN_VMULOUH:
case CRYPTO_BUILTIN_VCIPHER:
+ case CRYPTO_BUILTIN_VCIPHER_BE:
case CRYPTO_BUILTIN_VCIPHERLAST:
+ case CRYPTO_BUILTIN_VCIPHERLAST_BE:
case CRYPTO_BUILTIN_VNCIPHER:
+ case CRYPTO_BUILTIN_VNCIPHER_BE:
case CRYPTO_BUILTIN_VNCIPHERLAST:
+ case CRYPTO_BUILTIN_VNCIPHERLAST_BE:
case CRYPTO_BUILTIN_VPMSUMB:
case CRYPTO_BUILTIN_VPMSUMH:
case CRYPTO_BUILTIN_VPMSUMW:
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 94e4849..7211072 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -18420,20 +18420,33 @@ If the cryptographic instructions are enabled
(@option{-mcrypto} or
@smallexample
vector unsigned long long __builtin_crypto_vsbox (vector unsigned long long);
+vector unsigned char vec_sbox_be (vector unsigned char);
+
vector unsigned long long __builtin_crypto_vcipher (vector unsigned long long,
vector unsigned long long);
+vector unsigned char vec_cipher_be (vector unsigned char, vector unsigned
char);
+
vector unsigned long long __builtin_crypto_vcipherlast
(vector unsigned long long,
vector unsigned long long);
+vector unsigned char vec_cipherlast_be (vector unsigned char,
+ vector unsigned char);
+
vector unsigned long long __builtin_crypto_vncipher (vector unsigned long long,
vector unsigned long
long);
+vector unsigned char vec_ncipher_be (vector unsigned char,
+ vector unsigned char);
+
vector unsigned long long __builtin_crypto_vncipherlast
(vector unsigned long long,
vector unsigned long long);
+vector unsigned char vec_ncipherlast_be (vector unsigned char,
+ vector unsigned char);
+
vector unsigned char __builtin_crypto_vpermxor (vector unsigned char,
vector unsigned char,
vector unsigned char);
diff --git a/gcc/testsuite/gcc.target/powerpc/crypto-builtin-1.c
b/gcc/testsuite/gcc.target/powerpc/crypto-builtin-1.c
index e4b460e..941f11d 100644
--- a/gcc/testsuite/gcc.target/powerpc/crypto-builtin-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/crypto-builtin-1.c
@@ -4,37 +4,63 @@
/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } {
"-mcpu=power8" } } */
/* { dg-options "-mcpu=power8 -O2 -ftree-vectorize -fvect-cost-model=dynamic
-fno-unroll-loops -fno-unroll-all-loops" } */
+#include <altivec.h>
typedef vector unsigned long long crypto_t;
typedef vector unsigned long long v2di_t;
typedef vector unsigned int v4si_t;
typedef vector unsigned short v8hi_t;
typedef vector unsigned char v16qi_t;
-crypto_t crpyto1 (crypto_t a)
+crypto_t crypto1 (crypto_t a)
{
return __builtin_crypto_vsbox (a);
}
+v16qi_t crypto1_be (v16qi_t a)
+{
+ return vec_sbox_be (a);
+}
+
crypto_t crypto2 (crypto_t a, crypto_t b)
{
return __builtin_crypto_vcipher (a, b);
}
+v16qi_t crypto2_be (v16qi_t a, v16qi_t b)
+{
+ return vec_cipher_be (a, b);
+}
+
crypto_t crypto3 (crypto_t a, crypto_t b)
{
return __builtin_crypto_vcipherlast (a, b);
}
+v16qi_t crypto3_be (v16qi_t a, v16qi_t b)
+{
+ return vec_cipherlast_be (a, b);
+}
+
crypto_t crypto4 (crypto_t a, crypto_t b)
{
return __builtin_crypto_vncipher (a, b);
}
+v16qi_t crypto4_be (v16qi_t a, v16qi_t b)
+{
+ return vec_ncipher_be (a, b);
+}
+
crypto_t crypto5 (crypto_t a, crypto_t b)
{
return __builtin_crypto_vncipherlast (a, b);
}
+v16qi_t crypto5_be (v16qi_t a, v16qi_t b)
+{
+ return vec_ncipherlast_be (a, b);
+}
+
v16qi_t crypto6a (v16qi_t a, v16qi_t b, v16qi_t c)
{
return __builtin_crypto_vpermxor (a, b, c);
@@ -117,15 +143,15 @@ v4si_t crypto8d (v4si_t a)
/* Note space is used after the instruction so that vcipherlast does not match
vcipher. */
-/* { dg-final { scan-assembler-times "vcipher " 1 } } */
-/* { dg-final { scan-assembler-times "vcipherlast " 1 } } */
-/* { dg-final { scan-assembler-times "vncipher " 1 } } */
-/* { dg-final { scan-assembler-times "vncipherlast " 1 } } */
+/* { dg-final { scan-assembler-times "vcipher " 2 } } */
+/* { dg-final { scan-assembler-times "vcipherlast " 2 } } */
+/* { dg-final { scan-assembler-times "vncipher " 2 } } */
+/* { dg-final { scan-assembler-times "vncipherlast " 2 } } */
/* { dg-final { scan-assembler-times "vpermxor " 4 } } */
/* { dg-final { scan-assembler-times "vpmsumb " 2 } } */
/* { dg-final { scan-assembler-times "vpmsumd " 2 } } */
/* { dg-final { scan-assembler-times "vpmsumh " 2 } } */
/* { dg-final { scan-assembler-times "vpmsumw " 2 } } */
-/* { dg-final { scan-assembler-times "vsbox " 1 } } */
+/* { dg-final { scan-assembler-times "vsbox " 2 } } */
/* { dg-final { scan-assembler-times "vshasigmad " 2 } } */
/* { dg-final { scan-assembler-times "vshasigmaw " 2 } } */
--
2.7.4
