Merge 'master' into 'amd-master'

Change-Id: Ibb123e2f64e03999afd020a1fac5bfc3ea40e37f

hipamd/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.4.3)
 project(hip)
 
 #############################
@@ -155,7 +155,13 @@ add_to_config(_buildInfo COMPILE_HIP_ATP_MARKER)
 ################
 if(USE_PROF_API EQUAL 1)
     if(NOT DEFINED PROF_API_HEADER_PATH)
-        set(PROF_API_HEADER_PATH /opt/rocm/roctracer/include/ext)
+        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)
+        else()
+            set(PROF_API_HEADER_PATH /opt/rocm/roctracer/include/ext)
+        endif()
     endif()
     find_path(PROF_API_HEADER_DIR NAMES prof_protocol.h PATHS ${PROF_API_HEADER_PATH} NO_DEFAULT_PATH)
     if(NOT PROF_API_HEADER_DIR)

hipamd/Jenkinsfile

@@ -294,8 +294,53 @@ def docker_upload_dockerhub( String local_org, String image_name, String remote_
 String build_config = 'Release'
 String job_name = env.JOB_NAME.toLowerCase( )
 
-// The following launches 3 builds in parallel: rocm-head, rocm-1.9.x and cuda-9.x
-parallel rocm_2_0:
+// The following launches 4 builds in parallel: rocm-head, rocm-2.1.x, rocm-2.0.x and cuda-9.x
+parallel rocm_2_1:
+{
+  node('hip-rocm')
+  {
+    String hcc_ver = 'rocm-2.1.x'
+    String from_image = 'ci_test_nodes/rocm-2.1.x/ubuntu-16.04:latest'
+    String inside_args = '--device=/dev/kfd --device=/dev/dri --group-add=video'
+
+    // Checkout source code, dependencies and version files
+    String source_hip_rel = checkout_and_version( hcc_ver )
+
+    // Create/reuse a docker image that represents the hip build environment
+    def hip_build_image = docker_build_image( hcc_ver, 'hip', '', source_hip_rel, from_image )
+
+    // Print system information for the log
+    hip_build_image.inside( inside_args )
+    {
+      sh  """#!/usr/bin/env bash
+          set -x
+          /opt/rocm/bin/rocm_agent_enumerator -t ALL
+          /opt/rocm/bin/hcc --version
+        """
+    }
+
+    // Conctruct a binary directory path based on build config
+    String build_hip_rel = build_directory_rel( build_config );
+
+    // Build hip inside of the build environment
+    docker_build_inside_image( hip_build_image, inside_args, hcc_ver, '', build_config, source_hip_rel, build_hip_rel )
+
+    // Clean docker build image
+    docker_clean_images( 'hip', docker_build_image_name( ) )
+
+    // After a successful build, upload a docker image of the results
+    /*
+    String hip_image_name = docker_upload_artifactory( hcc_ver, job_name, from_image, source_hip_rel, build_hip_rel )
+    if( params.push_image_to_docker_hub )
+    {
+      docker_upload_dockerhub( job_name, hip_image_name, 'rocm' )
+      docker_clean_images( 'rocm', hip_image_name )
+    }
+    docker_clean_images( job_name, hip_image_name )
+    */
+  }
+},
+rocm_2_0:
 {
   node('hip-rocm')
   {