From 7dbdd61088ae147d19e6652d6052dd63d02864f8 Mon Sep 17 00:00:00 2001
From: Ben Sander <ben.sander@amd.com>
Date: Sat, 9 Apr 2016 04:35:06 -0500
Subject: [PATCH] Remove stray debug msgs, hipInfo don't print self as peer.

[ROCm/clr commit: 715940672c5b1932c7f44224bc39c87d73684274]
---
 projects/clr/hipamd/samples/1_Utils/hipInfo/hipInfo.cpp | 2 +-
 projects/clr/hipamd/src/hip_memory.cpp                  | 2 --
 projects/clr/hipamd/src/hip_peer.cpp                    | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/projects/clr/hipamd/samples/1_Utils/hipInfo/hipInfo.cpp b/projects/clr/hipamd/samples/1_Utils/hipInfo/hipInfo.cpp
index 581194f624..9151d5058e 100644
--- a/projects/clr/hipamd/samples/1_Utils/hipInfo/hipInfo.cpp
+++ b/projects/clr/hipamd/samples/1_Utils/hipInfo/hipInfo.cpp
@@ -127,7 +127,7 @@ void printDeviceProp (int deviceId)
     for (int i=0; i<deviceCnt; i++) {
         int isPeer;
         hipDeviceCanAccessPeer(&isPeer, deviceId, i);
-        if (isPeer) {
+        if ((i != deviceId) && isPeer) {
             cout << "device#" << i << " ";
         }
     }
diff --git a/projects/clr/hipamd/src/hip_memory.cpp b/projects/clr/hipamd/src/hip_memory.cpp
index 2a4ec205e2..9e8c963433 100644
--- a/projects/clr/hipamd/src/hip_memory.cpp
+++ b/projects/clr/hipamd/src/hip_memory.cpp
@@ -442,8 +442,6 @@ hipError_t hipMemGetInfo  (size_t *free, size_t *total)
             // TODO - replace with kernel-level for reporting free memory:
             size_t deviceMemSize, hostMemSize, userMemSize;
             hc::am_memtracker_sizeinfo(hipDevice->_acc, &deviceMemSize, &hostMemSize, &userMemSize);
-            printf ("deviceMemSize=%zu\n", deviceMemSize);
-        
             *free =  hipDevice->_props.totalGlobalMem - deviceMemSize;
         }
 
diff --git a/projects/clr/hipamd/src/hip_peer.cpp b/projects/clr/hipamd/src/hip_peer.cpp
index ad9cf14634..aeb9c7fd49 100644
--- a/projects/clr/hipamd/src/hip_peer.cpp
+++ b/projects/clr/hipamd/src/hip_peer.cpp
@@ -37,7 +37,6 @@ hipError_t hipDeviceCanAccessPeer (int* canAccessPeer, int  deviceId, int peerDe
     if ((thisDevice != NULL) && (peerDevice != NULL)) {
 #if USE_PEER_TO_PEER>=2
         *canAccessPeer = peerDevice->_acc.get_is_peer(thisDevice->_acc);
-        printf ("canAccessPeer=%d\n", *canAccessPeer);
 #else
         *canAccessPeer = 0;
 #endif