From b4518a750f7f2783412529cf78efd0908bc91a44 Mon Sep 17 00:00:00 2001
From: Rahul Garg <rahul.garg@amd.com>
Date: Fri, 16 Sep 2016 11:18:34 +0530
Subject: [PATCH] Added further properties in hipChooseDevice

Change-Id: I8f7f5800e8a95873318a534f09e75e037ad31b06


[ROCm/hip commit: 13e88c54d7039757d7d9bb00d5b4d6e12b96550f]
---
 projects/hip/src/hip_device.cpp | 43 ++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/projects/hip/src/hip_device.cpp b/projects/hip/src/hip_device.cpp
index fe7ad6ecd7..6ea4658a4f 100644
--- a/projects/hip/src/hip_device.cpp
+++ b/projects/hip/src/hip_device.cpp
@@ -305,7 +305,48 @@ hipError_t hipChooseDevice( int* device, const hipDeviceProp_t* prop )
                  }
             }
         }
-
+        if(prop->totalGlobalMem != 0) {
+            inPropCount++;
+            if(tempProp.totalGlobalMem >= prop->totalGlobalMem) {
+                matchedPropCount++;
+            }
+        }
+        if(prop->sharedMemPerBlock != 0) {
+            inPropCount++;
+            if(tempProp.sharedMemPerBlock >= prop->sharedMemPerBlock) {
+                matchedPropCount++;
+            }
+        }
+        if(prop->maxThreadsPerBlock  != 0) {
+            inPropCount++;
+            if(tempProp.maxThreadsPerBlock >= prop->maxThreadsPerBlock ) {
+                matchedPropCount++;
+            }
+        }
+        if(prop->totalConstMem  != 0) {
+            inPropCount++;
+            if(tempProp.totalConstMem >= prop->totalConstMem ) {
+                matchedPropCount++;
+            }
+        }
+        if(prop->multiProcessorCount  != 0) {
+            inPropCount++;
+            if(tempProp.multiProcessorCount >= prop->multiProcessorCount ) {
+                matchedPropCount++;
+            }
+        }
+        if(prop->maxThreadsPerMultiProcessor  != 0) {
+            inPropCount++;
+            if(tempProp.maxThreadsPerMultiProcessor >= prop->maxThreadsPerMultiProcessor ) {
+                matchedPropCount++;
+            }
+        }
+        if(prop->memoryClockRate  != 0) {
+            inPropCount++;
+            if(tempProp.memoryClockRate >= prop->memoryClockRate ) {
+                matchedPropCount++;
+            }
+        }
         if(inPropCount == matchedPropCount) {
             *device = i;
         }