|
 |
446cf2 |
commit f7e3f92b7c45663be808279a43b5221c16001229
|
|
|
446cf2 |
Author: H.J. Lu <hjl.tools@gmail.com>
|
|
|
446cf2 |
Date: Thu May 7 07:29:46 2020 -0700
|
|
|
446cf2 |
|
|
|
446cf2 |
strncmp: Add a testcase for page boundary [BZ #25933]
|
|
|
446cf2 |
|
|
|
446cf2 |
Add a strncmp testcase to cover cases where one of strings ends on the
|
|
|
446cf2 |
page boundary with the maximum string length less than the number bytes
|
|
|
446cf2 |
of each AVX2 loop iteration and different offsets from page boundary.
|
|
|
446cf2 |
|
|
|
446cf2 |
The updated string/test-strncmp fails on Intel Core i7-8559U without
|
|
|
446cf2 |
|
|
|
446cf2 |
ommit 1c6432316bc434a72108d7b0c7cfbfdde64c3124
|
|
|
446cf2 |
Author: Sunil K Pandey <skpgkp1@gmail.com>
|
|
|
446cf2 |
Date: Fri Jun 12 08:57:16 2020 -0700
|
|
|
446cf2 |
|
|
|
446cf2 |
Fix avx2 strncmp offset compare condition check [BZ #25933]
|
|
|
446cf2 |
|
|
|
446cf2 |
diff --git a/string/test-strncmp.c b/string/test-strncmp.c
|
|
|
446cf2 |
index d961ac4493..962679b384 100644
|
|
|
446cf2 |
--- a/string/test-strncmp.c
|
|
|
446cf2 |
+++ b/string/test-strncmp.c
|
|
|
446cf2 |
@@ -403,6 +403,38 @@ check2 (void)
|
|
|
446cf2 |
free (s2);
|
|
|
446cf2 |
}
|
|
|
446cf2 |
|
|
|
446cf2 |
+static void
|
|
|
446cf2 |
+check3 (void)
|
|
|
446cf2 |
+{
|
|
|
446cf2 |
+ /* To trigger bug 25933, we need a size that is equal to the vector
|
|
|
446cf2 |
+ length times 4. In the case of AVX2 for Intel, we need 32 * 4. We
|
|
|
446cf2 |
+ make this test generic and run it for all architectures as additional
|
|
|
446cf2 |
+ boundary testing for such related algorithms. */
|
|
|
446cf2 |
+ size_t size = 32 * 4;
|
|
|
446cf2 |
+ CHAR *s1 = (CHAR *) (buf1 + (BUF1PAGES - 1) * page_size);
|
|
|
446cf2 |
+ CHAR *s2 = (CHAR *) (buf2 + (BUF1PAGES - 1) * page_size);
|
|
|
446cf2 |
+ int exp_result;
|
|
|
446cf2 |
+
|
|
|
446cf2 |
+ memset (s1, 'a', page_size);
|
|
|
446cf2 |
+ memset (s2, 'a', page_size);
|
|
|
446cf2 |
+ s1[(page_size / CHARBYTES) - 1] = (CHAR) 0;
|
|
|
446cf2 |
+
|
|
|
446cf2 |
+ /* Iterate over a size that is just below where we expect the bug to
|
|
|
446cf2 |
+ trigger up to the size we expect will trigger the bug e.g. [99-128].
|
|
|
446cf2 |
+ Likewise iterate the start of two strings between 30 and 31 bytes
|
|
|
446cf2 |
+ away from the boundary to simulate alignment changes. */
|
|
|
446cf2 |
+ for (size_t s = 99; s <= size; s++)
|
|
|
446cf2 |
+ for (size_t s1a = 30; s1a < 32; s1a++)
|
|
|
446cf2 |
+ for (size_t s2a = 30; s2a < 32; s2a++)
|
|
|
446cf2 |
+ {
|
|
|
446cf2 |
+ CHAR *s1p = s1 + (page_size / CHARBYTES - s) - s1a;
|
|
|
446cf2 |
+ CHAR *s2p = s2 + (page_size / CHARBYTES - s) - s2a;
|
|
|
446cf2 |
+ exp_result = SIMPLE_STRNCMP (s1p, s2p, s);
|
|
|
446cf2 |
+ FOR_EACH_IMPL (impl, 0)
|
|
|
446cf2 |
+ check_result (impl, s1p, s2p, s, exp_result);
|
|
|
446cf2 |
+ }
|
|
|
446cf2 |
+}
|
|
|
446cf2 |
+
|
|
|
446cf2 |
int
|
|
|
446cf2 |
test_main (void)
|
|
|
446cf2 |
{
|
|
|
446cf2 |
@@ -412,6 +444,7 @@ test_main (void)
|
|
|
446cf2 |
|
|
|
446cf2 |
check1 ();
|
|
|
446cf2 |
check2 ();
|
|
|
446cf2 |
+ check3 ();
|
|
|
446cf2 |
|
|
|
446cf2 |
printf ("%23s", "");
|
|
|
446cf2 |
FOR_EACH_IMPL (impl, 0)
|