Skip to content

Commit

Permalink
Fix ROCm+OpenCL builds
Browse files Browse the repository at this point in the history
When built with ROCm, TAU was building its own GPU library with
-fvisibility=hidden, which prevented the OpenCL wrapper from calling the
GPU functions in TAU. Fixed by not setting -fvisibility=hidden.


Former-commit-id: 38cd077b4d0c0a974989701d0e08f07439ffd990
  • Loading branch information
nchaimov committed Feb 12, 2025
1 parent 2c17327 commit cdcc068
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions include/Makefile.skel
Original file line number Diff line number Diff line change
Expand Up @@ -771,10 +771,10 @@ JDKBINDIR = $(JDKDIR)/bin
#CUDA#PROFILEOPT114 = -DTAU_GPU #ENDIF#
#CUPTI#PROFILEOPT114 = -DTAU_GPU #ENDIF#
#OPENCL#PROFILEOPT114 = -DTAU_GPU #ENDIF#
#ROCPROFILER#ROCPROFILER_FLAGS = -I$(TAU_ROCM_DIR)/include/hsa -I$(TAU_ROCPROFILER_INC) -I$(TAU_ROCPROFILER)/test -DAMD_INTERNAL_BUILD -DAQLPROF_NEW_API=1 -DROCP_LD_AQLPROFILE=1 -DDEBUG_TRACE=1 -DHSA_DEPRECATED="" -DHSA_LARGE_MODEL="" -D__HIP_PLATFORM_HCC__ -DLINUX -DLITTLEENDIAN_CPU=1 -DUNIX_OS -D__AMD64__ -D__linux__ -D__x86_64__ -Dintercept_test_EXPORTS -std=c++11 -Wall -Werror=return-type -fexceptions -fvisibility=hidden -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -fmerge-all-constants -Werror=unused-result -fPIC -ggdb -m64 -msse -msse2 -g #ENDIF#
#ROCPROFILERROCM6#ROCPROFILER_FLAGS = -I$(TAU_ROCM_DIR)/include/hsa -I$(TAU_ROCM_DIR)/include -I$(TAU_ROCPROFILER_INC) -DAMD_INTERNAL_BUILD -DAQLPROF_NEW_API=1 -DROCP_LD_AQLPROFILE=1 -DDEBUG_TRACE=1 -DHSA_DEPRECATED="" -DHSA_LARGE_MODEL="" -D__HIP_PLATFORM_HCC__ -DLINUX -DLITTLEENDIAN_CPU=1 -DUNIX_OS -D__AMD64__ -D__linux__ -D__x86_64__ -Dintercept_test_EXPORTS -std=c++11 -Wall -Werror=return-type -fexceptions -fvisibility=hidden -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -fmerge-all-constants -Werror=unused-result -fPIC -ggdb -m64 -msse -msse2 -g #ENDIF#
#ROCPROFILERV2#ROCPROFILER_FLAGS = -I$(TAU_ROCM_DIR)/include -I$(TAU_ROCPROFILER_INC) -DAMD_INTERNAL_BUILD -DAQLPROF_NEW_API=1 -DROCP_LD_AQLPROFILE=1 -DDEBUG_TRACE=1 -DHSA_DEPRECATED="" -DHSA_LARGE_MODEL="" -D__HIP_PLATFORM_HCC__ -DLINUX -DLITTLEENDIAN_CPU=1 -DUNIX_OS -D__AMD64__ -D__linux__ -D__x86_64__ -Dintercept_test_EXPORTS -std=c++11 -Wall -Werror=return-type -fexceptions -fvisibility=hidden -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -fmerge-all-constants -Werror=unused-result -fPIC -ggdb -m64 -msse -msse2 -g #ENDIF#
#ROCPROFILERSDK#ROCPROFILER_FLAGS = -I$(TAUROCPROFSDK_DIR)/include -I$(TAU_ROCM_DIR)/include -DAMD_INTERNAL_BUILD -DAQLPROF_NEW_API=1 -DROCP_LD_AQLPROFILE=1 -DDEBUG_TRACE=1 -DHSA_DEPRECATED="" -DHSA_LARGE_MODEL="" -D__HIP_PLATFORM_HCC__ -DLINUX -DLITTLEENDIAN_CPU=1 -DUNIX_OS -D__AMD64__ -D__linux__ -D__x86_64__ -Dintercept_test_EXPORTS -std=c++17 -Wall -Werror=return-type -fexceptions -fvisibility=hidden -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -fmerge-all-constants -Werror=unused-result -fPIC -ggdb -m64 -msse -msse2 -g -DUSE_PROF_API=1 -D__HIP_PLATFORM_AMD__=1 #ENDIF#
#ROCPROFILER#ROCPROFILER_FLAGS = -I$(TAU_ROCM_DIR)/include/hsa -I$(TAU_ROCPROFILER_INC) -I$(TAU_ROCPROFILER)/test -DAMD_INTERNAL_BUILD -DAQLPROF_NEW_API=1 -DROCP_LD_AQLPROFILE=1 -DDEBUG_TRACE=1 -DHSA_DEPRECATED="" -DHSA_LARGE_MODEL="" -D__HIP_PLATFORM_HCC__ -DLINUX -DLITTLEENDIAN_CPU=1 -DUNIX_OS -D__AMD64__ -D__linux__ -D__x86_64__ -Dintercept_test_EXPORTS -std=c++11 -Wall -Werror=return-type -fexceptions -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -fmerge-all-constants -Werror=unused-result -fPIC -ggdb -m64 -msse -msse2 -g #ENDIF#
#ROCPROFILERROCM6#ROCPROFILER_FLAGS = -I$(TAU_ROCM_DIR)/include/hsa -I$(TAU_ROCM_DIR)/include -I$(TAU_ROCPROFILER_INC) -DAMD_INTERNAL_BUILD -DAQLPROF_NEW_API=1 -DROCP_LD_AQLPROFILE=1 -DDEBUG_TRACE=1 -DHSA_DEPRECATED="" -DHSA_LARGE_MODEL="" -D__HIP_PLATFORM_HCC__ -DLINUX -DLITTLEENDIAN_CPU=1 -DUNIX_OS -D__AMD64__ -D__linux__ -D__x86_64__ -Dintercept_test_EXPORTS -std=c++11 -Wall -Werror=return-type -fexceptions -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -fmerge-all-constants -Werror=unused-result -fPIC -ggdb -m64 -msse -msse2 -g #ENDIF#
#ROCPROFILERV2#ROCPROFILER_FLAGS = -I$(TAU_ROCM_DIR)/include -I$(TAU_ROCPROFILER_INC) -DAMD_INTERNAL_BUILD -DAQLPROF_NEW_API=1 -DROCP_LD_AQLPROFILE=1 -DDEBUG_TRACE=1 -DHSA_DEPRECATED="" -DHSA_LARGE_MODEL="" -D__HIP_PLATFORM_HCC__ -DLINUX -DLITTLEENDIAN_CPU=1 -DUNIX_OS -D__AMD64__ -D__linux__ -D__x86_64__ -Dintercept_test_EXPORTS -std=c++11 -Wall -Werror=return-type -fexceptions -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -fmerge-all-constants -Werror=unused-result -fPIC -ggdb -m64 -msse -msse2 -g #ENDIF#
#ROCPROFILERSDK#ROCPROFILER_FLAGS = -I$(TAUROCPROFSDK_DIR)/include -I$(TAU_ROCM_DIR)/include -DAMD_INTERNAL_BUILD -DAQLPROF_NEW_API=1 -DROCP_LD_AQLPROFILE=1 -DDEBUG_TRACE=1 -DHSA_DEPRECATED="" -DHSA_LARGE_MODEL="" -D__HIP_PLATFORM_HCC__ -DLINUX -DLITTLEENDIAN_CPU=1 -DUNIX_OS -D__AMD64__ -D__linux__ -D__x86_64__ -Dintercept_test_EXPORTS -std=c++17 -Wall -Werror=return-type -fexceptions -fno-math-errno -fno-threadsafe-statics -fmerge-all-constants -fms-extensions -fmerge-all-constants -Werror=unused-result -fPIC -ggdb -m64 -msse -msse2 -g -DUSE_PROF_API=1 -D__HIP_PLATFORM_AMD__=1 #ENDIF#
#ROCPROFILERSDK_PC#ROCPROFILER_FLAGS += -L$(ELFUTILS_INC_DIR) -Wl,-rpath,$(ELFUTILS_LIB_DIR) -ldw -I$(ELFUTILS_INC_DIR)
#ROCTRACER#PROFILEOPT115 = -DTAU_ENABLE_ROCTRACER -DTAU_GPU -I$(TAU_ROCM_DIR)/include -I$(TAU_ROCM_DIR)/include/hsa -I$(TAU_ROCTRACER)/include/roctracer -I$(TAU_ROCTRACER)/include -DHIP_VDI=1 -DHSA_DEPRECATED="" -DHSA_LARGE_MODEL="" -DAMD_INTERNAL_BUILD -D__HIP_PLATFORM_HCC__ #ENDIF#
#ROCTRACER_HSA#PROFILEOPT115 = -DTAU_ENABLE_ROCTRACER -DTAU_GPU -I$(TAU_ROCTRACER)/include/roctracer -I$(TAU_ROCTRACER)/include -I$(TAU_ROCPROFILER)/include -I$(TAU_ROCTRACER)/inc -I$(TAU_ROCTRACER) -I$(TAU_ROCM_DIR)/hsa/include/hsa -DAMD_INTERNAL_BUILD -DLOCAL_BUILD=1 -DHIP_VDI=1 #ENDIF#
Expand Down

0 comments on commit cdcc068

Please sign in to comment.