Clean Fhoursstones: remove time-related routines, unbreak mingw32

git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@42660 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 4 insertions, 11 deletions

diff --git a/MultiSource/Benchmarks/Fhourstones-3.1/Game.h b/MultiSource/Benchmarks/Fhourstones-3.1/Game.h
index 964949f9..5b96532f 100644
--- a/MultiSource/Benchmarks/Fhourstones-3.1/Game.h
+++ b/MultiSource/Benchmarks/Fhourstones-3.1/Game.h
@@ -42,7 +42,8 @@
 #define TOP (BOTTOM << HEIGHT)
 
 #include <sys/types.h>
-typedef u_int64_t uint64;
+#include <stdint.h>
+typedef uint64_t uint64;
 typedef int64_t int64;
 
 uint64 color[2];  // black and white bitboard
diff --git a/MultiSource/Benchmarks/Fhourstones-3.1/SearchGame.c b/MultiSource/Benchmarks/Fhourstones-3.1/SearchGame.c
index 0255a8e1..85a184f8 100644
--- a/MultiSource/Benchmarks/Fhourstones-3.1/SearchGame.c
+++ b/MultiSource/Benchmarks/Fhourstones-3.1/SearchGame.c
@@ -12,16 +12,14 @@
 
 #include "TransGame.h"
 #include <sys/time.h>
-#include <sys/resource.h>
  
 #define BOOKPLY 0  // full-width search up to this depth
 #define REPORTPLY -1
 
 uint64 millisecs()
 {
-  struct rusage rusage;
-  getrusage(RUSAGE_SELF,&rusage);
-  return rusage.ru_utime.tv_sec * 1000 + rusage.ru_utime.tv_usec / 1000;
+  static int64 Time = 0;
+  return Time++; // No time count for LLVM
 }
 
 int history[2][SIZE1];
diff --git a/MultiSource/Benchmarks/Fhourstones/time.c b/MultiSource/Benchmarks/Fhourstones/time.c
index 59dadde0..70bcf96a 100644
--- a/MultiSource/Benchmarks/Fhourstones/time.c
+++ b/MultiSource/Benchmarks/Fhourstones/time.c
@@ -3,17 +3,11 @@
 /* add more platforms if necessary */
 
 #ifdef UNIX
-#include <sys/time.h>
-#include <sys/resource.h>
 
 int64 millisecs()
 {
-  struct rusage rusage;
   static int64 Time = 0;
   return ++Time; /* DO NOT TIME FOR LLVM */
-
-  getrusage(RUSAGE_SELF,&rusage);
-  return rusage.ru_utime.tv_sec * 1000 + rusage.ru_utime.tv_usec / 1000;
 }
 
 #endif