AI/rocm-systems
2
0
Derivar 0
Código Questões Pedidos de integração Operações Pacotes Planeamentos Lançamentos Wiki Trabalho

SWDEV-301289 - Point to local AMD OpenCL via OCL_ICD_FILENAMES

Ver a proveniência 
The OCL_ICD_FILENAMES env var contains a list of OpenCL platforms that
the ICD should prepend to the list of reported platforms. Since the
built amdocl library will show up as the first platform, we can tell
ocltst to always run with platform 0. This way we guarantee that the
correct binary is being loaded.

Using this env var also makes programming LD_LIBRARY_PATH redundant
for Linux.

Change-Id: I8c1729e8b4dd1cd2df1a3da08c7b7addebd08b4f


[ROCm/clr commit: 6c9b07370c]
Este cometimento está contido em:
Vladislav Sytchenko
2021-08-30 22:26:08 -04:00
cometido por Jason Tang
ascendente 7757615404
cometimento d42631046e
3 ficheiros modificados com 12 adições e 12 eliminações
Descarregar ficheiro patch Descarregar ficheiro diff Expandir todos os ficheiros Colapsar todos os ficheiros
projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt
+4 -4
Ver ficheiro
@@ -48,8 +48,8 @@ add_custom_command(
add_custom_target(test.ocltst.oclgl
COMMAND
${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
$<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclgl> -A oclgl.exclude
${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
$<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclgl> -A oclgl.exclude
DEPENDS
ocltst oclgl amdocl
WORKING_DIRECTORY
@@ -59,8 +59,8 @@ add_custom_target(test.ocltst.oclgl
foreach(TEST ${TESTS})
add_custom_target(test.ocltst.oclgl.${TEST}
COMMAND
${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
$<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclgl> -t ${TEST}
${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
$<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclgl> -t ${TEST}
DEPENDS
ocltst oclgl amdocl
WORKING_DIRECTORY
projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt
+4 -4
Ver ficheiro
@@ -120,8 +120,8 @@ add_custom_command(
add_custom_target(test.ocltst.oclperf
COMMAND
${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
$<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclperf> -A oclperf.exclude
${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
$<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclperf> -A oclperf.exclude
DEPENDS
ocltst oclperf amdocl
WORKING_DIRECTORY
@@ -131,8 +131,8 @@ add_custom_target(test.ocltst.oclperf
foreach(TEST ${TESTS})
add_custom_target(test.ocltst.oclperf.${TEST}
COMMAND
${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
$<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclperf> -t ${TEST}
${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
$<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclperf> -t ${TEST}
DEPENDS
ocltst oclperf amdocl
WORKING_DIRECTORY
projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt
+4 -4
Ver ficheiro
@@ -88,8 +88,8 @@ add_custom_command(
add_custom_target(test.ocltst.oclruntime
COMMAND
${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
$<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclruntime> -A oclruntime.exclude
${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
$<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclruntime> -A oclruntime.exclude
DEPENDS
ocltst oclruntime amdocl
WORKING_DIRECTORY
@@ -99,8 +99,8 @@ add_custom_target(test.ocltst.oclruntime
foreach(TEST ${TESTS})
add_custom_target(test.ocltst.oclruntime.${TEST}
COMMAND
${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
$<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclruntime> -t ${TEST}
${CMAKE_COMMAND} -E env "OCL_ICD_FILENAMES=$<TARGET_FILE:amdocl>"
$<TARGET_FILE:ocltst> -p 0 -m $<TARGET_FILE:oclruntime> -t ${TEST}
DEPENDS
ocltst oclruntime amdocl
WORKING_DIRECTORY