From 05b5e301870cd1448c495b16dc6eb2da2f5ffa78 Mon Sep 17 00:00:00 2001
From: Yaxun Sam Liu <yaxun.liu@amd.com>
Date: Sun, 20 Jan 2019 00:04:24 -0500
Subject: [PATCH 1/2] Use chrono instead of sys/time.h in test

sys/time.h is not available on Windows. Use C++11 <chrono> instead so that the tests
compile on Windows.
---
 tests/src/test_common.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/src/test_common.h b/tests/src/test_common.h
index 40f6fffd8e..da5b47ea47 100644
--- a/tests/src/test_common.h
+++ b/tests/src/test_common.h
@@ -19,7 +19,7 @@ THE SOFTWARE.
 
 #include <iostream>
 #include <iomanip>
-#include <sys/time.h>
+#include <chrono>
 #include <stddef.h>
 
 #include "hip/hip_runtime.h"
@@ -105,9 +105,8 @@ namespace HipTest {
 
 // Returns the current system time in microseconds
 inline long long get_time() {
-    struct timeval tv;
-    gettimeofday(&tv, 0);
-    return (tv.tv_sec * 1000000) + tv.tv_usec;
+    return std::chrono::high_resolution_clock::now().time_since_epoch()
+        /std::chrono::microseconds(1);
 }
 
 double elapsed_time(long long startTimeUs, long long stopTimeUs);

From aa6abb0dcf8d2373cbcb828cacdd9d924c33dbbf Mon Sep 17 00:00:00 2001
From: Yaxun Sam Liu <yaxun.liu@amd.com>
Date: Mon, 21 Jan 2019 14:07:50 -0500
Subject: [PATCH 2/2] Fix get_time in tests for nvcc

---
 tests/src/test_common.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/src/test_common.h b/tests/src/test_common.h
index da5b47ea47..bacbf35a22 100644
--- a/tests/src/test_common.h
+++ b/tests/src/test_common.h
@@ -19,7 +19,11 @@ THE SOFTWARE.
 
 #include <iostream>
 #include <iomanip>
+#if __CUDACC__
+#include <sys/time.h>
+#else
 #include <chrono>
+#endif
 #include <stddef.h>
 
 #include "hip/hip_runtime.h"
@@ -105,8 +109,14 @@ namespace HipTest {
 
 // Returns the current system time in microseconds
 inline long long get_time() {
+#if __CUDACC__
+    struct timeval tv;
+    gettimeofday(&tv, 0);
+    return (tv.tv_sec * 1000000) + tv.tv_usec;
+#else
     return std::chrono::high_resolution_clock::now().time_since_epoch()
         /std::chrono::microseconds(1);
+#endif
 }
 
 double elapsed_time(long long startTimeUs, long long stopTimeUs);