llvm · frasercrmck · Jan 30, 2025 · Jan 30, 2025
diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt
@@ -277,9 +277,15 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
     list( APPEND dirs amdgpu )
   endif()
 
-  # nvptx is special
+  # Some targets' directories alias others
   if( ${ARCH} STREQUAL nvptx OR ${ARCH} STREQUAL nvptx64 )
     set( DARCH ptx )
+  elseif( ${ARCH} STREQUAL clspv OR ${ARCH} STREQUAL clspv64 )
+    set( DARCH clspv )
+  elseif( ${ARCH} STREQUAL spirv OR ${ARCH} STREQUAL spirv64 )
+    set( DARCH spirv )
+  elseif( ${ARCH} STREQUAL amdgcn-mesa3d )
+    set( DARCH amdgcn-amdhsa )
   else()
     set( DARCH ${ARCH} )
   endif()

diff --git a/libclc/amdgcn-mesa3d b/libclc/amdgcn-mesa3d
diff --git a/libclc/clc/lib/clspv64 b/libclc/clc/lib/clspv64
diff --git a/libclc/clc/lib/spirv64/SOURCES b/libclc/clc/lib/spirv64/SOURCES
diff --git a/libclc/clspv64 b/libclc/clspv64
diff --git a/libclc/spirv64/lib/SOURCES b/libclc/spirv64/lib/SOURCES
diff --git a/libclc/spirv64/lib/math/fma.cl b/libclc/spirv64/lib/math/fma.cl
diff --git a/libclc/spirv64/lib/math/fma.inc b/libclc/spirv64/lib/math/fma.inc
diff --git a/libclc/spirv64/lib/subnormal_config.cl b/libclc/spirv64/lib/subnormal_config.cl