e354a5
commit 659c0411880328ed341ca26b43d069ec5269a8b5
e354a5
Author: H.J. Lu <hjl.tools@gmail.com>
e354a5
Date:   Thu Jun 11 09:03:56 2020 -0700
e354a5
e354a5
    strcmp: Add a testcase for page boundary
e354a5
    
e354a5
    Add a strcmp testcase to cover cases where both strings end on the page
e354a5
    boundary.
e354a5
e354a5
diff --git a/string/test-strcmp.c b/string/test-strcmp.c
e354a5
index 8d4784de80..6a840fc04b 100644
e354a5
--- a/string/test-strcmp.c
e354a5
+++ b/string/test-strcmp.c
e354a5
@@ -359,6 +359,38 @@ check (void)
e354a5
     }
e354a5
 }
e354a5
 
e354a5
+static void
e354a5
+check2 (void)
e354a5
+{
e354a5
+  /* To trigger bug 25933, we need a size that is equal to the vector
e354a5
+     length times 4. In the case of AVX2 for Intel, we need 32 * 4.  We
e354a5
+     make this test generic and run it for all architectures as additional
e354a5
+     boundary testing for such related algorithms.  */
e354a5
+  size_t size = 32 * 4;
e354a5
+  CHAR *s1 = (CHAR *) (buf1 + (BUF1PAGES - 1) * page_size);
e354a5
+  CHAR *s2 = (CHAR *) (buf2 + (BUF1PAGES - 1) * page_size);
e354a5
+  int exp_result;
e354a5
+
e354a5
+  memset (s1, 'a', page_size);
e354a5
+  memset (s2, 'a', page_size);
e354a5
+  s1[(page_size / CHARBYTES) - 1] = (CHAR) 0;
e354a5
+  s2[(page_size / CHARBYTES) - 1] = (CHAR) 0;
e354a5
+
e354a5
+  /* Iterate over a size that is just below where we expect the bug to
e354a5
+     trigger up to the size we expect will trigger the bug e.g. [99-128].
e354a5
+     Likewise iterate the start of two strings between 30 and 31 bytes
e354a5
+     away from the boundary to simulate alignment changes.  */
e354a5
+  for (size_t s = 99; s <= size; s++)
e354a5
+    for (size_t s1a = 30; s1a < 32; s1a++)
e354a5
+      for (size_t s2a = 30; s2a < 32; s2a++)
e354a5
+	{
e354a5
+	  CHAR *s1p = s1 + (page_size / CHARBYTES - s) - s1a;
e354a5
+	  CHAR *s2p = s2 + (page_size / CHARBYTES - s) - s2a;
e354a5
+	  exp_result = SIMPLE_STRCMP (s1p, s2p);
e354a5
+	  FOR_EACH_IMPL (impl, 0)
e354a5
+	    check_result (impl, s1p, s2p, exp_result);
e354a5
+	}
e354a5
+}
e354a5
 
e354a5
 int
e354a5
 test_main (void)
e354a5
@@ -367,6 +399,7 @@ test_main (void)
e354a5
 
e354a5
   test_init ();
e354a5
   check();
e354a5
+  check2 ();
e354a5
 
e354a5
   printf ("%23s", "");
e354a5
   FOR_EACH_IMPL (impl, 0)