Refactor the benchmark code.
Changes:
- Modify the benchmarks to derive from a single Benchmark object.
- Rewrite the main iteration code. This includes changing the iteration
code to use the actual total time calculated by the benchmark as a basis
for determining whether there are enough iterations instead of using
the time it takes to run the benchmark.
- Allow benchmarks to take no argument, int, or double.
- Fix the PrettyInt printer for negative integers.
- Modify the max column width name to include the whole name including
the arg part.
- Reformat property_benchmark.cpp in line with the rest of the code.
- Modify a few of the math benchmarks to take an argument instead of
separate benchmarks for the same function with different args.
- Create a vector of regex_t structs to represent the args all at
once instead of when running each benchmark.
This change is in preparation for adding new math based benchmarks.
Tested by running on a nexus flo running at max using the new code
and the old code and comparing. All of the numbers are similar, but
some of the iterations are different due to the slightly different
algorithm used.
Change-Id: I57ad1f3ff083282b9ffeb72e687cab369ce3523a
diff --git a/benchmarks/property_benchmark.cpp b/benchmarks/property_benchmark.cpp
index 0802b4c..944cd68 100644
--- a/benchmarks/property_benchmark.cpp
+++ b/benchmarks/property_benchmark.cpp
@@ -14,19 +14,21 @@
* limitations under the License.
*/
-#include "benchmark.h"
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
+#include <string>
+
+#if defined(__BIONIC__)
+
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include <sys/_system_properties.h>
-#include <vector>
-#include <string>
+#include <benchmark/Benchmark.h>
-extern void *__system_property_area__;
+extern void* __system_property_area__;
// Do not exceed 512, that is about the largest number of properties
// that can be created with the current property area size.
@@ -34,200 +36,198 @@
Arg(1)->Arg(4)->Arg(16)->Arg(64)->Arg(128)->Arg(256)->Arg(512)
struct LocalPropertyTestState {
- LocalPropertyTestState(int nprops) : nprops(nprops), valid(false) {
- static const char prop_name_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_.";
+ LocalPropertyTestState(int nprops) : nprops(nprops), valid(false) {
+ static const char prop_name_chars[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_.";
- const char* android_data = getenv("ANDROID_DATA");
- if (android_data == NULL) {
- printf("ANDROID_DATA environment variable not set\n");
- return;
- }
- char dir_template[PATH_MAX];
- snprintf(dir_template, sizeof(dir_template), "%s/local/tmp/prop-XXXXXX", android_data);
- char *dirname = mkdtemp(dir_template);
- if (!dirname) {
- printf("making temp file for test state failed (is %s/local/tmp writable?): %s\n",
- android_data, strerror(errno));
- return;
- }
-
- old_pa = __system_property_area__;
- __system_property_area__ = NULL;
-
- pa_dirname = dirname;
- pa_filename = pa_dirname + "/__properties__";
-
- __system_property_set_filename(pa_filename.c_str());
- __system_property_area_init();
-
- names = new char* [nprops];
- name_lens = new int[nprops];
- values = new char* [nprops];
- value_lens = new int[nprops];
-
- srandom(nprops);
-
- for (int i = 0; i < nprops; i++) {
- // Make sure the name has at least 10 characters to make
- // it very unlikely to generate the same random name.
- name_lens[i] = (random() % (PROP_NAME_MAX - 10)) + 10;
- names[i] = new char[PROP_NAME_MAX + 1];
- size_t prop_name_len = sizeof(prop_name_chars) - 1;
- for (int j = 0; j < name_lens[i]; j++) {
- if (j == 0 || names[i][j-1] == '.' || j == name_lens[i] - 1) {
- // Certain values are not allowed:
- // - Don't start name with '.'
- // - Don't allow '.' to appear twice in a row
- // - Don't allow the name to end with '.'
- // This assumes that '.' is the last character in the
- // array so that decrementing the length by one removes
- // the value from the possible values.
- prop_name_len--;
- }
- names[i][j] = prop_name_chars[random() % prop_name_len];
- }
- names[i][name_lens[i]] = 0;
-
- // Make sure the value contains at least 1 character.
- value_lens[i] = (random() % (PROP_VALUE_MAX - 1)) + 1;
- values[i] = new char[PROP_VALUE_MAX];
- for (int j = 0; j < value_lens[i]; j++) {
- values[i][j] = prop_name_chars[random() % (sizeof(prop_name_chars) - 1)];
- }
-
- if (__system_property_add(names[i], name_lens[i], values[i], value_lens[i]) < 0) {
- printf("Failed to add a property, terminating...\n");
- printf("%s = %.*s\n", names[i], value_lens[i], values[i]);
- exit(1);
- }
- }
-
- valid = true;
+ const char* android_data = getenv("ANDROID_DATA");
+ if (android_data == NULL) {
+ printf("ANDROID_DATA environment variable not set\n");
+ return;
+ }
+ char dir_template[PATH_MAX];
+ snprintf(dir_template, sizeof(dir_template), "%s/local/tmp/prop-XXXXXX", android_data);
+ char* dirname = mkdtemp(dir_template);
+ if (!dirname) {
+ printf("making temp file for test state failed (is %s/local/tmp writable?): %s\n",
+ android_data, strerror(errno));
+ return;
}
- ~LocalPropertyTestState() {
- if (!valid)
- return;
+ old_pa = __system_property_area__;
+ __system_property_area__ = NULL;
- __system_property_area__ = old_pa;
+ pa_dirname = dirname;
+ pa_filename = pa_dirname + "/__properties__";
- __system_property_set_filename(PROP_FILENAME);
- unlink(pa_filename.c_str());
- rmdir(pa_dirname.c_str());
+ __system_property_set_filename(pa_filename.c_str());
+ __system_property_area_init();
- for (int i = 0; i < nprops; i++) {
- delete names[i];
- delete values[i];
+ names = new char* [nprops];
+ name_lens = new int[nprops];
+ values = new char* [nprops];
+ value_lens = new int[nprops];
+
+ srandom(nprops);
+
+ for (int i = 0; i < nprops; i++) {
+ // Make sure the name has at least 10 characters to make
+ // it very unlikely to generate the same random name.
+ name_lens[i] = (random() % (PROP_NAME_MAX - 10)) + 10;
+ names[i] = new char[PROP_NAME_MAX + 1];
+ size_t prop_name_len = sizeof(prop_name_chars) - 1;
+ for (int j = 0; j < name_lens[i]; j++) {
+ if (j == 0 || names[i][j-1] == '.' || j == name_lens[i] - 1) {
+ // Certain values are not allowed:
+ // - Don't start name with '.'
+ // - Don't allow '.' to appear twice in a row
+ // - Don't allow the name to end with '.'
+ // This assumes that '.' is the last character in the
+ // array so that decrementing the length by one removes
+ // the value from the possible values.
+ prop_name_len--;
}
- delete[] names;
- delete[] name_lens;
- delete[] values;
- delete[] value_lens;
+ names[i][j] = prop_name_chars[random() % prop_name_len];
+ }
+ names[i][name_lens[i]] = 0;
+
+ // Make sure the value contains at least 1 character.
+ value_lens[i] = (random() % (PROP_VALUE_MAX - 1)) + 1;
+ values[i] = new char[PROP_VALUE_MAX];
+ for (int j = 0; j < value_lens[i]; j++) {
+ values[i][j] = prop_name_chars[random() % (sizeof(prop_name_chars) - 1)];
+ }
+
+ if (__system_property_add(names[i], name_lens[i], values[i], value_lens[i]) < 0) {
+ printf("Failed to add a property, terminating...\n");
+ printf("%s = %.*s\n", names[i], value_lens[i], values[i]);
+ exit(1);
+ }
}
+
+ valid = true;
+ }
+
+ ~LocalPropertyTestState() {
+ if (!valid)
+ return;
+
+ __system_property_area__ = old_pa;
+
+ __system_property_set_filename(PROP_FILENAME);
+ unlink(pa_filename.c_str());
+ rmdir(pa_dirname.c_str());
+
+ for (int i = 0; i < nprops; i++) {
+ delete names[i];
+ delete values[i];
+ }
+ delete[] names;
+ delete[] name_lens;
+ delete[] values;
+ delete[] value_lens;
+ }
public:
- const int nprops;
- char **names;
- int *name_lens;
- char **values;
- int *value_lens;
- bool valid;
+ const int nprops;
+ char** names;
+ int* name_lens;
+ char** values;
+ int* value_lens;
+ bool valid;
private:
- std::string pa_dirname;
- std::string pa_filename;
- void *old_pa;
+ std::string pa_dirname;
+ std::string pa_filename;
+ void* old_pa;
};
-static void BM_property_get(int iters, int nprops)
-{
- StopBenchmarkTiming();
+BENCHMARK_WITH_ARG(BM_property_get, int)->TEST_NUM_PROPS;
+void BM_property_get::Run(int iters, int nprops) {
+ StopBenchmarkTiming();
- LocalPropertyTestState pa(nprops);
- char value[PROP_VALUE_MAX];
+ LocalPropertyTestState pa(nprops);
+ char value[PROP_VALUE_MAX];
- if (!pa.valid)
- return;
+ if (!pa.valid)
+ return;
- srandom(iters * nprops);
+ srandom(iters * nprops);
- StartBenchmarkTiming();
+ StartBenchmarkTiming();
- for (int i = 0; i < iters; i++) {
- __system_property_get(pa.names[random() % nprops], value);
- }
- StopBenchmarkTiming();
+ for (int i = 0; i < iters; i++) {
+ __system_property_get(pa.names[random() % nprops], value);
+ }
+ StopBenchmarkTiming();
}
-BENCHMARK(BM_property_get)->TEST_NUM_PROPS;
-static void BM_property_find(int iters, int nprops)
-{
- StopBenchmarkTiming();
+BENCHMARK_WITH_ARG(BM_property_find, int)->TEST_NUM_PROPS;
+void BM_property_find::Run(int iters, int nprops) {
+ StopBenchmarkTiming();
- LocalPropertyTestState pa(nprops);
+ LocalPropertyTestState pa(nprops);
- if (!pa.valid)
- return;
+ if (!pa.valid)
+ return;
- srandom(iters * nprops);
+ srandom(iters * nprops);
- StartBenchmarkTiming();
+ StartBenchmarkTiming();
- for (int i = 0; i < iters; i++) {
- __system_property_find(pa.names[random() % nprops]);
- }
- StopBenchmarkTiming();
+ for (int i = 0; i < iters; i++) {
+ __system_property_find(pa.names[random() % nprops]);
+ }
+ StopBenchmarkTiming();
}
-BENCHMARK(BM_property_find)->TEST_NUM_PROPS;
-static void BM_property_read(int iters, int nprops)
-{
- StopBenchmarkTiming();
+BENCHMARK_WITH_ARG(BM_property_read, int)->TEST_NUM_PROPS;
+void BM_property_read::Run(int iters, int nprops) {
+ StopBenchmarkTiming();
- LocalPropertyTestState pa(nprops);
+ LocalPropertyTestState pa(nprops);
- if (!pa.valid)
- return;
+ if (!pa.valid)
+ return;
- srandom(iters * nprops);
- const prop_info** pinfo = new const prop_info*[iters];
- char propvalue[PROP_VALUE_MAX];
+ srandom(iters * nprops);
+ const prop_info** pinfo = new const prop_info*[iters];
+ char propvalue[PROP_VALUE_MAX];
- for (int i = 0; i < iters; i++) {
- pinfo[i] = __system_property_find(pa.names[random() % nprops]);
- }
+ for (int i = 0; i < iters; i++) {
+ pinfo[i] = __system_property_find(pa.names[random() % nprops]);
+ }
- StartBenchmarkTiming();
- for (int i = 0; i < iters; i++) {
- __system_property_read(pinfo[i], 0, propvalue);
- }
- StopBenchmarkTiming();
+ StartBenchmarkTiming();
+ for (int i = 0; i < iters; i++) {
+ __system_property_read(pinfo[i], 0, propvalue);
+ }
+ StopBenchmarkTiming();
- delete[] pinfo;
+ delete[] pinfo;
}
-BENCHMARK(BM_property_read)->TEST_NUM_PROPS;
-static void BM_property_serial(int iters, int nprops)
-{
- StopBenchmarkTiming();
+BENCHMARK_WITH_ARG(BM_property_serial, int)->TEST_NUM_PROPS;
+void BM_property_serial::Run(int iters, int nprops) {
+ StopBenchmarkTiming();
- LocalPropertyTestState pa(nprops);
+ LocalPropertyTestState pa(nprops);
- if (!pa.valid)
- return;
+ if (!pa.valid)
+ return;
- srandom(iters * nprops);
- const prop_info** pinfo = new const prop_info*[iters];
+ srandom(iters * nprops);
+ const prop_info** pinfo = new const prop_info*[iters];
- for (int i = 0; i < iters; i++) {
- pinfo[i] = __system_property_find(pa.names[random() % nprops]);
- }
+ for (int i = 0; i < iters; i++) {
+ pinfo[i] = __system_property_find(pa.names[random() % nprops]);
+ }
- StartBenchmarkTiming();
- for (int i = 0; i < iters; i++) {
- __system_property_serial(pinfo[i]);
- }
- StopBenchmarkTiming();
+ StartBenchmarkTiming();
+ for (int i = 0; i < iters; i++) {
+ __system_property_serial(pinfo[i]);
+ }
+ StopBenchmarkTiming();
- delete[] pinfo;
+ delete[] pinfo;
}
-BENCHMARK(BM_property_serial)->TEST_NUM_PROPS;
+
+#endif // __BIONIC__