Merge pull request #483 from RadeonOpenCompute/fix_remove_vla_from_hc_am

whchung · web-flow · commit fa56c929cc8d · 2017-10-04T13:46:21.000-05:00
Remove VLA usage from HC_AM
diff --git a/lib/hsa/hc_am.cpp b/lib/hsa/hc_am.cpp
@@ -524,9 +524,8 @@ am_status_t am_map_to_peers(void* ptr, size_t num_peer, const hc::accelerator* p
         else
             return AM_ERROR_MISC;
     }
-
-    const size_t max_agent = hc::accelerator::get_all().size();
-    hsa_agent_t agents[max_agent];
+    
+    std::vector<hsa_agent_t> agents{hc::accelerator::get_all().size()};
   
     int peer_count = 0;
 
@@ -572,7 +571,7 @@ am_status_t am_map_to_peers(void* ptr, size_t num_peer, const hc::accelerator* p
     // allow access to the agents
     if(peer_count)
     {
-        hsa_status_t status = hsa_amd_agents_allow_access(peer_count, agents, NULL, ptr);
+        hsa_status_t status = hsa_amd_agents_allow_access(peer_count, agents.data(), NULL, ptr);
         return status == HSA_STATUS_SUCCESS ? AM_SUCCESS : AM_ERROR_MISC;
     }
    

Original file line number	Diff line number	Diff line change
`@@ -524,9 +524,8 @@ am_status_t am_map_to_peers(void* ptr, size_t num_peer, const hc::accelerator* p`
`524`	`524`	`else`
`525`	`525`	`return AM_ERROR_MISC;`
`526`	`526`	`}`
`527`		`-`
`528`		`- const size_t max_agent = hc::accelerator::get_all().size();`
`529`		`- hsa_agent_t agents[max_agent];`
	`527`	`+`
	`528`	`+ std::vector<hsa_agent_t> agents{hc::accelerator::get_all().size()};`
`530`	`529`
`531`	`530`	`int peer_count = 0;`
`532`	`531`
`@@ -572,7 +571,7 @@ am_status_t am_map_to_peers(void* ptr, size_t num_peer, const hc::accelerator* p`
`572`	`571`	`// allow access to the agents`
`573`	`572`	`if(peer_count)`
`574`	`573`	`{`
`575`		`- hsa_status_t status = hsa_amd_agents_allow_access(peer_count, agents, NULL, ptr);`
	`574`	`+ hsa_status_t status = hsa_amd_agents_allow_access(peer_count, agents.data(), NULL, ptr);`
`576`	`575`	`return status == HSA_STATUS_SUCCESS ? AM_SUCCESS : AM_ERROR_MISC;`
`577`	`576`	`}`
`578`	`577`