SWDEV-345870 - Correct include paths for new directory layout

Use hsa header files from /opt/rocm-ver/include rather than using wrapper files from /opt/rocm-ver/hsa/include/hsa

Change-Id: Id7a9bde19447cd2a0fd6e03b11c08471f09c2a46


[ROCm/rocprofiler commit: e7eb195924]

projects/rocprofiler/inc/rocprofiler.h

@@ -41,10 +41,10 @@ THE SOFTWARE.
 #ifndef INC_ROCPROFILER_H_
 #define INC_ROCPROFILER_H_
 
-#include <amd_hsa_kernel_code.h>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ven_amd_aqlprofile.h>
+#include <hsa/amd_hsa_kernel_code.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
 #include <stdint.h>
 
 #define ROCPROFILER_VERSION_MAJOR 8

projects/rocprofiler/src/core/context.h

@@ -25,8 +25,8 @@ THE SOFTWARE.
 
 #include "inc/rocprofiler.h"
 
-#include <hsa.h>
-#include <hsa_ext_amd.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
 #include <unistd.h> // usleep
 #include <atomic>
 #include <list>

projects/rocprofiler/src/core/gpu_command.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 #include "gpu_command.h"
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 
 #include <map>
 

projects/rocprofiler/src/core/gpu_command.h

@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef SRC_CORE_GPU_COMMAND_H_
 #define SRC_CORE_GPU_COMMAND_H_
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 
 #include "core/types.h"
 #include "util/exception.h"

projects/rocprofiler/src/core/hsa_interceptor.h

@@ -26,9 +26,9 @@ SOFTWARE.
 #define _SRC_CORE_HSA_INTERCEPTOR_H
 
 #include <cxxabi.h>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ven_amd_loader.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ven_amd_loader.h>
 
 #include <atomic>
 #include <mutex>

projects/rocprofiler/src/core/hsa_proxy_queue.h

@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef _SRC_CORE_HSA_PROXY_QUEUE_H
 #define _SRC_CORE_HSA_PROXY_QUEUE_H
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <atomic>
 #include <map>
 #include <mutex>

projects/rocprofiler/src/core/intercept_queue.h

@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef _SRC_CORE_INTERCEPT_QUEUE_H
 #define _SRC_CORE_INTERCEPT_QUEUE_H
 
-#include <amd_hsa_kernel_code.h>
+#include <hsa/amd_hsa_kernel_code.h>
 #include <dlfcn.h>
 #include <sys/syscall.h>
 

projects/rocprofiler/src/core/profile.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 #include "inc/rocprofiler.h"
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <vector>
 
 #include "core/types.h"

projects/rocprofiler/src/core/proxy_queue.h

@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef _SRC_CORE_PROXY_QUEUE_H
 #define _SRC_CORE_PROXY_QUEUE_H
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <string.h>
 #include <atomic>
 #include <map>

projects/rocprofiler/src/core/rocprofiler.cpp

@@ -22,7 +22,7 @@ THE SOFTWARE.
 
 #include "inc/rocprofiler.h"
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <string.h>
 
 #include <sstream>

projects/rocprofiler/src/core/simple_proxy_queue.h

@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef _SRC_CORE_SIMPLE_PROXY_QUEUE_H
 #define _SRC_CORE_SIMPLE_PROXY_QUEUE_H
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <atomic>
 #include <map>
 #include <mutex>

projects/rocprofiler/src/core/tracker.h

@@ -23,10 +23,10 @@ THE SOFTWARE.
 #ifndef SRC_CORE_TRACKER_H_
 #define SRC_CORE_TRACKER_H_
 
-#include <amd_hsa_signal.h>
+#include <hsa/amd_hsa_signal.h>
 #include <assert.h>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
 
 #include <atomic>
 #include <list>

projects/rocprofiler/src/core/types.h

@@ -25,7 +25,7 @@ THE SOFTWARE.
 
 #include <iostream>
 
-#include <hsa_ven_amd_aqlprofile.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
 
 namespace rocprofiler {
 typedef hsa_ven_amd_aqlprofile_pfn_t pfn_t;

projects/rocprofiler/src/util/exception.h

@@ -23,8 +23,8 @@ THE SOFTWARE.
 #ifndef SRC_UTIL_EXCEPTION_H_
 #define SRC_UTIL_EXCEPTION_H_
 
-#include <hsa.h>
-#include <hsa_ven_amd_aqlprofile.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
 
 #include <exception>
 #include <sstream>

projects/rocprofiler/src/util/hsa_rsrc_factory.cpp

@@ -27,9 +27,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <cxxabi.h>
 #include <dlfcn.h>
 #include <fcntl.h>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ext_finalize.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ext_finalize.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>

projects/rocprofiler/src/util/hsa_rsrc_factory.h

@@ -27,12 +27,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define AMD_INTERNAL_BUILD
 
-#include <hsa.h>
-#include <hsa_api_trace.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ext_finalize.h>
-#include <hsa_ven_amd_aqlprofile.h>
-#include <hsa_ven_amd_loader.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_api_trace.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ext_finalize.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
+#include <hsa/hsa_ven_amd_loader.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>

projects/rocprofiler/test/app/intercept_test.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 *******************************************************************************/
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <string.h>
 #include <unistd.h>
 #include <dlfcn.h>

projects/rocprofiler/test/app/stand_intercept_test.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 *******************************************************************************/
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <string.h>
 #include <unistd.h>
 #include <iostream>

projects/rocprofiler/test/app/standalone_test.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 *******************************************************************************/
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <string.h>
 #include <unistd.h>
 #include <iostream>

projects/rocprofiler/test/app/test.cpp

@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 *******************************************************************************/
 
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <stdio.h>
 #include <string.h>
 #include <iostream>

projects/rocprofiler/test/ctrl/test_aql.h

@@ -23,8 +23,8 @@ THE SOFTWARE.
 #ifndef TEST_CTRL_TEST_AQL_H_
 #define TEST_CTRL_TEST_AQL_H_
 
-#include <hsa.h>
-#include <hsa_ven_amd_aqlprofile.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
 
 #include "util/hsa_rsrc_factory.h"
 

projects/rocprofiler/test/tool/tool.cpp

@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include <assert.h>
 #include <cxxabi.h>
 #include <dirent.h>
-#include <hsa.h>
+#include <hsa/hsa.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>

projects/rocprofiler/test/util/hsa_rsrc_factory.cpp

@@ -27,9 +27,9 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <cxxabi.h>
 #include <dlfcn.h>
 #include <fcntl.h>
-#include <hsa.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ext_finalize.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ext_finalize.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>

projects/rocprofiler/test/util/hsa_rsrc_factory.h

@@ -27,12 +27,12 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #define AMD_INTERNAL_BUILD
 
-#include <hsa.h>
-#include <hsa_api_trace.h>
-#include <hsa_ext_amd.h>
-#include <hsa_ext_finalize.h>
-#include <hsa_ven_amd_aqlprofile.h>
-#include <hsa_ven_amd_loader.h>
+#include <hsa/hsa.h>
+#include <hsa/hsa_api_trace.h>
+#include <hsa/hsa_ext_amd.h>
+#include <hsa/hsa_ext_finalize.h>
+#include <hsa/hsa_ven_amd_aqlprofile.h>
+#include <hsa/hsa_ven_amd_loader.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>