Add test cases for PCMPxSTRx cases 0x62 and 0x72, and reformat the associated

switch statements a bit more consistently.  Pertains to #353384 and #353727.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15913

diff --git a/none/tests/amd64/pcmpstr64.c b/none/tests/amd64/pcmpstr64.c
index 2b48c72db11451359a9748c3db24fbd284715f5a..a76ec55cfd95187dffcac24c19fcada67b1bfa7a 100644 (file)
--- a/none/tests/amd64/pcmpstr64.c
+++ b/none/tests/amd64/pcmpstr64.c
@@ -203,11 +203,16 @@ Bool pcmpXstrX_WRK ( /*OUT*/V128* resV,
       even if they would probably work.  Life is too short to have
       unvalidated cases in the code base. */
    switch (imm8) {
-      case 0x00: case 0x02: case 0x08: case 0x0A: case 0x0C: case 0x0E:
-      case 0x12: case 0x14: case 0x18: case 0x1A:
-      case 0x30: case 0x34: case 0x38: case 0x3A:
-      case 0x40: case 0x42: case 0x44: case 0x46: case 0x4A:
-      case 0x70:
+      case 0x00: case 0x02:
+      case 0x08: case 0x0A: case 0x0C: case 0x0E:
+                 case 0x12: case 0x14:
+      case 0x18: case 0x1A:
+      case 0x30:            case 0x34:
+      case 0x38: case 0x3A:
+      case 0x40: case 0x42: case 0x44: case 0x46:
+                 case 0x4A:
+                 case 0x62:
+      case 0x70: case 0x72:
          break;
       default:
          return False;
@@ -2050,6 +2055,166 @@ void istri_70 ( void )
 }
 
 
+//////////////////////////////////////////////////////////
+//                                                      //
+//                       ISTRI_62                       //
+//                                                      //
+//////////////////////////////////////////////////////////
+
+UInt h_pcmpistri_62 ( V128* argL, V128* argR )
+{
+   V128 block[2];
+   memcpy(&block[0], argL, sizeof(V128));
+   memcpy(&block[1], argR, sizeof(V128));
+   ULong res, flags;
+   __asm__ __volatile__(
+      "subq      $1024,  %%rsp"             "\n\t"
+      "movdqu    0(%2),  %%xmm2"            "\n\t"
+      "movdqu    16(%2), %%xmm11"           "\n\t"
+      "pcmpistri $0x62,  %%xmm2, %%xmm11"   "\n\t"
+      "pushfq"                              "\n\t"
+      "popq      %%rdx"                     "\n\t"
+      "movq      %%rcx,  %0"                "\n\t"
+      "movq      %%rdx,  %1"                "\n\t"
+      "addq      $1024,  %%rsp"             "\n\t"
+      : /*out*/ "=r"(res), "=r"(flags) : "r"/*in*/(&block[0])
+      : "rcx","rdx","xmm0","xmm2","xmm11","cc","memory"
+   );
+   return ((flags & 0x8D5) << 16) | (res & 0xFFFF);
+}
+
+UInt s_pcmpistri_62 ( V128* argLU, V128* argRU )
+{
+   V128 resV;
+   UInt resOSZACP, resECX;
+   Bool ok
+      = pcmpXstrX_WRK( &resV, &resOSZACP, argLU, argRU,
+                       zmask_from_V128(argLU),
+                       zmask_from_V128(argRU),
+                       0x62, False/*!isSTRM*/
+        );
+   assert(ok);
+   resECX = resV.uInt[0];
+   return (resOSZACP << 16) | resECX;
+}
+
+void istri_62 ( void )
+{
+   char* wot = "62";
+   UInt(*h)(V128*,V128*) = h_pcmpistri_62;
+   UInt(*s)(V128*,V128*) = s_pcmpistri_62;
+
+   try_istri(wot,h,s, "abcdacbdabcdabcd", "000000000000000a"); 
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000000b"); 
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "00000000000000ab"); 
+   try_istri(wot,h,s, "abcdabc0abcdabcd", "000000000000abcd"); 
+
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000abcd"); 
+   try_istri(wot,h,s, "0bcdabcdabcdabcd", "000000000000abcd"); 
+   try_istri(wot,h,s, "abcdabcdabcda0cd", "000000000000abcd"); 
+   try_istri(wot,h,s, "abcdabcdabcdab0d", "000000000000abcd"); 
+   try_istri(wot,h,s, "abcdabcdabcdabc0", "000000000000abcd"); 
+
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000abcd"); 
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000a0cd"); 
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000ab0d"); 
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000abc0"); 
+
+   try_istri(wot,h,s, "0000000000000000", "0000000000000000"); 
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaa"); 
+
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000abcd"); 
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000dcba"); 
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000bbbb"); 
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000baba"); 
+
+   try_istri(wot,h,s, "0000abcdabcdabcd", "00000000000baba0"); 
+
+   try_istri(wot,h,s, "0ddc0ffeebadf00d", "00000000cafebabe"); 
+   try_istri(wot,h,s, "0ddc0ffeebadfeed", "00000000cafebabe"); 
+}
+
+
+//////////////////////////////////////////////////////////
+//                                                      //
+//                       ISTRI_72                       //
+//                                                      //
+//////////////////////////////////////////////////////////
+
+UInt h_pcmpistri_72 ( V128* argL, V128* argR )
+{
+   V128 block[2];
+   memcpy(&block[0], argL, sizeof(V128));
+   memcpy(&block[1], argR, sizeof(V128));
+   ULong res, flags;
+   __asm__ __volatile__(
+      "subq      $1024,  %%rsp"             "\n\t"
+      "movdqu    0(%2),  %%xmm2"            "\n\t"
+      "movdqu    16(%2), %%xmm11"           "\n\t"
+      "pcmpistri $0x72,  %%xmm2, %%xmm11"   "\n\t"
+      "pushfq"                              "\n\t"
+      "popq      %%rdx"                     "\n\t"
+      "movq      %%rcx,  %0"                "\n\t"
+      "movq      %%rdx,  %1"                "\n\t"
+      "addq      $1024,  %%rsp"             "\n\t"
+      : /*out*/ "=r"(res), "=r"(flags) : "r"/*in*/(&block[0])
+      : "rcx","rdx","xmm0","xmm2","xmm11","cc","memory"
+   );
+   return ((flags & 0x8D5) << 16) | (res & 0xFFFF);
+}
+
+UInt s_pcmpistri_72 ( V128* argLU, V128* argRU )
+{
+   V128 resV;
+   UInt resOSZACP, resECX;
+   Bool ok
+      = pcmpXstrX_WRK( &resV, &resOSZACP, argLU, argRU,
+                       zmask_from_V128(argLU),
+                       zmask_from_V128(argRU),
+                       0x72, False/*!isSTRM*/
+        );
+   assert(ok);
+   resECX = resV.uInt[0];
+   return (resOSZACP << 16) | resECX;
+}
+
+void istri_72 ( void )
+{
+   char* wot = "72";
+   UInt(*h)(V128*,V128*) = h_pcmpistri_72;
+   UInt(*s)(V128*,V128*) = s_pcmpistri_72;
+
+   try_istri(wot,h,s, "abcdacbdabcdabcd", "000000000000000a"); 
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000000b"); 
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "00000000000000ab"); 
+   try_istri(wot,h,s, "abcdabc0abcdabcd", "000000000000abcd"); 
+
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000abcd"); 
+   try_istri(wot,h,s, "0bcdabcdabcdabcd", "000000000000abcd"); 
+   try_istri(wot,h,s, "abcdabcdabcda0cd", "000000000000abcd"); 
+   try_istri(wot,h,s, "abcdabcdabcdab0d", "000000000000abcd"); 
+   try_istri(wot,h,s, "abcdabcdabcdabc0", "000000000000abcd"); 
+
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000abcd"); 
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000a0cd"); 
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000ab0d"); 
+   try_istri(wot,h,s, "abcdabcdabcdabcd", "000000000000abc0"); 
+
+   try_istri(wot,h,s, "0000000000000000", "0000000000000000"); 
+   try_istri(wot,h,s, "aaaaaaaaaaaaaaaa", "aaaaaaaaaaaaaaaa"); 
+
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000abcd"); 
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000dcba"); 
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000bbbb"); 
+   try_istri(wot,h,s, "0000abcdabcdabcd", "000000000000baba"); 
+
+   try_istri(wot,h,s, "0000abcdabcdabcd", "00000000000baba0"); 
+
+   try_istri(wot,h,s, "0ddc0ffeebadf00d", "00000000cafebabe"); 
+   try_istri(wot,h,s, "0ddc0ffeebadfeed", "00000000cafebabe"); 
+}
+
+
 //////////////////////////////////////////////////////////
 //                                                      //
 //                         main                         //
@@ -2077,5 +2242,7 @@ int main ( void )
    istri_14();
    istri_34();
    istri_70();
+   istri_62();
+   istri_72();
    return 0;
 }

diff --git a/none/tests/amd64/pcmpstr64.stdout.exp b/none/tests/amd64/pcmpstr64.stdout.exp
index 55d7fe06fa68aaa6ef9d65199d669be36e73e431..ae006e1daeb3e47daac40e56c1034e5fff4dc51a 100644 (file)
--- a/none/tests/amd64/pcmpstr64.stdout.exp
+++ b/none/tests/amd64/pcmpstr64.stdout.exp
@@ -480,3 +480,47 @@ istri 70  0000abcdabcdabcd 000000000000baba -> 08c10009 08c10009
 istri 70  0000abcdabcdabcd 00000000000baba0 -> 08c1000b 08c1000b 
 istri 70  0ddc0ffeebadf00d 00000000cafebabe -> 08c10000 08c10000 
 istri 70  0ddc0ffeebadfeed 00000000cafebabe -> 08c10004 08c10004 
+istri 62  abcdacbdabcdabcd 000000000000000a -> 0081000f 0081000f 
+istri 62  abcdabcdabcdabcd 000000000000000b -> 0081000e 0081000e 
+istri 62  abcdabcdabcdabcd 00000000000000ab -> 0081000f 0081000f 
+istri 62  abcdabc0abcdabcd 000000000000abcd -> 08c10007 08c10007 
+istri 62  abcdabcdabcdabcd 000000000000abcd -> 0881000f 0881000f 
+istri 62  0bcdabcdabcdabcd 000000000000abcd -> 08c1000e 08c1000e 
+istri 62  abcdabcdabcda0cd 000000000000abcd -> 08c10001 08c10001 
+istri 62  abcdabcdabcdab0d 000000000000abcd -> 08c10000 08c10000 
+istri 62  abcdabcdabcdabc0 000000000000abcd -> 00c00010 00c00010 
+istri 62  abcdabcdabcdabcd 000000000000abcd -> 0881000f 0881000f 
+istri 62  abcdabcdabcdabcd 000000000000a0cd -> 0881000d 0881000d 
+istri 62  abcdabcdabcdabcd 000000000000ab0d -> 0881000c 0881000c 
+istri 62  abcdabcdabcdabcd 000000000000abc0 -> 00800010 00800010 
+istri 62  0000000000000000 0000000000000000 -> 00c00010 00c00010 
+istri 62  aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa -> 0801000f 0801000f 
+istri 62  0000abcdabcdabcd 000000000000abcd -> 08c1000b 08c1000b 
+istri 62  0000abcdabcdabcd 000000000000dcba -> 08c1000b 08c1000b 
+istri 62  0000abcdabcdabcd 000000000000bbbb -> 00c1000a 00c1000a 
+istri 62  0000abcdabcdabcd 000000000000baba -> 00c1000b 00c1000b 
+istri 62  0000abcdabcdabcd 00000000000baba0 -> 00c00010 00c00010 
+istri 62  0ddc0ffeebadf00d 00000000cafebabe -> 00c00010 00c00010 
+istri 62  0ddc0ffeebadfeed 00000000cafebabe -> 00c1000a 00c1000a 
+istri 72  abcdacbdabcdabcd 000000000000000a -> 0881000e 0881000e 
+istri 72  abcdabcdabcdabcd 000000000000000b -> 0881000f 0881000f 
+istri 72  abcdabcdabcdabcd 00000000000000ab -> 0881000d 0881000d 
+istri 72  abcdabc0abcdabcd 000000000000abcd -> 00c00010 00c00010 
+istri 72  abcdabcdabcdabcd 000000000000abcd -> 00800010 00800010 
+istri 72  0bcdabcdabcdabcd 000000000000abcd -> 00c00010 00c00010 
+istri 72  abcdabcdabcda0cd 000000000000abcd -> 00c00010 00c00010 
+istri 72  abcdabcdabcdab0d 000000000000abcd -> 00c00010 00c00010 
+istri 72  abcdabcdabcdabc0 000000000000abcd -> 00c00010 00c00010 
+istri 72  abcdabcdabcdabcd 000000000000abcd -> 00800010 00800010 
+istri 72  abcdabcdabcdabcd 000000000000a0cd -> 0081000f 0081000f 
+istri 72  abcdabcdabcdabcd 000000000000ab0d -> 0081000f 0081000f 
+istri 72  abcdabcdabcdabcd 000000000000abc0 -> 0881000f 0881000f 
+istri 72  0000000000000000 0000000000000000 -> 00c00010 00c00010 
+istri 72  aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa -> 00000010 00000010 
+istri 72  0000abcdabcdabcd 000000000000abcd -> 00c00010 00c00010 
+istri 72  0000abcdabcdabcd 000000000000dcba -> 00c00010 00c00010 
+istri 72  0000abcdabcdabcd 000000000000bbbb -> 08c1000b 08c1000b 
+istri 72  0000abcdabcdabcd 000000000000baba -> 08c10009 08c10009 
+istri 72  0000abcdabcdabcd 00000000000baba0 -> 08c1000b 08c1000b 
+istri 72  0ddc0ffeebadf00d 00000000cafebabe -> 08c10000 08c10000 
+istri 72  0ddc0ffeebadfeed 00000000cafebabe -> 08c10004 08c10004