Revert "Revert all"

This reverts commit 2fd4e94f242c982e9f6d167a388252a9b00a9ec7.

Author: devajithvs

.github/workflows/root-ci-config/buildconfig/global.txt

@@ -1,3 +1,4 @@
+adaptivecpp=ON
 alien=OFF
 all=OFF
 arrow=OFF

cmake/modules/RootBuildOptions.cmake

@@ -77,6 +77,7 @@ endfunction()
 #   The default value can be changed as many times as we wish before calling ROOT_APPLY_OPTIONS()
 #--------------------------------------------------------------------------------------------------
 
+ROOT_BUILD_OPTION(adaptivecpp ON "Build AdaptiveCPP, for SYCL support")
 ROOT_BUILD_OPTION(arrow OFF "Enable support for Apache Arrow")
 ROOT_BUILD_OPTION(asimage ON "Enable support for image processing via libAfterImage")
 ROOT_BUILD_OPTION(asserts OFF "Enable asserts (defaults to ON for CMAKE_BUILD_TYPE=Debug and/or dev=ON)")

interpreter/CMakeLists.txt

@@ -27,7 +27,7 @@ set(LLVM_INCLUDE_TESTS OFF CACHE BOOL "")
 set(LLVM_INCLUDE_BENCHMARKS OFF CACHE BOOL "")
 set(CLANG_INCLUDE_TESTS OFF CACHE BOOL "")
 set(LLVM_INCLUDE_EXAMPLES OFF CACHE BOOL "")
-set(CLANG_BUILD_TOOLS OFF CACHE BOOL "")
+set(CLANG_BUILD_TOOLS ON CACHE BOOL "")
 # It looks like that turning off CLANG_BUILD_TOOLS is not enough.
 set(CLANG_TOOL_ARCMT_TEST_BUILD OFF CACHE BOOL "")
 set(CLANG_TOOL_CLANG_CHECK_BUILD OFF CACHE BOOL "")
@@ -53,7 +53,10 @@ set(LLVM_FORCE_USE_OLD_TOOLCHAIN ON CACHE BOOL "")
 # found before (because the user turned on cuda or tmva-gpu), this will not have
 # an effect, which is fine.
 # (Note that the option is very counter-intuitive: We turn *on* disabling it...)
-set(CMAKE_DISABLE_FIND_PACKAGE_CUDA ON)
+# Special case when we want to build cling with adaptiveCpp
+if(NOT adaptivecpp)
+  set(CMAKE_DISABLE_FIND_PACKAGE_CUDA ON)
+endif()
 
 # will be set again in case NOT builtin_llvm
 set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/llvm-project/llvm")
@@ -390,6 +393,9 @@ if (builtin_clang)
     ${CLANG_BINARY_DIR}/include
     CACHE STRING "Clang include directories.")
   set(CLANG_CMAKE_DIR "${CMAKE_BINARY_DIR}/lib/cmake/clang/")
+  set(CLANG_EXECUTABLE_PATH
+    "${LLVM_BINARY_DIR}/bin/clang${CMAKE_EXECUTABLE_SUFFIX}"
+    CACHE STRING "Path to just‐built clang (if builtin_clang).")
 else()
   find_package(Clang REQUIRED CONFIG)
   message(STATUS "Found Clang ${CLANG_PACKAGE_VERSION} in ${CLANG_CMAKE_DIR}")

interpreter/cling/CMakeLists.txt

@@ -8,10 +8,6 @@ else(WIN32)
   cmake_minimum_required(VERSION 3.5)
 endif(WIN32)
 
-if(adaptivecpp)
-  add_compile_definitions(ADAPTIVECPP_ENABLED)
-endif()
-
 # If we are not building as a part of LLVM, build Cling as an
 # standalone project, using LLVM as an external library:
 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
@@ -140,6 +136,20 @@ set(CLING_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(LLVM_TOOLS_BINARY_DIR "${LLVM_BINARY_DIR}/bin")
 if(DEFINED CLING_ROOT_BUILD)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${LLVM_TOOLS_BINARY_DIR}")
+
+  if(adaptivecpp)
+    # Hack for now to make it work with adaptiveCpp without making more changes
+    # Ensure runtime ACPP directory exists to prevent SYCL from running
+    set(ACPP_RUNTIME_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../lib/hipSYCL/")
+    file(MAKE_DIRECTORY "${ACPP_RUNTIME_DIRECTORY}")
+
+    # Create a symbolic link to the bitcode directory
+    execute_process(
+      COMMAND ${CMAKE_COMMAND} -E create_symlink
+      "${CMAKE_BINARY_DIR}/lib/hipSYCL/bitcode"
+      "${ACPP_RUNTIME_DIRECTORY}/bitcode"
+    )
+  endif()
 endif()
 
 if( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE )
@@ -248,7 +258,7 @@ if(MSVC)
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std:c++14")
     endif()
   endif()
-else()
+elseif(NOT adaptivecpp)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
 endif()
 
@@ -482,6 +492,35 @@ if (TARGET clang-headers)
   list(APPEND LLVM_COMMON_DEPENDS clang-headers)
 endif()
 
+if(adaptivecpp)
+  set(ADAPTIVE_CPP_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/AdaptiveCpp)
+  set(WITH_CUDA_BACKEND false)
+  set(Boost_FIBER_LIBRARY_DEBUG false)
+  set(LLVM_VERSION_MAJOR 18)
+  list(INSERT CMAKE_MODULE_PATH 0 "${ADAPTIVE_CPP_SOURCE_DIR}/cmake/")
+  add_compile_definitions(ADAPTIVECPP_ENABLED)
+
+  set(ACPP_EXPORTS
+      acpp-clang-cbs
+      acpp-clang
+      acpp-common
+      llvm-to-backend
+      # llvm-to-ptx
+      llvm-to-host
+      # rt-backend-cuda
+      rt-backend-omp
+      acpp-rt
+  )
+
+  set_property(GLOBAL APPEND PROPERTY CLING_EXPORTS ${ACPP_EXPORTS})
+  add_subdirectory(${ADAPTIVE_CPP_SOURCE_DIR})
+
+  if (TARGET intrinsics_gen)
+    add_dependencies(acpp-clang-cbs intrinsics_gen)
+    add_dependencies(llvm-to-backend intrinsics_gen)
+  endif()
+endif()
+
 add_subdirectory(include/cling/Interpreter)
 add_subdirectory(lib)
 

interpreter/cling/lib/Interpreter/BackendPasses.cpp

@@ -29,6 +29,12 @@
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils.h"
 
+#ifdef ADAPTIVECPP_ENABLED
+#include "hipSYCL/compiler/SMCPCompatPass.hpp"
+#include "hipSYCL/compiler/GlobalsPruningPass.hpp"
+#include "hipSYCL/compiler/sscp/TargetSeparationPass.hpp"
+#endif
+
 //#include "clang/Basic/LangOptions.h"
 //#include "clang/Basic/TargetOptions.h"
 #include "clang/Basic/CharInfo.h"
@@ -511,6 +517,18 @@ void BackendPasses::CreatePasses(int OptLevel, llvm::ModulePassManager& MPM,
   std::optional<PGOOptions> PGOOpt;
   PassBuilder PB(&m_TM, PTO, PGOOpt, &PIC);
 
+#ifdef ADAPTIVECPP_ENABLED
+  PB.registerOptimizerLastEPCallback([](llvm::ModulePassManager &MPM, OptimizationLevel) {
+    MPM.addPass(hipsycl::compiler::SMCPCompatPass{});
+    MPM.addPass(hipsycl::compiler::GlobalsPruningPass{});
+  });
+
+  PB.registerPipelineStartEPCallback(
+    [&](llvm::ModulePassManager &MPM, OptimizationLevel Level) {
+      MPM.addPass(hipsycl::compiler::TargetSeparationPass{""});
+    });
+#endif
+
   // Attempt to load pass plugins and register their callbacks with PB.
   for (auto& PluginFN : m_CGOpts.PassPlugins) {
     auto PassPlugin = PassPlugin::Load(PluginFN);

interpreter/cling/lib/Interpreter/CMakeLists.txt

@@ -7,6 +7,8 @@
 #------------------------------------------------------------------------------
 
 set(LIBS
+  acpp-clang
+  acpp-rt
   clingUtils
   clangCodeGen
   clangDriver

interpreter/cling/lib/Interpreter/Interpreter.cpp

@@ -212,6 +212,31 @@ namespace cling {
     m_RuntimeOptions{},
     m_OptLevel(parentInterp ? parentInterp->m_OptLevel : -1) {
 
+#ifdef ADAPTIVECPP_ENABLED
+    // Compiler arguments for ADAPTIVECPP
+    static constexpr std::array<const char*, 8> extraArgs = {
+      "-D__OPENSYCL__",
+      "-D__HIPSYCL__",
+      "-D__ADAPTIVECPP__",
+      "-D__ACPP__",
+      "-D__ACPP_ENABLE_LLVM_SSCP_TARGET__",
+      "-ffp-contract=fast",
+      "-Xclang",
+      "-disable-O0-optnone"
+    };
+
+    std::vector<const char*> argvChar;
+    argvChar.reserve(argc + 8);
+
+    // Copy existing arguments
+    argvChar.assign(argv, argv + argc);
+
+    argvChar.insert(argvChar.end(), extraArgs.begin(), extraArgs.end());
+    argvChar.push_back(nullptr); // signal end of array
+
+    m_Opts = InvocationOptions(argvChar.size() - 1, argvChar.data());
+#endif
+
     if (handleSimpleOptions(m_Opts))
       return;
 

interpreter/cling/lib/Utils/CMakeLists.txt

@@ -27,6 +27,8 @@ set(LLVM_LINK_COMPONENTS
 )
 
 set(LIBS
+  acpp-clang
+  acpp-rt
   clangCodeGen
   clangDriver
   clangFrontend

interpreter/cling/tools/driver/CMakeLists.txt

@@ -12,6 +12,8 @@ set(LLVM_NO_DEAD_STRIP 1)
 set(LLVM_LINK_COMPONENTS Support)
 if(BUILD_SHARED_LIBS)
   set(LIBS
+    acpp-clang
+    acpp-rt
 
     clangFrontendTool
 
@@ -25,6 +27,9 @@ if(BUILD_SHARED_LIBS)
   )
 else()
   set(LIBS
+    acpp-clang
+    acpp-rt
+
     clangASTMatchers
     clangFrontendTool
 

interpreter/cling/tools/libcling/CMakeLists.txt

@@ -11,6 +11,8 @@ set(SOURCES
   )
 
 set(LIBS
+  acpp-clang
+  acpp-rt
   clangAnalysis
   clangDriver
   clangFrontend