Merge 'master' into 'amd-master'

Change-Id: I51774a512af3c672a4ebbbcf905ac32d3f9351a1

hipamd/CMakeLists.txt

@@ -158,7 +158,7 @@ if(USE_PROF_API EQUAL 1)
         find_package(PkgConfig)
         pkg_check_modules(ROCTRACERPROTO QUIET roctracer-proto)
         if(ROCTRACERPROTO_FOUND EQUAL 1)
-            pkg_get_variable(PROF_API_HEADER_PATH roctracer-proto prefix)
+            pkg_get_variable(PROF_API_HEADER_PATH roctracer-proto includedir)
         else()
             set(PROF_API_HEADER_PATH /opt/rocm/roctracer/include/ext)
         endif()

hipamd/Jenkinsfile

@@ -167,6 +167,7 @@ def docker_build_inside_image( def build_image, String inside_args, String platf
     }
 
     // Cap the maximum amount of testing, in case of hangs
+    // Excluding hipMultiThreadDevice-pyramid test from automation; due to its flakiness which requires some investigation
     timeout(time: 1, unit: 'HOURS')
     {
       stage("${platform} unit testing")
@@ -176,7 +177,7 @@ def docker_build_inside_image( def build_image, String inside_args, String platf
             cd ${build_dir_rel}
             make install -j\$(nproc)
             make build_tests -i -j\$(nproc)
-            ctest
+            ctest -E pyramid
           """
         // If unit tests output a junit or xunit file in the future, jenkins can parse that file
         // to display test results on the dashboard

hipamd/hipify-clang/src/ArgParse.cpp

@@ -49,6 +49,11 @@ cl::opt <bool> SaveTemps("save-temps",
   cl::value_desc("save-temps"),
   cl::cat(ToolTemplateCategory));
 
+cl::opt <bool> Verbose("v",
+  cl::desc("Show commands to run and use verbose output"),
+  cl::value_desc("v"),
+  cl::cat(ToolTemplateCategory));
+
 cl::opt <bool> TranslateToRoc("roc",
   cl::desc("Translate to roc instead of hip where it is possible"),
   cl::value_desc("roc"),

hipamd/hipify-clang/src/ArgParse.h

@@ -37,6 +37,7 @@ extern cl::list<std::string> IncludeDirs;
 extern cl::list<std::string> MacroNames;
 extern cl::opt<bool> Inplace;
 extern cl::opt<bool> SaveTemps;
+extern cl::opt<bool> Verbose;
 extern cl::opt<bool> NoBackup;
 extern cl::opt<bool> NoOutput;
 extern cl::opt<bool> PrintStats;

hipamd/hipify-clang/src/main.cpp

@@ -234,6 +234,9 @@ int main(int argc, const char **argv) {
         Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster(s.c_str(), ct::ArgumentInsertPosition::END));
       }
     }
+    if (Verbose) {
+      Tool.appendArgumentsAdjuster(ct::getInsertArgumentAdjuster("-v", ct::ArgumentInsertPosition::END));
+    }
     Tool.appendArgumentsAdjuster(ct::getClangSyntaxOnlyAdjuster());
     Statistics& currentStat = Statistics::current();
     // Hipify _all_ the things!

hipamd/include/hip/hcc_detail/hip_prof_api.h

@@ -195,8 +195,8 @@ class api_callbacks_table_t {
  public:
   typedef void* act_t;
   typedef void* fun_t;
-  bool set_activity(uint32_t id, act_t fun, void* arg) { return true; }
+  bool set_activity(uint32_t id, act_t fun, void* arg) { return false; }
-  bool set_callback(uint32_t id, fun_t fun, void* arg) { return true; }
+  bool set_callback(uint32_t id, fun_t fun, void* arg) { return false; }
 };
 
 #endif