From 9428d4e8a080260c3d49d2397f17b78f8e4a030b Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Tue, 23 Nov 2021 12:24:30 -0500 Subject: [PATCH] Revert "SWDEV-296926 - hipamd cmake file change to build hip/src" This reverts commit fa7ff8bb0866bcec6df54ae52042525f88c87387. Reason for revert: Fix for SWDEV-312654 Change-Id: I45bef538273431e0dd5d85cf889a7c769c87af73 [ROCm/clr commit: 2472abf589a1b51c0a68fae4b198ed33fee7d60f] --- projects/clr/hipamd/CMakeLists.txt | 77 +++++---------------- projects/clr/hipamd/packaging/hip-devel.txt | 2 - 2 files changed, 19 insertions(+), 60 deletions(-) diff --git a/projects/clr/hipamd/CMakeLists.txt b/projects/clr/hipamd/CMakeLists.txt index 3fbd759864..e61d134128 100755 --- a/projects/clr/hipamd/CMakeLists.txt +++ b/projects/clr/hipamd/CMakeLists.txt @@ -58,16 +58,8 @@ endif() message (STATUS "HIP_COMMON_DIR found at ${HIP_COMMON_DIR}" ) set(HIP_COMMON_INCLUDE_DIR ${HIP_COMMON_DIR}/include) set(HIP_COMMON_BIN_DIR ${HIP_COMMON_DIR}/bin) -set(HIP_COMMON_SRC_DIR ${HIP_COMMON_DIR}/src) set(__HIPCONFIG_EXECUTABLE__ ${HIP_COMMON_DIR}/bin/hipconfig) - -if(EXISTS ${HIP_COMMON_SRC_DIR}) - option(BUILD_HIPCONFIG "Build hipconfig/hipcc executable" ON) -else() - option(BUILD_HIPCONFIG "Using hipconfig/hipcc perl scripts" OFF) -endif() - ############################# # Setup config generation ############################# @@ -85,23 +77,15 @@ find_package(Perl REQUIRED) # Determine HIP_BASE_VERSION set(ENV{HIP_PATH} "") - -if (BUILD_HIPCONFIG) - #the built executables are copied to build/bin folder - add_subdirectory(${HIP_COMMON_SRC_DIR} ./bin) -endif() - -if (NOT BUILD_HIPCONFIG) - execute_process(COMMAND ${PERL_EXECUTABLE} ${__HIPCONFIG_EXECUTABLE__} --version - OUTPUT_VARIABLE HIP_BASE_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - string(REPLACE "." ";" VERSION_LIST ${HIP_BASE_VERSION}) - list(GET VERSION_LIST 0 HIP_VERSION_MAJOR) - list(GET VERSION_LIST 1 HIP_VERSION_MINOR) - list(GET VERSION_LIST 2 HIP_VERSION_PATCH_GITHASH) - string(REPLACE "-" ";" VERSION_LIST ${HIP_VERSION_PATCH_GITHASH}) - list(GET VERSION_LIST 0 HIP_VERSION_PATCH) -endif() +execute_process(COMMAND ${PERL_EXECUTABLE} ${__HIPCONFIG_EXECUTABLE__} --version + OUTPUT_VARIABLE HIP_BASE_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) +string(REPLACE "." ";" VERSION_LIST ${HIP_BASE_VERSION}) +list(GET VERSION_LIST 0 HIP_VERSION_MAJOR) +list(GET VERSION_LIST 1 HIP_VERSION_MINOR) +list(GET VERSION_LIST 2 HIP_VERSION_PATCH_GITHASH) +string(REPLACE "-" ";" VERSION_LIST ${HIP_VERSION_PATCH_GITHASH}) +list(GET VERSION_LIST 0 HIP_VERSION_PATCH) set(HIP_VERSION_GITDATE 0) find_package(Git) @@ -206,28 +190,23 @@ endif () # overwrite HIP_VERSION_PATCH for packaging set(HIP_VERSION ${HIP_VERSION_MAJOR}.${HIP_VERSION_MINOR}.${HIP_PACKAGING_VERSION_PATCH}) - +# Remove when CI is updated +if(HIP_PLATFORM STREQUAL "rocclr") + set(HIP_PLATFORM "amd") +endif() ############################# # Configure variables ############################# # Determine HIP_PLATFORM if(NOT DEFINED HIP_PLATFORM) - if(NOT DEFINED ENV{HIP_PLATFORM}) - if(BUILD_HIPCONFIG) - #HIP_PLATFORM could be set as a command line arg - if((HIP_PLATFORM STREQUAL "") OR NOT (HIP_PLATFORM STREQUAL "nvidia" OR HIP_PLATFORM STREQUAL "amd")) - set(HIP_PLATFORM "amd" CACHE STRING "HIP Platform") - message(STATUS "HIP Platform defaulting to AMD") - endif() - else() + if(NOT DEFINED ENV{HIP_PLATFORM}) execute_process(COMMAND ${__HIPCONFIG_EXECUTABLE__} --platform - OUTPUT_VARIABLE HIP_PLATFORM - OUTPUT_STRIP_TRAILING_WHITESPACE) + OUTPUT_VARIABLE HIP_PLATFORM + OUTPUT_STRIP_TRAILING_WHITESPACE) + else() + set(HIP_PLATFORM $ENV{HIP_PLATFORM} CACHE STRING "HIP Platform") endif() - else() - set(HIP_PLATFORM $ENV{HIP_PLATFORM} CACHE STRING "HIP Platform") - endif() #end of env hip_platform -endif() #end of not defined hip_platform +endif() message(STATUS "HIP Platform: " ${HIP_PLATFORM}) if(HIP_PLATFORM STREQUAL "nvidia") @@ -350,19 +329,6 @@ if(NOT ${INSTALL_SOURCE} EQUAL 0) install(DIRECTORY ${HIP_COMMON_BIN_DIR} DESTINATION . USE_SOURCE_PERMISSIONS PATTERN *.bat EXCLUDE) endif() - # installing build/bin hipcc/hipconfig to build/install/bin - if(BUILD_HIPCONFIG) - if(WIN32) - SET(EXE_FILES FILES "${CMAKE_CURRENT_BINARY_DIR}/bin/hipcc.exe" "${CMAKE_CURRENT_BINARY_DIR}/bin/hipconfig.exe") - else() - SET(EXE_FILES FILES "${CMAKE_CURRENT_BINARY_DIR}/bin/hipcc" "${CMAKE_CURRENT_BINARY_DIR}/bin/hipconfig") - endif() - FOREACH(EXE_FILE ${EXE_FILES}) - install(FILES ${EXE_FILE} - PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - DESTINATION ./bin/) - ENDFOREACH() - endif() # The following two lines will be removed after upstream updation install(CODE "MESSAGE(\"Removing ${CMAKE_INSTALL_PREFIX}/include\")") @@ -425,11 +391,6 @@ add_custom_target(pkg_hip_base COMMAND ${CMAKE_COMMAND} . COMMAND cp *.rpm ${PROJECT_BINARY_DIR} COMMAND cp *.tar.gz ${PROJECT_BINARY_DIR} WORKING_DIRECTORY ${BUILD_DIR} ) -# Packaging needs to wait for hipcc/hipconfig to build if it's enabled... -if (BUILD_HIPCONFIG) - add_dependencies(pkg_hip_base hipcc) - add_dependencies(pkg_hip_base hipconfig) -endif() # Packaging needs to wait for hipify-clang to build if it's enabled... if (BUILD_HIPIFY_CLANG) diff --git a/projects/clr/hipamd/packaging/hip-devel.txt b/projects/clr/hipamd/packaging/hip-devel.txt index f197232fc2..85cd60957a 100644 --- a/projects/clr/hipamd/packaging/hip-devel.txt +++ b/projects/clr/hipamd/packaging/hip-devel.txt @@ -28,8 +28,6 @@ else() PATTERN *.bat EXCLUDE) endif() install(DIRECTORY @hip_SOURCE_DIR@/bin DESTINATION . USE_SOURCE_PERMISSIONS) -install(FILES @PROJECT_BINARY_DIR@/bin/hipcc PERMISSIONS OWNER_EXECUTE OWNER_READ DESTINATION bin/) -install(FILES @PROJECT_BINARY_DIR@/bin/hipconfig PERMISSIONS OWNER_EXECUTE OWNER_READ DESTINATION bin/) install(DIRECTORY @HIP_COMMON_DIR@/include DESTINATION .) install(DIRECTORY @hip_SOURCE_DIR@/include/hip/amd_detail DESTINATION include/hip) install(DIRECTORY @hip_SOURCE_DIR@/include/hip/nvidia_detail DESTINATION include/hip)