From 84b14aa9d62c29bc63a14940a656291c8c143967 Mon Sep 17 00:00:00 2001
From: Ben Sander <ben.sander@amd.com>
Date: Fri, 2 Sep 2016 09:38:42 -0500
Subject: [PATCH] Doc and test updates.

Change-Id: I44cbd2c0de7cb692d0194d1bb8b8ae25c58d4e00
---
 docs/markdown/hip_faq.md                      |  3 +++
 tests/README.md                               |  9 ++++++++
 tests/src/CMakeLists.txt                      |  3 ++-
 tests/src/hipModule.cpp                       | 21 +++++++++++--------
 .../src/runtimeApi/memory/hipMemcpyAsync.cpp  |  2 +-
 tests/src/test_common.h                       |  3 ++-
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/docs/markdown/hip_faq.md b/docs/markdown/hip_faq.md
index d62f40510a..e21fc984e2 100644
--- a/docs/markdown/hip_faq.md
+++ b/docs/markdown/hip_faq.md
@@ -213,6 +213,9 @@ export HIP_ATP_MARKER=1
 ```shell
 # Use profile to generate timeline view:
 /opt/rocm/bin/rocm-profiler -o <outputATPFileName> -A <applicationName> <applicationArguments>
+
+Or
+/opt/rocm/bin/rocm-profiler -e HIP_ATP_MARKER=1 -o <outputATPFileName> -A <applicationName> <applicationArguments>
 ```
 
 #### Using HIP_TRACE_API
diff --git a/tests/README.md b/tests/README.md
index c762b09ceb..de73652e43 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -50,3 +50,12 @@ ctest
 ctest -R Memcpy
 ```
 
+
+### If a test fails:
+
+Extract the commandline from the testing log:
+$ grep -A3 -m2  hipMemcpy-size  Testing/Temporary/LastTest.log
+36/47 Testing: hipMemcpy-size
+36/47 Test: hipMemcpy-size
+Command: "/home/bensander/git/compute/external/hip/hip/tests/b6.hcc-LC.debug/runtimeApi/memory/hipMemcpy" "--tests" "0x6"
+Directory: /home/bensander/git/compute/external/hip/hip/tests/b6.hcc-LC.debug/runtimeApi/memory
diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt
index 86ba712ead..eea43659dc 100644
--- a/tests/src/CMakeLists.txt
+++ b/tests/src/CMakeLists.txt
@@ -166,7 +166,8 @@ build_hip_executable (hipEventRecord hipEventRecord.cpp)
 build_hip_executable_libcpp (hipHcc hipHcc.cpp)
 #set_source_files_properties (hipHcc.cpp PROPERTIES COMPILE_FLAGS --stdlib=libc++ )
 
-build_hip_executable_libcpp (hipPointerAttrib hipPointerAttrib.cpp)
+# __workweek fix.
+#build_hip_executable_libcpp (hipPointerAttrib hipPointerAttrib.cpp)
 build_hip_executable (hipHostAlloc hipHostAlloc.cpp)
 build_hip_executable (hipHostGetFlags hipHostGetFlags.cpp)
 build_hip_executable (hipHostRegister hipHostRegister.cpp)
diff --git a/tests/src/hipModule.cpp b/tests/src/hipModule.cpp
index 86ccb3ab9f..44855fb74f 100644
--- a/tests/src/hipModule.cpp
+++ b/tests/src/hipModule.cpp
@@ -23,6 +23,8 @@ THE SOFTWARE.
 #include<fstream>
 #include<vector>
 
+#include "test_common.h"
+
 #define LEN 64
 #define SIZE LEN<<2
 
@@ -45,17 +47,17 @@ int main(){
     std::cout<<A[i] << " "<<B[i]<<std::endl;
   }
 
-  hipMalloc((void**)&Ad, SIZE);
-  hipMalloc((void**)&Bd, SIZE);
+  HIPCHECK(hipMalloc((void**)&Ad, SIZE));
+  HIPCHECK(hipMalloc((void**)&Bd, SIZE));
 
-  hipMemcpy(Ad, A, SIZE, hipMemcpyHostToDevice);
-  hipMemcpy(Bd, B, SIZE, hipMemcpyHostToDevice);
+  HIPCHECK(hipMemcpy(Ad, A, SIZE, hipMemcpyHostToDevice));
+  HIPCHECK(hipMemcpy(Bd, B, SIZE, hipMemcpyHostToDevice));
   hipModule_t Module;
   hipFunction_t Function;
-  hipModuleLoad(&Module, fileName);
-  hipModuleGetFunction(&Function, Module, kernel_name);
+  HIPCHECK(hipModuleLoad(&Module, fileName));
+  HIPCHECK(hipModuleGetFunction(&Function, Module, kernel_name));
   hipStream_t stream;
-  hipStreamCreate(&stream);
+  HIPCHECK(hipStreamCreate(&stream));
   void *args[2] = {&Ad, &Bd};
 
 
@@ -73,9 +75,9 @@ int main(){
 
     hipModuleLaunchKernel(Function, 1, 1, 1, LEN, 1, 1, 0, stream, NULL, (void**)&config); 
 
-    hipStreamDestroy(stream);
+    HIPCHECK(hipStreamDestroy(stream));
 
- hipMemcpy(B, Bd, SIZE, hipMemcpyDeviceToHost);
+  HIPCHECK(hipMemcpy(B, Bd, SIZE, hipMemcpyDeviceToHost));
 
   for(uint32_t i=0;i<LEN;i++){
   std::cout<<A[i]<<" - "<<B[i]<<std::endl;
@@ -83,3 +85,4 @@ int main(){
 
   return 0;
 }
+
diff --git a/tests/src/runtimeApi/memory/hipMemcpyAsync.cpp b/tests/src/runtimeApi/memory/hipMemcpyAsync.cpp
index 83ce944189..a7e05c53f4 100644
--- a/tests/src/runtimeApi/memory/hipMemcpyAsync.cpp
+++ b/tests/src/runtimeApi/memory/hipMemcpyAsync.cpp
@@ -330,7 +330,7 @@ int main(int argc, char *argv[])
     parseMyArguments(argc, argv);
 
 
-    printf ("info: set device to %d\n", p_gpuDevice);
+    printf ("info: set device to %d  tests=%x\n", p_gpuDevice, p_tests);
     HIPCHECK(hipSetDevice(p_gpuDevice));
 
     if (p_tests & 0x01) {
diff --git a/tests/src/test_common.h b/tests/src/test_common.h
index cfde590f78..c50bab233b 100644
--- a/tests/src/test_common.h
+++ b/tests/src/test_common.h
@@ -68,8 +68,9 @@ THE SOFTWARE.
 {\
     hipError_t localError = error; \
     if (localError != hipSuccess) { \
-      printf("%serror: '%s'(%d) at %s:%d%s\n", \
+      printf("%serror: '%s'(%d) from %s at %s:%d%s\n", \
           KRED,hipGetErrorString(localError), localError,\
+          #error,\
       __FILE__, __LINE__,KNRM); \
         failed("API returned error code.");\
     }\