ANRdaemon: move trace result from /sdcard to /data am: d93aa41807

[android-x86/system-extras.git] / tests / memtest / bandwidth.h

diff --git a/tests/memtest/bandwidth.h b/tests/memtest/bandwidth.h
index a09d082..b43349c 100644 (file)
--- a/tests/memtest/bandwidth.h
+++ b/tests/memtest/bandwidth.h
@@ -17,6 +17,10 @@
 #ifndef __BANDWIDTH_H__
 #define __BANDWIDTH_H__
 
+#include <stdlib.h>
+#include <string.h>
+
+#include "utils/Compat.h"
 #include "memtest.h"
 
 // Bandwidth Class definitions.
@@ -90,8 +94,8 @@ protected:
 
 private:
     // Static constants
-    static const double _NUM_NS_PER_SEC = 1000000000.0;
-    static const double _BYTES_PER_MB = 1024.0* 1024.0;
+    static const CONSTEXPR double _NUM_NS_PER_SEC = 1000000000.0;
+    static const CONSTEXPR double _BYTES_PER_MB = 1024.0* 1024.0;
 };
 
 class CopyBandwidthBenchmark : public BandwidthBenchmark {
@@ -268,8 +272,8 @@ public:
 
 protected:
     // Copy using vld1/vst1 instructions.
-    void bench(size_t num_loops) {
 #if defined(__ARM_NEON__)
+    void bench(size_t num_loops) {
         asm volatile(
             "stmfd sp!, {r0,r1,r2,r3,r4}\n"
 
@@ -296,6 +300,8 @@ protected:
 
             "ldmfd sp!, {r0,r1,r2,r3,r4}\n"
         :: "r" (_src), "r" (_dst), "r" (_size), "r" (num_loops) : "r0", "r1", "r2", "r3");
+#else
+    void bench(size_t) {
 #endif
     }
 };
@@ -311,8 +317,8 @@ public:
 
 protected:
     // Copy using vldr/vstr instructions.
-    void bench(size_t num_loops) {
 #if defined(__ARM_NEON__)
+    void bench(size_t num_loops) {
         asm volatile(
             "stmfd sp!, {r0,r1,r2,r3,r4}\n"
 
@@ -353,6 +359,8 @@ protected:
 
             "ldmfd sp!, {r0,r1,r2,r3,r4}\n"
         :: "r" (_src), "r" (_dst), "r" (_size), "r" (num_loops) : "r0", "r1", "r2", "r3");
+#else
+    void bench(size_t) {
 #endif
     }
 };
@@ -368,8 +376,8 @@ public:
 
 protected:
     // Copy using vldmia/vstmia instructions.
-    void bench(size_t num_loops) {
 #if defined(__ARM_NEON__)
+    void bench(size_t num_loops) {
         asm volatile(
             "stmfd sp!, {r0,r1,r2,r3,r4}\n"
 
@@ -394,6 +402,8 @@ protected:
 
             "ldmfd sp!, {r0,r1,r2,r3,r4}\n"
         :: "r" (_src), "r" (_dst), "r" (_size), "r" (num_loops) : "r0", "r1", "r2", "r3");
+#else
+    void bench(size_t) {
 #endif
     }
 };
@@ -429,7 +439,7 @@ public:
             _buffer = NULL;
         }
 
-        if (_size == 0) {
+        if (size == 0) {
             _size = DEFAULT_SINGLE_BUFFER_SIZE;
         } else {
             _size = size;
@@ -581,8 +591,8 @@ public:
 
 protected:
     // Write a given value using vst.
-    void bench(size_t num_loops) {
 #if defined(__ARM_NEON__)
+    void bench(size_t num_loops) {
         asm volatile(
             "stmfd sp!, {r0,r1,r2,r3,r4}\n"
 
@@ -611,6 +621,8 @@ protected:
 
             "ldmfd sp!, {r0,r1,r2,r3,r4}\n"
         :: "r" (_buffer), "r" (_size), "r" (num_loops) : "r0", "r1", "r2");
+#else
+    void bench(size_t) {
 #endif
     }
 };
@@ -626,8 +638,8 @@ public:
 
 protected:
     // Write a given value using vst.
-    void bench(size_t num_loops) {
 #if defined(__ARM_NEON__)
+    void bench(size_t num_loops) {
         asm volatile(
             "stmfd sp!, {r0,r1,r2,r3,r4}\n"
 
@@ -660,6 +672,8 @@ protected:
 
             "ldmfd sp!, {r0,r1,r2,r3,r4}\n"
         :: "r" (_buffer), "r" (_size), "r" (num_loops) : "r0", "r1", "r2");
+#else
+    void bench(size_t) {
 #endif
     }
 };
@@ -675,8 +689,8 @@ public:
 
 protected:
     // Write a given value using vstmia.
-    void bench(size_t num_loops) {
 #if defined(__ARM_NEON__)
+    void bench(size_t num_loops) {
         asm volatile(
             "stmfd sp!, {r0,r1,r2,r3,r4}\n"
 
@@ -705,6 +719,8 @@ protected:
 
             "ldmfd sp!, {r0,r1,r2,r3,r4}\n"
         :: "r" (_buffer), "r" (_size), "r" (num_loops) : "r0", "r1", "r2");
+#else
+    void bench(size_t) {
 #endif
     }
 };
@@ -807,8 +823,8 @@ public:
 
 protected:
     // Write a given value using vst.
-    void bench(size_t num_loops) {
 #if defined(__ARM_NEON__)
+    void bench(size_t num_loops) {
         asm volatile(
             "stmfd sp!, {r0,r1,r2,r3}\n"
 
@@ -830,6 +846,8 @@ protected:
 
             "ldmfd sp!, {r0,r1,r2,r3}\n"
         :: "r" (_buffer), "r" (_size), "r" (num_loops) : "r0", "r1", "r2");
+#else
+    void bench(size_t) {
 #endif
     }
 };
@@ -845,8 +863,8 @@ public:
 
 protected:
     // Write a given value using vst.
-    void bench(size_t num_loops) {
 #if defined(__ARM_NEON__)
+    void bench(size_t num_loops) {
         asm volatile(
             "stmfd sp!, {r0,r1,r2,r3}\n"
 
@@ -872,6 +890,8 @@ protected:
 
             "ldmfd sp!, {r0,r1,r2,r3}\n"
         :: "r" (_buffer), "r" (_size), "r" (num_loops) : "r0", "r1", "r2");
+#else
+    void bench(size_t) {
 #endif
     }
 };
@@ -888,8 +908,8 @@ public:
 
 protected:
     // Write a given value using vstmia.
-    void bench(size_t num_loops) {
 #if defined(__ARM_NEON__)
+    void bench(size_t num_loops) {
         asm volatile(
             "stmfd sp!, {r0,r1,r2,r3}\n"
 
@@ -911,6 +931,8 @@ protected:
 
             "ldmfd sp!, {r0,r1,r2,r3}\n"
         :: "r" (_buffer), "r" (_size), "r" (num_loops) : "r0", "r1", "r2");
+#else
+    void bench(size_t) {
 #endif
     }
 };