Skip to content

Commit 8870460

Browse files
author
sewardj
committed
Enable test cases for: AESE AESD AESMC AESIMC.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15906 a5019735-40e9-0310-863c-91ae7b9d1cf9
1 parent 632a6db commit 8870460

File tree

2 files changed

+53
-8
lines changed

2 files changed

+53
-8
lines changed

‎none/tests/arm64/fp_and_simd.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4523,10 +4523,6 @@ GEN_UNARY_TEST(xtn2, 16b, 8h)
45234523

45244524
// ======================== CRYPTO ========================
45254525

4526-
// These tests are believed to be correct but are disabled because
4527-
// GNU assembler (GNU Binutils) 2.24.0.20140311 Linaro 2014.03
4528-
// cannot be persuaded to accept those instructions (AFAICT).
4529-
45304526
GEN_TWOVEC_TEST(aesd_16b_16b, "aesd v6.16b, v27.16b", 6, 27)
45314527
GEN_TWOVEC_TEST(aese_16b_16b, "aese v6.16b, v27.16b", 6, 27)
45324528
GEN_TWOVEC_TEST(aesimc_16b_16b, "aesimc v6.16b, v27.16b", 6, 27)
@@ -7385,14 +7381,22 @@ int main ( void )
73857381

73867382
// ======================== CRYPTO ========================
73877383

7384+
// By default each test only runs once. That seems a bit too minimal
7385+
// for the crypto ones. So here's an extra run multiplication factor.
7386+
const int CRYPTO_ITER_MULTIPLIER = 10;
7387+
73887388
// aesd 16b (aes single round decryption)
73897389
// aese 16b (aes single round encryption)
73907390
// aesimc 16b (aes inverse mix columns)
73917391
// aesmc 16b (aes mix columns)
7392-
if (0) test_aesd_16b_16b(TyNONE);
7393-
if (0) test_aese_16b_16b(TyNONE);
7394-
if (0) test_aesimc_16b_16b(TyNONE);
7395-
if (0) test_aesmc_16b_16b(TyNONE);
7392+
if (1) for (int i = 0; i < CRYPTO_ITER_MULTIPLIER; i++)
7393+
test_aesd_16b_16b(TyNONE);
7394+
if (1) for (int i = 0; i < CRYPTO_ITER_MULTIPLIER; i++)
7395+
test_aese_16b_16b(TyNONE);
7396+
if (1) for (int i = 0; i < CRYPTO_ITER_MULTIPLIER; i++)
7397+
test_aesimc_16b_16b(TyNONE);
7398+
if (1) for (int i = 0; i < CRYPTO_ITER_MULTIPLIER; i++)
7399+
test_aesmc_16b_16b(TyNONE);
73967400

73977401
// sha1c q_s_4s
73987402
// sha1h s_s

‎none/tests/arm64/fp_and_simd.stdout.exp

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28793,3 +28793,44 @@ xtn v8.4h, v7.4s87c02c9ba5b25e09d5f68a39f51e4915 00000000000000002c9b5e098a3949
2879328793
xtn2 v8.8h, v7.4s84dc03eb98680d7370a20b36262e4d85 03eb0d730b364d8567181415788bf1b7 fpsr=00000000
2879428794
xtn v8.8b, v7.8h2ca8635ab8c96385922e6ada920bfd94 0000000000000000a85ac9852eda0b94 fpsr=00000000
2879528795
xtn2 v8.16b, v7.8hcb1fb88391120d19091694424470869f 1f8312191642709f078822ac5f050d24 fpsr=00000000
28796+
aesd v6.16b, v27.16b ad3c6e02b07fb70d9fd77489491a1302 739d536739e995431983556db1388e96 e1fd94bc9c947bb6f2f175aedc358be7 739d536739e995431983556db1388e96 fpsr=00000000
28797+
aesd v6.16b, v27.16b 6a5ead74eeb3b9815ad00525782dec40 9d5c678e38c8da85c06cb0684f364ebb b27800142644d2304a6a1a6537031063 9d5c678e38c8da85c06cb0684f364ebb fpsr=00000000
28798+
aesd v6.16b, v27.16b c1ec8190d147c9c125fb7f908222e72f fb81e698f37f844b0e7dcb69dd8f8948 84dc65bfa218c6cf94b345690b760a0a fb81e698f37f844b0e7dcb69dd8f8948 fpsr=00000000
28799+
randV128: 9728 calls, 10055 iters
28800+
aesd v6.16b, v27.16b ecea3363ccecf67463980750bd239e1d 1a0877230e10be492570ec1c59f5e287 aec8d472d64a3c8ba83b015d98558637 1a0877230e10be492570ec1c59f5e287 fpsr=00000000
28801+
aesd v6.16b, v27.16b d079abd022ef8de2209bc2fd4fd2ed1a 5a1a823b3344761afa896f5da6563841 eb39633ccf4f18e1e300b5477a0e4c57 5a1a823b3344761afa896f5da6563841 fpsr=00000000
28802+
aesd v6.16b, v27.16b 080cb0c0566aab73a4675f4ff17bd71e 862af10e4d680dc72f62aa7c1c297fbb 5336c5ece64877c644236f66ce6af829 862af10e4d680dc72f62aa7c1c297fbb fpsr=00000000
28803+
aesd v6.16b, v27.16b f384a210c73caf094fdd3b280500bb0b fd16247abc5ae23123ddfe591b4f19d4 e9526558d792077603741a2cb8d3dcef fd16247abc5ae23123ddfe591b4f19d4 fpsr=00000000
28804+
aesd v6.16b, v27.16b f1c1dfa3d544fa8282dbb866eb3ffabf 1fbf7c61e1fb553637d8cad404a8656e 61d51ba899851ec6288a6e3ed2f47151 1fbf7c61e1fb553637d8cad404a8656e fpsr=00000000
28805+
aesd v6.16b, v27.16b 63a2c958e164ebbf9c4236ea0219f31b 4d0558a11b2bc6b7ca346ecc3614c467 280ffa69c3f35ebf1489b223b992ac01 4d0558a11b2bc6b7ca346ecc3614c467 fpsr=00000000
28806+
aesd v6.16b, v27.16b a809c00f4a7ae2a0fdf11394aa6f0600 e6c8191bcaca96943cd14b23127395a0 9a54ca9bb6c45e283add2220ddfce547 e6c8191bcaca96943cd14b23127395a0 fpsr=00000000
28807+
aese v6.16b, v27.16b 21d523a77167400406cab144441f944c 4ae71eaf4fb825acee8fc0b7f7a538f9 b26e91309bf427c26d234d0d7f9ea3d5 4ae71eaf4fb825acee8fc0b7f7a538f9 fpsr=00000000
28808+
aese v6.16b, v27.16b 2de55201b50b64cd16ab70da2f0afce0 da44c73d09d5d2e13f4d2e6a458a0e52 658e89eba5cd2a7102324ee7681d5837 da44c73d09d5d2e13f4d2e6a458a0e52 fpsr=00000000
28809+
aese v6.16b, v27.16b 2c1aaefe7646afda8e76af36cb0f9f9b f5be75a45901fd128fedf41a5d01768b 15141ebe7cabb9e89049007135a039ca f5be75a45901fd128fedf41a5d01768b fpsr=00000000
28810+
aese v6.16b, v27.16b 7f54967c15f8800acd09ce377910db5f fb3487c69e1b061e3f4e72a89eecd084 3da02bf489b082fa94d044db5f1165b9 fb3487c69e1b061e3f4e72a89eecd084 fpsr=00000000
28811+
aese v6.16b, v27.16b 85736a5cf101373e33452dbf98ec130b 4d875d8138044ee6ae4f08f468297d1c dd679fc15ea69a618cbfb6b3e86b3ff0 4d875d8138044ee6ae4f08f468297d1c fpsr=00000000
28812+
aese v6.16b, v27.16b 9e578b7e6a403556210a2dac8882a47e 4b9758b7889d344a3dd118de1c99dc34 98b9bcdd9caf669c22ba7c4003c196d6 4b9758b7889d344a3dd118de1c99dc34 fpsr=00000000
28813+
aese v6.16b, v27.16b 2be058c1e196d933f6382ee0aab3f099 5344d746edc4192a4bb4ff46191c4ead fe64ae177a7973d46d49ba24bc003e18 5344d746edc4192a4bb4ff46191c4ead fpsr=00000000
28814+
aese v6.16b, v27.16b 8bee3107b5e483b213af8e395d5f573d c76e3b0fc85a5c6638d81f0bc0923265 fff54d30f1bd67485ecd9e2329ae816a c76e3b0fc85a5c6638d81f0bc0923265 fpsr=00000000
28815+
aese v6.16b, v27.16b 1f60772e460894b6d74faf9802663748 07f5e3f2783f5dde651dd70f70dbe83d b2009e86377a2245402add88ad9abc9d 07f5e3f2783f5dde651dd70f70dbe83d fpsr=00000000
28816+
aese v6.16b, v27.16b 45188918f5e36b1ea2f7f1dcf8a8f39b 71b82fcf5d527d723163873089d6d115 c222930edcf32450a3e047ce18c83819 71b82fcf5d527d723163873089d6d115 fpsr=00000000
28817+
aesimc v6.16b, v27.16b 60f4c8a3225569c9d589b3e79f05e815 68998085d8751b01fd8a904f6c654ccd 31052aea28879e86b2c2944c11453ae6 68998085d8751b01fd8a904f6c654ccd fpsr=00000000
28818+
aesimc v6.16b, v27.16b cdd593b02b3dec99cfe35598585d7898 497635f64887986d2871524c7866b944 9a6305009e763ae85a7eaecd93688f97 497635f64887986d2871524c7866b944 fpsr=00000000
28819+
aesimc v6.16b, v27.16b ee9b4a1f727d576cf0e637ce828f0203 7630ae000d67539412f92b070eba795c 3e952d6ef5e0ea527944d52f180956d6 7630ae000d67539412f92b070eba795c fpsr=00000000
28820+
aesimc v6.16b, v27.16b 23264ed057f407239972ba6b7e7de735 4ea84c8588f6ac571b037d608c41ebf3 8787dbf47c7949c943892fe0d219041a 4ea84c8588f6ac571b037d608c41ebf3 fpsr=00000000
28821+
aesimc v6.16b, v27.16b cb56fea238815e9e29673e4daa05860f 32bb6f6318140396a46da83755db70ea 3e3e72f74e0f7ca47947d9b110ac1db5 32bb6f6318140396a46da83755db70ea fpsr=00000000
28822+
aesimc v6.16b, v27.16b 460abb777805bcbd00a5215569083f71 814c757b1da1b9310d180b6bc6686721 12907b3a6c3ba0c32915c58c48f9227b 814c757b1da1b9310d180b6bc6686721 fpsr=00000000
28823+
aesimc v6.16b, v27.16b f424e42e746080607f0bc5631866733c 9b3ac0adf87d2e08b4e406de41c83079 76ffaeebba6f31473a08833974a99e83 9b3ac0adf87d2e08b4e406de41c83079 fpsr=00000000
28824+
aesimc v6.16b, v27.16b 3682d9a68e720a67067b8a5719ff814d e165afd90888c1fafbb0f96e25db2ccf 919320d0ea544e4ba41505683b9908b7 e165afd90888c1fafbb0f96e25db2ccf fpsr=00000000
28825+
aesimc v6.16b, v27.16b 6c05fbc0251bbab1f3d3cf11ccb3c987 b2aca3deaea1d2e9425e45fcd380ba06 7815afa1440b502bc32295d10bdea79d b2aca3deaea1d2e9425e45fcd380ba06 fpsr=00000000
28826+
aesimc v6.16b, v27.16b f48da95c9a3bf120a8f5f4708f61acc9 6ff0fb9e49aac1b3e8cc4968aa993afd 9b1de09cc56674466c0fc7a1676104f6 6ff0fb9e49aac1b3e8cc4968aa993afd fpsr=00000000
28827+
aesmc v6.16b, v27.16b 30fa435a4cb20e9285bf5956c4eb89f2 771218f73981ef394ddc66920b040d93 e65286b857845de08d806c04b18b8e25 771218f73981ef394ddc66920b040d93 fpsr=00000000
28828+
aesmc v6.16b, v27.16b 2af058cadf07bb5bd26cfb5a54a292aa 8da508d99c81ec6f2bc5ac931bae0d0e dc0cb099ff25a8ec91d3af3c8769e6be 8da508d99c81ec6f2bc5ac931bae0d0e fpsr=00000000
28829+
aesmc v6.16b, v27.16b e96b1ef89a1d86f9d65d69a0e8532a20 ed42b59f0c84ce7fcea9779b8f0ee08f 8c82c54ed3b6633fefec5bd361f9c9bf ed42b59f0c84ce7fcea9779b8f0ee08f fpsr=00000000
28830+
aesmc v6.16b, v27.16b 1363c75fcba1aff3b98f0e4324f734d6 51541fd8086f65a2e8c65239c5da7d08 9a9c4b8fe701d19714df24aa2e8e4288 51541fd8086f65a2e8c65239c5da7d08 fpsr=00000000
28831+
aesmc v6.16b, v27.16b 18bba562f32113bad9fc9d4d1cf04559 edbb5450e210bfa0636ed3536fcefb29 de45c30a8b0217738ef93fc590e4e2e5 edbb5450e210bfa0636ed3536fcefb29 fpsr=00000000
28832+
aesmc v6.16b, v27.16b 075ffc9cdbded89459b649b57785a713 504f4555819aa491ea5603b2501943f1 557e5e7a8f82f6d55738a4c6f2700c75 504f4555819aa491ea5603b2501943f1 fpsr=00000000
28833+
aesmc v6.16b, v27.16b dd1059319baa20f37ecfc98578bf954d f37ed68061f18e9e5a3eabc01f1e79f2 cea446f7044af03e7af9951954963d75 f37ed68061f18e9e5a3eabc01f1e79f2 fpsr=00000000
28834+
aesmc v6.16b, v27.16b 4a92530d7e9e5eb0f1cf93555fffa9da 4f2b9966be5424d760f6b995600539c3 86787d187582dd332b7b9d77a250deb3 4f2b9966be5424d760f6b995600539c3 fpsr=00000000
28835+
aesmc v6.16b, v27.16b b56b1ddc388375a510e91c4f709a338b de707d888fd16358600e91cc74bad158 296c3c225f08794b10e187456b7a4016 de707d888fd16358600e91cc74bad158 fpsr=00000000
28836+
aesmc v6.16b, v27.16b 92e993cdf07e325e166ca690b3d078e3 7752e50575dda055df864181d3827c4e 56dd551b68cb07f9faad4d839143f849 7752e50575dda055df864181d3827c4e fpsr=00000000

0 commit comments

Comments
 (0)