Fix benchmark-tests
1. fix all_benchmarks. Some new benchmarks were added.
2. move some benchmark suites to the right place.
3. add unit test for https://android-review.googlesource.com/c/platform/bionic/+/724785
Test: compile and run bionic-benchmarks-tests on device.
Change-Id: I2b686b51910a422b664f9ea968199f37944039c0
diff --git a/benchmarks/test_suites/test_alignment_onebuf_manual.xml b/benchmarks/test_suites/test_alignment_onebuf_manual.xml
index 97ed5dd..08ef9bd 100644
--- a/benchmarks/test_suites/test_alignment_onebuf_manual.xml
+++ b/benchmarks/test_suites/test_alignment_onebuf_manual.xml
@@ -18,3 +18,13 @@
<iterations>1</iterations>
<args>AT_ONEBUF_MANUAL_ALIGN_32_SIZE_4000</args>
</fn>
+<fn>
+ <name>BM_string_strlen</name>
+ <iterations>1</iterations>
+ <args>AT_ONEBUF_MANUAL_ALIGN_4_SIZE_MEDIUM</args>
+</fn>
+<fn>
+ <name>BM_string_memset</name>
+ <iterations>1</iterations>
+ <args>AT_ONEBUF_MANUAL_ALIGN_32_SIZE_LARGE</args>
+</fn>
diff --git a/benchmarks/test_suites/test_alignment_twobuf_manual.xml b/benchmarks/test_suites/test_alignment_twobuf_manual.xml
index 1d49015..3d1575e 100644
--- a/benchmarks/test_suites/test_alignment_twobuf_manual.xml
+++ b/benchmarks/test_suites/test_alignment_twobuf_manual.xml
@@ -18,3 +18,14 @@
<iterations>1</iterations>
<args>AT_TWOBUF_MANUAL_ALIGN1_16_ALIGN2_32_SIZE_20000</args>
</fn>
+
+<fn>
+ <name>BM_string_strcmp</name>
+ <iterations>1</iterations>
+ <args>AT_TWOBUF_MANUAL_ALIGN1_4_ALIGN2_0_SIZE_SMALL</args>
+</fn>
+<fn>
+ <name>BM_string_strcmp</name>
+ <iterations>1</iterations>
+ <args>AT_TWOBUF_MANUAL_ALIGN1_4_ALIGN2_4_SIZE_MEDIUM</args>
+</fn>
diff --git a/benchmarks/test_suites/test_memcmp.xml b/benchmarks/test_suites/test_memcmp.xml
deleted file mode 100644
index f7734c8..0000000
--- a/benchmarks/test_suites/test_memcmp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<fn>
- <name>BM_string_memcmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_0_ALIGN2_0_SIZE_SMALL</args>
-</fn>
-<fn>
- <name>BM_string_memcmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_0_ALIGN2_0_SIZE_MEDIUM</args>
-</fn>
-<fn>
- <name>BM_string_memcmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_0_ALIGN2_0_SIZE_LARGE</args>
-</fn>
-<fn>
- <name>BM_string_memcmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_4_ALIGN2_4_SIZE_MEDIUM</args>
-</fn>
-<fn>
- <name>BM_string_memcmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_4_ALIGN2_0_SIZE_MEDIUM</args>
-</fn>
-<fn>
- <name>BM_string_memcmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_0_ALIGN2_4_SIZE_MEDIUM</args>
-</fn>
diff --git a/benchmarks/test_suites/test_strcmp.xml b/benchmarks/test_suites/test_strcmp.xml
deleted file mode 100644
index 17d1b83..0000000
--- a/benchmarks/test_suites/test_strcmp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<fn>
- <name>BM_string_strcmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_0_ALIGN2_0_SIZE_SMALL</args>
-</fn>
-<fn>
- <name>BM_string_strcmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_0_ALIGN2_0_SIZE_MEDIUM</args>
-</fn>
-<fn>
- <name>BM_string_strcmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_4_ALIGN2_0_SIZE_SMALL</args>
-</fn>
-<fn>
- <name>BM_string_strcmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_0_ALIGN2_4_SIZE_SMALL</args>
-</fn>
-<fn>
- <name>BM_string_strcmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_4_ALIGN2_4_SIZE_SMALL</args>
-</fn>
diff --git a/benchmarks/test_suites/test_strncmp.xml b/benchmarks/test_suites/test_strncmp.xml
deleted file mode 100644
index 42299fc..0000000
--- a/benchmarks/test_suites/test_strncmp.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<fn>
- <name>BM_string_strncmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_0_ALIGN2_0_SIZE_SMALL</args>
-</fn>
-<fn>
- <name>BM_string_strncmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_0_ALIGN2_0_SIZE_MEDIUM</args>
-</fn>
-<fn>
- <name>BM_string_strncmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_4_ALIGN2_0_SIZE_SMALL</args>
-</fn>
-<fn>
- <name>BM_string_strncmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_0_ALIGN2_4_SIZE_SMALL</args>
-</fn>
-<fn>
- <name>BM_string_strncmp</name>
- <args>AT_TWOBUF_MANUAL_ALIGN1_4_ALIGN2_4_SIZE_SMALL</args>
-</fn>