[libspirv] Reduce CMake downstream changes (#19364)

This commit reduces the number of downstream CMake changes in
libclc/libspirv.

It's still not perfect in that some changes we've made impact the
(upstream) OpenCL builtins as well as our SPIR-V builtins.

Author: frasercrmck

libclc/CMakeLists.txt

@@ -244,7 +244,7 @@ configure_file( libclc.pc.in libclc.pc @ONLY )
 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libclc.pc DESTINATION "${CMAKE_INSTALL_DATADIR}/pkgconfig" )
 
 if( ENABLE_RUNTIME_SUBNORMAL )
-  foreach( file subnormal_use_default subnormal_disable )
+  foreach( file IN ITEMS subnormal_use_default subnormal_disable )
     link_bc(
        TARGET ${file}
        RSP_DIR ${LIBCLC_ARCH_OBJFILE_DIR}
@@ -364,6 +364,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
   else()
     set( DARCH ${ARCH} )
   endif()
+
   # Append a variety of target- and triple-based directories to search,
   # increasing in specificity.
   list( APPEND opencl_dirs ${DARCH} ${DARCH}-${OS} ${DARCH}-${VENDOR}-${OS} )
@@ -419,13 +420,9 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
     set( libspirv_gen_files )
     set( BUILD_LIBSPIRV_${t} TRUE )
 
-    if( NOT ARCH STREQUAL spirv AND NOT ARCH STREQUAL spirv64 )
-      if( ARCH STREQUAL clspv OR ARCH STREQUAL clspv64 )
-        list( APPEND libspirv_gen_files clspv-convert.cl )
-      elseif ( NOT ENABLE_RUNTIME_SUBNORMAL )
-        list( APPEND libspirv_gen_files spirv-convert.cl )
-        list( APPEND libspirv_lib_files libspirv/lib/generic/subnormal_use_default.ll )
-      endif()
+    if ( NOT ENABLE_RUNTIME_SUBNORMAL )
+      list( APPEND libspirv_gen_files spirv-convert.cl )
+      list( APPEND libspirv_lib_files libspirv/lib/generic/subnormal_use_default.ll )
     endif()
 
     libclc_configure_lib_source(
@@ -444,61 +441,61 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
       CLANG_TRIPLE clang_triple
     )
 
-    # Some targets don't have a specific GPU to target
-    set( build_flags )
-    if( d STREQUAL none OR ARCH STREQUAL spirv OR ARCH STREQUAL spirv64 )
-      # FIXME: Ideally we would not be tied to a specific PTX ISA version
-      if( ARCH STREQUAL nvptx OR ARCH STREQUAL nvptx64 )
-        # Disables NVVM reflection to defer to after linking
-        list( APPEND build_flags -Xclang -target-feature -Xclang +ptx72
-             -march=sm_86 -mllvm --nvvm-reflect-enable=false)
-      elseif( ARCH STREQUAL amdgcn )
-        # AMDGCN needs libclc to be compiled to high bc version since all atomic
-        # clang builtins need to be accessible
-        list( APPEND build_flags -mcpu=gfx942 -mllvm --amdgpu-oclc-reflect-enable=false )
-      elseif( ARCH STREQUAL native_cpu )
-        list( APPEND build_flags -Xclang -fsycl-is-native-cpu )
-      endif()
-    endif()
-
     message( STATUS "  device: ${d} ( ${${d}_aliases} )" )
 
     if ( ARCH STREQUAL spirv OR ARCH STREQUAL spirv64 )
-      set( opt_flags -O3 )
-      list( APPEND build_flags -DCLC_SPIRV )
+      set( build_flags -O0 -finline-hint-functions -DCLC_SPIRV )
+      set( opt_flags )
       set( spvflags --spirv-max-version=1.1 )
       set( MACRO_ARCH SPIRV32 )
       if( ARCH STREQUAL spirv64 )
         set( MACRO_ARCH SPIRV64 )
       endif()
     elseif( ARCH STREQUAL clspv OR ARCH STREQUAL clspv64 )
+      set( build_flags "-Wno-unknown-assumption" -DCLC_CLSPV )
       set( opt_flags -O3 )
-      list( APPEND build_flags -DCLC_CLSPV )
       set( MACRO_ARCH CLSPV32 )
       if( ARCH STREQUAL clspv64 )
         set( MACRO_ARCH CLSPV64 )
       endif()
     elseif( ARCH STREQUAL nvptx OR ARCH STREQUAL nvptx64 )
+      set( build_flags )
       set( opt_flags -O3 "--nvvm-reflect-enable=false" )
     elseif( ARCH STREQUAL amdgcn )
+      set( build_flags )
       set( opt_flags -O3 --amdgpu-oclc-reflect-enable=false )
     elseif( ARCH STREQUAL native_cpu )
+      set( build_flags -Xclang -fsycl-is-native-cpu )
       set( opt_flags -O3 )
     else()
+      set( build_flags )
       set( opt_flags -O3 )
       set( MACRO_ARCH ${ARCH} )
     endif()
 
+    # Some targets don't have a specific GPU to target
+    if( ARCH STREQUAL nvptx OR ARCH STREQUAL nvptx64 )
+      # Disable NVVM reflection to deferring to after linking
+      list( APPEND build_flags -Xclang -target-feature -Xclang +ptx72
+           -march=sm_86 -mllvm --nvvm-reflect-enable=false )
+    elseif( t STREQUAL amdgcn--amdhsa )
+      # Disable AMDGPU reflection, deferring to after linking
+      list( APPEND build_flags -mllvm --amdgpu-oclc-reflect-enable=false )
+    endif()
+
     set( LIBCLC_ARCH_OBJFILE_DIR "${LIBCLC_OBJFILE_DIR}/${arch_suffix}" )
     file( MAKE_DIRECTORY ${LIBCLC_ARCH_OBJFILE_DIR} )
 
+    # Build for OpenCL 3.0 independently of the target or device.
+    list( APPEND build_flags -cl-std=CL3.0 )
+
     # OpenCL 3.0 extensions
     string(CONCAT CL_3_0_EXTENSIONS
       "-cl-ext="
       "+__opencl_c_3d_image_writes,"
       "+__opencl_c_images,"
       "+cl_khr_3d_image_writes")
-    list( APPEND build_flags -cl-std=CL3.0 "-Xclang" ${CL_3_0_EXTENSIONS} )
+    list( APPEND build_flags "-Xclang" ${CL_3_0_EXTENSIONS} )
 
     # Add platform specific flags
     if(WIN32)
@@ -543,8 +540,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} )
     if( ARCH STREQUAL amdgcn OR ARCH STREQUAL r600 OR ARCH STREQUAL amdgcn-amdhsa )
       set ( private_addrspace_val 5 )
     endif()
-    if( ARCH STREQUAL spirv OR ARCH STREQUAL spirv64
-        OR ARCH STREQUAL clspv OR ARCH STREQUAL clspv64 )
+    if( ARCH STREQUAL spirv OR ARCH STREQUAL spirv64)
       set ( generic_addrspace_val 4 )
     endif()
     list( APPEND build_flags
@@ -618,21 +614,11 @@ install(DIRECTORY ${LIBCLC_LIBRARY_OUTPUT_INTDIR}
   COMPONENT libspirv-builtins
   FILES_MATCHING PATTERN "libspirv-*")
 
-install(DIRECTORY ${LIBCLC_LIBRARY_OUTPUT_INTDIR}
-  DESTINATION lib${LLVM_LIBDIR_SUFFIX}
-  COMPONENT clc-builtins
-  FILES_MATCHING PATTERN "clc-*")
-
 if( LIBCLC_GENERATE_REMANGLED_VARIANTS )
   install(DIRECTORY ${LIBCLC_LIBRARY_OUTPUT_INTDIR}
     DESTINATION lib${LLVM_LIBDIR_SUFFIX}
     COMPONENT libspirv-builtins
     FILES_MATCHING PATTERN "remangled-*libspirv-*")
-
-  install(DIRECTORY ${LIBCLC_LIBRARY_OUTPUT_INTDIR}
-    DESTINATION lib${LLVM_LIBDIR_SUFFIX}
-    COMPONENT clc-builtins
-    FILES_MATCHING PATTERN "remangled-*clc-*")
 endif()
 
 add_subdirectory(test)