From 8717a78bf729d6f57ea5de48e4cf598a0bd4c4e2 Mon Sep 17 00:00:00 2001 From: agodavar Date: Tue, 9 Jun 2020 15:45:22 -0400 Subject: [PATCH] cmake hip-rocclr as default build,change HIP_PLATFORM to amd|nvidia Change-Id: I59d2e15b297b6ca2d5eee1a6dee642bdb01a3839 --- hipamd/CMakeLists.txt | 326 +++++++++--------- hipamd/bin/hipcc | 62 ++-- hipamd/bin/hipcc_cmake_linker_helper | 2 + hipamd/bin/hipconfig | 39 ++- hipamd/cmake/FindHIP.cmake | 11 +- hipamd/cmake/FindHIP/run_hipcc.cmake | 2 +- hipamd/hip-config.cmake.in | 2 +- hipamd/tests/README.md | 26 +- .../dispatch/hipPerfDispatchSpeed.cpp | 2 +- .../memory/hipPerfBufferCopyRectSpeed.cpp | 2 +- .../memory/hipPerfBufferCopySpeed.cpp | 2 +- .../memory/hipPerfMemMallocCpyFree.cpp | 2 +- .../tests/src/Functional/host/hipFloat16.cpp | 2 +- .../tests/src/Negative/memory/hipMemory.cpp | 2 +- .../stream/hipStreamCreateWithFlags.cpp | 2 +- hipamd/tests/src/cppstd/hipInvocable11.cpp | 2 +- .../src/cppstd/hipInvocable11Fallback.cpp | 2 +- hipamd/tests/src/cppstd/hipInvocable14.cpp | 2 +- hipamd/tests/src/cppstd/hipInvocable17.cpp | 2 +- .../src/deviceLib/hipHalf2Comparision.cpp | 2 +- .../src/deviceLib/hipLaunchKernelFunc.cpp | 2 +- .../tests/src/deviceLib/hipMathFunctions.cpp | 2 +- hipamd/tests/src/deviceLib/hipStdComplex.cpp | 2 +- .../tests/src/deviceLib/hipTestAtomicAdd.cpp | 2 +- .../src/deviceLib/hipTestDotFunctions.cpp | 2 +- hipamd/tests/src/deviceLib/hipTestFMA.cpp | 2 +- hipamd/tests/src/deviceLib/hipTestHalf.cpp | 2 +- .../tests/src/deviceLib/hipTestNativeHalf.cpp | 2 +- hipamd/tests/src/deviceLib/hipVectorTypes.cpp | 2 +- .../src/deviceLib/hipVectorTypesDevice.cpp | 2 +- hipamd/tests/src/deviceLib/hip_bitextract.cpp | 2 +- hipamd/tests/src/deviceLib/hip_bitinsert.cpp | 2 +- hipamd/tests/src/deviceLib/hip_floatnTM.cpp | 2 +- hipamd/tests/src/deviceLib/hip_mbcnt.cpp | 2 +- .../complex_loading_behavior.cpp | 4 +- .../src/dynamicLoading/hipApiDynamicLoad.cpp | 4 +- hipamd/tests/src/g++/hipMalloc.cpp | 4 +- hipamd/tests/src/gcc/LaunchKernel.c | 8 +- hipamd/tests/src/gcc/hipMalloc.c | 8 +- hipamd/tests/src/hipHcc.cpp | 62 ++++ .../tests/src/hiprtc/hiprtcGetLoweredName.cpp | 2 +- hipamd/tests/src/hiprtc/saxpy.cpp | 2 +- .../src/hostcall/hipHostcallFuncCall.cpp | 2 +- .../src/hostcall/hipHostcallPrintThings.cpp | 2 +- hipamd/tests/src/ipc/hipSimpleIpc.cpp | 2 +- hipamd/tests/src/kernel/hipDynamicShared.cpp | 4 +- hipamd/tests/src/kernel/hipDynamicShared2.cpp | 4 +- .../src/kernel/hipExtLaunchKernelGGL.cpp | 2 +- hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp | 6 +- hipamd/tests/src/printf/hipPrintfAltForms.cpp | 4 +- hipamd/tests/src/printf/hipPrintfBasic.cpp | 4 +- hipamd/tests/src/printf/hipPrintfFlags.cpp | 4 +- .../tests/src/printf/hipPrintfManyDevices.cpp | 4 +- .../tests/src/printf/hipPrintfManyWaves.cpp | 4 +- .../tests/src/printf/hipPrintfSpecifiers.cpp | 4 +- hipamd/tests/src/printf/hipPrintfStar.cpp | 4 +- .../src/printf/hipPrintfWidthPrecision.cpp | 4 +- .../device/hipDeviceGetPCIBusId.cpp | 4 +- .../src/runtimeApi/device/hipSetGetDevice.cpp | 2 +- .../runtimeApi/event/hipEventElapsedTime.cpp | 2 +- .../src/runtimeApi/event/hipEventIpc.cpp | 2 +- .../memory/hipMallocManaged_MultiScenario.cpp | 4 +- .../runtimeApi/memory/hipMemPtrGetInfo.cpp | 2 +- .../runtimeApi/memory/hipMemcpyDtoDAsync.cpp | 2 +- .../memory/hipMemcpyNegetiveTests.cpp | 2 +- .../runtimeApi/memory/hipMemcpyPeerAsync.cpp | 2 +- .../runtimeApi/memory/hipMemcpyWithStream.cpp | 2 +- .../memory/hipMemcpyWithStreamMultiThread.cpp | 2 +- .../tests/src/runtimeApi/memory/hipMemset.cpp | 12 +- .../src/runtimeApi/memory/hipMemset2D.cpp | 2 +- .../hipMemset2DAsyncMultiThreadAndKernel.cpp | 2 +- .../memory/hipMemsetAsyncAndKernel.cpp | 2 +- .../memory/hipMemsetAsyncMultiThread.cpp | 2 +- .../runtimeApi/memory/hipMemsetInvalidPtr.cpp | 2 +- .../hipMultiMemcpyMultiThrdMultiStrm.cpp | 2 +- .../memory/hipMultiMemcpyMultiThread.cpp | 2 +- .../hipExtLaunchMultiKernelMultiDevice.cpp | 2 +- .../module/hipExtModuleLaunchKernel.cpp | 4 +- .../runtimeApi/module/hipFuncSetAttribute.cpp | 2 +- .../hipModuleLoadDataMultThreadOnMultGPU.cpp | 2 +- .../module/hipModuleLoadDataMultThreaded.cpp | 2 +- .../runtimeApi/module/hipModuleNegative.cpp | 30 +- .../module/hipModuleTexture2dDrv.cpp | 2 +- .../src/runtimeApi/module/tex2d_kernel.cpp | 2 +- .../src/runtimeApi/stream/hipMultiStreams.cpp | 2 +- .../stream/hipStreamACb_AltEnqueue.cpp | 2 +- .../stream/hipStreamACb_MStrm_Mgpu.cpp | 2 +- .../stream/hipStreamACb_MultiCalls.cpp | 2 +- .../stream/hipStreamACb_StrmSyncTiming.cpp | 2 +- .../stream/hipStreamACb_ThrdBehaviour.cpp | 2 +- .../runtimeApi/stream/hipStreamACb_order.cpp | 2 +- .../runtimeApi/stream/hipStreamGetFlags.cpp | 2 +- .../stream/hipStreamGetPriority.cpp | 2 +- .../runtimeApi/stream/hipStreamWithCUMask.cpp | 2 +- hipamd/tests/src/surface/hipSurfaceObj2D.cpp | 2 +- .../tests/src/texture/hipBindTex2DPitch.cpp | 2 +- .../src/texture/hipBindTexRef1DFetch.cpp | 2 +- .../texture/hipNormalizedFloatValueTex.cpp | 2 +- .../src/texture/hipTex1DFetchCheckModes.cpp | 2 +- .../src/texture/hipTextureObj1DFetch.cpp | 2 +- hipamd/tests/src/texture/hipTextureRef2D.cpp | 2 +- .../src/texture/simpleTexture2DLayered.cpp | 2 +- hipamd/tests/src/texture/simpleTexture3D.cpp | 2 +- 103 files changed, 430 insertions(+), 376 deletions(-) create mode 100644 hipamd/tests/src/hipHcc.cpp diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt index 649e868702..9e4d41602f 100755 --- a/hipamd/CMakeLists.txt +++ b/hipamd/CMakeLists.txt @@ -1,8 +1,12 @@ cmake_minimum_required(VERSION 3.4.3) project(hip) +# sample command for hip-hcc +# cmake -DHIP_RUNTIME=hcc .. # sample command for hip-rocclr, you'll need to have rocclr installed -# cmake -DHIP_COMPILER=clang -DHIP_PLATFORM=rocclr .. -# cmake -DHIP_COMPILER=clang -DHIP_PLATFORM=rocclr -DOPENCL_DIR=/path/to/opencl/api/opencl -DCMAKE_PREFIX_PATH=/path/to/rocclr/build/or/install/directory .. +# cmake .. +# cmake -DHIP_COMPILER=clang .. +# cmake -DHIP_COMPILER=clang -DHIP_RUNTIME=rocclr .. +# cmake -DHIP_COMPILER=clang -DHIP_RUNTIME=rocclr -DOPENCL_DIR=/path/to/opencl/api/opencl -DCMAKE_PREFIX_PATH=/path/to/rocclr/build/or/install/directory .. set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared library (.so) or static lib (.a) ") @@ -143,15 +147,20 @@ endif () if(CMAKE_CXX_COMPILER MATCHES ".*hcc") set(HIP_COMPILER "hcc" CACHE STRING "HIP Compiler") - set(HIP_PLATFORM "hcc" CACHE STRING "HIP Platform") + set(HIP_PLATFORM "amd" CACHE STRING "HIP Platform") + set(HIP_RUNTIME "hcc" CACHE STRING "HIP Runtime") get_filename_component(CXX_PATH ${CMAKE_CXX_COMPILER} DIRECTORY) get_filename_component(CXX_PATH ${CXX_PATH} DIRECTORY) - set(HCC_HOME "${CXX_PATH}" CACHE PATH "Path to which HCC has been installed") + set(HCC_HOME "${CXX_PATH}" CACHE PATH "Path to which hcc has been installed") 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 ############################# @@ -167,40 +176,43 @@ if(NOT DEFINED HIP_PLATFORM) endif() message(STATUS "HIP Platform: " ${HIP_PLATFORM}) +if(HIP_PLATFORM STREQUAL "nvidia") + set(HIP_COMPILER "nvcc" CACHE STRING "HIP Compiler") + set(HIP_RUNTIME "cuda" CACHE STRING "HIP Runtime") +endif() + +# default runtime is rocclr +if(NOT DEFINED HIP_RUNTIME) + if(NOT DEFINED ENV{HIP_RUNTIME}) + set(HIP_RUNTIME "rocclr" CACHE STRING "HIP Runtime") + else() + set(HIP_RUNTIME $ENV{HIP_RUNTIME} CACHE STRING "HIP Compiler") + endif() +endif() + +message(STATUS "HIP Runtime: " ${HIP_RUNTIME}) +add_to_config(_buildInfo HIP_RUNTIME) + # Determine HIP_COMPILER -# Either hcc or clang; default is hcc +# Either hcc or clang; default is clang if(NOT DEFINED HIP_COMPILER) if(NOT DEFINED ENV{HIP_COMPILER}) - set(HIP_COMPILER "hcc" CACHE STRING "HIP Compiler") + if(HIP_RUNTIME STREQUAL "hcc") + set(HIP_COMPILER "hcc" CACHE STRING "HIP Compiler") + else() + set(HIP_COMPILER "clang" CACHE STRING "HIP Compiler") + endif() else() set(HIP_COMPILER $ENV{HIP_COMPILER} CACHE STRING "HIP Compiler") endif() endif() -if(NOT (HIP_COMPILER STREQUAL "hcc" OR HIP_COMPILER STREQUAL "clang")) - message(FATAL_ERROR "Must use HIP_COMPILER as hcc or clang") -endif() + message(STATUS "HIP Compiler: " ${HIP_COMPILER}) add_to_config(_buildInfo HIP_COMPILER) -# Determine HIP_RUNTIME -# Either HCC or ROCclr; default is HCC -if(NOT DEFINED ENV{HIP_RUNTIME}) - if(HIP_PLATFORM STREQUAL "hcc") - set(HIP_RUNTIME "HCC" CACHE STRING "HIP Runtime") - elseif (HIP_PLATFORM STREQUAL "rocclr") - set(HIP_RUNTIME "ROCclr" CACHE STRING "HIP Runtime") - elseif (HIP_PLATFORM STREQUAL "nvcc") - set(HIP_RUNTIME "CUDA" CACHE STRING "HIP Runtime") - endif() -endif() -add_to_config(_buildInfo HIP_RUNTIME) +########### Determine HCC_HOME If compiler is hcc ################## -if(HIP_PLATFORM STREQUAL "rocclr") - set(USE_PROF_API "1") -endif() - -# If HIP_PLATFORM is hcc, we need HCC_HOME and HSA_PATH to be defined -if(HIP_PLATFORM STREQUAL "hcc") +if(HIP_COMPILER STREQUAL "hcc") # Determine HCC_HOME if(NOT DEFINED HCC_HOME) if(NOT DEFINED ENV{HCC_HOME}) @@ -209,10 +221,6 @@ if(HIP_PLATFORM STREQUAL "hcc") set(HCC_HOME $ENV{HCC_HOME} CACHE PATH "Path to which HCC has been installed") endif() endif() - - if(DEFINED ENV{HIP_DEVELOPER}) - add_to_config(_buildInfo HCC_HOME) - endif() if(IS_ABSOLUTE ${HCC_HOME} AND EXISTS ${HCC_HOME} AND IS_DIRECTORY ${HCC_HOME}) execute_process(COMMAND ${HCC_HOME}/bin/hcc --version OUTPUT_VARIABLE HCC_VERSION @@ -229,7 +237,11 @@ if(HIP_PLATFORM STREQUAL "hcc") string(REPLACE "." ";" HCC_VERSION_LIST ${HCC_PACKAGE_VERSION}) list(GET HCC_VERSION_LIST 0 HCC_VERSION_MAJOR) list(GET HCC_VERSION_LIST 1 HCC_VERSION_MINOR) +endif() +############ If HIP_PLATFORM is amd, HSA_PATH has to be defined ################## + +if(HIP_PLATFORM STREQUAL "amd") # Determine HSA_PATH if(NOT DEFINED HSA_PATH) if(NOT DEFINED ENV{HSA_PATH}) @@ -244,6 +256,7 @@ if(HIP_PLATFORM STREQUAL "hcc") message(FATAL_ERROR "Don't know where to find HSA runtime. Please specify absolute path using -DHSA_PATH") endif() endif() +message(STATUS "\nHSA runtime in: " ${HSA_PATH}) # Set default build type if(NOT CMAKE_BUILD_TYPE) @@ -288,41 +301,6 @@ if (NOT CPACK_SET_DESTDIR) set(CPACK_PACKAGING_INSTALL_PREFIX "/opt/rocm/hip" CACHE PATH "Default installation path of hcc installer package") endif (NOT CPACK_SET_DESTDIR) -############################# -# Profiling API support -############################# -# Generate profiling API macros/structures header -if(HIP_PLATFORM STREQUAL "hcc") -if(USE_PROF_API EQUAL 1) -set(PROF_API_STR "${PROJECT_BINARY_DIR}/include/hip/hcc_detail/hip_prof_str.h") -set(PROF_API_HDR "${CMAKE_CURRENT_SOURCE_DIR}/include/hip/hcc_detail/hip_runtime_api.h") -set(PROF_API_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src") -set(PROF_API_GEN "${CMAKE_CURRENT_SOURCE_DIR}/hip_prof_gen.py") -set(PROF_API_LOG "${PROJECT_BINARY_DIR}/hip_prof_gen.log.txt") -set(PROF_API_CMD "${PROF_API_GEN} -v ${OPT_PROF_API} ${PROF_API_HDR} ${PROF_API_SRC} ${PROF_API_STR} >${PROF_API_LOG}") -MESSAGE(STATUS "Generating profiling promitives: ${PROF_API_STR}") -execute_process(COMMAND sh -c "rm -f ${PROF_API_STR}; ${PROF_API_CMD}") -set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${PROF_API_GEN} ${PROF_API_HDR} ${PROF_API_STR}) - -# Enable profiling API - find_path(PROF_API_HEADER_DIR prof_protocol.h - HINTS - ${PROF_API_HEADER_PATH} - PATHS - /opt/rocm/roctracer - PATH_SUFFIXES - include/ext - ) - if(NOT PROF_API_HEADER_DIR) - MESSAGE(WARNING "Profiling API header not found. Disabling roctracer integration. Use -DPROF_API_HEADER_PATH=") - else() - add_definitions(-DUSE_PROF_API=1) - include_directories(${PROF_API_HEADER_DIR}) - MESSAGE(STATUS "Profiling API: ${PROF_API_HEADER_DIR}") - endif() -endif() -endif() - ############################# # Build steps ############################# @@ -336,45 +314,53 @@ if (BUILD_HIPIFY_CLANG) add_subdirectory(hipify-clang) endif() -# Build LPL an CA (fat binary generation / fat binary decomposition tools) if -# platform is hcc; do this before the ugly hijacking of the compiler, since no -# HC code is involved. -#if (HIP_PLATFORM STREQUAL "hcc") -# add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lpl_ca) -#endif () - -if(HIP_PLATFORM STREQUAL "rocclr") - # Determine HSA_PATH - if(NOT DEFINED HSA_PATH) - if(NOT DEFINED ENV{HSA_PATH}) - set(HSA_PATH "/opt/rocm/hsa" CACHE PATH "Path to which HSA runtime has been installed") - else() - set(HSA_PATH $ENV{HSA_PATH} CACHE PATH "Path to which HSA runtime has been installed") - endif() - endif() - if(IS_ABSOLUTE ${HSA_PATH} AND EXISTS ${HSA_PATH} AND IS_DIRECTORY ${HSA_PATH}) - message(STATUS "Looking for HSA runtime in: " ${HSA_PATH}) - else() - message(FATAL_ERROR "Don't know where to find HSA runtime. Please specify absolute path using -DHSA_PATH") - endif() - +if(HIP_RUNTIME STREQUAL "rocclr") include_directories(${PROJECT_SOURCE_DIR}/include) add_subdirectory(rocclr) - file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo}) - -# set(ROCclr_CXX_FLAGS "-hc -fno-gpu-rdc --amdgpu-target=gfx803 --amdgpu-target=gfx900 --amdgpu-target=gfx906 --amdgpu-target=gfx908 ") + # set(ROCclr_CXX_FLAGS "-hc -fno-gpu-rdc --amdgpu-target=gfx803 --amdgpu-target=gfx900 --amdgpu-target=gfx906 --amdgpu-target=gfx908 ") set(HIP_ROCclr_BUILD_FLAGS "${HIP_ROCclr_BUILD_FLAGS} -fPIC ${ROCclr_CXX_FLAGS} -I${HSA_PATH}/include") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HIP_ROCclr_BUILD_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HIP_ROCclr_BUILD_FLAGS}") set(HCC_CXX_FLAGS "-hc -fno-gpu-rdc --amdgpu-target=gfx803 --amdgpu-target=gfx900 --amdgpu-target=gfx906 --amdgpu-target=gfx908 ") set(HIP_HCC_BUILD_FLAGS "${HIP_HCC_BUILD_FLAGS} -fPIC ${HCC_CXX_FLAGS} -I${HSA_PATH}/include") - endif() -message(STATUS "\nHSA runtime in: " ${HSA_PATH}) -# Build hip_hcc if platform is hcc -if(HIP_PLATFORM STREQUAL "hcc") +# Build hip_hcc if runtime is hcc +if(HIP_RUNTIME STREQUAL "hcc") + ############################# + # Profiling API support + ############################# + # Generate profiling API macros/structures header + if(USE_PROF_API EQUAL 1) + set(PROF_API_STR "${PROJECT_BINARY_DIR}/include/hip/hcc_detail/hip_prof_str.h") + set(PROF_API_HDR "${CMAKE_CURRENT_SOURCE_DIR}/include/hip/hcc_detail/hip_runtime_api.h") + set(PROF_API_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src") + set(PROF_API_GEN "${CMAKE_CURRENT_SOURCE_DIR}/hip_prof_gen.py") + set(PROF_API_LOG "${PROJECT_BINARY_DIR}/hip_prof_gen.log.txt") + set(PROF_API_CMD "${PROF_API_GEN} -v ${OPT_PROF_API} ${PROF_API_HDR} ${PROF_API_SRC} ${PROF_API_STR} >${PROF_API_LOG}") + MESSAGE(STATUS "Generating profiling promitives: ${PROF_API_STR}") + execute_process(COMMAND sh -c "rm -f ${PROF_API_STR}; ${PROF_API_CMD}") + set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS ${PROF_API_GEN} ${PROF_API_HDR} ${PROF_API_STR}) + + # Enable profiling API + find_path(PROF_API_HEADER_DIR prof_protocol.h + HINTS + ${PROF_API_HEADER_PATH} + PATHS + /opt/rocm/roctracer + PATH_SUFFIXES + include/ext + ) + if(NOT PROF_API_HEADER_DIR) + MESSAGE(WARNING "Profiling API header not found. Disabling roctracer integration. Use -DPROF_API_HEADER_PATH=") + else() + add_definitions(-DUSE_PROF_API=1) + include_directories(${PROF_API_HEADER_DIR}) + MESSAGE(STATUS "Profiling API: ${PROF_API_HEADER_DIR}") + endif() + endif() + include_directories(${PROJECT_BINARY_DIR}/include) include_directories(${PROJECT_SOURCE_DIR}/include) set(HIP_HCC_BUILD_FLAGS) @@ -430,24 +416,21 @@ if(HIP_PLATFORM STREQUAL "hcc") target_include_directories( hiprtc SYSTEM - PRIVATE ${PROJECT_SOURCE_DIR}/include ${HSA_PATH}/include) + PRIVATE ${PROJECT_SOURCE_DIR}/include ${HSA_PATH}/include) set_target_properties(hip_hcc PROPERTIES CXX_VISIBILITY_PRESET hidden) set_target_properties(hip_hcc PROPERTIES VISIBILITY_INLINES_HIDDEN 1) set_target_properties(hiprtc PROPERTIES CXX_VISIBILITY_PRESET hidden) set_target_properties(hiprtc PROPERTIES VISIBILITY_INLINES_HIDDEN 1) - - if(HIP_PLATFORM STREQUAL "hcc") - find_package(amd_comgr REQUIRED CONFIG - PATHS - /opt/rocm/ - PATH_SUFFIXES - cmake/amd_comgr - lib/cmake/amd_comgr - ) - MESSAGE(STATUS "Code Object Manager found at ${amd_comgr_DIR}.") - endif() + find_package(amd_comgr REQUIRED CONFIG + PATHS + /opt/rocm/ + PATH_SUFFIXES + cmake/amd_comgr + lib/cmake/amd_comgr + ) + MESSAGE(STATUS "Code Object Manager found at ${amd_comgr_DIR}.") target_link_libraries(hip_hcc PRIVATE amd_comgr) target_link_libraries(hip_hcc_static PRIVATE amd_comgr) @@ -464,19 +447,20 @@ if(HIP_PLATFORM STREQUAL "hcc") else() target_link_libraries(device INTERFACE host) endif() - - # Generate .hipInfo - file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo}) endif() -if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "rocclr") +if(HIP_PLATFORM STREQUAL "amd") add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lpl_ca) endif() + +# Generate .hipInfo +file(WRITE "${PROJECT_BINARY_DIR}/.hipInfo" ${_buildInfo}) + # Generate .hipVersion file(WRITE "${PROJECT_BINARY_DIR}/.hipVersion" ${_versionInfo}) if(NOT DEFINED HIP_VERSION_GITDATE) - set(HIP_VERSION_GITDATE 0) + set(HIP_VERSION_GITDATE 0) endif() # Generate hip_version.h @@ -504,15 +488,13 @@ endif() ############################# # Install steps ############################# -# Install hip_hcc if platform is hcc -if(HIP_PLATFORM STREQUAL "hcc") +# Install hip_hcc if runtime is hcc +if(HIP_RUNTIME STREQUAL "hcc") install(TARGETS hip_hcc_static hip_hcc hiprtc DESTINATION lib) endif() # Install .hipInfo -if(HIP_PLATFORM STREQUAL "hcc" OR HIP_PLATFORM STREQUAL "rocclr") - install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib) -endif() +install(FILES ${PROJECT_BINARY_DIR}/.hipInfo DESTINATION lib) # Install .hipVersion install(FILES ${PROJECT_BINARY_DIR}/.hipVersion DESTINATION bin) @@ -521,9 +503,9 @@ install(FILES ${PROJECT_BINARY_DIR}/.hipVersion DESTINATION bin) execute_process(COMMAND test ${CMAKE_INSTALL_PREFIX} -ef ${CMAKE_CURRENT_SOURCE_DIR} RESULT_VARIABLE INSTALL_SOURCE) if(NOT ${INSTALL_SOURCE} EQUAL 0) - if(HIP_RUNTIME STREQUAL "HCC") + if(HIP_RUNTIME STREQUAL "hcc") install(DIRECTORY src DESTINATION .) - elseif(HIP_RUNTIME STREQUAL "ROCclr") + elseif(HIP_RUNTIME STREQUAL "rocclr") install(DIRECTORY rocclr DESTINATION .) endif() install(DIRECTORY bin DESTINATION . USE_SOURCE_PERMISSIONS) @@ -540,36 +522,37 @@ install(DIRECTORY ${PROJECT_BINARY_DIR}/include/hip DESTINATION include FILES_MATCHING PATTERN "*.h*") +if(HIP_RUNTIME STREQUAL "hcc") + install(TARGETS hip_hcc_static hip_hcc host device EXPORT hip-targets DESTINATION ${LIB_INSTALL_DIR}) + install(EXPORT hip-targets DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR} NAMESPACE hip::) +elseif(HIP_RUNTIME STREQUAL "rocclr") +# install(TARGETS hip_on_rocclr host device EXPORT hip-targets DESTINATION ${LIB_INSTALL_DIR}) +endif() + ############################# # hip-config ############################# -if(HIP_PLATFORM STREQUAL "hcc") - install(TARGETS hip_hcc_static hip_hcc host device EXPORT hip-targets DESTINATION ${LIB_INSTALL_DIR}) - install(EXPORT hip-targets DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR} NAMESPACE hip::) -elseif( HIP_PLATFORM STREQUAL "rocclr") -# install(TARGETS hip_on_rocclr host device EXPORT hip-targets DESTINATION ${LIB_INSTALL_DIR}) -endif() - include(CMakePackageConfigHelpers) +include(CMakePackageConfigHelpers) - configure_package_config_file( - hip-config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/hip-config.cmake - INSTALL_DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR} - PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR - ) +configure_package_config_file( + hip-config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/hip-config.cmake + INSTALL_DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR} + PATH_VARS LIB_INSTALL_DIR INCLUDE_INSTALL_DIR BIN_INSTALL_DIR + ) - write_basic_package_version_file( - ${CMAKE_CURRENT_BINARY_DIR}/hip-config-version.cmake - VERSION "${HIP_VERSION_MAJOR}.${HIP_VERSION_MINOR}.${HIP_VERSION_GITDATE}" - COMPATIBILITY SameMajorVersion - ) - install( - FILES - ${CMAKE_CURRENT_BINARY_DIR}/hip-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/hip-config-version.cmake - DESTINATION - ${CONFIG_PACKAGE_INSTALL_DIR} - ) +write_basic_package_version_file( + ${CMAKE_CURRENT_BINARY_DIR}/hip-config-version.cmake + VERSION "${HIP_VERSION_MAJOR}.${HIP_VERSION_MINOR}.${HIP_VERSION_GITDATE}" + COMPATIBILITY SameMajorVersion + ) +install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/hip-config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/hip-config-version.cmake + DESTINATION + ${CONFIG_PACKAGE_INSTALL_DIR} + ) ############################# # Packaging steps @@ -594,33 +577,33 @@ if (BUILD_HIPIFY_CLANG) add_dependencies(pkg_hip_base hipify-clang) endif() -if(HIP_PLATFORM STREQUAL "hcc") +if(HIP_RUNTIME STREQUAL "hcc") message("HCC Package\n") # Package: hip_hcc - set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip_hcc) - configure_file(packaging/hip-hcc.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) - configure_file(packaging/hip-hcc.postinst ${BUILD_DIR}/postinst @ONLY) - configure_file(packaging/hip-hcc.prerm ${BUILD_DIR}/prerm @ONLY) - add_custom_target(pkg_hip_hcc COMMAND ${CMAKE_COMMAND} . - COMMAND rm -rf *.deb *.rpm *.tar.gz - COMMAND make package - COMMAND cp *.deb ${PROJECT_BINARY_DIR} - COMMAND cp *.rpm ${PROJECT_BINARY_DIR} - COMMAND cp *.tar.gz ${PROJECT_BINARY_DIR} - WORKING_DIRECTORY ${BUILD_DIR} - DEPENDS hip_hcc hip_hcc_static hiprtc) -else() - set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/rocclr) - configure_file(packaging/hip-rocclr.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) - configure_file(packaging/hip-rocclr.postinst ${BUILD_DIR}/postinst @ONLY) - configure_file(packaging/hip-rocclr.prerm ${BUILD_DIR}/prerm @ONLY) - add_custom_target(hip_on_rocclr COMMAND ${CMAKE_COMMAND} . - COMMAND rm -rf *.deb *.rpm *.tar.gz - COMMAND make package - COMMAND cp *.deb ${PROJECT_BINARY_DIR} - COMMAND cp *.rpm ${PROJECT_BINARY_DIR} - COMMAND cp *.tar.gz ${PROJECT_BINARY_DIR} - WORKING_DIRECTORY ${BUILD_DIR} ) + set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip_hcc) + configure_file(packaging/hip-hcc.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) + configure_file(packaging/hip-hcc.postinst ${BUILD_DIR}/postinst @ONLY) + configure_file(packaging/hip-hcc.prerm ${BUILD_DIR}/prerm @ONLY) + add_custom_target(pkg_hip_hcc COMMAND ${CMAKE_COMMAND} . + COMMAND rm -rf *.deb *.rpm *.tar.gz + COMMAND make package + COMMAND cp *.deb ${PROJECT_BINARY_DIR} + COMMAND cp *.rpm ${PROJECT_BINARY_DIR} + COMMAND cp *.tar.gz ${PROJECT_BINARY_DIR} + WORKING_DIRECTORY ${BUILD_DIR} + DEPENDS hip_hcc hip_hcc_static hiprtc) +elseif(HIP_RUNTIME STREQUAL "rocclr") + set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/rocclr) + configure_file(packaging/hip-rocclr.txt ${BUILD_DIR}/CMakeLists.txt @ONLY) + configure_file(packaging/hip-rocclr.postinst ${BUILD_DIR}/postinst @ONLY) + configure_file(packaging/hip-rocclr.prerm ${BUILD_DIR}/prerm @ONLY) + add_custom_target(hip_on_rocclr COMMAND ${CMAKE_COMMAND} . + COMMAND rm -rf *.deb *.rpm *.tar.gz + COMMAND make package + COMMAND cp *.deb ${PROJECT_BINARY_DIR} + COMMAND cp *.rpm ${PROJECT_BINARY_DIR} + COMMAND cp *.tar.gz ${PROJECT_BINARY_DIR} + WORKING_DIRECTORY ${BUILD_DIR} ) endif() # Package: hip_nvcc @@ -656,18 +639,17 @@ add_custom_target(pkg_hip_samples COMMAND ${CMAKE_COMMAND} . COMMAND cp *.tar.gz ${PROJECT_BINARY_DIR} WORKING_DIRECTORY ${BUILD_DIR}) - # Package: all if(POLICY CMP0037) cmake_policy(PUSH) cmake_policy(SET CMP0037 OLD) endif() -if(HIP_PLATFORM STREQUAL "hcc") +if(HIP_RUNTIME STREQUAL "hcc") add_custom_target(package WORKING_DIRECTORY ${PROJECT_BINARY_DIR} DEPENDS pkg_hip_base pkg_hip_hcc pkg_hip_nvcc pkg_hip_doc pkg_hip_samples) -elseif(HIP_PLATFORM STREQUAL "rocclr") +elseif(HIP_RUNTIME STREQUAL "rocclr") add_custom_target(package WORKING_DIRECTORY ${PROJECT_BINARY_DIR} DEPENDS pkg_hip_base hip_on_rocclr pkg_hip_nvcc pkg_hip_doc pkg_hip_samples) diff --git a/hipamd/bin/hipcc b/hipamd/bin/hipcc index eeab8222a0..64c07e1d96 100755 --- a/hipamd/bin/hipcc +++ b/hipamd/bin/hipcc @@ -15,8 +15,8 @@ use Cwd 'abs_path'; # Will pass-through options to the target compiler. The tools calling HIPCC must ensure the compiler # options are appropriate for the target compiler. -# Environment variable HIP_PLATFORM control compilation path: -# HIP_PLATFORM='nvcc' or HIP_PLATFORM='hcc'. +# Environment variable HIP_PLATFORM is to detect amd/nvidia path: +# HIP_PLATFORM='nvidia' or HIP_PLATFORM='amd'. # If HIP_PLATFORM is not set hipcc will attempt auto-detect based on if nvcc is found. # # Other environment variable controls: @@ -122,9 +122,9 @@ sub delete_temp_dirs { } #--- -#HIP_PLATFORM controls whether to use hcc (AMD) or nvcc as the platform: +#HIP_PLATFORM controls whether to use amd or nvidia as the platform: #HIP_COMPILER controls whether to use hcc, clang or nvcc for compilation: -#HIP_RUNTIME controls whether to use HCC, ROCclr, or NVCC as the runtime: +#HIP_RUNTIME controls whether to use hcc, rocclr, or nvcc as the runtime: if ($isWindows) { # Windows cannot run perl natively, so hipcc will explicitly call perl $HIP_PLATFORM= `perl $HIP_PATH/bin/hipconfig --platform`; @@ -139,7 +139,7 @@ if ($isWindows) { } # If using ROCclr runtime, need to find HIP_ROCCLR_HOME -if (defined $HIP_RUNTIME and $HIP_RUNTIME eq "ROCclr" and !defined $HIP_ROCCLR_HOME) { +if (defined $HIP_RUNTIME and $HIP_RUNTIME eq "rocclr" and !defined $HIP_ROCCLR_HOME) { my $hipcc_dir = dirname($0); if (-e "$hipcc_dir/../lib/bitcode") { $HIP_ROCCLR_HOME = abs_path($hipcc_dir . "/.."); @@ -163,7 +163,7 @@ if (defined $HIP_ROCCLR_HOME) { } } -if (defined $HIP_COMPILER and $HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") { +if (defined $HIP_COMPILER and $HIP_PLATFORM eq "amd" and $HIP_COMPILER eq "clang") { if (!defined $HIP_CLANG_PATH) { $HIP_CLANG_PATH = "$ROCM_PATH/llvm/bin"; } @@ -191,7 +191,7 @@ $setStdLib = 0; # TODO - set to 0 $default_amdgpu_target = 1; -if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") { +if ($HIP_PLATFORM eq "amd" and $HIP_COMPILER eq "clang") { $HIPCC="$HIP_CLANG_PATH/clang++"; # If $HIPCC clang++ is not compiled, use clang instead @@ -249,7 +249,7 @@ if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") { $HIPCFLAGS .= " -D__HIP_ROCclr__"; } -} elsif ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "hcc") { +} elsif ($HIP_PLATFORM eq "amd" and $HIP_COMPILER eq "hcc") { $HIP_INCLUDE_PATH = "$HIP_PATH/include"; if (! defined $HIP_LIB_PATH) { $HIP_LIB_PATH = "$HIP_PATH/lib"; @@ -320,7 +320,7 @@ if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") { print ("HCC_HOME=$HCC_HOME\n"); } -} elsif ($HIP_PLATFORM eq "nvcc") { +} elsif ($HIP_PLATFORM eq "nvidia") { $CUDA_PATH=$ENV{'CUDA_PATH'} // '/usr/local/cuda'; $HIP_INCLUDE_PATH = "$HIP_PATH/include"; if ($verbose & 0x2) { @@ -351,7 +351,7 @@ my $hasC = 0; # options contain a c-style file my $hasCXX = 0; # options contain a cpp-style file (NVCC must force recognition as GPU file) my $hasCU = 0; # options contain a cu-style file (HCC must force recognition as GPU file) my $hasHIP = 0; # options contain a hip-style file (HIP-Clang must pass offloading options) -my $needHipHcc = ($HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'hcc'); # set if we need to link hip_hcc.o from src tree. (some builds, ie cmake, provide their own) +my $needHipHcc = ($HIP_PLATFORM eq 'amd' and $HIP_COMPILER eq 'hcc'); # set if we need to link hip_hcc.o from src tree. (some builds, ie cmake, provide their own) my $printHipVersion = 0; # print HIP version my $printCXXFlags = 0; # print HIPCXXFLAGS my $printLDFlags = 0; # print HIPLDFLAGS @@ -375,7 +375,7 @@ if ($verbose & 0x4) { # Handle code object generation my $ISACMD=""; -if($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "hcc"){ +if($HIP_PLATFORM eq "amd" and $HIP_COMPILER eq "hcc"){ $ISACMD .= "$HIP_PATH/bin/lpl "; if($ARGV[0] eq "--genco"){ foreach $isaarg (@ARGV[1..$#ARGV]){ @@ -390,11 +390,11 @@ if($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "hcc"){ } } -if(($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "hcc")){ +if(($HIP_PLATFORM eq "amd" and $HIP_COMPILER eq "hcc")){ $ENV{HCC_EXTRA_LIBRARIES}="\n"; } -if($HIP_PLATFORM eq "nvcc"){ +if($HIP_PLATFORM eq "nvidia"){ $ISACMD .= "$HIP_PATH/bin/hipcc -ptx "; if($ARGV[0] eq "--genco"){ foreach $isaarg (@ARGV[1..$#ARGV]){ @@ -458,7 +458,7 @@ foreach $arg (@ARGV) $targetsStr .= substr($arg, length($targetOpt)); $default_amdgpu_target = 0; # hip-clang does not accept --amdgpu-target= options. - if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") { + if ($HIP_PLATFORM eq "amd" and $HIP_COMPILER eq "clang") { $swallowArg = 1; } } @@ -471,11 +471,11 @@ foreach $arg (@ARGV) $coFormatv3 = 0; } - if (($arg =~ /--genco/) and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'clang' ) { + if (($arg =~ /--genco/) and $HIP_PLATFORM eq 'amd' and $HIP_COMPILER eq 'clang' ) { $arg = "--cuda-device-only"; } - if(($trimarg eq '-stdlib=libstdc++') and ($setStdLib eq 0) and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'hcc') + if(($trimarg eq '-stdlib=libstdc++') and ($setStdLib eq 0) and $HIP_PLATFORM eq 'amd' and $HIP_COMPILER eq 'hcc') { $HIPCXXFLAGS .= $HCC_WA_FLAGS; $setStdLib = 1; @@ -524,7 +524,7 @@ foreach $arg (@ARGV) ## hip-clang in command line. ## ToDo: Remove this after hip-clang switch to lto and lld is able to ## handle clang-offload-bundler bundles. - if ($arg =~ m/^-Wl,@/ and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'clang') { + if ($arg =~ m/^-Wl,@/ and $HIP_PLATFORM eq 'amd' and $HIP_COMPILER eq 'clang') { my $file = substr $arg, 5; open my $in, "<:encoding(utf8)", $file or die "$file: $!"; my $new_arg = ""; @@ -581,7 +581,7 @@ foreach $arg (@ARGV) $arg = "$new_arg -Wl,\@$new_file"; $escapeArg = 0; } elsif (($arg =~ m/\.a$/ || $arg =~ m/\.lo$/) && - $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'clang') { + $HIP_PLATFORM eq 'amd' and $HIP_COMPILER eq 'clang') { ## process static library for hip-clang ## extract object files from static library and pass them directly to ## hip-clang. @@ -678,13 +678,13 @@ foreach $arg (@ARGV) $needCXXFLAGS = 1; if ($HIP_COMPILE_CXX_AS_HIP eq '0' or $HIP_COMPILER ne "clang") { $hasCXX = 1; - } elsif ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") { + } elsif ($HIP_PLATFORM eq "amd" and $HIP_COMPILER eq "clang") { $hasHIP = 1; $toolArgs .= " -x hip"; } } elsif ((($arg =~ /\.cu$/ or $arg =~ /\.cuh$/) and $HIP_COMPILE_CXX_AS_HIP ne '0') or ($arg =~ /\.hip$/)) { $needCXXFLAGS = 1; - if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") { + if ($HIP_PLATFORM eq "amd" and $HIP_COMPILER eq "clang") { $hasHIP = 1; $toolArgs .= " -x hip"; } else { @@ -713,7 +713,7 @@ foreach $arg (@ARGV) $prevArg = $arg; } -if($HIP_PLATFORM eq "hcc"){ +if($HIP_PLATFORM eq "amd"){ # No AMDGPU target specified at commandline. So look for HCC_AMDGPU_TARGET if($default_amdgpu_target eq 1) { if (defined $ENV{HCC_AMDGPU_TARGET}) { @@ -764,34 +764,34 @@ if($HIP_PLATFORM eq "hcc"){ # hcc defaults to v2, so we need to convert to the appropriate flag # hip-clang defaults to v3, so we don't need to do anything -if ($coFormatv3 and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'hcc') { +if ($coFormatv3 and $HIP_PLATFORM eq 'amd' and $HIP_COMPILER eq 'hcc') { $HIPLDFLAGS .= " -mcode-object-v3"; $HIPCXXFLAGS .= " -mcode-object-v3"; } -if ($hasCXX and $HIP_PLATFORM eq 'nvcc') { +if ($hasCXX and $HIP_PLATFORM eq 'nvidia') { $HIPCXXFLAGS .= " -x cu"; } -if ($hasCU and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'hcc') { +if ($hasCU and $HIP_PLATFORM eq 'amd' and $HIP_COMPILER eq 'hcc') { $HIPCXXFLAGS .= " -x c++"; } -if ($buildDeps and $HIP_PLATFORM eq 'nvcc') { +if ($buildDeps and $HIP_PLATFORM eq 'nvidia') { $HIPCXXFLAGS .= " -M -D__CUDACC__"; $HIPCFLAGS .= " -M -D__CUDACC__"; } -if ($buildDeps and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'clang') { +if ($buildDeps and $HIP_PLATFORM eq 'amd' and $HIP_COMPILER eq 'clang') { $HIPCXXFLAGS .= " --cuda-host-only"; } # Add --hip-link only if it is compile only and -fgpu-rdc is on. -if ($rdc and !$compileOnly and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'clang') { +if ($rdc and !$compileOnly and $HIP_PLATFORM eq 'amd' and $HIP_COMPILER eq 'clang') { $HIPLDFLAGS .= " --hip-link"; $HIPLDFLAGS .= $HIPLDARCHFLAGS; } -if ($setStdLib eq 0 and $HIP_PLATFORM eq 'hcc' and $HIP_COMPILER eq 'hcc') +if ($setStdLib eq 0 and $HIP_PLATFORM eq 'amd' and $HIP_COMPILER eq 'hcc') { $HIPCXXFLAGS .= $HCC_WA_FLAGS; } @@ -810,7 +810,7 @@ if ($needHipHcc) { # Reason is that NVCC uses the file extension to determine whether to compile in CUDA mode or # pass-through CPP mode. -if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") { +if ($HIP_PLATFORM eq "amd" and $HIP_COMPILER eq "clang") { # Set default optimization level to -O3 for hip-clang. if ($optArg eq "") { $HIPCXXFLAGS .= " -O3"; @@ -828,7 +828,7 @@ if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "clang") { if ($DEVICE_LIB_PATH ne "$ROCM_PATH/amdgcn/bitcode") { $HIPCXXFLAGS .= " --hip-device-lib-path=$DEVICE_LIB_PATH"; } - if ($HIP_RUNTIME ne "HCC") { + if ($HIP_RUNTIME ne "hcc") { $HIPCXXFLAGS .= " -fhip-new-launch-api"; } } @@ -888,7 +888,7 @@ if ($printLDFlags) { print $HIPLDFLAGS; } if ($runCmd) { - if ($HIP_PLATFORM eq "hcc" and $HIP_COMPILER eq "hcc" and exists($hipConfig{'HCC_VERSION'}) and $HCC_VERSION ne $hipConfig{'HCC_VERSION'}) { + if ($HIP_PLATFORM eq "amd" and $HIP_COMPILER eq "hcc" and exists($hipConfig{'HCC_VERSION'}) and $HCC_VERSION ne $hipConfig{'HCC_VERSION'}) { print ("HIP ($HIP_PATH) was built using hcc $hipConfig{'HCC_VERSION'}, but you are using $HCC_HOME/hcc with version $HCC_VERSION from hipcc. Please rebuild HIP including cmake or update HCC_HOME variable.\n") ; die unless $ENV{'HIP_IGNORE_HCC_VERSION'}; } diff --git a/hipamd/bin/hipcc_cmake_linker_helper b/hipamd/bin/hipcc_cmake_linker_helper index 4870531881..18542d0977 100755 --- a/hipamd/bin/hipcc_cmake_linker_helper +++ b/hipamd/bin/hipcc_cmake_linker_helper @@ -7,4 +7,6 @@ if [ "$HIP_COMPILER" = "hcc" ]; then HCC_HOME=$1 $HIP_PATH/bin/hipcc "${@:2}" elif [ "$HIP_COMPILER" = "clang" ]; then HIP_CLANG_PATH=$1 $HIP_PATH/bin/hipcc "${@:2}" +else + $HIP_PATH/bin/hipcc "${@:1}" fi \ No newline at end of file diff --git a/hipamd/bin/hipconfig b/hipamd/bin/hipconfig index 3cbaadd250..63eb87c58c 100755 --- a/hipamd/bin/hipconfig +++ b/hipamd/bin/hipconfig @@ -35,8 +35,8 @@ if ($p_help) { print " --rocmpath, -R : print ROCM_PATH (use env var if set, else determine from hip path or /opt/rocm)\n"; print " --cpp_config, -C : print C++ compiler options\n"; print " --compiler, -c : print compiler (hcc or clang or nvcc)\n"; - print " --platform, -P : print platform (hcc or nvcc)\n"; - print " --runtime, -r : print runtime (HCC or ROCclr)\n"; + print " --platform, -P : print platform (amd or nvidia)\n"; + print " --runtime, -r : print runtime (hcc or rocclr)\n"; print " --hipclangpath, -l : print HIP_CLANG_PATH\n"; print " --full, -f : print full config\n"; print " --version, -v : print hip version\n"; @@ -98,17 +98,17 @@ if (defined $HIP_ROCCLR_HOME) { $HIP_INFO_PATH= "$HIP_PATH/lib/.hipInfo"; # use actual file } #--- -#HIP_PLATFORM controls whether to use NVCC or HCC for compilation: +#HIP_PLATFORM controls whether to use nvidia or amd platform: $HIP_PLATFORM=$ENV{'HIP_PLATFORM'}; # Read .hipInfo my %hipInfo = (); parse_config_file("$HIP_INFO_PATH", \%hipInfo); # Prioritize Env first, otherwise use the hipInfo config file -$HIP_COMPILER = $ENV{'HIP_COMPILER'} // $hipInfo{'HIP_COMPILER'} // "hcc"; -$HIP_RUNTIME = $ENV{'HIP_RUNTIME'} // $hipInfo{'HIP_RUNTIME'} // "HCC"; +$HIP_COMPILER = $ENV{'HIP_COMPILER'} // $hipInfo{'HIP_COMPILER'} // "clang"; +$HIP_RUNTIME = $ENV{'HIP_RUNTIME'} // $hipInfo{'HIP_RUNTIME'} // "rocclr"; # If using ROCclr runtime, need to find HIP_ROCCLR_HOME -if (defined $HIP_RUNTIME and $HIP_RUNTIME eq "ROCclr" and !defined $HIP_ROCCLR_HOME) { +if (defined $HIP_RUNTIME and $HIP_RUNTIME eq "rocclr" and !defined $HIP_ROCCLR_HOME) { my $hipconfig_dir = dirname($0); if (-e "$hipconfig_dir/../lib/bitcode") { $HIP_ROCCLR_HOME = abs_path($hipconfig_dir . "/.."); @@ -118,15 +118,17 @@ if (defined $HIP_RUNTIME and $HIP_RUNTIME eq "ROCclr" and !defined $HIP_ROCCLR_H } if (not defined $HIP_PLATFORM) { - if (can_run("$HCC_HOME/bin/hcc") or can_run("hcc")) { - $HIP_PLATFORM = "hcc"; - } elsif (can_run("$HIP_CLANG_PATH/clang++") or can_run("clang++")) { - $HIP_PLATFORM = "hcc"; + if (can_run("$HIP_CLANG_PATH/clang++") or can_run("clang++")) { + $HIP_PLATFORM = "amd"; + } elsif (can_run("$HCC_HOME/bin/hcc") or can_run("hcc")) { + $HIP_PLATFORM = "amd"; } elsif (can_run("$CUDA_PATH/bin/nvcc") or can_run("nvcc")) { - $HIP_PLATFORM = "nvcc"; + $HIP_PLATFORM = "nvidia"; + $HIP_COMPILER = "nvcc"; + $HIP_RUNTIME = "cuda"; } else { - # Default to hcc for now - $HIP_PLATFORM = "hcc"; + # Default to amd for now + $HIP_PLATFORM = "amd"; } } @@ -144,10 +146,10 @@ if ($HIP_COMPILER eq "clang") { $CPP_CONFIG = " -D__HIP_PLATFORM_HCC__= -I$HIP_PATH/include -I$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION -I$HSA_PATH/include"; } -if ($HIP_RUNTIME eq "ROCclr") { +if ($HIP_RUNTIME eq "rocclr") { $CPP_CONFIG .= " -D__HIP_ROCclr__"; } -if ($HIP_PLATFORM eq "nvcc") { +if ($HIP_PLATFORM eq "nvidia") { $CPP_CONFIG = " -D__HIP_PLATFORM_NVCC__= -I$HIP_PATH/include -I$CUDA_PATH/include"; }; @@ -211,7 +213,7 @@ if (!$printed or $p_full) { print "HIP_PLATFORM : ", $HIP_PLATFORM, "\n"; print "HIP_RUNTIME : ", $HIP_RUNTIME, "\n"; print "CPP_CONFIG : ", $CPP_CONFIG, "\n"; - if ($HIP_PLATFORM eq "hcc") + if ($HIP_PLATFORM eq "amd") { print "\n" ; if ($HIP_COMPILER eq "hcc") @@ -243,7 +245,7 @@ if (!$printed or $p_full) { printf("\n"); } } - if ($HIP_PLATFORM eq "nvcc") { + if ($HIP_PLATFORM eq "nvidia") { print "\n" ; print "== nvcc\n"; #print "CUDA_PATH :", $CUDA_PATH"; @@ -282,7 +284,7 @@ if ($p_check) { printf "good\n"; } - if ($HIP_PLATFORM eq "hcc") { + if ($HIP_PLATFORM eq "amd") { $LD_LIBRARY_PATH=$ENV{'LD_LIBRARY_PATH'}; printf("%-70s", "check LD_LIBRARY_PATH ($LD_LIBRARY_PATH) contains HSA_PATH ($HSA_PATH)..."); if (index($LD_LIBRARY_PATH, $HSA_PATH) == -1) { @@ -295,7 +297,6 @@ if ($p_check) { } } - if ($p_newline) { print "\n"; } diff --git a/hipamd/cmake/FindHIP.cmake b/hipamd/cmake/FindHIP.cmake index b4a5cb239e..b5afd46913 100644 --- a/hipamd/cmake/FindHIP.cmake +++ b/hipamd/cmake/FindHIP.cmake @@ -205,8 +205,13 @@ set(CMAKE_SHARED_LIBRARY_LINK_DYNAMIC_HIP_FLAGS ${CMAKE_SHARED_LIBRARY_LINK_DYNA set(HIP_CLANG_PARALLEL_BUILD_COMPILE_OPTIONS "") set(HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS "") -if("${HIP_COMPILER}" STREQUAL "hcc") - # Set the CMake Flags to use the HCC Compiler. +if("${HIP_COMPILER}" STREQUAL "nvcc") + # Set the CMake Flags to use the nvcc Compiler. + set(CMAKE_HIP_CREATE_SHARED_LIBRARY "${HIP_HIPCC_CMAKE_LINKER_HELPER} -o ") + set(CMAKE_HIP_CREATE_SHARED_MODULE "${HIP_HIPCC_CMAKE_LINKER_HELPER} -o -shared" ) + set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} -o ") +elseif("${HIP_COMPILER}" STREQUAL "hcc") + # Set the CMake Flags to use the hcc Compiler. set(CMAKE_HIP_CREATE_SHARED_LIBRARY "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HCC_HOME} -o ") set(CMAKE_HIP_CREATE_SHARED_MODULE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HCC_HOME} -o -shared" ) set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HCC_HOME} -o ") @@ -637,6 +642,8 @@ macro(HIP_ADD_EXECUTABLE hip_target) endif() endif() set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} ${HIP_CLANG_PATH} ${HIP_CLANG_PARALLEL_BUILD_LINK_OPTIONS} -o ") + else() + set(CMAKE_HIP_LINK_EXECUTABLE "${HIP_HIPCC_CMAKE_LINKER_HELPER} -o ") endif() if ("${_sources}" STREQUAL "") add_executable(${hip_target} ${_cmake_options} ${_generated_files} "") diff --git a/hipamd/cmake/FindHIP/run_hipcc.cmake b/hipamd/cmake/FindHIP/run_hipcc.cmake index 63c7bb3887..ce0b406ce7 100644 --- a/hipamd/cmake/FindHIP/run_hipcc.cmake +++ b/hipamd/cmake/FindHIP/run_hipcc.cmake @@ -48,7 +48,7 @@ execute_process(COMMAND ${HIP_HIPCONFIG_EXECUTABLE} --compiler OUTPUT_VARIABLE H execute_process(COMMAND ${HIP_HIPCONFIG_EXECUTABLE} --runtime OUTPUT_VARIABLE HIP_RUNTIME OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT host_flag) set(__CC ${HIP_HIPCC_EXECUTABLE}) - if("${HIP_PLATFORM}" STREQUAL "hcc") + if("${HIP_PLATFORM}" STREQUAL "amd") if("${HIP_COMPILER}" STREQUAL "hcc") if(NOT "x${HCC_HOME}" STREQUAL "x") set(ENV{HCC_HOME} ${HCC_HOME}) diff --git a/hipamd/hip-config.cmake.in b/hipamd/hip-config.cmake.in index 6dfbd527cd..4273c39e0f 100644 --- a/hipamd/hip-config.cmake.in +++ b/hipamd/hip-config.cmake.in @@ -123,7 +123,7 @@ set_target_properties(hip::host PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__HIP_PLATFORM_HCC__=1" ) -if(HIP_RUNTIME MATCHES "ROCclr") +if(HIP_RUNTIME MATCHES "rocclr") set_target_properties(hip::amdhip64 PROPERTIES INTERFACE_COMPILE_DEFINITIONS "__HIP_ROCclr__=1" INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${HSA_HEADER}" diff --git a/hipamd/tests/README.md b/hipamd/tests/README.md index 275a25f9dd..bb822d1d6f 100644 --- a/hipamd/tests/README.md +++ b/hipamd/tests/README.md @@ -47,16 +47,16 @@ In the above, BUILD commands provide instructions on how to build the test case The supported syntax for the BUILD command is: <<<<<<< HEAD -BUILD: %t %s HIPCC_OPTIONS HCC_OPTIONS CLANG_OPTIONS NVCC_OPTIONS EXCLUDE_HIP_PLATFORM EXCLUDE_HIP_RUNTIME EXCLUDE_HIP_COMPILER DEPENDS +BUILD: %t %s HIPCC_OPTIONS HCC_OPTIONS CLANG_OPTIONS NVCC_OPTIONS EXCLUDE_HIP_PLATFORM EXCLUDE_HIP_RUNTIME EXCLUDE_HIP_COMPILER DEPENDS ``` %s: refers to current source file name. Additional source files needed for the test can be specified by name (including relative path). %t: refers to target executable named derived by removing the extension from the current source file. Alternatively a target executable name can be specified. -HIPCC_OPTIONS: All options specified after this delimiter are passed to hipcc on both HCC and NVCC platforms. -HCC_OPTIONS: All options specified after this delimiter are passed to hipcc on HCC compiler only. +HIPCC_OPTIONS: All options specified after this delimiter are passed to hipcc on both amd and nvidia platforms. +HCC_OPTIONS: All options specified after this delimiter are passed to hipcc on hcc compiler only. CLANG_OPTIONS: All options specified after this delimiter are passed to hipcc on HIP-Clang compiler only. -NVCC_OPTIONS: All options specified after this delimiter are passed to hipcc on NVCC platform only. -EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from HCC, NVCC or both platforms. -EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from HCC or ROCclr runtime. +NVCC_OPTIONS: All options specified after this delimiter are passed to hipcc on nvidia platform only. +EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from amd, nvidia or both platforms. +EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from hcc or rocclr runtime. EXCLUDE_HIP_COMPILER: This can be used to exclude a test case from hcc or clang compiler. EXCLUDE_HIP_RUNTIME AND EXCLUDE_HIP_COMPILER: when both options are specified it excludes test case from particular runtime and compiler. DEPENDS: This can be used to specify dependencies that need to be built before building the current target. @@ -66,7 +66,7 @@ DEPENDS: This can be used to specify dependencies that need to be built before b The supported syntax for the BUILD_CMD command is: ``` -BUILD_CMD: EXCLUDE_HIP_PLATFORM EXCLUDE_HIP_RUNTIME EXCLUDE_HIP_COMPILER DEPENDS +BUILD_CMD: EXCLUDE_HIP_PLATFORM EXCLUDE_HIP_RUNTIME EXCLUDE_HIP_COMPILER DEPENDS ``` %s: refers to current source file name. Additional source files needed for the test can be specified by name (including relative path). %t: refers to target executable named derived by removing the extension from the current source file. Alternatively a target executable name can be specified. @@ -76,8 +76,8 @@ BUILD_CMD: EXCLUDE_HIP_PLATFORM EXCL %cxx: refers to system c compiler pointed to by /usr/bin/c++. %S: refers to path to current source file. %T: refers to path to current build target. -EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from HCC, NVCC or both platforms. -EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from HCC or ROCclr runtime. +EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from amd, nvidia or both platforms. +EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from hcc or rocclr runtime. EXCLUDE_HIP_COMPILER: This can be used to exclude a test case from hcc or clang compiler. EXCLUDE_HIP_RUNTIME AND EXCLUDE_HIP_COMPILER: when both options are specified it excludes test from particular runtime and compiler. DEPENDS: This can be used to specify dependencies that need to be built before building the current target. @@ -87,11 +87,11 @@ DEPENDS: This can be used to specify dependencies that need to be built before b The supported syntax for the TEST command is: ``` -TEST: %t EXCLUDE_HIP_PLATFORM EXCLUDE_HIP_RUNTIME EXCLUDE_HIP_COMPILER +TEST: %t EXCLUDE_HIP_PLATFORM EXCLUDE_HIP_RUNTIME EXCLUDE_HIP_COMPILER ``` %t: refers to target executable named derived by removing the extension from the current source file. Alternatively a target executable name can be specified. -EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from HCC, NVCC or both platforms. -EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from HCC or ROCclr runtime. +EXCLUDE_HIP_PLATFORM: This can be used to exclude a test case from amd, nvidia or both platforms. +EXCLUDE_HIP_RUNTIME: This can be used to exclude a test case from hcc or rocclr runtime. EXCLUDE_HIP_COMPILER: This can be used to exclude a test case from hcc or clang compiler. EXCLUDE_HIP_RUNTIME AND EXCLUDE_HIP_COMPILER: when both options are specified it excludes test from particular runtime and compiler. Note that if the test has been excluded for a specific platform/runtime/compiler in the BUILD command, it is automatically excluded from the TEST command as well for the sameplatform. @@ -100,7 +100,7 @@ Note that if the test has been excluded for a specific platform/runtime/compiler When using the TEST command, HIT will squash and append the arguments specified to the test executable name to generate the CMAKE test name. Sometimes we might want to specify a more descriptive name. The TEST_NAMED command is used for that. The supported syntax for the TEST_NAMED command is: ``` -TEST: %t CMAKE_TEST_NAME EXCLUDE_HIP_PLATFORM EXCLUDE_HIP_RUNTIME EXCLUDE_HIP_COMPILER +TEST: %t CMAKE_TEST_NAME EXCLUDE_HIP_PLATFORM EXCLUDE_HIP_RUNTIME EXCLUDE_HIP_COMPILER ``` diff --git a/hipamd/tests/performance/dispatch/hipPerfDispatchSpeed.cpp b/hipamd/tests/performance/dispatch/hipPerfDispatchSpeed.cpp index 12999ebc33..278958c4d5 100644 --- a/hipamd/tests/performance/dispatch/hipPerfDispatchSpeed.cpp +++ b/hipamd/tests/performance/dispatch/hipPerfDispatchSpeed.cpp @@ -7,7 +7,7 @@ #include "test_common.h" /* HIT_START - * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/performance/memory/hipPerfBufferCopyRectSpeed.cpp b/hipamd/tests/performance/memory/hipPerfBufferCopyRectSpeed.cpp index 3cb3243e80..badb13e36f 100644 --- a/hipamd/tests/performance/memory/hipPerfBufferCopyRectSpeed.cpp +++ b/hipamd/tests/performance/memory/hipPerfBufferCopyRectSpeed.cpp @@ -7,7 +7,7 @@ #include "test_common.h" /* HIT_START - * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/performance/memory/hipPerfBufferCopySpeed.cpp b/hipamd/tests/performance/memory/hipPerfBufferCopySpeed.cpp index d9a2d443a2..36b482dbf5 100644 --- a/hipamd/tests/performance/memory/hipPerfBufferCopySpeed.cpp +++ b/hipamd/tests/performance/memory/hipPerfBufferCopySpeed.cpp @@ -7,7 +7,7 @@ #include "test_common.h" /* HIT_START - * BUILD: %t %s ../../src/test_common.cpp ../../src/timer.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../src/test_common.cpp timer.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/performance/memory/hipPerfMemMallocCpyFree.cpp b/hipamd/tests/performance/memory/hipPerfMemMallocCpyFree.cpp index d58fdb381e..5723819f75 100644 --- a/hipamd/tests/performance/memory/hipPerfMemMallocCpyFree.cpp +++ b/hipamd/tests/performance/memory/hipPerfMemMallocCpyFree.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. #include /* HIT_START - * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../src/test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/Functional/host/hipFloat16.cpp b/hipamd/tests/src/Functional/host/hipFloat16.cpp index 62cf166955..1fa3ba132a 100644 --- a/hipamd/tests/src/Functional/host/hipFloat16.cpp +++ b/hipamd/tests/src/Functional/host/hipFloat16.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t 1.2 2.3 * HIT_END */ diff --git a/hipamd/tests/src/Negative/memory/hipMemory.cpp b/hipamd/tests/src/Negative/memory/hipMemory.cpp index 030df7e69c..1a871024c5 100644 --- a/hipamd/tests/src/Negative/memory/hipMemory.cpp +++ b/hipamd/tests/src/Negative/memory/hipMemory.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/Negative/stream/hipStreamCreateWithFlags.cpp b/hipamd/tests/src/Negative/stream/hipStreamCreateWithFlags.cpp index 9ef13eec5a..1efceb909c 100644 --- a/hipamd/tests/src/Negative/stream/hipStreamCreateWithFlags.cpp +++ b/hipamd/tests/src/Negative/stream/hipStreamCreateWithFlags.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/cppstd/hipInvocable11.cpp b/hipamd/tests/src/cppstd/hipInvocable11.cpp index 6fa7e53622..0e4dc9f141 100644 --- a/hipamd/tests/src/cppstd/hipInvocable11.cpp +++ b/hipamd/tests/src/cppstd/hipInvocable11.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/cppstd/hipInvocable11Fallback.cpp b/hipamd/tests/src/cppstd/hipInvocable11Fallback.cpp index 071dce8997..7420ffc0c7 100644 --- a/hipamd/tests/src/cppstd/hipInvocable11Fallback.cpp +++ b/hipamd/tests/src/cppstd/hipInvocable11Fallback.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/cppstd/hipInvocable14.cpp b/hipamd/tests/src/cppstd/hipInvocable14.cpp index 41b58bd7dd..a0c6d837a8 100644 --- a/hipamd/tests/src/cppstd/hipInvocable14.cpp +++ b/hipamd/tests/src/cppstd/hipInvocable14.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++14 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++14 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/cppstd/hipInvocable17.cpp b/hipamd/tests/src/cppstd/hipInvocable17.cpp index aa37aac5fb..7f4a6055cf 100644 --- a/hipamd/tests/src/cppstd/hipInvocable17.cpp +++ b/hipamd/tests/src/cppstd/hipInvocable17.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++17 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp HIPCC_OPTIONS -std=c++17 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hipHalf2Comparision.cpp b/hipamd/tests/src/deviceLib/hipHalf2Comparision.cpp index c9b100ccae..e91c8c143d 100644 --- a/hipamd/tests/src/deviceLib/hipHalf2Comparision.cpp +++ b/hipamd/tests/src/deviceLib/hipHalf2Comparision.cpp @@ -19,7 +19,7 @@ THE SOFTWARE. /* HIT_START - * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hipLaunchKernelFunc.cpp b/hipamd/tests/src/deviceLib/hipLaunchKernelFunc.cpp index 75dbc81da7..781fd7eb09 100644 --- a/hipamd/tests/src/deviceLib/hipLaunchKernelFunc.cpp +++ b/hipamd/tests/src/deviceLib/hipLaunchKernelFunc.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp HCC_OPTIONS -Xclang -fallow-half-arguments-and-returns CLANG_OPTIONS -Xclang -fallow-half-arguments-and-returns EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp HCC_OPTIONS -Xclang -fallow-half-arguments-and-returns CLANG_OPTIONS -Xclang -fallow-half-arguments-and-returns EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hipMathFunctions.cpp b/hipamd/tests/src/deviceLib/hipMathFunctions.cpp index 9f8d5b0618..e24a23e1b9 100644 --- a/hipamd/tests/src/deviceLib/hipMathFunctions.cpp +++ b/hipamd/tests/src/deviceLib/hipMathFunctions.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp HCC_OPTIONS -Xclang -fallow-half-arguments-and-returns CLANG_OPTIONS -Xclang -fallow-half-arguments-and-returns EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp HCC_OPTIONS -Xclang -fallow-half-arguments-and-returns CLANG_OPTIONS -Xclang -fallow-half-arguments-and-returns EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hipStdComplex.cpp b/hipamd/tests/src/deviceLib/hipStdComplex.cpp index 0a57889be6..9b025a0734 100644 --- a/hipamd/tests/src/deviceLib/hipStdComplex.cpp +++ b/hipamd/tests/src/deviceLib/hipStdComplex.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START * BUILD: %t %s NVCC_OPTIONS -std=c++11 - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia * HIT_END */ #include "test_common.h" diff --git a/hipamd/tests/src/deviceLib/hipTestAtomicAdd.cpp b/hipamd/tests/src/deviceLib/hipTestAtomicAdd.cpp index 28007d3b42..15285fd3c6 100644 --- a/hipamd/tests/src/deviceLib/hipTestAtomicAdd.cpp +++ b/hipamd/tests/src/deviceLib/hipTestAtomicAdd.cpp @@ -37,7 +37,7 @@ Testcase Scenarios : /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST_NAMED: %t hipTestAtomicnoret-manywaves --atomicnoret --tests 1 * TEST_NAMED: %t hipTestAtomicnoret-simple --atomicnoret --tests 2 * TEST_NAMED: %t hipTestAtomic-manywaves --tests 1 diff --git a/hipamd/tests/src/deviceLib/hipTestDotFunctions.cpp b/hipamd/tests/src/deviceLib/hipTestDotFunctions.cpp index 247ee02026..d38a1b84a2 100644 --- a/hipamd/tests/src/deviceLib/hipTestDotFunctions.cpp +++ b/hipamd/tests/src/deviceLib/hipTestDotFunctions.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. /* HIT_START * BUILD: %t %s ../test_common.cpp NVCC_OPTIONS -std=c++11 - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hipTestFMA.cpp b/hipamd/tests/src/deviceLib/hipTestFMA.cpp index 0c22f33d9f..e19f3120d7 100644 --- a/hipamd/tests/src/deviceLib/hipTestFMA.cpp +++ b/hipamd/tests/src/deviceLib/hipTestFMA.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hipTestHalf.cpp b/hipamd/tests/src/deviceLib/hipTestHalf.cpp index e3b93f5c84..f64d16d77b 100644 --- a/hipamd/tests/src/deviceLib/hipTestHalf.cpp +++ b/hipamd/tests/src/deviceLib/hipTestHalf.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hipTestNativeHalf.cpp b/hipamd/tests/src/deviceLib/hipTestNativeHalf.cpp index 9a5345ad7b..ce54d40b11 100644 --- a/hipamd/tests/src/deviceLib/hipTestNativeHalf.cpp +++ b/hipamd/tests/src/deviceLib/hipTestNativeHalf.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hipVectorTypes.cpp b/hipamd/tests/src/deviceLib/hipVectorTypes.cpp index 31bd7ee08c..8b6af720c6 100644 --- a/hipamd/tests/src/deviceLib/hipVectorTypes.cpp +++ b/hipamd/tests/src/deviceLib/hipVectorTypes.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hipVectorTypesDevice.cpp b/hipamd/tests/src/deviceLib/hipVectorTypesDevice.cpp index ec3baa73ad..809fe70ee1 100644 --- a/hipamd/tests/src/deviceLib/hipVectorTypesDevice.cpp +++ b/hipamd/tests/src/deviceLib/hipVectorTypesDevice.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hip_bitextract.cpp b/hipamd/tests/src/deviceLib/hip_bitextract.cpp index 5c686f5705..17b9a9aafd 100644 --- a/hipamd/tests/src/deviceLib/hip_bitextract.cpp +++ b/hipamd/tests/src/deviceLib/hip_bitextract.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hip_bitinsert.cpp b/hipamd/tests/src/deviceLib/hip_bitinsert.cpp index d2c1006b5f..eddb8c1b40 100644 --- a/hipamd/tests/src/deviceLib/hip_bitinsert.cpp +++ b/hipamd/tests/src/deviceLib/hip_bitinsert.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hip_floatnTM.cpp b/hipamd/tests/src/deviceLib/hip_floatnTM.cpp index 921933636f..c5b1486617 100644 --- a/hipamd/tests/src/deviceLib/hip_floatnTM.cpp +++ b/hipamd/tests/src/deviceLib/hip_floatnTM.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc HIPCC_OPTIONS -std=c++14 + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia HIPCC_OPTIONS -std=c++14 * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/deviceLib/hip_mbcnt.cpp b/hipamd/tests/src/deviceLib/hip_mbcnt.cpp index 2cb958f280..4afe4ab1f5 100644 --- a/hipamd/tests/src/deviceLib/hip_mbcnt.cpp +++ b/hipamd/tests/src/deviceLib/hip_mbcnt.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/dynamicLoading/complex_loading_behavior.cpp b/hipamd/tests/src/dynamicLoading/complex_loading_behavior.cpp index 6b7a09dbc1..000139dc60 100644 --- a/hipamd/tests/src/dynamicLoading/complex_loading_behavior.cpp +++ b/hipamd/tests/src/dynamicLoading/complex_loading_behavior.cpp @@ -23,8 +23,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD_CMD: libLazyLoad_amd %hc %S/%s -o liblazyLoad.so -I%S/.. -fPIC -lpthread -shared -DTEST_SHARED_LIBRARY EXCLUDE_HIP_PLATFORM nvcc - * BUILD_CMD: libLazyLoad_nvidia %hc %S/%s --std=c++11 -o liblazyLoad.so -I%S/.. -Xcompiler -fPIC -lpthread -shared -DTEST_SHARED_LIBRARY EXCLUDE_HIP_PLATFORM hcc rocclr + * BUILD_CMD: libLazyLoad_amd %hc %S/%s -o liblazyLoad.so -I%S/.. -fPIC -lpthread -shared -DTEST_SHARED_LIBRARY EXCLUDE_HIP_PLATFORM nvidia + * BUILD_CMD: libLazyLoad_nvidia %hc %S/%s --std=c++11 -o liblazyLoad.so -I%S/.. -Xcompiler -fPIC -lpthread -shared -DTEST_SHARED_LIBRARY EXCLUDE_HIP_PLATFORM amd * BUILD_CMD: %t %hc %S/%s --std=c++11 -o %T/%t -I%S/.. -ldl * TEST: %t * HIT_END diff --git a/hipamd/tests/src/dynamicLoading/hipApiDynamicLoad.cpp b/hipamd/tests/src/dynamicLoading/hipApiDynamicLoad.cpp index f46e94f7f9..c7b7cc2b93 100644 --- a/hipamd/tests/src/dynamicLoading/hipApiDynamicLoad.cpp +++ b/hipamd/tests/src/dynamicLoading/hipApiDynamicLoad.cpp @@ -25,8 +25,8 @@ THE SOFTWARE. * */ /* HIT_START - * BUILD_CMD: bit_extract_kernel.code %hc --genco %S/bit_extract_kernel.cpp -o bit_extract_kernel.code EXCLUDE_HIP_PLATFORM nvcc - * BUILD_CMD: %t %hc %S/%s -I%S/.. -o %T/%t -ldl EXCLUDE_HIP_PLATFORM nvcc + * BUILD_CMD: bit_extract_kernel.code %hc --genco %S/bit_extract_kernel.cpp -o bit_extract_kernel.code EXCLUDE_HIP_PLATFORM nvidia + * BUILD_CMD: %t %hc %S/%s -I%S/.. -o %T/%t -ldl EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/g++/hipMalloc.cpp b/hipamd/tests/src/g++/hipMalloc.cpp index d527db3570..9d08cf45b5 100644 --- a/hipamd/tests/src/g++/hipMalloc.cpp +++ b/hipamd/tests/src/g++/hipMalloc.cpp @@ -18,8 +18,8 @@ * */ /* HIT_START - * BUILD_CMD: hipMalloc %cxx -D__HIP_PLATFORM_HCC__ -I%hip-path/include -I/opt/rocm/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/%t -std=c++11 EXCLUDE_HIP_PLATFORM nvcc - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc + * BUILD_CMD: hipMalloc %cxx -D__HIP_PLATFORM_HCC__ -I%hip-path/include -I/opt/rocm/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/%t -std=c++11 EXCLUDE_HIP_PLATFORM nvidia + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia * HIT_END */ diff --git a/hipamd/tests/src/gcc/LaunchKernel.c b/hipamd/tests/src/gcc/LaunchKernel.c index 08aca3e2fe..bac8a8f3d1 100644 --- a/hipamd/tests/src/gcc/LaunchKernel.c +++ b/hipamd/tests/src/gcc/LaunchKernel.c @@ -19,10 +19,10 @@ /* HIT_START - * BUILD_CMD: gpu.o %hc -I%hip-path/include -g -c %S/gpu.cpp -o %T/gpu.o EXCLUDE_HIP_PLATFORM nvcc rocclr - * BUILD_CMD: launchkernel.o %hc -D__HIP_PLATFORM_HCC__ -g -I%hip-path/include -c %S/LaunchKernel.c -o %T/launchkernel.o EXCLUDE_HIP_PLATFORM nvcc rocclr - * BUILD_CMD: LaunchKernel %hc %T/launchkernel.o %T/gpu.o -g -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/%t DEPENDS gpu.o launchkernel.o EXCLUDE_HIP_PLATFORM nvcc rocclr - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc rocclr + * BUILD_CMD: gpu.o %hc -I%hip-path/include -g -c %S/gpu.cpp -o %T/gpu.o EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr + * BUILD_CMD: launchkernel.o %hc -D__HIP_PLATFORM_HCC__ -g -I%hip-path/include -c %S/LaunchKernel.c -o %T/launchkernel.o EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr + * BUILD_CMD: LaunchKernel %hc %T/launchkernel.o %T/gpu.o -g -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/%t DEPENDS gpu.o launchkernel.o EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr * HIT_END */ diff --git a/hipamd/tests/src/gcc/hipMalloc.c b/hipamd/tests/src/gcc/hipMalloc.c index 2e5deb2a16..cec4a4bbaf 100644 --- a/hipamd/tests/src/gcc/hipMalloc.c +++ b/hipamd/tests/src/gcc/hipMalloc.c @@ -18,10 +18,10 @@ * */ /* HIT_START - * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_NVCC__ -I%hip-path/include -I/usr/local/cuda/include %S/%s -o %T/hipMalloc_nv -L/usr/local/cuda/lib64 -lcudart EXCLUDE_HIP_PLATFORM hcc rocclr - * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_HCC__ -I%hip-path/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvcc rocclr - * TEST: hipMalloc_nv EXCLUDE_HIP_PLATFORM hcc rocclr - * TEST: hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvcc rocclr + * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_NVCC__ -I%hip-path/include -I/usr/local/cuda/include %S/%s -o %T/hipMalloc_nv -L/usr/local/cuda/lib64 -lcudart EXCLUDE_HIP_PLATFORM amd + * BUILD_CMD: hipMalloc %cc -D__HIP_PLATFORM_HCC__ -I%hip-path/include %S/%s -Wl,--rpath=%hip-path/lib %hip-path/lib/libamdhip64.so -o %T/hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr + * TEST: hipMalloc_nv EXCLUDE_HIP_PLATFORM amd + * TEST: hipMalloc_hcc EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr * HIT_END */ diff --git a/hipamd/tests/src/hipHcc.cpp b/hipamd/tests/src/hipHcc.cpp new file mode 100644 index 0000000000..82f01cf1db --- /dev/null +++ b/hipamd/tests/src/hipHcc.cpp @@ -0,0 +1,62 @@ +/* +Copyright (c) 2015-2016 Advanced Micro Devices, Inc. All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ +// Test the HCC-specific API extensions for HIP: + +/* HIT_START + * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia + * TEST: %t EXCLUDE_HIP_PLATFORM all + * HIT_END + */ + +#include +#include +#include "hip/hip_runtime.h" +#include "hip/hip_ext.h" +#include "test_common.h" + +#define CHECK(error) \ + if (error != hipSuccess) { \ + fprintf(stderr, "error: '%s'(%d) at %s:%d\n", hipGetErrorString(error), error, __FILE__, \ + __LINE__); \ + exit(EXIT_FAILURE); \ + } + + +int main(int argc, char* argv[]) { + int deviceId; + CHECK(hipGetDevice(&deviceId)); + hipDeviceProp_t props; + CHECK(hipGetDeviceProperties(&props, deviceId)); + printf("info: running on device #%d %s\n", deviceId, props.name); + +#ifdef __HCC__ + hc::accelerator acc; + CHECK(hipHccGetAccelerator(deviceId, &acc)); + std::wcout << "device_path=" << acc.get_device_path() << "\n"; + + hc::accelerator_view* av; + CHECK(hipHccGetAcceleratorView(0 /*nullStream*/, &av)); +#endif + + + passed(); +}; diff --git a/hipamd/tests/src/hiprtc/hiprtcGetLoweredName.cpp b/hipamd/tests/src/hiprtc/hiprtcGetLoweredName.cpp index 639b790fd7..3aee80aa4c 100644 --- a/hipamd/tests/src/hiprtc/hiprtcGetLoweredName.cpp +++ b/hipamd/tests/src/hiprtc/hiprtcGetLoweredName.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp LINK_OPTIONS hiprtc EXCLUDE_HIP_PLATFORM nvcc rocclr + * BUILD: %t %s ../test_common.cpp LINK_OPTIONS hiprtc EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/hiprtc/saxpy.cpp b/hipamd/tests/src/hiprtc/saxpy.cpp index 5090d645ca..f9976cfcd8 100755 --- a/hipamd/tests/src/hiprtc/saxpy.cpp +++ b/hipamd/tests/src/hiprtc/saxpy.cpp @@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp LINK_OPTIONS hiprtc EXCLUDE_HIP_PLATFORM nvcc rocclr + * BUILD: %t %s ../test_common.cpp LINK_OPTIONS hiprtc EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/hostcall/hipHostcallFuncCall.cpp b/hipamd/tests/src/hostcall/hipHostcallFuncCall.cpp index 15ac3e1f4e..0b596a2286 100644 --- a/hipamd/tests/src/hostcall/hipHostcallFuncCall.cpp +++ b/hipamd/tests/src/hostcall/hipHostcallFuncCall.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc + * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc * HIT_END */ diff --git a/hipamd/tests/src/hostcall/hipHostcallPrintThings.cpp b/hipamd/tests/src/hostcall/hipHostcallPrintThings.cpp index 3d1a0c4e07..7e03e92bfa 100644 --- a/hipamd/tests/src/hostcall/hipHostcallPrintThings.cpp +++ b/hipamd/tests/src/hostcall/hipHostcallPrintThings.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc + * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc * HIT_END */ diff --git a/hipamd/tests/src/ipc/hipSimpleIpc.cpp b/hipamd/tests/src/ipc/hipSimpleIpc.cpp index 4caea82aab..7a4f2c0140 100755 --- a/hipamd/tests/src/ipc/hipSimpleIpc.cpp +++ b/hipamd/tests/src/ipc/hipSimpleIpc.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/kernel/hipDynamicShared.cpp b/hipamd/tests/src/kernel/hipDynamicShared.cpp index a66df017a7..e26ca34684 100644 --- a/hipamd/tests/src/kernel/hipDynamicShared.cpp +++ b/hipamd/tests/src/kernel/hipDynamicShared.cpp @@ -21,8 +21,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_RUNTIME hcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia * HIT_END */ diff --git a/hipamd/tests/src/kernel/hipDynamicShared2.cpp b/hipamd/tests/src/kernel/hipDynamicShared2.cpp index 11f0640537..d261ed5aba 100644 --- a/hipamd/tests/src/kernel/hipDynamicShared2.cpp +++ b/hipamd/tests/src/kernel/hipDynamicShared2.cpp @@ -21,8 +21,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM hcc - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_RUNTIME hcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia * HIT_END */ diff --git a/hipamd/tests/src/kernel/hipExtLaunchKernelGGL.cpp b/hipamd/tests/src/kernel/hipExtLaunchKernelGGL.cpp index 12b96578de..354e0339f7 100644 --- a/hipamd/tests/src/kernel/hipExtLaunchKernelGGL.cpp +++ b/hipamd/tests/src/kernel/hipExtLaunchKernelGGL.cpp @@ -19,7 +19,7 @@ THE SOFTWARE. // Test the Grid_Launch syntax. /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp b/hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp index 13779694e2..7ba4b4ab62 100755 --- a/hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp +++ b/hipamd/tests/src/p2p/hipPeerToPeer_simple.cpp @@ -24,9 +24,9 @@ THE SOFTWARE. /* HIT_START * BUILD: %t %s ../test_common.cpp - * TEST: %t EXCLUDE_HIP_PLATFORM hcc rocclr - * TEST: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM hcc rocclr - * TEST: %t --mirrorPeers EXCLUDE_HIP_PLATFORM hcc rocclr + * TEST: %t EXCLUDE_HIP_PLATFORM amd + * TEST: %t --memcpyWithPeer EXCLUDE_HIP_PLATFORM amd + * TEST: %t --mirrorPeers EXCLUDE_HIP_PLATFORM amd * HIT_END */ diff --git a/hipamd/tests/src/printf/hipPrintfAltForms.cpp b/hipamd/tests/src/printf/hipPrintfAltForms.cpp index 062b688ed8..963ee38cf5 100644 --- a/hipamd/tests/src/printf/hipPrintfAltForms.cpp +++ b/hipamd/tests/src/printf/hipPrintfAltForms.cpp @@ -21,8 +21,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc + * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc * HIT_END */ diff --git a/hipamd/tests/src/printf/hipPrintfBasic.cpp b/hipamd/tests/src/printf/hipPrintfBasic.cpp index db2ee269db..5aa25bd9eb 100644 --- a/hipamd/tests/src/printf/hipPrintfBasic.cpp +++ b/hipamd/tests/src/printf/hipPrintfBasic.cpp @@ -21,8 +21,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc + * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc * HIT_END */ diff --git a/hipamd/tests/src/printf/hipPrintfFlags.cpp b/hipamd/tests/src/printf/hipPrintfFlags.cpp index e9feb2e5e8..8f8948cfd3 100644 --- a/hipamd/tests/src/printf/hipPrintfFlags.cpp +++ b/hipamd/tests/src/printf/hipPrintfFlags.cpp @@ -21,8 +21,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc + * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc * HIT_END */ diff --git a/hipamd/tests/src/printf/hipPrintfManyDevices.cpp b/hipamd/tests/src/printf/hipPrintfManyDevices.cpp index 44c8ed5741..f4efea55f3 100644 --- a/hipamd/tests/src/printf/hipPrintfManyDevices.cpp +++ b/hipamd/tests/src/printf/hipPrintfManyDevices.cpp @@ -21,8 +21,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc + * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc * HIT_END */ diff --git a/hipamd/tests/src/printf/hipPrintfManyWaves.cpp b/hipamd/tests/src/printf/hipPrintfManyWaves.cpp index dae6dde307..666b2c463d 100644 --- a/hipamd/tests/src/printf/hipPrintfManyWaves.cpp +++ b/hipamd/tests/src/printf/hipPrintfManyWaves.cpp @@ -21,8 +21,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc + * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc * HIT_END */ diff --git a/hipamd/tests/src/printf/hipPrintfSpecifiers.cpp b/hipamd/tests/src/printf/hipPrintfSpecifiers.cpp index 009c76a968..a7f3841282 100644 --- a/hipamd/tests/src/printf/hipPrintfSpecifiers.cpp +++ b/hipamd/tests/src/printf/hipPrintfSpecifiers.cpp @@ -21,8 +21,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc + * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc * HIT_END */ diff --git a/hipamd/tests/src/printf/hipPrintfStar.cpp b/hipamd/tests/src/printf/hipPrintfStar.cpp index e4d48e692f..21ca252c68 100644 --- a/hipamd/tests/src/printf/hipPrintfStar.cpp +++ b/hipamd/tests/src/printf/hipPrintfStar.cpp @@ -21,8 +21,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc + * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc * HIT_END */ diff --git a/hipamd/tests/src/printf/hipPrintfWidthPrecision.cpp b/hipamd/tests/src/printf/hipPrintfWidthPrecision.cpp index 5bf6b65724..62abbb6573 100644 --- a/hipamd/tests/src/printf/hipPrintfWidthPrecision.cpp +++ b/hipamd/tests/src/printf/hipPrintfWidthPrecision.cpp @@ -21,8 +21,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc - * TEST: %t EXCLUDE_HIP_PLATFORM nvcc EXCLUDE_HIP_RUNTIME HCC EXCLUDE_HIP_COMPILER hcc + * BUILD: %t %s EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc + * TEST: %t EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME hcc EXCLUDE_HIP_COMPILER hcc * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/device/hipDeviceGetPCIBusId.cpp b/hipamd/tests/src/runtimeApi/device/hipDeviceGetPCIBusId.cpp index f7a9dac703..39bf13c9cf 100644 --- a/hipamd/tests/src/runtimeApi/device/hipDeviceGetPCIBusId.cpp +++ b/hipamd/tests/src/runtimeApi/device/hipDeviceGetPCIBusId.cpp @@ -24,9 +24,9 @@ */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST_NAMED: %t hipDeviceGetPCIBusId-vs-hipDeviceGetAttribute --tests 0x1 - * TEST_NAMED: %t hipDeviceGetPCIBusId-vs-lspci --tests 0x2 EXCLUDE_HIP_PLATFORM nvcc + * TEST_NAMED: %t hipDeviceGetPCIBusId-vs-lspci --tests 0x2 EXCLUDE_HIP_PLATFORM nvidia * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/device/hipSetGetDevice.cpp b/hipamd/tests/src/runtimeApi/device/hipSetGetDevice.cpp index 6c703de867..b74a1bfbe7 100644 --- a/hipamd/tests/src/runtimeApi/device/hipSetGetDevice.cpp +++ b/hipamd/tests/src/runtimeApi/device/hipSetGetDevice.cpp @@ -25,7 +25,7 @@ */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST_NAMED: %t hipSetGetDevice-invalidDevice * TEST_NAMED: %t hipSetGetDevice-allValidDevice * TEST_NAMED: %t hipSetGetDevice-validDev1 --computeDevCnt 1 diff --git a/hipamd/tests/src/runtimeApi/event/hipEventElapsedTime.cpp b/hipamd/tests/src/runtimeApi/event/hipEventElapsedTime.cpp index afb1802194..080fb11649 100644 --- a/hipamd/tests/src/runtimeApi/event/hipEventElapsedTime.cpp +++ b/hipamd/tests/src/runtimeApi/event/hipEventElapsedTime.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/event/hipEventIpc.cpp b/hipamd/tests/src/runtimeApi/event/hipEventIpc.cpp index bec87ee725..5a0992dc20 100644 --- a/hipamd/tests/src/runtimeApi/event/hipEventIpc.cpp +++ b/hipamd/tests/src/runtimeApi/event/hipEventIpc.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. // forces synchronization : set /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr * TEST: %t --iterations 10 * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMallocManaged_MultiScenario.cpp b/hipamd/tests/src/runtimeApi/memory/hipMallocManaged_MultiScenario.cpp index 25820e2305..9fbe14a4a7 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMallocManaged_MultiScenario.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMallocManaged_MultiScenario.cpp @@ -24,8 +24,8 @@ THE SOFTWARE. * TEST_NAMED: %t hipMallocManaged2 --tests 2 * TEST_NAMED: %t hipMallocManagedNegativeTests --tests 3 * TEST_NAMED: %t hipMallocManagedMultiChunkSingleDevice --tests 4 - * TEST_NAMED: %t hipMallocManagedMultiChunkMultiDevice --tests 5 EXCLUDE_HIP_PLATFORM nvcc - * TEST_NAMED: %t hipMallocManagedOversubscription --tests 6 EXCLUDE_HIP_PLATFORM rocclr nvcc + * TEST_NAMED: %t hipMallocManagedMultiChunkMultiDevice --tests 5 EXCLUDE_HIP_PLATFORM nvidia + * TEST_NAMED: %t hipMallocManagedOversubscription --tests 6 EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemPtrGetInfo.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemPtrGetInfo.cpp index 2041ea41d1..f5ab448a24 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMemPtrGetInfo.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemPtrGetInfo.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp index 0b3724b0cc..9e1a1a8d24 100755 --- a/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemcpyDtoDAsync.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemcpyNegetiveTests.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemcpyNegetiveTests.cpp index ceaa8ed0d9..77b72f740f 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMemcpyNegetiveTests.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemcpyNegetiveTests.cpp @@ -18,7 +18,7 @@ * */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeerAsync.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeerAsync.cpp index 3aa6451975..59a129b260 100755 --- a/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeerAsync.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemcpyPeerAsync.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemcpyWithStream.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemcpyWithStream.cpp index 30d4191b41..1dcf9a3d16 100755 --- a/hipamd/tests/src/runtimeApi/memory/hipMemcpyWithStream.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemcpyWithStream.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemcpyWithStreamMultiThread.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemcpyWithStreamMultiThread.cpp index 87e52b93ff..0e95ca9c04 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMemcpyWithStreamMultiThread.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemcpyWithStreamMultiThread.cpp @@ -24,7 +24,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemset.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemset.cpp index 9f5b9092f9..dec5037c36 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMemset.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemset.cpp @@ -186,12 +186,12 @@ bool testhipMemset2AsyncOps() { int main(int argc, char *argv[]) { HipTest::parseStandardArguments(argc, argv, true); bool testResult = true; - char * cA_d; - char * cA_h; - int16_t * siA_d; - int16_t * siA_h; - int32_t * iA_d; - int32_t * iA_h; + char * cA_d = NULL; + char * cA_h = NULL; + int16_t * siA_d = NULL; + int16_t * siA_h = NULL; + int32_t * iA_d = NULL; + int32_t * iA_h = NULL; HIPCHECK(hipSetDevice(p_gpuDevice)); testResult &= testhipMemsetSmallSize(memsetval, p_gpuDevice); diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemset2D.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemset2D.cpp index 6515fa36e1..2ce2a0b8b0 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMemset2D.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemset2D.cpp @@ -20,7 +20,7 @@ // Test for hipMemset2D functionality for different width and height values /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST_NAMED: %t hipMemset2D-basic * TEST_NAMED: %t hipMemset2D-dim1 --width2D 10 --height2D 10 --memsetWidth 4 --memsetHeight 4 * TEST_NAMED: %t hipMemset2D-dim2 --width2D 100 --height2D 100 --memsetWidth 20 --memsetHeight 40 diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemset2DAsyncMultiThreadAndKernel.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemset2DAsyncMultiThreadAndKernel.cpp index 6bad4c054c..7834545707 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMemset2DAsyncMultiThreadAndKernel.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemset2DAsyncMultiThreadAndKernel.cpp @@ -24,7 +24,7 @@ // /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemsetAsyncAndKernel.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemsetAsyncAndKernel.cpp index 564b804a9f..e4a872f585 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMemsetAsyncAndKernel.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemsetAsyncAndKernel.cpp @@ -23,7 +23,7 @@ */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemsetAsyncMultiThread.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemsetAsyncMultiThread.cpp index b4ae8658f7..7685d1c284 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMemsetAsyncMultiThread.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemsetAsyncMultiThread.cpp @@ -22,7 +22,7 @@ */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMemsetInvalidPtr.cpp b/hipamd/tests/src/runtimeApi/memory/hipMemsetInvalidPtr.cpp index 6945c73a43..394a451183 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMemsetInvalidPtr.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMemsetInvalidPtr.cpp @@ -20,7 +20,7 @@ // * To test invalid pointer to hipMemset* apis /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMultiMemcpyMultiThrdMultiStrm.cpp b/hipamd/tests/src/runtimeApi/memory/hipMultiMemcpyMultiThrdMultiStrm.cpp index 01d96e9cd8..616bb6a2b8 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMultiMemcpyMultiThrdMultiStrm.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMultiMemcpyMultiThrdMultiStrm.cpp @@ -21,7 +21,7 @@ // and also launch hipMemcpyAsync() api on the same stream. This test case is simulate the scenario // reported in SWDEV-181598. /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/memory/hipMultiMemcpyMultiThread.cpp b/hipamd/tests/src/runtimeApi/memory/hipMultiMemcpyMultiThread.cpp index 881afef9fb..a7f104afa6 100644 --- a/hipamd/tests/src/runtimeApi/memory/hipMultiMemcpyMultiThread.cpp +++ b/hipamd/tests/src/runtimeApi/memory/hipMultiMemcpyMultiThread.cpp @@ -21,7 +21,7 @@ // and also launch hipMemcpyAsync() api. This test case is simulate the scenario // reported in SWDEV-181598. /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/module/hipExtLaunchMultiKernelMultiDevice.cpp b/hipamd/tests/src/runtimeApi/module/hipExtLaunchMultiKernelMultiDevice.cpp index fe9b06713c..668088458d 100644 --- a/hipamd/tests/src/runtimeApi/module/hipExtLaunchMultiKernelMultiDevice.cpp +++ b/hipamd/tests/src/runtimeApi/module/hipExtLaunchMultiKernelMultiDevice.cpp @@ -23,7 +23,7 @@ THE SOFTWARE. // single GPU or multi GPUs. /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp b/hipamd/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp index 804922e28c..1ecc442537 100755 --- a/hipamd/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp +++ b/hipamd/tests/src/runtimeApi/module/hipExtModuleLaunchKernel.cpp @@ -18,8 +18,8 @@ THE SOFTWARE. */ /* HIT_START - * BUILD_CMD: matmul.code %hc --genco %S/matmul.cpp -o matmul.code EXCLUDE_HIP_PLATFORM nvcc - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr + * BUILD_CMD: matmul.code %hc --genco %S/matmul.cpp -o matmul.code EXCLUDE_HIP_PLATFORM nvidia + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/module/hipFuncSetAttribute.cpp b/hipamd/tests/src/runtimeApi/module/hipFuncSetAttribute.cpp index df86f34deb..f4a3788b24 100644 --- a/hipamd/tests/src/runtimeApi/module/hipFuncSetAttribute.cpp +++ b/hipamd/tests/src/runtimeApi/module/hipFuncSetAttribute.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreadOnMultGPU.cpp b/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreadOnMultGPU.cpp index e83083fd55..0288137479 100644 --- a/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreadOnMultGPU.cpp +++ b/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreadOnMultGPU.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreaded.cpp b/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreaded.cpp index dbf58209fa..c91acea68f 100644 --- a/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreaded.cpp +++ b/hipamd/tests/src/runtimeApi/module/hipModuleLoadDataMultThreaded.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM rocclr nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_RUNTIME rocclr EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/module/hipModuleNegative.cpp b/hipamd/tests/src/runtimeApi/module/hipModuleNegative.cpp index ede25307bc..ca19d1dd5f 100644 --- a/hipamd/tests/src/runtimeApi/module/hipModuleNegative.cpp +++ b/hipamd/tests/src/runtimeApi/module/hipModuleNegative.cpp @@ -22,32 +22,32 @@ THE SOFTWARE. /* HIT_START * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 - * TEST: %t --tests 0x10 EXCLUDE_HIP_PLATFORM hcc rocclr - * TEST: %t --tests 0x11 EXCLUDE_HIP_PLATFORM hcc rocclr - * TEST: %t --tests 0x12 EXCLUDE_HIP_PLATFORM hcc rocclr + * TEST: %t --tests 0x10 EXCLUDE_HIP_PLATFORM amd + * TEST: %t --tests 0x11 EXCLUDE_HIP_PLATFORM amd + * TEST: %t --tests 0x12 EXCLUDE_HIP_PLATFORM amd * TEST: %t --tests 0x13 * TEST: %t --tests 0x14 * TEST: %t --tests 0x15 - * TEST: %t --tests 0x20 EXCLUDE_HIP_PLATFORM hcc rocclr - * TEST: %t --tests 0x21 EXCLUDE_HIP_PLATFORM hcc rocclr + * TEST: %t --tests 0x20 EXCLUDE_HIP_PLATFORM amd + * TEST: %t --tests 0x21 EXCLUDE_HIP_PLATFORM amd * TEST: %t --tests 0x22 - * TEST: %t --tests 0x30 EXCLUDE_HIP_PLATFORM hcc rocclr - * TEST: %t --tests 0x31 EXCLUDE_HIP_PLATFORM hcc rocclr + * TEST: %t --tests 0x30 EXCLUDE_HIP_PLATFORM amd + * TEST: %t --tests 0x31 EXCLUDE_HIP_PLATFORM amd * TEST: %t --tests 0x32 - * TEST: %t --tests 0x40 EXCLUDE_HIP_PLATFORM hcc rocclr + * TEST: %t --tests 0x40 EXCLUDE_HIP_PLATFORM amd * TEST: %t --tests 0x41 * TEST: %t --tests 0x42 - * TEST: %t --tests 0x43 EXCLUDE_HIP_PLATFORM hcc rocclr - * TEST: %t --tests 0x44 EXCLUDE_HIP_PLATFORM nvcc + * TEST: %t --tests 0x43 EXCLUDE_HIP_PLATFORM amd + * TEST: %t --tests 0x44 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t --tests 0x45 - * TEST: %t --tests 0x50 EXCLUDE_HIP_PLATFORM hcc rocclr nvcc - * TEST: %t --tests 0x51 EXCLUDE_HIP_PLATFORM hcc rocclr nvcc - * TEST: %t --tests 0x52 EXCLUDE_HIP_PLATFORM hcc rocclr + * TEST: %t --tests 0x50 EXCLUDE_HIP_PLATFORM amd nvidia + * TEST: %t --tests 0x51 EXCLUDE_HIP_PLATFORM amd nvidia + * TEST: %t --tests 0x52 EXCLUDE_HIP_PLATFORM amd * TEST: %t --tests 0x53 * TEST: %t --tests 0x54 - * TEST: %t --tests 0x55 EXCLUDE_HIP_PLATFORM nvcc + * TEST: %t --tests 0x55 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t --tests 0x56 - * TEST: %t --tests 0x60 EXCLUDE_HIP_PLATFORM nvcc + * TEST: %t --tests 0x60 EXCLUDE_HIP_PLATFORM nvidia * HIT_END */ #include diff --git a/hipamd/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp b/hipamd/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp index ed43366671..660c289bac 100755 --- a/hipamd/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp +++ b/hipamd/tests/src/runtimeApi/module/hipModuleTexture2dDrv.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. /* HIT_START * BUILD_CMD: tex2d_kernel.code %hc --genco %S/tex2d_kernel.cpp -o tex2d_kernel.code - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/module/tex2d_kernel.cpp b/hipamd/tests/src/runtimeApi/module/tex2d_kernel.cpp index 579714566d..32f6aca4d0 100755 --- a/hipamd/tests/src/runtimeApi/module/tex2d_kernel.cpp +++ b/hipamd/tests/src/runtimeApi/module/tex2d_kernel.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD_CMD: tex2d_kernel.code %hc --genco %S/tex2d_kernel.cpp -o tex2d_kernel.code EXCLUDE_HIP_PLATFORM rocclr nvcc + * BUILD_CMD: tex2d_kernel.code %hc --genco %S/tex2d_kernel.cpp -o tex2d_kernel.code EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/stream/hipMultiStreams.cpp b/hipamd/tests/src/runtimeApi/stream/hipMultiStreams.cpp index a6cc18f6e9..6fe41299da 100644 --- a/hipamd/tests/src/runtimeApi/stream/hipMultiStreams.cpp +++ b/hipamd/tests/src/runtimeApi/stream/hipMultiStreams.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_AltEnqueue.cpp b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_AltEnqueue.cpp index 3ee2f4a050..1b33447cde 100644 --- a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_AltEnqueue.cpp +++ b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_AltEnqueue.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_MStrm_Mgpu.cpp b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_MStrm_Mgpu.cpp index 0d65a0f50b..b1c49f61b5 100644 --- a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_MStrm_Mgpu.cpp +++ b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_MStrm_Mgpu.cpp @@ -21,7 +21,7 @@ // kernel. Verify that all the kernels queued are executed before the callback. /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_MultiCalls.cpp b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_MultiCalls.cpp index a98fbb87c7..f2c2e5c3ce 100644 --- a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_MultiCalls.cpp +++ b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_MultiCalls.cpp @@ -21,7 +21,7 @@ // when hipStreamAddCallback() is called back to back multiple calls /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_StrmSyncTiming.cpp b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_StrmSyncTiming.cpp index fb93268176..ec7a796b49 100644 --- a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_StrmSyncTiming.cpp +++ b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_StrmSyncTiming.cpp @@ -22,7 +22,7 @@ // by hipStreamAddCallback() api. /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_ThrdBehaviour.cpp b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_ThrdBehaviour.cpp index 5e9b75adee..e2fb998051 100644 --- a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_ThrdBehaviour.cpp +++ b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_ThrdBehaviour.cpp @@ -22,7 +22,7 @@ // finish. Ideally Host thread should not wait for callback to finish. /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_order.cpp b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_order.cpp index f7d8a866f2..d088ad7db5 100644 --- a/hipamd/tests/src/runtimeApi/stream/hipStreamACb_order.cpp +++ b/hipamd/tests/src/runtimeApi/stream/hipStreamACb_order.cpp @@ -18,7 +18,7 @@ * */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS --std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/stream/hipStreamGetFlags.cpp b/hipamd/tests/src/runtimeApi/stream/hipStreamGetFlags.cpp index 8d1129e567..041c3335d1 100644 --- a/hipamd/tests/src/runtimeApi/stream/hipStreamGetFlags.cpp +++ b/hipamd/tests/src/runtimeApi/stream/hipStreamGetFlags.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/stream/hipStreamGetPriority.cpp b/hipamd/tests/src/runtimeApi/stream/hipStreamGetPriority.cpp index 49991eec20..b80d8b7e15 100644 --- a/hipamd/tests/src/runtimeApi/stream/hipStreamGetPriority.cpp +++ b/hipamd/tests/src/runtimeApi/stream/hipStreamGetPriority.cpp @@ -19,7 +19,7 @@ THE SOFTWARE. /* HIT_START - * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp NVCC_OPTIONS -std=c++11 EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/runtimeApi/stream/hipStreamWithCUMask.cpp b/hipamd/tests/src/runtimeApi/stream/hipStreamWithCUMask.cpp index 94ac8bb34c..25615e4b3f 100644 --- a/hipamd/tests/src/runtimeApi/stream/hipStreamWithCUMask.cpp +++ b/hipamd/tests/src/runtimeApi/stream/hipStreamWithCUMask.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc + * BUILD: %t %s ../../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/surface/hipSurfaceObj2D.cpp b/hipamd/tests/src/surface/hipSurfaceObj2D.cpp index cc154fb65f..9f4c24e492 100644 --- a/hipamd/tests/src/surface/hipSurfaceObj2D.cpp +++ b/hipamd/tests/src/surface/hipSurfaceObj2D.cpp @@ -1,5 +1,5 @@ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/texture/hipBindTex2DPitch.cpp b/hipamd/tests/src/texture/hipBindTex2DPitch.cpp index 2fd3f1228d..a039d849f7 100644 --- a/hipamd/tests/src/texture/hipBindTex2DPitch.cpp +++ b/hipamd/tests/src/texture/hipBindTex2DPitch.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /*HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/texture/hipBindTexRef1DFetch.cpp b/hipamd/tests/src/texture/hipBindTexRef1DFetch.cpp index eeaf42129f..87174ddb34 100644 --- a/hipamd/tests/src/texture/hipBindTexRef1DFetch.cpp +++ b/hipamd/tests/src/texture/hipBindTexRef1DFetch.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/texture/hipNormalizedFloatValueTex.cpp b/hipamd/tests/src/texture/hipNormalizedFloatValueTex.cpp index 59c2a83761..04a681fa40 100644 --- a/hipamd/tests/src/texture/hipNormalizedFloatValueTex.cpp +++ b/hipamd/tests/src/texture/hipNormalizedFloatValueTex.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc hcc rocclr + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_PLATFORM amd * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/texture/hipTex1DFetchCheckModes.cpp b/hipamd/tests/src/texture/hipTex1DFetchCheckModes.cpp index 5a8ff959fa..bdaaada5e3 100644 --- a/hipamd/tests/src/texture/hipTex1DFetchCheckModes.cpp +++ b/hipamd/tests/src/texture/hipTex1DFetchCheckModes.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/texture/hipTextureObj1DFetch.cpp b/hipamd/tests/src/texture/hipTextureObj1DFetch.cpp index 55520aecce..2c4f1f58b8 100644 --- a/hipamd/tests/src/texture/hipTextureObj1DFetch.cpp +++ b/hipamd/tests/src/texture/hipTextureObj1DFetch.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /*HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/texture/hipTextureRef2D.cpp b/hipamd/tests/src/texture/hipTextureRef2D.cpp index 4f00260998..533dddde00 100644 --- a/hipamd/tests/src/texture/hipTextureRef2D.cpp +++ b/hipamd/tests/src/texture/hipTextureRef2D.cpp @@ -1,5 +1,5 @@ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/texture/simpleTexture2DLayered.cpp b/hipamd/tests/src/texture/simpleTexture2DLayered.cpp index 1424976716..ad9229a1f9 100644 --- a/hipamd/tests/src/texture/simpleTexture2DLayered.cpp +++ b/hipamd/tests/src/texture/simpleTexture2DLayered.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */ diff --git a/hipamd/tests/src/texture/simpleTexture3D.cpp b/hipamd/tests/src/texture/simpleTexture3D.cpp index bd342df1c3..f5141eab7f 100644 --- a/hipamd/tests/src/texture/simpleTexture3D.cpp +++ b/hipamd/tests/src/texture/simpleTexture3D.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvidia EXCLUDE_HIP_RUNTIME rocclr * TEST: %t * HIT_END */