AI/rocm-systems
2
0
Förgrening 0
Kod Ärenden Pull-förfrågningar Actions Packages Projekt Släpp Wiki Aktiviteter

name change vdi to rocclr

Bläddra i källkod 
Change-Id: I856d6ac1a9a83d89715d6e33dec4aa17abc2f2f2
This commit is contained in:
Payam
2020-04-29 23:32:12 -04:00
committad av Aakash Sudhanwa
förälder bfbc8cd09b
incheckning d6100a9547
3 ändrade filer med 57 tillägg och 57 borttagningar
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/CMakeLists.txt
+20 -20
Visa fil
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.5)
#cmake -DOPENCL_DIR=/path to/opencl ..
set(ROCCLR_EXPORTS_FILE "${CMAKE_CURRENT_BINARY_DIR}/amdvdi_staticTargets.cmake")
set(ROCCLR_EXPORTS_FILE "${CMAKE_CURRENT_BINARY_DIR}/amdrocclr_staticTargets.cmake")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
@@ -141,13 +141,13 @@ set(oclruntime_src
#${CMAKE_CURRENT_SOURCE_DIR}/compiler/tools/caching/cache.cpp
)
add_library(amdvdi_static STATIC
add_library(amdrocclr_static STATIC
${oclruntime_src} ${COMGR_CPP}
$<TARGET_OBJECTS:oclelf_obj>)
set_target_properties(amdvdi_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(amdrocclr_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_include_directories(amdvdi_static
target_include_directories(amdrocclr_static
PUBLIC
$<TARGET_PROPERTY:amd_comgr,INTERFACE_INCLUDE_DIRECTORIES>
PRIVATE
@@ -155,54 +155,54 @@ target_include_directories(amdvdi_static
${ROCR_INCLUDES}
${ROCT_INCLUDES})
target_compile_definitions(amdvdi_static PRIVATE BSD_LIBELF)
target_compile_definitions(amdrocclr_static PRIVATE BSD_LIBELF)
if(${USE_COMGR_LIBRARY} MATCHES "yes")
# FIXME: This should not be part of the public interface. Downstream
# users need to add these definitions. This should be defined in a
# config header here so other builds don't need to be aware of this.
target_compile_definitions(amdvdi_static PUBLIC USE_COMGR_LIBRARY COMGR_DYN_DLL)
target_compile_definitions(amdrocclr_static PUBLIC USE_COMGR_LIBRARY COMGR_DYN_DLL)
endif()
target_link_libraries(amdvdi_static PUBLIC Threads::Threads)
target_link_libraries(amdvdi_static PUBLIC dl ${ROCT_LIBRARIES} ${ROCR_LIBRARIES} )
target_link_libraries(amdrocclr_static PUBLIC Threads::Threads)
target_link_libraries(amdrocclr_static PUBLIC dl ${ROCT_LIBRARIES} ${ROCR_LIBRARIES} )
if (BUILD_PAL)
target_sources(amdvdi_static PRIVATE $<TARGET_OBJECTS:vdipal>)
target_link_libraries(amdvdi_static PRIVATE amdhsaloader)
target_link_libraries(amdvdi_static PRIVATE pal)
target_sources(amdrocclr_static PRIVATE $<TARGET_OBJECTS:rocclrpal>)
target_link_libraries(amdrocclr_static PRIVATE amdhsaloader)
target_link_libraries(amdrocclr_static PRIVATE pal)
target_compile_definitions(amdvdi_static PRIVATE WITH_PAL_DEVICE)
target_compile_definitions(amdrocclr_static PRIVATE WITH_PAL_DEVICE)
export(TARGETS amdvdi_static vdipal amdhsaloader amdhsacode pal addrlib vam metrohash cwpack gpuopen ddCore mpack rapidjson
export(TARGETS amdrocclr_static rocclrpal amdhsaloader amdhsacode pal addrlib vam metrohash cwpack gpuopen ddCore mpack rapidjson
FILE ${ROCCLR_EXPORTS_FILE}
)
else()
target_compile_definitions(amdvdi_static PRIVATE WITH_HSA_DEVICE)
target_compile_definitions(amdrocclr_static PRIVATE WITH_HSA_DEVICE)
target_sources(amdvdi_static PRIVATE $<TARGET_OBJECTS:oclrocm>)
export(TARGETS amdvdi_static
target_sources(amdrocclr_static PRIVATE $<TARGET_OBJECTS:oclrocm>)
export(TARGETS amdrocclr_static
FILE ${ROCCLR_EXPORTS_FILE}
)
endif()
if (UNIX)
set(VDI_DEFAULT_INSTALL_PREFIX "/opt/rocm/vdi")
set(ROCclr_DEFAULT_INSTALL_PREFIX "/opt/rocm/rocclr")
endif()
#comment out as it's not available in cmake 3.5
#if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
if(NOT CMAKE_INSTALL_PREFIX)
if(CMAKE_BUILD_TYPE MATCHES Debug)
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Installation path for vdi" FORCE)
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_SOURCE_DIR} CACHE PATH "Installation path for rocclr" FORCE)
#elseif(CMAKE_BUILD_TYPE MATCHES Release)
else()
set(CMAKE_INSTALL_PREFIX ${VDI_DEFAULT_INSTALL_PREFIX} CACHE PATH "Installation path for vdi" FORCE)
set(CMAKE_INSTALL_PREFIX ${ROCclr_DEFAULT_INSTALL_PREFIX} CACHE PATH "Installation path for rocclr" FORCE)
# message(FATAL_ERROR "Invalid CMAKE_BUILD_TYPE specified. Valid values are Debug and Release")
endif()
#endif()
endif()
install( TARGETS amdvdi_static ARCHIVE DESTINATION lib LIBRARY DESTINATION lib COMPONENT applications)
install( TARGETS amdrocclr_static ARCHIVE DESTINATION lib LIBRARY DESTINATION lib COMPONENT applications)
file(GLOB headerfiles "${CMAKE_CURRENT_SOURCE_DIR}/*.h*")
install (
FILES ${headerfiles}
rocclr/device/devprogram.cpp
+1 -1
Visa fil
@@ -1765,7 +1765,7 @@ std::vector<std::string> Program::ProcessOptions(amd::option::Options* options)
} else {
if (isHIP()) {
optionsVec.push_back("-D__HIP_VDI__=1");
optionsVec.push_back("-D__HIP_ROCclr__=1");
scratchStr.clear();
std::string target(machineTarget_);
std::transform(target.begin(), target.end(), target.begin(), ::toupper);
rocclr/device/pal/CMakeLists.txt
+36 -36
Visa fil
@@ -5,8 +5,8 @@ string(REGEX REPLACE "PAL_MAJOR_VERSION = " "" PAL_MAJOR_VERSION ${PAL_MAJOR_VER
file(STRINGS palcdefs GPUOPEN_MAJOR_VERSION REGEX "^GPUOPEN_MAJOR_VERSION = [0-9]+")
string(REGEX REPLACE "GPUOPEN_MAJOR_VERSION = " "" GPUOPEN_MAJOR_VERSION ${GPUOPEN_MAJOR_VERSION})
### Create PAL backend library for VDI
add_library(vdipal OBJECT "")
### Create PAL backend library for ROCclr
add_library(rocclrpal OBJECT "")
# Add defines necessary for PAL build
set(PAL_CLIENT_INTERFACE_MAJOR_VERSION ${PAL_MAJOR_VERSION}
@@ -45,57 +45,57 @@ set(GLOBAL_ROOT_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory(palbe)
# Setup defines for the client compilation
target_compile_definitions(vdipal PRIVATE
target_compile_definitions(rocclrpal PRIVATE
PAL_CLIENT_INTERFACE_MAJOR_VERSION=${PAL_CLIENT_INTERFACE_MAJOR_VERSION})
target_compile_definitions(vdipal PRIVATE
target_compile_definitions(rocclrpal PRIVATE
GPUOPEN_CLIENT_INTERFACE_MAJOR_VERSION=${GPUOPEN_CLIENT_INTERFACE_MAJOR_VERSION})
target_compile_definitions(vdipal PRIVATE
target_compile_definitions(rocclrpal PRIVATE
GPUOPEN_CLIENT_INTERFACE_MINOR_VERSION=${GPUOPEN_CLIENT_INTERFACE_MINOR_VERSION})
target_compile_definitions(vdipal PRIVATE PAL_CLIENT_OCL=1)
target_compile_definitions(vdipal PRIVATE PAL_GPUOPEN_OCL=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_GPUOPEN=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_SCPC=0)
target_compile_definitions(vdipal PRIVATE PAL_CLOSED_SOURCE=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_GPUOPEN=1)
target_compile_definitions(rocclrpal PRIVATE PAL_CLIENT_OCL=1)
target_compile_definitions(rocclrpal PRIVATE PAL_GPUOPEN_OCL=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_GPUOPEN=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_SCPC=0)
target_compile_definitions(rocclrpal PRIVATE PAL_CLOSED_SOURCE=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_GPUOPEN=1)
# GFX9 targets
target_compile_definitions(vdipal PRIVATE PAL_BUILD_POLARIS22=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_GFX9=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_OSS4=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_VEGA12=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_VEGA20=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_RAVEN1=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_RAVEN2=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_RENOIR=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_POLARIS22=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_GFX9=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_OSS4=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_VEGA12=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_VEGA20=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_RAVEN1=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_RAVEN2=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_RENOIR=1)
# GFX10 targets
target_compile_definitions(vdipal PRIVATE PAL_BUILD_GFX10=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_NAVI12=1)
target_compile_definitions(vdipal PRIVATE PAL_BUILD_NAVI14=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_GFX10=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_NAVI12=1)
target_compile_definitions(rocclrpal PRIVATE PAL_BUILD_NAVI14=1)
target_compile_definitions(vdipal PRIVATE OPENCL_MAINLINE=1)
target_compile_definitions(rocclrpal PRIVATE OPENCL_MAINLINE=1)
if(${USE_COMGR_LIBRARY} MATCHES "yes")
target_compile_definitions(vdipal PRIVATE USE_COMGR_LIBRARY)
target_compile_definitions(rocclrpal PRIVATE USE_COMGR_LIBRARY)
endif()
if(UNIX)
target_compile_definitions(vdipal PRIVATE PAL_AMDGPU_BUILD)
target_compile_definitions(rocclrpal PRIVATE PAL_AMDGPU_BUILD)
endif()
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/compiler/sc/HSAIL/include)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../asic_reg)
target_include_directories(rocclrpal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/compiler/sc/HSAIL/include)
target_include_directories(rocclrpal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../asic_reg)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/inc)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/inc/core)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/inc/util)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/shared/gpuopen/inc)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/shared/gpuopen/third_party/metrohash/src)
target_include_directories(vdipal PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_include_directories(rocclrpal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe)
target_include_directories(rocclrpal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/inc)
target_include_directories(rocclrpal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/inc/core)
target_include_directories(rocclrpal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/inc/util)
target_include_directories(rocclrpal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/shared/gpuopen/inc)
target_include_directories(rocclrpal PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device/pal/palbe/shared/gpuopen/third_party/metrohash/src)
target_include_directories(rocclrpal PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
target_sources(vdipal PRIVATE
target_sources(rocclrpal PRIVATE
palappprofile.cpp
palblit.cpp
palconstbuf.cpp
@@ -119,6 +119,6 @@ target_sources(vdipal PRIVATE
palvirtual.cpp
)
set_target_properties(vdipal PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(rocclrpal PROPERTIES POSITION_INDEPENDENT_CODE ON)