[AIX][compiler-rt] Build and install standalone libatomic

[lkail]

Summary

On AIX, we have to ship libatomic.a for compatibility. First, a new clang_rt.atomic is added. Second, use added cmake modules for AIX, we are able to build a compatible libatomic.a for AIX. The second step can't be perfectly implemented with cmake now since AIX's archive approach is kinda unique, i.e., archiving shared libraries into a static archive file.

[jsji]

Thanks @lkail ! In general, I think we can try to make the Modules platform dependent.

compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake

4

Can we make *ALL* the code in this file platform independent? Although there are NO other users in other platform, we can make it reusable in case there are similar requests from other platform.

So, please remove AIX_ prefix here.

48

Same, remove _aix_ here, also pass down compile_flag and link flag.

61

Why this has to be OFF? Isn't SHARED needs PIC? Also AIX defaults to PIC.

62

Can we pass the flag into this functions instead of hardcoding them here.

63

Same as above, these flags should be passed down from CMakeLists.txt , not hardcoding them here.

75

Remove _aix_, also add options to control building 32 bit only, 64 bit only, or both.

81

Can we make this another function like generate_export_list?

100

ar flags should be passed down, or can have default, and can be overwritten by args.

compiler-rt/lib/builtins/CMakeLists.txt

757

Set the compile flags, linker flags, ar flags here.

[daltenty]

compiler-rt/lib/builtins/CMakeLists.txt

755

Maybe a more generic CMake option (e.g. COMPILER_RT_BUILD_LIBATOMIC) with an appropriate default for AIX would be better here?

[lkail]

Address comments by following method introduced by @daltenty in https://reviews.llvm.org/D101959. Now compiling shared atomic library is platform independent.

[jsji]

I like the part in compiler-rt/lib/builtins/CMakeLists.txt -- it is essentially the same principle of what we suggested yesterday -- make the code platform independent,
but I don't like the overall fact that we need to invoke compiler-rt/utils/aix-install-libatomic.sh as an additional step, and call cmake again...

I know CMake can NOT handle AIX archives well for now, I believe we can just implement that part using ar and add TODO to fix it once CMake support is ready.

What do you think?

[lkail]

What do you think?

Yes, invoking cmake twice does introduce more complexity.

[lkail]

Try to implement all in cmake.

[lkail]

compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake

4

I assume only AIX's binder need these exported symbols, so I make them AIX specific.

62

I leave these flags as default options, we can use -DAIX_LIBATOMIC_LINK_FLAGS to change.

[daltenty]

compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake

55

Why not just store this as an .exp file in the source tree if we are just going to write it out? (That would similar to what's in libcxx I believe)

[jsji]

Looks mostly good to me as long as you address David's comments.

compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake

55

Yes, agree.

compiler-rt/lib/builtins/CMakeLists.txt

769

This should be platform independent? So that people can override libatomic link flags to be different than builtin link flags.

[daltenty]

compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake

63

nit: don't some of these duplicate the driver default link flags for building a shared library?

[lkail]

compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake

63

I've checked generated build.ninja

LANGUAGE_COMPILE_FLAGS = -O3 -DNDEBUG
LINK_FLAGS = -Wl,-brtl   -m64 -Wl,-H512 -Wl,-D0      -Wl,-T512 -Wl,-bhalt:4 -Wl,-bernotok      -Wl,-bnoentry -Wl,-bexport:/home/lkail/llvm/dev/llvm-project/compiler-rt/lib/builtins/atomic.exp      -Wl,-bmodtype:SRE -Wl,-lc
LINK_LIBRARIES = -Wl,-blibpath:/usr/lib:/lib
OBJECT_DIR = lib/builtins/CMakeFiles/clang_rt.atomic-dynamic-powerpc64.dir
POST_BUILD = :
PRE_LINK = :

Looks no duplicated item in flags.

[lkail]

• Introduce COMPILER_RT_LIBATOMIC_LINK_FLAGS
• New file atomic.exp under compiler-rt/lib/builtins
• Minor tweak of dependencies

[jsji]

LGTM. Thanks. Please wait one or two days in case there are other feedback.

compiler-rt/lib/builtins/CMakeLists.txt

764

Maybe put atomic.exp into ppc subdir would be better.

[lkail]

• Put atomic.exp in ppc folder
• Move set(BUILTIN_DEPS builtins) under AIX check

compiler-rt/cmake/Modules/CompilerRTAIXUtils.cmake

+include(CMakeParseArguments)
+include(CompilerRTUtils)
+
+function(get_aix_libatomic_default_link_flags link_flags export_list)
+  set(${link_flags}
+    "-Wl,-H512 -Wl,-D0 \
+     -Wl,-T512 -Wl,-bhalt:4 -Wl,-bernotok \
+     -Wl,-bnoentry -Wl,-bexport:${export_list} \
+     -Wl,-bmodtype:SRE -Wl,-lc" PARENT_SCOPE)
+endfunction()
+
+macro(archive_aix_libatomic name)
+  cmake_parse_arguments(LIB
+    ""
+    ""
+    "ARCHS;PARENT_TARGET"
+    ${ARGN})
+  set(shared_libraries_to_archive "")
+  foreach (arch ${LIB_ARCHS})
+    if(CAN_TARGET_${arch})
+      set(output_dir "${CMAKE_CURRENT_BINARY_DIR}/libatomic-${arch}.dir")
+      # FIXME: Target name should be kept consistent with definition
+      # in AddCompilerRT.cmake added by
+      # add_compiler_rt_runtime(<name> SHARED ...)
+      set(target ${name}-dynamic-${arch})
+      if(TARGET ${target})
+        file(MAKE_DIRECTORY ${output_dir})
+        add_custom_command(OUTPUT "${output_dir}/libatomic.so.1"
+                           POST_BUILD
+                           COMMAND ${CMAKE_COMMAND} -E
+                           copy "$<TARGET_FILE:${target}>"
+                                "${output_dir}/libatomic.so.1"
+                           DEPENDS ${target})
+        list(APPEND shared_libraries_to_archive "${output_dir}/libatomic.so.1")
+      endif()
+    endif()
+  endforeach()
+  if(shared_libraries_to_archive)
+    set(output_dir "")
+    set(install_dir "")
+    get_compiler_rt_output_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} output_dir)
+    get_compiler_rt_install_dir(${COMPILER_RT_DEFAULT_TARGET_ARCH} install_dir)
+    add_custom_command(OUTPUT "${output_dir}/libatomic.a"
+                       COMMAND ${CMAKE_AR} -X32_64 r "${output_dir}/libatomic.a"
+                       ${shared_libraries_to_archive}
+                       DEPENDS ${shared_libraries_to_archive})
+    install(FILES "${output_dir}/libatomic.a"
+            DESTINATION ${install_dir})
+    add_custom_target(aix-libatomic
+                      DEPENDS "${output_dir}/libatomic.a")
+  endif()
+  add_dependencies(${LIB_PARENT_TARGET} aix-libatomic)
+endmacro()

compiler-rt/lib/builtins/CMakeLists.txt

if (COMPILER_RT_STANDALONE_BUILD)
   # LLVM configuration is not being utilized.
   option(COMPILER_RT_BUILTINS_ENABLE_PIC
     "Turns on or off -fPIC for the builtin library source"
     ON)
 endif()
 
 include(builtin-config-ix)
 
+if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
+  include(CompilerRTAIXUtils)
+endif()
+
 option(COMPILER_RT_BUILTINS_HIDE_SYMBOLS
   "Do not export any symbols from the static library." ON)
 
 # TODO: Need to add a mechanism for logging errors when builtin source files are
 # added to a sub-directory and not this CMakeLists file.
 set(GENERIC_SOURCES
   absvdi2.c
   absvsi2.c
if (CAN_TARGET_${arch})
                               SOURCES ${${arch}_SOURCES}
                               DEFS ${BUILTIN_DEFS}
                               CFLAGS ${BUILTIN_CFLAGS}
                               PARENT_TARGET builtins)
     endif ()
   endforeach ()
 endif ()
 
+option(COMPILER_RT_BUILD_STANDALONE_LIBATOMIC
+  "Build standalone shared atomic library."
+  OFF)
+
+if(COMPILER_RT_BUILD_STANDALONE_LIBATOMIC)
+  add_custom_target(builtins-standalone-atomic)
+  set(BUILTIN_DEPS "")
+  if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
+    if(NOT COMPILER_RT_LIBATOMIC_LINK_FLAGS)
+      get_aix_libatomic_default_link_flags(COMPILER_RT_LIBATOMIC_LINK_FLAGS
+        "${CMAKE_CURRENT_SOURCE_DIR}/ppc/atomic.exp")
+    endif()
+    # The compiler needs builtins to link any other binaries, so let
+    # clang_rt.atomic be built after builtins.
+    set(BUILTIN_DEPS builtins)
+  endif()
+  foreach (arch ${BUILTIN_SUPPORTED_ARCH})
+    if(CAN_TARGET_${arch})
+      add_compiler_rt_runtime(clang_rt.atomic
+                              SHARED
+                              ARCHS ${arch}
+                              SOURCES atomic.c
+                              LINK_FLAGS ${COMPILER_RT_LIBATOMIC_LINK_FLAGS}
+                              DEPS ${BUILTIN_DEPS}
+                              PARENT_TARGET builtins-standalone-atomic)
+    endif()
+  endforeach()
+  # FIXME: On AIX, we have to archive built shared libraries into a static
+  # archive, i.e., libatomic.a. Once cmake adds support of such usage for AIX,
+  # this ad-hoc part can be removed.
+  if(${CMAKE_SYSTEM_NAME} MATCHES "AIX")
+    archive_aix_libatomic(clang_rt.atomic
+                          ARCHS ${BUILTIN_SUPPORTED_ARCH}
+                          PARENT_TARGET builtins-standalone-atomic)
+  endif()
+  add_dependencies(compiler-rt builtins-standalone-atomic)
+endif()
+
 add_dependencies(compiler-rt builtins)

compiler-rt/lib/builtins/ppc/atomic.exp

+__atomic_compare_exchange
+__atomic_compare_exchange_1
+__atomic_compare_exchange_2
+__atomic_compare_exchange_4
+__atomic_compare_exchange_8
+__atomic_exchange
+__atomic_exchange_1
+__atomic_exchange_2
+__atomic_exchange_4
+__atomic_exchange_8
+__atomic_fetch_add_1
+__atomic_fetch_add_2
+__atomic_fetch_add_4
+__atomic_fetch_add_8
+__atomic_fetch_and_1
+__atomic_fetch_and_2
+__atomic_fetch_and_4
+__atomic_fetch_and_8
+__atomic_fetch_or_1
+__atomic_fetch_or_2
+__atomic_fetch_or_4
+__atomic_fetch_or_8
+__atomic_fetch_sub_1
+__atomic_fetch_sub_2
+__atomic_fetch_sub_4
+__atomic_fetch_sub_8
+__atomic_fetch_xor_1
+__atomic_fetch_xor_2
+__atomic_fetch_xor_4
+__atomic_fetch_xor_8
+__atomic_is_lock_free
+__atomic_load
+__atomic_load_1
+__atomic_load_2
+__atomic_load_4
+__atomic_load_8
+__atomic_store
+__atomic_store_1
+__atomic_store_2
+__atomic_store_4
+__atomic_store_8