Remove workaround for running property tests.
Also fix the tests for some missing benchmarks that have been
added recently.
Test: Ran bionic benchmarks tests and all pass.
Test: Ran bionic benchmarks to verify that there are no crashes.
Change-Id: I8501553e8a229c0c6ea81e894e91ac2f5f2fe26c
diff --git a/benchmarks/bionic_benchmarks.cpp b/benchmarks/bionic_benchmarks.cpp
index d82c739..fe7a1b1 100644
--- a/benchmarks/bionic_benchmarks.cpp
+++ b/benchmarks/bionic_benchmarks.cpp
@@ -514,28 +514,12 @@
void RegisterAllBenchmarks(const bench_opts_t& opts,
std::map<std::string, args_vector_t>& args_shorthand) {
- // Add the property tests at the end since they might cause segfaults in
- // tests running afterwards (b/62197783).
- std::vector<std::string> prop_tests;
-
for (auto& entry : g_str_to_func) {
- if (android::base::StartsWith(entry.first, "BM_property_")) {
- prop_tests.push_back(entry.first);
- } else {
- auto& function_info = entry.second;
- args_vector_t arg_vector;
- args_vector_t* run_args = ResolveArgs(&arg_vector, function_info.second,
- args_shorthand);
- RegisterGoogleBenchmarks(bench_opts_t(), opts, entry.first, run_args);
- }
- }
-
- for (auto& prop_name : prop_tests) {
- auto& function_info = g_str_to_func.at(prop_name);
+ auto& function_info = entry.second;
args_vector_t arg_vector;
args_vector_t* run_args = ResolveArgs(&arg_vector, function_info.second,
args_shorthand);
- RegisterGoogleBenchmarks(bench_opts_t(), opts, prop_name, run_args);
+ RegisterGoogleBenchmarks(bench_opts_t(), opts, entry.first, run_args);
}
}
diff --git a/benchmarks/tests/interface_test.cpp b/benchmarks/tests/interface_test.cpp
index 64629e6..d34017d 100644
--- a/benchmarks/tests/interface_test.cpp
+++ b/benchmarks/tests/interface_test.cpp
@@ -176,6 +176,8 @@
"BM_atomic_seq_cst_fence/iterations:1\n"
"BM_atomic_store_release/iterations:1\n"
"BM_atomic_store_seq_cst/iterations:1\n"
+ "BM_inttypes_strtoimax/iterations:1\n"
+ "BM_inttypes_strtoumax/iterations:1\n"
"BM_math_fabs/0/iterations:1\n"
"BM_math_fabs/1/iterations:1\n"
"BM_math_fabs/2/iterations:1\n"
@@ -234,6 +236,34 @@
"BM_math_sin_fesetenv/iterations:1\n"
"BM_math_sin_feupdateenv/iterations:1\n"
"BM_math_sqrt/iterations:1\n"
+ "BM_property_find/1/iterations:1\n"
+ "BM_property_find/4/iterations:1\n"
+ "BM_property_find/16/iterations:1\n"
+ "BM_property_find/64/iterations:1\n"
+ "BM_property_find/128/iterations:1\n"
+ "BM_property_find/256/iterations:1\n"
+ "BM_property_find/512/iterations:1\n"
+ "BM_property_get/1/iterations:1\n"
+ "BM_property_get/4/iterations:1\n"
+ "BM_property_get/16/iterations:1\n"
+ "BM_property_get/64/iterations:1\n"
+ "BM_property_get/128/iterations:1\n"
+ "BM_property_get/256/iterations:1\n"
+ "BM_property_get/512/iterations:1\n"
+ "BM_property_read/1/iterations:1\n"
+ "BM_property_read/4/iterations:1\n"
+ "BM_property_read/16/iterations:1\n"
+ "BM_property_read/64/iterations:1\n"
+ "BM_property_read/128/iterations:1\n"
+ "BM_property_read/256/iterations:1\n"
+ "BM_property_read/512/iterations:1\n"
+ "BM_property_serial/1/iterations:1\n"
+ "BM_property_serial/4/iterations:1\n"
+ "BM_property_serial/16/iterations:1\n"
+ "BM_property_serial/64/iterations:1\n"
+ "BM_property_serial/128/iterations:1\n"
+ "BM_property_serial/256/iterations:1\n"
+ "BM_property_serial/512/iterations:1\n"
"BM_pthread_create/iterations:1\n"
"BM_pthread_create_and_run/iterations:1\n"
"BM_pthread_exit_and_join/iterations:1\n"
@@ -300,7 +330,10 @@
"BM_stdio_printf_s/iterations:1\n"
"BM_stdio_scanf_d/iterations:1\n"
"BM_stdio_scanf_maps/iterations:1\n"
+ "BM_stdio_scanf_maps_baseline/iterations:1\n"
"BM_stdio_scanf_s/iterations:1\n"
+ "BM_stdlib_atoi/iterations:1\n"
+ "BM_stdlib_atol/iterations:1\n"
"BM_stdlib_malloc_free/8/iterations:1\n"
"BM_stdlib_malloc_free/64/iterations:1\n"
"BM_stdlib_malloc_free/512/iterations:1\n"
@@ -312,6 +345,10 @@
"BM_stdlib_malloc_free/131072/iterations:1\n"
"BM_stdlib_mbrtowc/0/iterations:1\n"
"BM_stdlib_mbstowcs/0/0/iterations:1\n"
+ "BM_stdlib_strtol/iterations:1\n"
+ "BM_stdlib_strtoll/iterations:1\n"
+ "BM_stdlib_strtoul/iterations:1\n"
+ "BM_stdlib_strtoull/iterations:1\n"
"BM_string_memcmp/8/0/0/iterations:1\n"
"BM_string_memcmp/64/0/0/iterations:1\n"
"BM_string_memcmp/512/0/0/iterations:1\n"
@@ -460,35 +497,7 @@
"BM_unistd_getpid/iterations:1\n"
"BM_unistd_getpid_syscall/iterations:1\n"
"BM_unistd_gettid/iterations:1\n"
- "BM_unistd_gettid_syscall/iterations:1\n"
- "BM_property_find/1/iterations:1\n"
- "BM_property_find/4/iterations:1\n"
- "BM_property_find/16/iterations:1\n"
- "BM_property_find/64/iterations:1\n"
- "BM_property_find/128/iterations:1\n"
- "BM_property_find/256/iterations:1\n"
- "BM_property_find/512/iterations:1\n"
- "BM_property_get/1/iterations:1\n"
- "BM_property_get/4/iterations:1\n"
- "BM_property_get/16/iterations:1\n"
- "BM_property_get/64/iterations:1\n"
- "BM_property_get/128/iterations:1\n"
- "BM_property_get/256/iterations:1\n"
- "BM_property_get/512/iterations:1\n"
- "BM_property_read/1/iterations:1\n"
- "BM_property_read/4/iterations:1\n"
- "BM_property_read/16/iterations:1\n"
- "BM_property_read/64/iterations:1\n"
- "BM_property_read/128/iterations:1\n"
- "BM_property_read/256/iterations:1\n"
- "BM_property_read/512/iterations:1\n"
- "BM_property_serial/1/iterations:1\n"
- "BM_property_serial/4/iterations:1\n"
- "BM_property_serial/16/iterations:1\n"
- "BM_property_serial/64/iterations:1\n"
- "BM_property_serial/128/iterations:1\n"
- "BM_property_serial/256/iterations:1\n"
- "BM_property_serial/512/iterations:1\n";
+ "BM_unistd_gettid_syscall/iterations:1\n";
Verify(expected, 0, std::vector<const char*>{"--bionic_iterations=1"});
}