Improve copy testing implementation.

- add tests for (unpinned/pinned) x H2H x D2D. - Free memory at end of test.
2016-02-12 17:39:44 -06:00
parent 24c1fdb864
commit 134d7975ce
4 changed files with 214 additions and 34 deletions
@@ -96,7 +96,7 @@ vectorADD(hipLaunchParm lp,
 template <typename T>
 void initArrays(T **A_d, T **B_d, T **C_d,
                T **A_h, T **B_h, T **C_h, 
-                size_t N) 
+                size_t N, bool usePinnedHost=false) 
 {
    size_t Nbytes = N*sizeof(T);

@@ -110,14 +110,32 @@ void initArrays(T **A_d, T **B_d, T **C_d,
        HIPCHECK ( hipMalloc(C_d, Nbytes) );
    }

-    if (A_h)
-        *A_h = (T*)malloc(Nbytes);
-    
-    if (B_h)
-        *B_h = (T*)malloc(Nbytes);
+    if (usePinnedHost) {
+        if (A_h) {
+            HIPCHECK ( hipMallocHost(A_h, Nbytes) );
+        }
+        if (B_h) {
+            HIPCHECK ( hipMallocHost(B_h, Nbytes) );
+        }
+        if (C_h) {
+            HIPCHECK ( hipMallocHost(C_h, Nbytes) );
+        }
+    } else {
+        if (A_h) {
+            *A_h = (T*)malloc(Nbytes);
+            HIPASSERT(*A_h != NULL);
+        }
+        
+        if (B_h) {
+            *B_h = (T*)malloc(Nbytes);
+            HIPASSERT(*B_h != NULL);
+        }

-    if (C_h)
-        *C_h = (T*)malloc(Nbytes);
+        if (C_h) {
+            *C_h = (T*)malloc(Nbytes);
+            HIPASSERT(*C_h != NULL);
+        }
+    }


    // Initialize the host data:
@@ -130,7 +148,43 @@ void initArrays(T **A_d, T **B_d, T **C_d,
 }


+template <typename T>
+void freeArrays(T *A_d, T *B_d, T *C_d,
+                T *A_h, T *B_h, T *C_h, bool usePinnedHost) 
+{
+    if (A_d) {
+        HIPCHECK ( hipFree(A_d) );
+    }
+    if (B_d) {
+        HIPCHECK ( hipFree(B_d) );
+    }
+    if (C_d) {
+        HIPCHECK ( hipFree(C_d) );
+    }

+    if (usePinnedHost) {
+        if (A_h) {
+            HIPCHECK (hipFreeHost(A_h));
+        }
+        if (B_h) {
+            HIPCHECK (hipFreeHost(B_h));
+        }
+        if (C_h) {
+            HIPCHECK (hipFreeHost(C_h));
+        }
+    } else {
+        if (A_h) {
+            free (A_h);
+        }
+        if (B_h) {
+            free (B_h);
+        }
+        if (C_h) {
+            free (C_h);
+        }
+    }
+    
+}


 // Assumes C_h contains vector add of A_h + B_h