Skip to content

Commit 0e2abe7

Browse files
authored
[libclc] Remove use of symlinks (#125069)
Symlinks are problematic on some systems. They aren't strictly necessary as we already have build infrastructure to 'alias' multiple targets' source directories together, as nvptx/nvptx64 has been doing. This commit takes the opportunity to merge together the spirv and spirv64 directories through the same system as they were identical. Fixes #114413
1 parent 7ae964c commit 0e2abe7

File tree

9 files changed

+7
-162
lines changed

9 files changed

+7
-162
lines changed

libclc/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,15 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
277277
list( APPEND dirs amdgpu )
278278
endif()
279279

280-
# nvptx is special
280+
# Some targets' directories alias others
281281
if( ${ARCH} STREQUAL nvptx OR ${ARCH} STREQUAL nvptx64 )
282282
set( DARCH ptx )
283+
elseif( ${ARCH} STREQUAL clspv OR ${ARCH} STREQUAL clspv64 )
284+
set( DARCH clspv )
285+
elseif( ${ARCH} STREQUAL spirv OR ${ARCH} STREQUAL spirv64 )
286+
set( DARCH spirv )
287+
elseif( ${ARCH} STREQUAL amdgcn-mesa3d )
288+
set( DARCH amdgcn-amdhsa )
283289
else()
284290
set( DARCH ${ARCH} )
285291
endif()

libclc/amdgcn-mesa3d

Lines changed: 0 additions & 1 deletion
This file was deleted.

libclc/clc/lib/clspv64

Lines changed: 0 additions & 1 deletion
This file was deleted.

libclc/clc/lib/spirv64/SOURCES

Lines changed: 0 additions & 24 deletions
This file was deleted.

libclc/clspv64

Lines changed: 0 additions & 1 deletion
This file was deleted.

libclc/spirv64/lib/SOURCES

Lines changed: 0 additions & 90 deletions
This file was deleted.

libclc/spirv64/lib/math/fma.cl

Lines changed: 0 additions & 11 deletions
This file was deleted.

libclc/spirv64/lib/math/fma.inc

Lines changed: 0 additions & 3 deletions
This file was deleted.

libclc/spirv64/lib/subnormal_config.cl

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)