From fbf7ed63a832d8ca8705c13fd68ba2575420b97d Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Wed, 23 Nov 2016 09:50:33 +0530 Subject: [PATCH] Fix for HCSWAP-67 Change-Id: I0b2ce5ab933237947fb41d89769db3da16e5be6a Conflicts: src/hip_hcc.cpp --- src/hip_hcc.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/hip_hcc.cpp b/src/hip_hcc.cpp index b4568a8457..19d7e1169d 100644 --- a/src/hip_hcc.cpp +++ b/src/hip_hcc.cpp @@ -732,13 +732,10 @@ hipError_t ihipDevice_t::initProperties(hipDeviceProp_t* prop) _isLargeBar = _acc.has_cpu_accessible_am(); // Get Max Threads Per Multiprocessor - - HsaNodeProperties node_prop = {0}; - if(HSAKMT_STATUS_SUCCESS == hsaKmtGetNodeProperties(node, &node_prop)) { - uint32_t waves_per_cu = node_prop.MaxWavesPerSIMD; - uint32_t simd_per_cu = node_prop.NumSIMDPerCU; - prop-> maxThreadsPerMultiProcessor = prop->warpSize*waves_per_cu*simd_per_cu; - } + uint32_t max_waves_per_cu; + err = hsa_agent_get_info(_hsaAgent,(hsa_agent_info_t) HSA_AMD_AGENT_INFO_MAX_WAVES_PER_CU, &max_waves_per_cu); + DeviceErrorCheck(err); + prop-> maxThreadsPerMultiProcessor = prop->warpSize*max_waves_per_cu; // Get memory properties err = hsa_agent_iterate_regions(_hsaAgent, get_region_info, prop);