Merge branch 'amd-master-next' into amd-npi-next

Change-Id: I4181bbab4fc0a5ec857fe39d6148ee8b4975836d


[ROCm/hip commit: 573b2dced3]

projects/hip/tests/src/cg/hipCGGridGroupType.cpp

@@ -137,6 +137,12 @@ int main()
   ASSERT_EQUAL(hipGetDeviceProperties(&deviceProperties, deviceId), hipSuccess);
   int maxThreadsPerBlock = deviceProperties.maxThreadsPerBlock;
 
+  if (!deviceProperties.cooperativeLaunch) {
+    std::cout << "info: Device doesn't support cooperative launch! skipping the test!\n";
+    passed();
+    return 0;
+  }
+
   // Test block sizes which are powers of 2
   int i = 0;
   while (true) {

projects/hip/tests/src/cg/hipCGGridGroupTypeViaBaseType.cpp

@@ -137,6 +137,12 @@ int main()
   ASSERT_EQUAL(hipGetDeviceProperties(&deviceProperties, deviceId), hipSuccess);
   int maxThreadsPerBlock = deviceProperties.maxThreadsPerBlock;
 
+  if (!deviceProperties.cooperativeLaunch) {
+    std::cout << "info: Device doesn't support cooperative launch! skipping the test!\n";
+    passed();
+    return 0;
+  }
+
   // Test block sizes which are powers of 2
   int i = 0;
   while (true) {

projects/hip/tests/src/cg/hipCGGridGroupTypeViaPublicApi.cpp

@@ -137,6 +137,12 @@ int main()
   ASSERT_EQUAL(hipGetDeviceProperties(&deviceProperties, deviceId), hipSuccess);
   int maxThreadsPerBlock = deviceProperties.maxThreadsPerBlock;
 
+  if (!deviceProperties.cooperativeLaunch) {
+    std::cout << "info: Device doesn't support cooperative launch! skipping the test!\n";
+    passed();
+    return 0;
+  }
+
   // Test block sizes which are powers of 2
   int i = 0;
   while (true) {

projects/hip/tests/src/runtimeApi/p2p/hipDeviceGetP2PAttribute.cpp

@@ -0,0 +1,53 @@
+/*
+Copyright (c) 2015-2017 Advanced Micro Devices, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+*/
+
+/* HIT_START
+ * BUILD: %t %s ../../test_common.cpp
+ * TEST: %t
+ * HIT_END
+ */
+
+#include "test_common.h"
+
+void runTest(int srcDevice, int dstDevice) {
+  std::cout<<"Between Device "<<srcDevice<<" and Device "<<dstDevice<<std::endl;
+  for (int p2p_attr_idx = hipDevP2PAttrPerformanceRank;
+        p2p_attr_idx <= hipDevP2PAttrHipArrayAccessSupported; ++p2p_attr_idx) {
+    int value = -1;
+    HIPCHECK(hipDeviceGetP2PAttribute(&value, static_cast<hipDeviceP2PAttr>(p2p_attr_idx),
+                                      srcDevice, dstDevice));
+    std::cout<<"Attr["<<p2p_attr_idx<<"] is "<<value<<std::endl;
+  }
+}
+
+int main() {
+
+  int count = -1;
+  HIPCHECK(hipGetDeviceCount(&count))
+
+  if (count >= 2){
+    for (int dev_idx = 0; dev_idx < (count-1); ++dev_idx) {
+      runTest(dev_idx, 1 + dev_idx);
+    }
+  } else {
+    std::cout<<"Not enough GPUs to run the single GPU tests"<<std::endl;
+  }
+
+  passed();
+}