From df576efeb41f38f8e31e6d4105be051d2cdd9013 Mon Sep 17 00:00:00 2001
From: Ben Sander <ben.sander@amd.com>
Date: Fri, 8 Apr 2016 02:15:46 -0500
Subject: [PATCH] Print peers in hipConfig.

Also include peer APIs in vim hilighting.


[ROCm/clr commit: 23dbffb20739eaeb5f5b98a446d8a26524586de6]
---
 .../hipamd/samples/1_Utils/hipInfo/hipInfo.cpp  | 17 +++++++++++++++++
 projects/clr/hipamd/util/vim/hip.vim            |  6 ++++++
 2 files changed, 23 insertions(+)

diff --git a/projects/clr/hipamd/samples/1_Utils/hipInfo/hipInfo.cpp b/projects/clr/hipamd/samples/1_Utils/hipInfo/hipInfo.cpp
index 146d17e015..581194f624 100644
--- a/projects/clr/hipamd/samples/1_Utils/hipInfo/hipInfo.cpp
+++ b/projects/clr/hipamd/samples/1_Utils/hipInfo/hipInfo.cpp
@@ -120,8 +120,25 @@ void printDeviceProp (int deviceId)
     cout << setw(w1) << "arch.hasSurfaceFuncs: " <<           props.arch.hasSurfaceFuncs          << endl;
     cout << setw(w1) << "arch.has3dGrid: " <<                 props.arch.has3dGrid                << endl;
     cout << setw(w1) << "arch.hasDynamicParallelism: " <<     props.arch.hasDynamicParallelism    << endl;
+
+    int deviceCnt;
+    hipGetDeviceCount(&deviceCnt);
+    cout << setw(w1) << "peers: ";
+    for (int i=0; i<deviceCnt; i++) {
+        int isPeer;
+        hipDeviceCanAccessPeer(&isPeer, deviceId, i);
+        if (isPeer) {
+            cout << "device#" << i << " ";
+        }
+    }
     cout << endl;
 
+
+
+
+    cout << endl;
+
+
     size_t free, total;
     hipMemGetInfo(&free, &total);
 
diff --git a/projects/clr/hipamd/util/vim/hip.vim b/projects/clr/hipamd/util/vim/hip.vim
index b530a3f9e5..c597df6118 100644
--- a/projects/clr/hipamd/util/vim/hip.vim
+++ b/projects/clr/hipamd/util/vim/hip.vim
@@ -158,6 +158,12 @@ syn keyword hipFunctionName hipStreamSynchronize
 syn keyword hipFunctionName hipThreadExit 
 syn keyword hipFunctionName hipThreadSynchronize 
 syn keyword hipFunctionName hipUnbindTexture 
+syn keyword hipFunctionName hipDeviceCanAccessPeer 
+syn keyword hipFunctionName hipDeviceEnablePeerAccess
+syn keyword hipFunctionName hipDeviceDisablePeerAccess
+syn keyword hipFunctionName hipMemcpyPeer
+syn keyword hipFunctionName hipMemcpyPeerAsync
+
 
 " HIP Flags
 syn keyword hipFlags hipFilterModePoint