Elliott Hughes
1d0ded2116
am c0e7f55d: am 07e218a4: am 3d83b189: Merge "[MIPS64] Fix mips64 build."
...
* commit 'c0e7f55d9b89c7d80083842223c941c413bc3942':
[MIPS64] Fix mips64 build.
2015-02-23 16:19:21 +00:00
Elliott Hughes
c0e7f55d9b
am 07e218a4: am 3d83b189: Merge "[MIPS64] Fix mips64 build."
...
* commit '07e218a484d8a1ac71c3b9317e86f5ba39aae919':
[MIPS64] Fix mips64 build.
2015-02-23 16:12:38 +00:00
Elliott Hughes
07e218a484
am 3d83b189: Merge "[MIPS64] Fix mips64 build."
...
* commit '3d83b18970f32467596830845793b18a858f59e6':
[MIPS64] Fix mips64 build.
2015-02-23 16:09:17 +00:00
Elliott Hughes
3d83b18970
Merge "[MIPS64] Fix mips64 build."
2015-02-23 16:04:20 +00:00
Nikola Veljkovic
daf8911079
[MIPS64] Fix mips64 build.
...
Build was broken by:
https://android-review.googlesource.com/133834
Use <unistd.h> to get syscall().
Remove <asm/unistd.h>, it gets included through <sys/syscall.h>.
Change-Id: Id762f6dea5f9538c19b79cdd46deda978efd50fe
2015-02-23 16:21:31 +01:00
Greg Hackmann
f937761134
am 973ceef6: am 4602d8c7: am 04bbef37: Merge "Fix 64-bit benchmark build"
...
* commit '973ceef6869a7dad02195389547bf6177bb6cb34':
Fix 64-bit benchmark build
2015-02-20 19:30:41 +00:00
Greg Hackmann
973ceef686
am 4602d8c7: am 04bbef37: Merge "Fix 64-bit benchmark build"
...
* commit '4602d8c7621ffd87e32f53c8f7e8ac5453a404ca':
Fix 64-bit benchmark build
2015-02-20 19:27:13 +00:00
Greg Hackmann
4602d8c762
am 04bbef37: Merge "Fix 64-bit benchmark build"
...
* commit '04bbef377b9941bf6d67d9c515b6640a314fb032':
Fix 64-bit benchmark build
2015-02-20 19:21:19 +00:00
Greg Hackmann
04bbef377b
Merge "Fix 64-bit benchmark build"
2015-02-20 19:16:49 +00:00
Greg Hackmann
567bfb3779
Fix 64-bit benchmark build
...
The * flag to printf() wants an int instead of size_t, and these are
distinct types on 64-bit. To accomodate this, make the name column
width helpers return int.
In theory this truncates things, but in practice this only matters if
you have a benchmark with more than INT_MAX characters in its name (in
which case you have bigger problems).
Change-Id: I3338948c25a3a8d84f1ead2f5b457c05da8a01cf
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-02-20 11:07:38 -08:00
Elliott Hughes
3f89ed1b47
am 5bf236e9: am 6421f8f5: am c39eef71: Merge "valgrind can\'t find syscall because we didn\'t put it in <unistd.h>."
...
* commit '5bf236e95f75de0169abbb22fc083c767ec681a6':
valgrind can't find syscall because we didn't put it in <unistd.h>.
2015-02-20 17:15:16 +00:00
Elliott Hughes
5bf236e95f
am 6421f8f5: am c39eef71: Merge "valgrind can\'t find syscall because we didn\'t put it in <unistd.h>."
...
* commit '6421f8f5b21357b3f956f4b20c3622f96863a219':
valgrind can't find syscall because we didn't put it in <unistd.h>.
2015-02-20 17:08:47 +00:00
Elliott Hughes
6421f8f5b2
am c39eef71: Merge "valgrind can\'t find syscall because we didn\'t put it in <unistd.h>."
...
* commit 'c39eef71a7f66b69e2216a51d0e7fbc1796d0696':
valgrind can't find syscall because we didn't put it in <unistd.h>.
2015-02-20 17:02:25 +00:00
Elliott Hughes
c39eef71a7
Merge "valgrind can't find syscall because we didn't put it in <unistd.h>."
2015-02-20 16:56:58 +00:00
Elliott Hughes
4c5891d93d
valgrind can't find syscall because we didn't put it in <unistd.h>.
...
Change-Id: I1e47291d4476bd2816138a8cf58f29d4986d39e3
2015-02-19 22:49:44 -08:00
Christopher Ferris
1e0f763c9a
am e84dff9a: am 479070c5: am 324313a9: Merge "Refactor the benchmark code."
...
* commit 'e84dff9a1f1d583c428e137cf0120fdd4ce315ce':
Refactor the benchmark code.
2015-02-20 01:10:48 +00:00
Christopher Ferris
e84dff9a1f
am 479070c5: am 324313a9: Merge "Refactor the benchmark code."
...
* commit '479070c51e34f9f9f809df4daa8184e5b2947f14':
Refactor the benchmark code.
2015-02-20 01:03:22 +00:00
Christopher Ferris
479070c51e
am 324313a9: Merge "Refactor the benchmark code."
...
* commit '324313a9e58c0e8d2546d124d8fcf04306a114f5':
Refactor the benchmark code.
2015-02-20 00:59:18 +00:00
Christopher Ferris
324313a9e5
Merge "Refactor the benchmark code."
2015-02-20 00:53:25 +00:00
Bill Yi
c390f2eae6
am f5700e1f: am a6395dda: Merge commit \'9d7f68ebfd79b1ce54dc56bceb7346f34615e5a1\' into HEAD
...
* commit 'f5700e1fd4eb70f3458b3bd508a9bf945561d22a':
2015-02-20 00:26:52 +00:00
Bill Yi
f5700e1fd4
am a6395dda: Merge commit \'9d7f68ebfd79b1ce54dc56bceb7346f34615e5a1\' into HEAD
...
* commit 'a6395dda54057170fc66faf00410e983202aa7e0':
2015-02-20 00:22:45 +00:00
Christopher Ferris
df4942c04a
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
2015-02-19 14:58:24 -08:00
Christopher Ferris
cd4e501223
am 4379016a: Revert "Modify test to avoid race condition."
...
* commit '4379016a20131740e25b33b2b09a2caef0aa62bd':
Revert "Modify test to avoid race condition."
2015-02-19 22:36:17 +00:00
Bill Yi
a6395dda54
Merge commit '9d7f68ebfd79b1ce54dc56bceb7346f34615e5a1' into HEAD
2015-02-19 14:30:25 -08:00
Christopher Ferris
4379016a20
Revert "Modify test to avoid race condition."
...
This reverts commit 3da136aa47e2d1608b98abb2580f024b36f92831.
This change is not needed any where but lmp mr1.
Change-Id: I3f38e2e8e418959a487bc0c4148d3238743e4626
2015-02-19 13:35:47 -08:00
Elliott Hughes
77a24e14c3
am 4dc261b1: am d071b814: am 97484d3a: Merge "Add GNU extensions mempcpy and wmemcpy."
...
* commit '4dc261b13c351edf26efd18aca448aa98f925d41':
Add GNU extensions mempcpy and wmemcpy.
2015-02-19 20:27:25 +00:00
Dan Albert
60787a931f
am c2c319b2: am 43379c9c: am 3e1b5f46: Merge "Parameterize use of clang in libc_ndk."
...
* commit 'c2c319b2cb5dc3a7928121ecdd4312331dfb0496':
Parameterize use of clang in libc_ndk.
2015-02-19 20:26:35 +00:00
Christopher Ferris
d2c65d8815
am 9ccce5d7: am 3da136aa: Modify test to avoid race condition.
...
* commit '9ccce5d7efde606914ec0b88fa50785b21ea672b':
Modify test to avoid race condition.
2015-02-19 20:26:26 +00:00
Elliott Hughes
8c43e225dd
am 0f13eac9: am 1cb009fb: am d3fa31a5: Merge "[MIPS] Fix setjmp signals"
...
* commit '0f13eac957c71e827e282fdd69de2dabeba28780':
[MIPS] Fix setjmp signals
2015-02-19 17:36:33 +00:00
Elliott Hughes
4dc261b13c
am d071b814: am 97484d3a: Merge "Add GNU extensions mempcpy and wmemcpy."
...
* commit 'd071b814ac5674ca032c05f369b2606cf3520332':
Add GNU extensions mempcpy and wmemcpy.
2015-02-19 16:01:31 +00:00
Elliott Hughes
d071b814ac
am 97484d3a: Merge "Add GNU extensions mempcpy and wmemcpy."
...
* commit '97484d3a9d0d822aeaaa1547aeb76d7669076082':
Add GNU extensions mempcpy and wmemcpy.
2015-02-19 15:55:12 +00:00
Elliott Hughes
97484d3a9d
Merge "Add GNU extensions mempcpy and wmemcpy."
2015-02-19 15:49:53 +00:00
Elliott Hughes
3cfb52aab2
Add GNU extensions mempcpy and wmemcpy.
...
Used by elfutils. On the bright side, they stopped using __mempcpy.
Bug: 18374026
Change-Id: Id29bbe6ef1c5ed5a171bb6c32182f129d8332abb
2015-02-18 22:02:56 -08:00
Dan Albert
c2c319b2cb
am 43379c9c: am 3e1b5f46: Merge "Parameterize use of clang in libc_ndk."
...
* commit '43379c9cfd7416e448b9b2834dd4f7b80697942a':
Parameterize use of clang in libc_ndk.
2015-02-19 02:44:25 +00:00
Dan Albert
43379c9cfd
am 3e1b5f46: Merge "Parameterize use of clang in libc_ndk."
...
* commit '3e1b5f46c07aef5983ecf2feb1c3369b2cd200c0':
Parameterize use of clang in libc_ndk.
2015-02-19 02:37:21 +00:00
Dan Albert
3e1b5f46c0
Merge "Parameterize use of clang in libc_ndk."
2015-02-19 02:33:08 +00:00
Christopher Ferris
9ccce5d7ef
am 3da136aa: Modify test to avoid race condition.
...
* commit '3da136aa47e2d1608b98abb2580f024b36f92831':
Modify test to avoid race condition.
2015-02-19 02:12:45 +00:00
Christopher Ferris
3da136aa47
Modify test to avoid race condition.
...
There is a possible race if a timer is set to trigger at nearly the same
time as it is set. Since nobody uses the timers like this, modify the test
so this doesn't happen. The race that this can provoke has been fixed in
aosp.
Bug: 19423618
Change-Id: I21084c99da5ae46f404936d673dae6bad7c82caa
android-cts-5.1_r1
2015-02-18 17:45:50 -08:00
Dan Albert
2c678e6644
Parameterize use of clang in libc_ndk.
...
We still have issues with clang coverage in static libraries, so we
need to make sure we follow suit with the rest of libc for now.
Bug: 17574078
Change-Id: I2ab58a84b1caa0d8d08415d240c35adec5b1e150
2015-02-18 17:37:52 -08:00
Elliott Hughes
0f13eac957
am 1cb009fb: am d3fa31a5: Merge "[MIPS] Fix setjmp signals"
...
* commit '1cb009fb5eb513e838085d75617db676fcfa7aa7':
[MIPS] Fix setjmp signals
2015-02-19 01:12:41 +00:00
Elliott Hughes
1cb009fb5e
am d3fa31a5: Merge "[MIPS] Fix setjmp signals"
...
* commit 'd3fa31a55d542d51fc3f2df46af7c1b701ecb86e':
[MIPS] Fix setjmp signals
2015-02-19 01:06:06 +00:00
Elliott Hughes
d3fa31a55d
Merge "[MIPS] Fix setjmp signals"
2015-02-19 01:00:19 +00:00
Yabin Cui
ed806d772a
am 82a36f31: am 37197363: am 4add77b9: Merge "Make gets() deprecated."
...
* commit '82a36f31c08ca890a30863dc68819566e26b0495':
Make gets() deprecated.
2015-02-18 23:04:28 +00:00
Elliott Hughes
d0051b8585
am 4a19d12b: am 08148bc9: am 1dbc6bb0: Merge "Implement _FILE_OFFSET_BITS (mostly)."
...
* commit '4a19d12b49bd19e38c136cf6e586a13095bcca72':
Implement _FILE_OFFSET_BITS (mostly).
2015-02-18 23:04:27 +00:00
Yabin Cui
82a36f31c0
am 37197363: am 4add77b9: Merge "Make gets() deprecated."
...
* commit '371973633c579a32125c4b01c4235eb5f529cb4e':
Make gets() deprecated.
2015-02-18 22:57:05 +00:00
Elliott Hughes
4a19d12b49
am 08148bc9: am 1dbc6bb0: Merge "Implement _FILE_OFFSET_BITS (mostly)."
...
* commit '08148bc9825ea337168819f3d92a0c7ef4ffe1f9':
Implement _FILE_OFFSET_BITS (mostly).
2015-02-18 22:57:04 +00:00
Yabin Cui
371973633c
am 4add77b9: Merge "Make gets() deprecated."
...
* commit '4add77b93c0c61381faa9d4d8dc62f81cafcc69a':
Make gets() deprecated.
2015-02-18 22:50:54 +00:00
Elliott Hughes
08148bc982
am 1dbc6bb0: Merge "Implement _FILE_OFFSET_BITS (mostly)."
...
* commit '1dbc6bb02521ba1535748826eeaf28404160d788':
Implement _FILE_OFFSET_BITS (mostly).
2015-02-18 22:50:32 +00:00
Yabin Cui
4add77b93c
Merge "Make gets() deprecated."
2015-02-18 21:33:02 +00:00
Yabin Cui
913fcb274f
Make gets() deprecated.
...
gets is already deprecated in glibc. Others with __warnattr are not deprecated.
Change-Id: I80a276d2b5964630218be47f1c94b146c0d31151
2015-02-18 12:20:32 -08:00