diff options
| author | Nick Desaulniers <ndesaulniers@google.com> | 2016-10-06 12:07:36 -0700 |
|---|---|---|
| committer | Nick Desaulniers <ndesaulniers@google.com> | 2016-10-06 12:28:39 -0700 |
| commit | cbd057f817e85fd2c13f5f126c3f4e4bee35cb77 (patch) | |
| tree | 8ebadce085a0f67c3f7c58153a17b61e64679f5c | |
| parent | 241f33a3e958842e3db803c03300764bd2ee9c19 (diff) | |
| download | stressapptest-cbd057f817e85fd2c13f5f126c3f4e4bee35cb77.tar.gz | |
external: stresstestapp: pull upstream build patch
https://github.com/nickdesaulniers/stressapptest/commit/1c66ad6b0199d56c689b0e79ce90d419e3203e2c
Bug: 31861507
Test: make checkbuild
Change-Id: I36c5d0165c09968a4064438e658d886d364920cb
| -rw-r--r-- | Android.mk | 10 | ||||
| -rw-r--r-- | src/adler32memcpy.cc | 26 | ||||
| -rw-r--r-- | src/stressapptest_config_android.h | 2 |
3 files changed, 18 insertions, 20 deletions
@@ -18,16 +18,14 @@ LOCAL_SRC_FILES := \ src/sat_factory.cc \ src/worker.cc -LOCAL_MODULE:= stressapptest +# just build a 32b version, even on 64b hosts +LOCAL_MULTILIB := 32 +LOCAL_MODULE := stressapptest LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_UNSUPPORTED_TARGET_ARCH := mips LOCAL_CFLAGS := -DHAVE_CONFIG_H -DANDROID -DNDEBUG -UDEBUG -DCHECKOPTS -LOCAL_C_INCLUDES := \ - bionic \ - libc++ - LOCAL_CPP_EXTENSION := .cc -LOCAL_CXX_STL := libc++ include $(BUILD_EXECUTABLE) diff --git a/src/adler32memcpy.cc b/src/adler32memcpy.cc index 47c6262..c0c6a39 100644 --- a/src/adler32memcpy.cc +++ b/src/adler32memcpy.cc @@ -423,22 +423,22 @@ bool AdlerMemcpyAsm(uint64 *dstmem64, uint64 *srcmem64, #define crc_r "r6" asm volatile ( - "mov "src_r", %[src]; \n" - "mov "dst_r", %[dst]; \n" - "mov "crc_r", %[crc]; \n" - "mov "blocks_r", %[blocks]; \n" + "mov " src_r ", %[src]; \n" + "mov " dst_r ", %[dst]; \n" + "mov " crc_r ", %[crc]; \n" + "mov " blocks_r ", %[blocks]; \n" // Loop over block count. - "cmp "blocks_r", #0; \n" // Compare counter to zero. + "cmp " blocks_r ", #0; \n" // Compare counter to zero. "ble END; \n" // Preload upcoming cacheline. - "pld ["src_r", #0x0]; \n" - "pld ["src_r", #0x20]; \n" + "pld [" src_r ", #0x0]; \n" + "pld [" src_r ", #0x20]; \n" // Init checksum - "vldm "crc_r", {q0}; \n" + "vldm " crc_r ", {q0}; \n" "vmov.i32 q1, #0; \n" // Start of the loop which copies 48 bytes from source to dst each time. @@ -448,8 +448,8 @@ bool AdlerMemcpyAsm(uint64 *dstmem64, uint64 *srcmem64, // We are using 2 words out of 4 words in each qX register, // word index 0 and word index 2. We'll swizzle them in a bit. // Copy it. - "vldm "src_r"!, {q8, q9, q10, q11}; \n" - "vstm "dst_r"!, {q8, q9, q10, q11}; \n" + "vldm " src_r "!, {q8, q9, q10, q11}; \n" + "vstm " dst_r "!, {q8, q9, q10, q11}; \n" // Arrange it. "vmov.i64 q12, #0; \n" @@ -487,8 +487,8 @@ bool AdlerMemcpyAsm(uint64 *dstmem64, uint64 *srcmem64, "vadd.i64 q1, q1, q0; \n" // Increment counter and loop. - "sub "blocks_r", "blocks_r", #1; \n" - "cmp "blocks_r", #0; \n" // Compare counter to zero. + "sub " blocks_r ", " blocks_r ", #1; \n" + "cmp " blocks_r ", #0; \n" // Compare counter to zero. "bgt TOP; \n" @@ -497,7 +497,7 @@ bool AdlerMemcpyAsm(uint64 *dstmem64, uint64 *srcmem64, // 64 bit numbers and have to be converted to 64 bit numbers) // seems like Adler128 (since size of each part is 4 byte rather than // 1 byte). - "vstm "crc_r", {q0, q1}; \n" + "vstm " crc_r ", {q0, q1}; \n" // Output registers. : diff --git a/src/stressapptest_config_android.h b/src/stressapptest_config_android.h index 14081e5..6beff2c 100644 --- a/src/stressapptest_config_android.h +++ b/src/stressapptest_config_android.h @@ -52,7 +52,7 @@ #define HAVE_NETDB_H 1 /* Define to 1 if you have the `posix_memalign' function. */ -/* #undef HAVE_POSIX_MEMALIGN */ +#define HAVE_POSIX_MEMALIGN 1 /* Define to 1 if the system has `pthread_barrier'. */ #undef HAVE_PTHREAD_BARRIERS |