Support mcc20 C++20 MUSA builds

Author: mingxu-2022

CMakeLists.txt

@@ -12,7 +12,7 @@ endif()
 set( CMAKE_INSTALL_PREFIX "/usr/local/musa" CACHE PATH
     "Install path prefix, prepended onto install directories" )
 set ( VERSION_STRING "1.17.2" )
-project(Thrust VERSION ${VERSION_STRING})
+project(Thrust VERSION ${VERSION_STRING} LANGUAGES NONE)
 # MUSA Configuration
 include(cmake/SimpleMUSA.cmake)
 

cmake/SimpleMUSA.cmake

@@ -1,25 +1,40 @@
 # SimpleMUSA.cmake
 # Minimal MUSA configuration without external dependencies
 
-# Set MUSA paths
-set(MUSA_ROOT "/usr/local/musa" CACHE PATH "MUSA toolkit root directory")
-set(MUSA_INCLUDE_DIR "${MUSA_ROOT}/include")
-set(MUSA_LIBRARY_DIR "${MUSA_ROOT}/lib")
+# Set MUSA paths. MUSA_ROOT points at the runtime toolkit, while
+# MUSA_COMPILER_ROOT may point at an alternate mcc compiler install.
+set(MUSA_ROOT "/usr/local/musa" CACHE PATH "MUSA runtime toolkit root directory")
+set(MUSA_COMPILER_ROOT "${MUSA_ROOT}" CACHE PATH "MUSA compiler root directory")
+set(MUSA_INCLUDE_DIR "${MUSA_ROOT}/include" CACHE PATH "MUSA runtime include directory")
+set(MUSA_LIBRARY_DIR "${MUSA_ROOT}/lib" CACHE PATH "MUSA runtime library directory")
+set(MUSA_COMPILER_INCLUDE_DIR "${MUSA_COMPILER_ROOT}/include" CACHE PATH "MUSA compiler include directory")
 
 # Find MUSA compiler (mcc)
 find_program(MCC_EXECUTABLE
     NAMES mcc
-    PATHS "${MUSA_ROOT}/bin"
+    PATHS "${MUSA_COMPILER_ROOT}/bin"
     ENV MUSA_PATH
     ENV MUSA_BIN_PATH
     PATH_SUFFIXES bin
+    NO_DEFAULT_PATH
 )
 
 if(NOT MCC_EXECUTABLE)
-    message(FATAL_ERROR "MUSA compiler (mcc) not found. Set MUSA_ROOT or MUSA_PATH.")
+    find_program(MCC_EXECUTABLE
+        NAMES mcc
+        ENV MUSA_PATH
+        ENV MUSA_BIN_PATH
+        PATH_SUFFIXES bin
+    )
+endif()
+
+if(NOT MCC_EXECUTABLE)
+    message(FATAL_ERROR "MUSA compiler (mcc) not found. Set MUSA_COMPILER_ROOT, MUSA_ROOT, or MUSA_PATH.")
 endif()
 
 message(STATUS "Found MUSA compiler: ${MCC_EXECUTABLE}")
+message(STATUS "MUSA compiler root: ${MUSA_COMPILER_ROOT}")
+message(STATUS "MUSA runtime root: ${MUSA_ROOT}")
 
 # Set MUSA_FOUND so ThrustCudaConfig.cmake can detect MUSA
 set(MUSA_FOUND TRUE CACHE INTERNAL "MUSA found")
@@ -43,6 +58,9 @@ message(STATUS "Found MUSA library: ${MUSA_LIBRARY}")
 set(CMAKE_CXX_COMPILER "${MCC_EXECUTABLE}" CACHE FILEPATH "C++ compiler" FORCE)
 
 # Add MUSA path to compile options globally
+if(EXISTS "${MUSA_COMPILER_INCLUDE_DIR}")
+    add_compile_options(-isystem ${MUSA_COMPILER_INCLUDE_DIR})
+endif()
 add_compile_options(--musa-path=${MUSA_ROOT})
 
 # Set default MUSA architecture if not specified
@@ -122,8 +140,12 @@ function(musa_add_executable target_name)
     # Link MUSA runtime (no keyword to match existing code)
     target_link_libraries(${target_name} ${MUSA_LIBRARY})
 
-    # Include MUSA headers (use include_directories for directory-level)
-    include_directories(${MUSA_INCLUDE_DIR})
+    # Prefer compiler-matched headers such as mp_ext_32_intrinsics.h, while
+    # still taking the runtime API and musart from MUSA_ROOT.
+    if(EXISTS "${MUSA_COMPILER_INCLUDE_DIR}")
+        target_include_directories(${target_name} SYSTEM BEFORE PRIVATE ${MUSA_COMPILER_INCLUDE_DIR})
+    endif()
+    target_include_directories(${target_name} SYSTEM PRIVATE ${MUSA_INCLUDE_DIR})
 endfunction()
 
 # Function to build MUSA libraries
@@ -185,6 +207,10 @@ function(musa_add_library target_name)
     # Link MUSA runtime (no keyword to match existing code)
     target_link_libraries(${target_name} ${MUSA_LIBRARY})
 
-    # Include MUSA headers (use include_directories for directory-level)
-    include_directories(${MUSA_INCLUDE_DIR})
+    # Prefer compiler-matched headers such as mp_ext_32_intrinsics.h, while
+    # still taking the runtime API and musart from MUSA_ROOT.
+    if(EXISTS "${MUSA_COMPILER_INCLUDE_DIR}")
+        target_include_directories(${target_name} SYSTEM BEFORE PRIVATE ${MUSA_COMPILER_INCLUDE_DIR})
+    endif()
+    target_include_directories(${target_name} SYSTEM PRIVATE ${MUSA_INCLUDE_DIR})
 endfunction()

cmake/ThrustBuildCompilerTargets.cmake

@@ -9,6 +9,7 @@
 # thrust.compiler_interface_cpp11
 # thrust.compiler_interface_cpp14
 # thrust.compiler_interface_cpp17
+# thrust.compiler_interface_cpp20
 # - Interface targets providing compiler-specific options that should only be
 #   applied to certain dialects of C++.
 #
@@ -129,6 +130,14 @@ function(thrust_build_compiler_targets)
         "-Wno-deprecated-declarations"
         "-Wno-pass-failed"
       )
+      if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND
+          CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 20)
+        list(APPEND cxx_compile_options
+          "-Wno-deprecated-builtins"
+          "-Wno-deprecated-volatile"
+          "-Wno-deprecated-anon-enum-enum-conversion"
+        )
+      endif()
       message(STATUS "Thrust: MUSA compiler detected: Suppressing selected warnings")
     endif()
   endif()
@@ -211,6 +220,7 @@ function(thrust_build_compiler_targets)
   add_library(thrust.compiler_interface_cpp11 INTERFACE)
   add_library(thrust.compiler_interface_cpp14 INTERFACE)
   add_library(thrust.compiler_interface_cpp17 INTERFACE)
+  add_library(thrust.compiler_interface_cpp20 INTERFACE)
 
   if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     # C4127: conditional expression is constant

cmake/ThrustBuildTargetList.cmake

@@ -19,7 +19,7 @@
 #   - <prop> is one of the following:
 #     - HOST: The host system. Valid values: CPP, OMP, TBB.
 #     - DEVICE: The device system. Valid values: CUDA, CPP, OMP, TBB.
-#     - DIALECT: The C++ dialect. Valid values: 11, 14, 17.
+#     - DIALECT: The C++ dialect. Valid values: 11, 14, 17, 20.
 #     - PREFIX: A unique prefix that should be used to name all
 #       targets/tests/examples that use this configuration.
 #
@@ -43,8 +43,8 @@ define_property(TARGET PROPERTY _THRUST_DEVICE
   FULL_DOCS "A target's device system: CUDA, CPP, TBB, or OMP."
 )
 define_property(TARGET PROPERTY _THRUST_DIALECT
-  BRIEF_DOCS "A target's C++ dialect: 11, 14, or 17."
-  FULL_DOCS "A target's C++ dialect: 11, 14, or 17."
+  BRIEF_DOCS "A target's C++ dialect: 11, 14, 17, or 20."
+  FULL_DOCS "A target's C++ dialect: 11, 14, 17, or 20."
 )
 define_property(TARGET PROPERTY _THRUST_PREFIX
   BRIEF_DOCS "A prefix describing the config, eg. 'thrust.cpp.cuda.cpp14'."

cmake/ThrustMultiConfig.cmake

@@ -7,7 +7,7 @@ function(thrust_configure_multiconfig)
 
   # Dialects:
   set(THRUST_CPP_DIALECT_OPTIONS
-    11 14 17
+    11 14 17 20
     CACHE INTERNAL "C++ dialects supported by Thrust." FORCE
   )
 

dependencies/cub

@@ -724,7 +724,8 @@ struct is_empty_helper_base
 
 template<typename T>
   struct is_empty : integral_constant<bool,
-    sizeof(is_empty_helper_base) == sizeof(is_empty_helper<T>)
+    sizeof(is_empty_helper_base) ==
+      sizeof(is_empty_helper<typename remove_cv<T>::type>)
   >
   {
   };
@@ -738,4 +739,3 @@ using detail::false_type;
 THRUST_NAMESPACE_END
 
 #include <thrust/detail/type_traits/has_trivial_assign.h>
-

thrust/detail/type_traits.h

@@ -2767,14 +2767,12 @@ template <class T> class optional<T &> {
   ///
   /// \group emplace
   __thrust_exec_check_disable__
-  template <class... Args>
+  template <class U = T>
   __host__ __device__
-  T &emplace(Args &&... args) noexcept {
-    static_assert(std::is_constructible<T, Args &&...>::value,
-                  "T must be constructible with Args");
-
-    *this = nullopt;
-    this->construct(std::forward<Args>(args)...);
+  T &emplace(U &&u) noexcept {
+    static_assert(std::is_lvalue_reference<U>::value, "U must be an lvalue");
+    m_value = addressof(u);
+    return *m_value;
   }
 
   /// Swaps this optional with the other.
@@ -2894,4 +2892,3 @@ template <class T> struct hash<THRUST_NS_QUALIFIER::optional<T>> {
 } // namespace std
 
 #endif // THRUST_CPP_DIALECT >= 2011
-