Adiak related testing and updates

src/c/CMakeLists.txt

@@ -12,11 +12,15 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     # require at least Clang 9.0
     if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0)
         message(FATAL_ERROR "Clang++ version must be at least 9.0!")
-    elseif (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 11)
+    elseif (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14)
+        set(PERFFLOWASPECT_CLANG_14_NEWER TRUE CACHE BOOL "using >=clang14")
+        add_definitions(-DPERFFLOWASPECT_CLANG_14_NEWER)
+    elseif ((CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 11) AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14))
         set(PERFFLOWASPECT_CLANG_11_NEWER TRUE CACHE BOOL "using >=clang11")
+        set(PERFFLOWASPECT_CLANG_14_NEWER FALSE CACHE BOOL "using < clang14")
         add_definitions(-DPERFFLOWASPECT_CLANG_11_NEWER)
     elseif (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
-        set(PERFFLOWASPECT_CLANG_11_NEWER FALSE CACHE BOOL "using >=clang11")
+        set(PERFFLOWASPECT_CLANG_11_NEWER FALSE CACHE BOOL "using < clang11")
     endif()
 else()
     message(WARNING "Unsupported CXX compiler: please use Clang >= 9.0")

src/c/host-configs/lassen-4.14.0-ppc64le-clang@14.0.5-gcc@8.3.1.cmake

@@ -11,6 +11,10 @@
 set(CMAKE_C_COMPILER "/usr/tce/packages/clang/clang-14.0.5-gcc-8.3.1/bin/clang" CACHE PATH "")
 set(CMAKE_CXX_COMPILER "/usr/tce/packages/clang/clang-14.0.5-gcc-8.3.1/bin/clang++" CACHE PATH "")
 set(LLVM_DIR "/usr/tce/packages/clang/clang-ibm-14.0.5-gcc-8.3.1/lib/cmake/llvm" CACHE PATH "")
+
+# Clang 14 supports both legacy and new pass manager.
+# Use the -flegacy-pass-manager if you want to use the legacy pass.
+# Use -fpass-plugin=<weavePass.so> to use the new pass
 # Use both C and CXX flags to support both targets.
-set(CMAKE_C_FLAGS "-flegacy-pass-manager" CACHE STRING "") 
-set(CMAKE_CXX_FLAGS "-flegacy-pass-manager" CACHE STRING "") 
+# set(CMAKE_C_FLAGS "-flegacy-pass-manager" CACHE STRING "") 
+# set(CMAKE_CXX_FLAGS "-flegacy-pass-manager" CACHE STRING "") 

src/c/test/CMakeLists.txt

@@ -11,29 +11,45 @@ message(STATUS "Adding CXX unit tests")
 foreach(TEST ${SMOKETESTS})
     message(STATUS " [*] Adding test: ${TEST}")
     add_executable(${TEST} ${TEST}.cpp)
-    set_source_files_properties(${TEST}.cpp COMPILE_FLAGS "-Xclang -load -Xclang ../weaver/weave/libWeavePass.so -fPIC")
+    if (PERFFLOWASPECT_CLANG_14_NEWER)
+        set_source_files_properties(${TEST}.cpp COMPILE_FLAGS "-Xclang -load -Xclang ../weaver/weave/libWeavePass.so -fpass-plugin=../weaver/weave/libWeavePass.so  -fPIC")
+    else()
+        set_source_files_properties(${TEST}.cpp COMPILE_FLAGS "-Xclang -load -Xclang ../weaver/weave/libWeavePass.so -fPIC")
+    endif() 
     target_link_libraries(${TEST} ${perfflow_deps})
 endforeach()
 
 if(PERFFLOWASPECT_WITH_MULTITHREADS)
     message(STATUS " [*] Adding test: smoketest_MT")
     add_executable(smoketest_MT smoketest_MT.cpp)
-    set_source_files_properties(smoketest_MT.cpp COMPILE_FLAGS "-Xclang -load -Xclang ../weaver/weave/libWeavePass.so -fPIC")
+    if (PERFFLOWASPECT_CLANG_14_NEWER)
+        set_source_files_properties(smoketest_MT.cpp COMPILE_FLAGS "-Xclang -load -Xclang ../weaver/weave/libWeavePass.so -fpass-plugin=../weaver/weave/libWeavePass.so  -fPIC")
+    else()
+        set_source_files_properties(smoketest_MT.cpp COMPILE_FLAGS "-Xclang -load -Xclang ../weaver/weave/libWeavePass.so -fPIC")
+    endif() 
     set(THREADS_PREFER_PTHREAD_FLAG ON)
     target_link_libraries(smoketest_MT ${perfflow_deps} pthread)
 endif()
 
 if(PERFFLOWASPECT_WITH_MPI)
     message(STATUS " [*] Adding test: smoketest_MPI")
     add_executable(smoketest_MPI smoketest_MPI.cpp)
-    set_source_files_properties(smoketest_MPI.cpp COMPILE_FLAGS "-Xclang -load -Xclang ../weaver/weave/libWeavePass.so -fPIC")
+    if (PERFFLOWASPECT_CLANG_14_NEWER)
+        set_source_files_properties(smoketest_MPI.cpp COMPILE_FLAGS "-Xclang -load -Xclang ../weaver/weave/libWeavePass.so -fpass-plugin=../weaver/weave/libWeavePass.so  -fPIC")
+    else()
+        set_source_files_properties(smoketest_MPI.cpp COMPILE_FLAGS "-Xclang -load -Xclang ../weaver/weave/libWeavePass.so -fPIC")
+    endif() 
     include_directories(${MPI_INCLUDE_PATH})
     target_link_libraries(smoketest_MPI ${perfflow_deps} ${MPI_LIBRARIES})
 endif()
 
 if(PERFFLOWASPECT_WITH_CUDA)
     message(STATUS " [*] Adding test: smoketest_cuda")
-    set(CUDA_NVCC_FLAGS  "-ccbin ${CMAKE_CXX_COMPILER} -Xcompiler=-Xclang -Xcompiler=-load -Xcompiler=-Xclang -Xcompiler=../../../weaver/weave/libWeavePass.so")
+    if (PERFFLOWASPECT_CLANG_14_NEWER)
+        set(CUDA_NVCC_FLAGS  "-ccbin ${CMAKE_CXX_COMPILER} -Xcompiler=-Xclang -Xcompiler=-load -Xcompiler=-Xclang -Xcompiler=../../../weaver/weave/libWeavePass.so -Xcompiler=-fpass-plugin=../../../weaver/weave/libWeavePass.so")
+    else()
+        set(CUDA_NVCC_FLAGS  "-ccbin ${CMAKE_CXX_COMPILER} -Xcompiler=-Xclang -Xcompiler=-load -Xcompiler=-Xclang -Xcompiler=../../../weaver/weave/libWeavePass.so")
+    endif() 
     cuda_add_executable(smoketest_cuda smoketest_cuda_wrapper.cpp smoketest_cuda_kernel.cu)
     target_link_libraries(smoketest_cuda ${perfflow_deps} ${CUDA_LIBRARIES})
 endif()

src/c/weaver/weave/CMakeLists.txt

@@ -1,7 +1,16 @@
-add_library(WeavePass MODULE
-    # List your source files here.
-    perfflow_weave.cpp
-)
+if (PERFFLOWASPECT_CLANG_14_NEWER)
+    # Add the new pass 
+    add_library(WeavePass MODULE
+        # List your source files here.
+        perfflow_weave_new_pass.cpp
+    )
+else()
+    # Add the legacy pass if we have Clang < 14.
+    add_library(WeavePass MODULE
+        # List your source files here.
+        perfflow_weave_legacy_pass.cpp
+    )
+endif()
 
 # Use C++11 to compile our pass (i.e., supply -std=c++11).
 target_compile_features(WeavePass PRIVATE cxx_range_for cxx_auto_type)

src/c/weaver/weave/perfflow_weave.cpp → src/c/weaver/weave/perfflow_weave_common.cpp

@@ -8,34 +8,87 @@
  * SPDX-License-Identifier: LGPL-3.0
 \************************************************************/
 
-#include "llvm/IR/Value.h"
-#include "llvm/IR/Attributes.h"
-#include "llvm/IR/Constants.h"
-#include "llvm/IR/LegacyPassManager.h"
-#ifdef PERFFLOWASPECT_CLANG_11_NEWER
-#include "llvm/IR/AbstractCallSite.h"
-#else
-#include "llvm/IR/CallSite.h"
-#endif
-#include "llvm/IR/Module.h"
-#include "llvm/IR/Argument.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/Transforms/IPO/PassManagerBuilder.h"
-#include "llvm/Support/raw_ostream.h"
-
-#include "../../parser/perfflow_parser.hpp"
-#include "perfflow_weave.hpp"
-
-using namespace llvm;
+#include "perfflow_weave_common.hpp"
+
+/******************************************************************************
+ *                                                                            *
+ *                 Public Method of WeaveCommon Class                         *
+ *                                                                            *
+ ******************************************************************************/
+
+bool WeaveCommon::modifyAnnotatedFunctions(Module &m)
+{
+    auto annotations = m.getNamedGlobal("llvm.global.annotations");
+    if (!annotations)
+    {
+        return false;
+    }
+
+    bool changed = false;
+    auto a = cast<ConstantArray> (annotations->getOperand(0));
+    for (unsigned int i = 0; i < a->getNumOperands(); i++)
+    {
+        auto e = cast<ConstantStruct> (a->getOperand(i));
+        if (auto *fn = dyn_cast<Function> (e->getOperand(0)->getOperand(0)))
+        {
+            auto anno = cast<ConstantDataArray>(
+                            cast<GlobalVariable>(e->getOperand(1)->getOperand(0))
+                            ->getOperand(0))
+                        ->getAsCString();
+            std::string pcut, scope, flow;
+            if (perfflow_parser_parse(anno.data(), pcut, scope, flow) == 0)
+            {
+                if (pcut == "around" || pcut == "before")
+                    changed = insertBefore(m, *fn,
+                                           anno, 0, scope, flow, pcut) || changed;
+                else if (pcut == "around_async" || pcut == "before_async")
+                {
+                    changed = insertBefore(m, *fn,
+                                           anno, 1, scope, flow, pcut) || changed;
+                }
+                if (pcut == "around" || pcut == "after")
+                {
+                    if (pcut == "around")
+                    {
+                        if (flow == "in" || flow == "out")
+                        {
+                            flow = "NA";
+                        }
+                    }
+                    changed = insertAfter(m, *fn,
+                                          anno, 0, scope, flow, pcut) || changed;
+                }
+                else if (pcut == "around_async" || pcut == "after_async")
+                {
+                    if (pcut == "around")
+                    {
+                        if (flow == "in" || flow == "out")
+                        {
+                            flow = "NA";
+                        }
+                    }
+                    changed = insertAfter(m, *fn,
+                                          anno, 1, scope, flow, pcut) || changed;
+                }
+            }
+            else
+            {
+                errs() << "WeavePass[WARN]: Ignoring " << anno << "\n";
+            }
+        }
+    }
+    return changed;
+
+}
 
 
 /******************************************************************************
  *                                                                            *
- *                 Private Methods of WeavingPass Class                       *
+ *                 Private Methods of WeaveCommon Class                         *
  *                                                                            *
  ******************************************************************************/
 
-bool WeavingPass::insertAfter(Module &m, Function &f, StringRef &a,
+bool WeaveCommon::insertAfter(Module &m, Function &f, StringRef &a,
                               int async, std::string &scope, std::string &flow, std::string pcut)
 {
     if (m.empty() || f.empty())
@@ -88,7 +141,7 @@ bool WeavingPass::insertAfter(Module &m, Function &f, StringRef &a,
     return true;
 }
 
-bool WeavingPass::insertBefore(Module &m, Function &f, StringRef &a,
+bool WeaveCommon::insertBefore(Module &m, Function &f, StringRef &a,
                                int async, std::string &scope, std::string &flow, std::string pcut)
 {
     if (m.empty() || f.empty())
@@ -135,98 +188,6 @@ bool WeavingPass::insertBefore(Module &m, Function &f, StringRef &a,
     return true;
 }
 
-
-/******************************************************************************
- *                                                                            *
- *                 Public Methods of WeavingPass Class                        *
- *                                                                            *
- ******************************************************************************/
-
-bool WeavingPass::doInitialization(Module &m)
-{
-    outs() << "WeavePass loaded successfully. \n";
-
-    auto annotations = m.getNamedGlobal("llvm.global.annotations");
-    if (!annotations)
-    {
-        return false;
-    }
-
-    bool changed = false;
-    auto a = cast<ConstantArray> (annotations->getOperand(0));
-    for (unsigned int i = 0; i < a->getNumOperands(); i++)
-    {
-        auto e = cast<ConstantStruct> (a->getOperand(i));
-        if (auto *fn = dyn_cast<Function> (e->getOperand(0)->getOperand(0)))
-        {
-            auto anno = cast<ConstantDataArray>(
-                            cast<GlobalVariable>(e->getOperand(1)->getOperand(0))
-                            ->getOperand(0))
-                        ->getAsCString();
-            std::string pcut, scope, flow;
-            if (perfflow_parser_parse(anno.data(), pcut, scope, flow) == 0)
-            {
-                if (pcut == "around" || pcut == "before")
-                    changed = insertBefore(m, *fn,
-                                           anno, 0, scope, flow, pcut) || changed;
-                else if (pcut == "around_async" || pcut == "before_async")
-                {
-                    changed = insertBefore(m, *fn,
-                                           anno, 1, scope, flow, pcut) || changed;
-                }
-                if (pcut == "around" || pcut == "after")
-                {
-                    if (pcut == "around")
-                    {
-                        if (flow == "in" || flow == "out")
-                        {
-                            flow = "NA";
-                        }
-                    }
-                    changed = insertAfter(m, *fn,
-                                          anno, 0, scope, flow, pcut) || changed;
-                }
-                else if (pcut == "around_async" || pcut == "after_async")
-                {
-                    if (pcut == "around")
-                    {
-                        if (flow == "in" || flow == "out")
-                        {
-                            flow = "NA";
-                        }
-                    }
-                    changed = insertAfter(m, *fn,
-                                          anno, 1, scope, flow, pcut) || changed;
-                }
-            }
-            else
-            {
-                errs() << "WeavePass[WARN]: Ignoring " << anno << "\n";
-            }
-        }
-    }
-    return changed;
-}
-
-bool WeavingPass::runOnFunction(Function &F)
-{
-    return false;
-}
-
-char WeavingPass::ID = 0;
-
-// Automatically enable the pass.
-// http://adriansampson.net/blog/clangpass.html
-static void registerWeavingPass(const PassManagerBuilder &,
-                                legacy::PassManagerBase &PM)
-{
-    PM.add(new WeavingPass());
-}
-
-static RegisterStandardPasses
-RegisterMyPass(PassManagerBuilder::EP_EarlyAsPossible,
-               registerWeavingPass);
-
 /*
  * vi:tabstop=4 shiftwidth=4 expandtab
  */