AI/rocm-systems
2
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

SWDEV-542947 - Revert wrong patch (#528)

Просмотр исходного кода 
Revert "SWDEV-542947 - Compile hipSquareGenericTargetOnly* with usual commands (#510)"

This reverts commit 98bf9ad0d3.

[ROCm/hip-tests commit: b0519e8441]
Этот коммит содержится в:
Sang, Tao
2025-08-18 09:28:44 -04:00
коммит произвёл GitHub
родитель d424664592
Коммит 7e5e54d9aa
1 изменённых файлов: 23 добавлений и 11 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы
projects/hip-tests/catch/unit/compiler/CMakeLists.txt
+23 -11
Просмотреть файл
@@ -37,6 +37,28 @@ if(HIP_PLATFORM MATCHES "amd")
set(LIBFS -lstdc++fs)
endif()
add_custom_target(hipSquareGenericTargetOnly ALL
COMMAND ${CMAKE_CXX_COMPILER} -DNO_GENERIC_TARGET_ONLY_TEST --std=c++17 -mcode-object-version=6 -w "${OFFLOAD_ARCH_GENERIC_STR}"
${CMAKE_CURRENT_SOURCE_DIR}/hipSquareGenericTarget.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../hipTestMain/hip_test_context.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../hipTestMain/hip_test_features.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../hipTestMain/main.cc
-o ${CMAKE_CURRENT_BINARY_DIR}/${GENERIC_TARGET_ONLY_EXE}
-I${HIP_PATH}/include/ --hip-path=${HIP_PATH}
-I${CMAKE_CURRENT_SOURCE_DIR}/../../include
-I${CMAKE_CURRENT_SOURCE_DIR}/../../external/Catch2
-I${CMAKE_CURRENT_SOURCE_DIR}/../../external/picojson ${LIBFS})
add_custom_target(hipSquareGenericTargetOnlyCompressed ALL
COMMAND ${CMAKE_CXX_COMPILER} -DNO_GENERIC_TARGET_ONLY_TEST -DGENERIC_COMPRESSED --std=c++17 -mcode-object-version=6 --offload-compress -w "${OFFLOAD_ARCH_GENERIC_STR}"
${CMAKE_CURRENT_SOURCE_DIR}/hipSquareGenericTarget.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../hipTestMain/hip_test_context.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../hipTestMain/hip_test_features.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../hipTestMain/main.cc
-o ${CMAKE_CURRENT_BINARY_DIR}/${GENERIC_TARGET_ONLY_COMPRESSED_EXE}
-I${HIP_PATH}/include/ --hip-path=${HIP_PATH}
-I${CMAKE_CURRENT_SOURCE_DIR}/../../include
-I${CMAKE_CURRENT_SOURCE_DIR}/../../external/Catch2
-I${CMAKE_CURRENT_SOURCE_DIR}/../../external/picojson ${LIBFS})
set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/${GENERIC_TARGET_ONLY_EXE})
set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/${GENERIC_TARGET_ONLY_COMPRESSED_EXE})
else()
@@ -55,20 +77,10 @@ if(HIP_PLATFORM MATCHES "amd")
hip_add_exe_to_target(NAME hipSquareGenericTargetCompressed
TEST_SRC ${TEST_SRC}
TEST_TARGET_NAME build_tests)
set_target_properties(hipSquareGenericTargetCompressed PROPERTIES COMPILE_FLAGS "-DGENERIC_COMPRESSED ${DISABLE_GENERIC_TARGET_ONLY} -mcode-object-version=6 --offload-compress -w ${OFFLOAD_ARCH_GENERIC_STR}")
set_target_properties(hipSquareGenericTargetCompressed PROPERTIES COMPILE_FLAGS " -DGENERIC_COMPRESSED ${DISABLE_GENERIC_TARGET_ONLY} -mcode-object-version=6 --offload-compress -w ${OFFLOAD_ARCH_GENERIC_STR}")
add_dependencies(hipSquareGenericTarget hipSquareGenericTargetCompressed)
if(BUILD_SHARED_LIBS)
hip_add_exe_to_target(NAME hipSquareGenericTargetOnly
TEST_SRC hipSquareGenericTargetOnly.cc
TEST_TARGET_NAME build_tests)
set_target_properties(hipSquareGenericTargetOnly PROPERTIES COMPILE_FLAGS "-DNO_GENERIC_TARGET_ONLY_TEST -mcode-object-version=6 -w \"${OFFLOAD_ARCH_GENERIC_STR}\"")
hip_add_exe_to_target(NAME hipSquareGenericTargetOnlyCompressed
TEST_SRC hipSquareGenericTargetOnlyCompressed.cc
TEST_TARGET_NAME build_tests)
set_target_properties(hipSquareGenericTargetOnlyCompressed PROPERTIES COMPILE_FLAGS "-DNO_GENERIC_TARGET_ONLY_TEST -DGENERIC_COMPRESSED -mcode-object-version=6 --offload-compress -w \"${OFFLOAD_ARCH_GENERIC_STR}\"")
add_dependencies(hipSquareGenericTarget hipSquareGenericTargetOnly)
add_dependencies(hipSquareGenericTarget hipSquareGenericTargetOnlyCompressed)
endif()