Finished

14 files changed, 25 insertions, 18 deletions

diff --git a/cuda-global/gol b/cuda-global/gol
index 85af8de..83f9de6 100755
--- a/cuda-global/gol
+++ b/cuda-global/gol
diff --git a/cuda-global/src/main.cu b/cuda-global/src/main.cu
index 41c2abf..03b66f2 100644
--- a/cuda-global/src/main.cu
+++ b/cuda-global/src/main.cu
@@ -36,7 +36,10 @@ true) {
 // Do the simulation
 void simulate(int argc, char** argv) {
   srand(SEED);
-  clock_t global_start = clock();
+  cudaEvent_t global_start, global_end;
+  cudaEventCreate(&global_start);
+  cudaEventCreate(&global_end);
+  cudaEventRecord(global_start);
   char* filename;
   struct GAME game;
   game.padding = PADDING;
@@ -135,8 +138,12 @@ void simulate(int argc, char** argv) {
       game.grid = temp;
     }
   }
+  cudaEventRecord(global_end);
+  cudaEventSynchronize(global_end);
+  float global_time;
+  cudaEventElapsedTime(&global_time, global_start, global_end);
 
-  printf("\n===Timing===\nTime computing life: %f\nClock time: %f\n", time_computing_life, ((double)clock() - (double)global_start)/CLOCKS_PER_SEC);
+  printf("\n===Timing===\nTime computing life: %f\nClock time: %f\n", time_computing_life, global_time/(double)1000);
 }
 
 int main(int argc, char** argv) {
diff --git a/cuda-global/timing-study/output--1000-1000.txt b/cuda-global/timing-study/output--1000-1000.txt
index 3792efc..e133bb0 100644
--- a/cuda-global/timing-study/output--1000-1000.txt
+++ b/cuda-global/timing-study/output--1000-1000.txt
@@ -1,4 +1,4 @@
 
 ===Timing===
-Time computing life: 0.169687
-Clock time: 1.560000
+Time computing life: 0.169470
+Clock time: 5.175729
diff --git a/cuda-global/timing-study/output--1000-1250.txt b/cuda-global/timing-study/output--1000-1250.txt
index 9081eb5..af6171c 100644
--- a/cuda-global/timing-study/output--1000-1250.txt
+++ b/cuda-global/timing-study/output--1000-1250.txt
@@ -1,4 +1,4 @@
 
 ===Timing===
-Time computing life: 0.254989
-Clock time: 2.240000
+Time computing life: 0.255659
+Clock time: 5.620605
diff --git a/cuda-global/timing-study/output--1000-1500.txt b/cuda-global/timing-study/output--1000-1500.txt
index c2fafe8..ba345e4 100644
--- a/cuda-global/timing-study/output--1000-1500.txt
+++ b/cuda-global/timing-study/output--1000-1500.txt
@@ -1,4 +1,4 @@
 
 ===Timing===
-Time computing life: 0.354361
-Clock time: 3.050000
+Time computing life: 0.354065
+Clock time: 8.177913
diff --git a/cuda-global/timing-study/output--1000-1750.txt b/cuda-global/timing-study/output--1000-1750.txt
index 557165e..e13e8b2 100644
--- a/cuda-global/timing-study/output--1000-1750.txt
+++ b/cuda-global/timing-study/output--1000-1750.txt
@@ -1,4 +1,4 @@
 
 ===Timing===
-Time computing life: 0.480174
-Clock time: 4.070000
+Time computing life: 0.480989
+Clock time: 9.626799
diff --git a/cuda-global/timing-study/output--1000-2000.txt b/cuda-global/timing-study/output--1000-2000.txt
index 91a9d45..27091f7 100644
--- a/cuda-global/timing-study/output--1000-2000.txt
+++ b/cuda-global/timing-study/output--1000-2000.txt
@@ -1,4 +1,4 @@
 
 ===Timing===
-Time computing life: 0.619636
-Clock time: 5.220000
+Time computing life: 0.618807
+Clock time: 10.948197
diff --git a/cuda-global/timing-study/output--1000-250.txt b/cuda-global/timing-study/output--1000-250.txt
index 0808a20..3f8aaa0 100644
--- a/cuda-global/timing-study/output--1000-250.txt
+++ b/cuda-global/timing-study/output--1000-250.txt
@@ -1,4 +1,4 @@
 
 ===Timing===
-Time computing life: 0.029867
-Clock time: 0.330000
+Time computing life: 0.029682
+Clock time: 2.946978
diff --git a/cuda-global/timing-study/output--1000-500.txt b/cuda-global/timing-study/output--1000-500.txt
index 913b15e..a78f7af 100644
--- a/cuda-global/timing-study/output--1000-500.txt
+++ b/cuda-global/timing-study/output--1000-500.txt
@@ -1,4 +1,4 @@
 
 ===Timing===
-Time computing life: 0.059907
-Clock time: 0.540000
+Time computing life: 0.059339
+Clock time: 3.249037
diff --git a/cuda-global/timing-study/output--1000-750.txt b/cuda-global/timing-study/output--1000-750.txt
index e3b8c5d..41908a8 100644
--- a/cuda-global/timing-study/output--1000-750.txt
+++ b/cuda-global/timing-study/output--1000-750.txt
@@ -1,4 +1,4 @@
 
 ===Timing===
-Time computing life: 0.110954
-Clock time: 1.000000
+Time computing life: 0.110569
+Clock time: 4.294806
diff --git a/cuda-global/timing-study/slurm-3610476.err-notch081 b/cuda-global/timing-study/slurm-3617105.err-notch081
index e69de29..e69de29 100644
--- a/cuda-global/timing-study/slurm-3610476.err-notch081
+++ b/cuda-global/timing-study/slurm-3617105.err-notch081
diff --git a/cuda-global/timing-study/slurm-3610476.out-notch081 b/cuda-global/timing-study/slurm-3617105.out-notch081
index e69de29..e69de29 100644
--- a/cuda-global/timing-study/slurm-3610476.out-notch081
+++ b/cuda-global/timing-study/slurm-3617105.out-notch081
diff --git a/cuda-global/timing-study/slurm-3611549.err-notch081 b/cuda-global/timing-study/slurm-3617127.err-notch081
index e69de29..e69de29 100644
--- a/cuda-global/timing-study/slurm-3611549.err-notch081
+++ b/cuda-global/timing-study/slurm-3617127.err-notch081
diff --git a/cuda-global/timing-study/slurm-3611549.out-notch081 b/cuda-global/timing-study/slurm-3617127.out-notch081
index e69de29..e69de29 100644
--- a/cuda-global/timing-study/slurm-3611549.out-notch081
+++ b/cuda-global/timing-study/slurm-3617127.out-notch081