From 88628c757f9b0b1afe94d060711613bbf72f943e Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Tue, 29 Jan 2019 13:15:26 -0600
Subject: [PATCH 1/4] roctracer-proto pkg-config fix to includedir

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3db80f9e7e..b2b67fbc0e 100644
--- a/CMakeLists.txt
+++ b/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()

From cc5ff70b90a5c1ae9a6e7441058d6a0389246aed Mon Sep 17 00:00:00 2001
From: Evgeny <evgeny.shcherbakov@amd.com>
Date: Tue, 29 Jan 2019 23:14:57 -0600
Subject: [PATCH 2/4] return false if PROF_API is disabled

---
 include/hip/hcc_detail/hip_prof_api.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/hip/hcc_detail/hip_prof_api.h b/include/hip/hcc_detail/hip_prof_api.h
index dd3c3efec9..eb3112bdb4 100644
--- a/include/hip/hcc_detail/hip_prof_api.h
+++ b/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_callback(uint32_t id, fun_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 false; }
 };
 
 #endif

From b5dfe12198661e7316dec020721de767b87221f6 Mon Sep 17 00:00:00 2001
From: Maneesh Gupta <maneesh.gupta@amd.com>
Date: Wed, 30 Jan 2019 13:13:09 +0530
Subject: [PATCH 3/4] [ci] Exclude flaky hipMultiThreadDevice-pyramid test for
 now

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1f9590fdf4..b157e71e59 100644
--- a/Jenkinsfile
+++ b/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

From ce28bc79efd16f7ec95925544ca383e504e63cc2 Mon Sep 17 00:00:00 2001
From: Evgeny Mankov <evgeny.mankov@gmail.com>
Date: Wed, 30 Jan 2019 15:19:06 +0300
Subject: [PATCH 4/4] [HIPIFY] Introduce Verbose '-v' option as hipify's own

---
 hipify-clang/src/ArgParse.cpp | 5 +++++
 hipify-clang/src/ArgParse.h   | 1 +
 hipify-clang/src/main.cpp     | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/hipify-clang/src/ArgParse.cpp b/hipify-clang/src/ArgParse.cpp
index 3cc372adab..bcd1457ec4 100644
--- a/hipify-clang/src/ArgParse.cpp
+++ b/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"),
diff --git a/hipify-clang/src/ArgParse.h b/hipify-clang/src/ArgParse.h
index d4e666c968..11d84c8e33 100644
--- a/hipify-clang/src/ArgParse.h
+++ b/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;
diff --git a/hipify-clang/src/main.cpp b/hipify-clang/src/main.cpp
index 6df2f57073..3b832deb8f 100644
--- a/hipify-clang/src/main.cpp
+++ b/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!