GPA 3.5 updates

Author: amitprakash07

BUILD.md

@@ -31,7 +31,7 @@ order to clone/update any dependent repositories.
 present on the system, this script will instead do a "git pull" on those repositories to ensure that they are up to date. Please re-run
 this script everytime you pull new changes from GPA repository.
  * NOTE: For GPA 3.3 or newer, if you are updating an existing clone of the GPA repo from a GPA release prior than 3.3, you will first need to delete the Common/Lib/Ext/GoogleTest directory. Starting with GPA 3.3, GPA is now using a fork of the official GoogleTest repo. Failure to remove this directory will lead to git errors when running PreBuild.py or UpdateCommon.py.
- * This script will also download and execute the Vulkan™ SDK installer.
+ * This script will also download and execute the Vulkan� SDK installer.
    * On Windows, running the installer may require elevation.  If you've previously installed the required Vulkan version, UpdateCommon will simply copy the files form the default installation location into the correct place into the GPUPerfAPI directory tree.
    * UpdateCommon is set up to install the version of the Vulkan SDK which was used during development. If you want to use a newer version of the SDK, the following file will need to be updated:
      * [UpdateCommonMap.py](Scripts/UpdateCommonMap.py)
@@ -50,7 +50,6 @@ this script everytime you pull new changes from GPA repository.
    * `--skipvulkan`: Does not generate build files for Vulkan version of GPA
    * `--skipopengl`: Does not generate build files for OpenGL version of GPA
    * `--skipopencl`: Does not generate build files for OpenCL version of GPA
-   * `--skiprocm`: Does not generate build files for ROCm version of GPA (Linux only)
    * `--skiptests`: Does not generate build files for unit tests
    * `--skipdocs`: Does not generate build files for documentation
    * `--cmakecmd="CMD"`: Override the "cmake" command with "CMD"
@@ -78,11 +77,6 @@ this script everytime you pull new changes from GPA repository.
 ##### Prerequisites
  * Install the Mesa common development package: sudo apt-get install mesa-common-dev
  * For 32-bit builds, install the multilib packages: sudo apt-get install gcc-multilib g++-multilib
- * In order to build the ROCm/HSA version of GPA, you will need all or part of the ROCm stack installed
-   * Follow the ROCm installation instructions to install either rocm-dkms or rocm-dev: https://rocm.github.io/ROCmInstall.html
-     * In addition, please make sure that the optional ROCm package "rocprofiler-dev" is installed:
-       * Ubuntu: sudo apt install rocprofiler-dev
-       * CentOS: sudo yum install rocprofiler-dev
 
 ##### Build Instructions
  * Execute "make" in the CMakeBuild/x64/debug to build the 64-bit debug version of GPA
@@ -102,7 +96,7 @@ and [docs](docs) directories.
 There are three ways to execute the tool:
 * With no parameters - it opens the user interface with no fields prepopulated
 * With two parameters - it opens the user interface with the two main fields prepopulated. When you press the "Compile Public Counters" button it will load the correct input files and generate the output files in the correct location.
-  * Param 1: API -- the API to compile counters for (ex: GL, CL, HSA, DX11, DX12, VK, etc).
+  * Param 1: API -- the API to compile counters for (ex: GL, CL, DX11, DX12, VK, etc).
   * Param 2: HW generation: the generation to compile counters for (ex: Gfx6, Gfx7, Gfx8, etc.)
 * With six or seven parameters - the user interface does not open. It simply generates the c++ files using the specified input and output file locations
   * Param 1: Counter names file - text file containing hardware counter names and type (CounterNames[API][GEN].txt)

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1)
 
 set(DEPTH "./")
 
-message("CMake: Generating project files for GPA....")
+message(STATUS "Generating project files for GPA....")
 set(GPA_CMAKE_MODULES_DIR   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules)
 
 include(${GPA_CMAKE_MODULES_DIR}/CommonDefs.cmake)
@@ -15,8 +15,17 @@ endif()
 
 set(GPA_ALL_OPEN_SOURCE ON)
 
+if(${BUILD_ANDROID})
+    include (${GPA_CMAKE_MODULES_DIR}/GPA-Android.cmake)
+
+    project(GPUPerfAPI-Full${AMDTInternalSuffix} VERSION ${GPA_MAJOR_VERSION}.${GPA_MINOR_VERSION} LANGUAGES C CXX)
+    include(${GPA_CMAKE_MODULES_DIR}/Targets.cmake)
+
+    return()
+endif()
+
 ## Define the GPA solution name
 project(GPUPerfAPI${AMDTInternalSuffix} VERSION ${GPA_MAJOR_VERSION}.${GPA_MINOR_VERSION} LANGUAGES C CXX)
 
 include(${GPA_CMAKE_MODULES_DIR}/Targets.cmake)
-message("CMake: Finished generating project files for GPA.")
+message(STATUS "Finished generating project files for GPA.")

CMakeModules/BuildFlags.cmake

@@ -1,4 +1,4 @@
-## Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
+## Copyright (c) 2018-2019 Advanced Micro Devices, Inc. All rights reserved.
 cmake_minimum_required(VERSION 3.5.1)
 
 ## GPA has only Debug and Release
@@ -30,12 +30,6 @@ if(${usingscript})
         set(build-debug OFF CACHE BOOL "Turn on to generate debug config of the project")
     endif()
 
-    if(${build-32bit})
-        set(CMAKE_SIZEOF_VOID_P 4)
-    else()
-        set(CMAKE_SIZEOF_VOID_P 8)
-    endif()
-
     if(NOT WIN32)
         if(${build-debug})
             set(CMAKE_BUILD_TYPE debug)
@@ -45,6 +39,12 @@ if(${usingscript})
     endif()
 endif()
 
+if(${build-32bit})
+    set(CMAKE_SIZEOF_VOID_P 4)
+else()
+    set(CMAKE_SIZEOF_VOID_P 8)
+endif()
+
 # DX11 variable
 if(NOT DEFINED skipdx11)
     set(skipdx11 OFF CACHE BOOL "Turn on to skip DX11 in the build" FORCE)
@@ -70,11 +70,6 @@ if(NOT DEFINED skipopencl)
     set(skipopencl OFF CACHE BOOL "Turn on to skip OpenCL in the build" FORCE)
 endif()
 
-# ROCm variable
-if(NOT DEFINED skiprocm)
-    set(skiprocm OFF CACHE BOOL "Turn on to skip ROCm in the build" FORCE)
-endif()
-
 # Tests variable
 if(NOT DEFINED skiptests)
     set(skiptests OFF CACHE BOOL "Turn on to skip Tests in the build" FORCE)
@@ -83,4 +78,14 @@ endif()
 # Sphinx documentation
 if(NOT DEFINED skipdocs)
     set(skipdocs OFF CACHE BOOL "Turn on to skip sphinx documentation in the build" FORCE)
+endif()
+
+# Default Output directory
+if(NOT DEFINED USE_DEFAULT_OUTPUT_DIRECTORY)
+    set(USE_DEFAULT_OUTPUT_DIRECTORY ON)
+endif()
+
+# Default compiler
+if(NOT DEFINED USE_DEFAULT_COMPILER)
+    set(USE_DEFAULT_COMPILER ON)
 endif()

CMakeModules/Common.cmake

@@ -1,4 +1,4 @@
-## Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
+## Copyright (c) 2018-2019 Advanced Micro Devices, Inc. All rights reserved.
 cmake_minimum_required(VERSION 3.5.1)
 
 include(${GPA_CMAKE_MODULES_DIR}/CommonDefs.cmake)
@@ -15,10 +15,11 @@ if(WIN32)
     add_compile_options("$<$<CONFIG:RELEASE>:/MT>"
                         "$<$<CONFIG:DEBUG>:/MTd>")
     set(AMDTCrt "MT")
-    add_compile_options(-DUNICODE
-                        -D_UNICODE)
 endif()
 
+add_compile_options(-DUNICODE
+                    -D_UNICODE)
+
 if(WIN32)
     set(CURRENT_CONFIG "Debug/Release")
 else()
@@ -27,26 +28,35 @@ endif()
 
 ## Handling project
 if(NOT ${ProjectName} STREQUAL "")
-    message("CMake: Evaluating and including project ${ProjectName} for config ${CURRENT_CONFIG} for ${AMDTPlatform} platform in ${PROJECT_NAME} solution")
+    message(STATUS "Evaluating and including project ${ProjectName} for config ${CURRENT_CONFIG} for ${AMDTPlatform} platform in ${PROJECT_NAME} solution")
 endif()
 
-if(WIN32)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${GPA_OUTPUT_DIR}/Release)
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${GPA_OUTPUT_DIR}/Debug)
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${GPA_OUTPUT_DIR}/Release)
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${GPA_OUTPUT_DIR}/Debug)
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${GPA_OUTPUT_DIR}/Release)
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${GPA_OUTPUT_DIR}/Debug)
+if(${USE_DEFAULT_OUTPUT_DIRECTORY})
+    if(WIN32)
+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${GPA_OUTPUT_DIR}/release)
+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${GPA_OUTPUT_DIR}/debug)
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${GPA_OUTPUT_DIR}/release)
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${GPA_OUTPUT_DIR}/debug)
+        set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${GPA_OUTPUT_DIR}/release)
+        set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${GPA_OUTPUT_DIR}/debug)
+    else()
+        set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  ${GPA_OUTPUT_DIR}/${CMAKE_BUILD_TYPE})
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY  ${GPA_OUTPUT_DIR}/${CMAKE_BUILD_TYPE})
+    endif()
 else()
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  ${GPA_OUTPUT_DIR}/${CMAKE_BUILD_TYPE})
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY  ${GPA_OUTPUT_DIR}/${CMAKE_BUILD_TYPE})
+    if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY OR NOT DEFINED CMAKE_LIBRARY_OUTPUT_DIRECTORY)
+        message(FATAL_ERROR "Output Directories are not set.")
+    endif()
 endif()
 
 add_definitions(-DUSE_POINTER_SINGLETON)
 
 if(NOT WIN32)
-    set(CMAKE_C_COMPILER gcc)
-    set(CMAKE_CXX_COMPILER g++)
+    if(${USE_DEFAULT_COMPILER})
+        set(CMAKE_C_COMPILER gcc)
+        set(CMAKE_CXX_COMPILER g++)
+    endif()
+
     set(GPA_COMMON_LINK_ARCHIVE_FLAG -Wl,--whole-archive)
     set(GPA_COMMON_LINK_NO_ARCHIVE_FLAG -Wl,--no-whole-archive)
     add_compile_options(-Wno-unknown-pragmas -Wno-strict-aliasing -Wno-non-virtual-dtor -Wno-unused-value -msse -fvisibility=hidden)

CMakeModules/CommonDefs.cmake

@@ -37,10 +37,6 @@ set(GPA_SRC_VK_REL_PATH                                     "Src/GPUPerfAPIVk")
 set(GPA_SRC_VK                                              "${GPA_ROOT}/${GPA_SRC_VK_REL_PATH}")
 set(GPA_SRC_CL_REL_PATH                                     "Src/GPUPerfAPICL")
 set(GPA_SRC_CL                                              "${GPA_ROOT}/${GPA_SRC_CL_REL_PATH}")
-set(GPA_SRC_HSA_REL_PATH                                    "Src/GPUPerfAPIHSA")
-set(GPA_SRC_HSA                                             "${GPA_ROOT}/${GPA_SRC_HSA_REL_PATH}")
-set(GPA_SRC_ROCM_REL_PATH                                   "Src/GPUPerfAPIROCm")
-set(GPA_SRC_ROCM                                            "${GPA_ROOT}/${GPA_SRC_ROCM_REL_PATH}")
 set(GPA_SRC_TESTS_REL_PATH                                  "Src/GPUPerfAPIUnitTests")
 set(GPA_SRC_TESTS                                           "${GPA_ROOT}/${GPA_SRC_TESTS_REL_PATH}")
 set(GPA_AUTOGEN_SRC_TESTS_REL_PATH                          "Src/AutoGenerated/GPUPerfAPIUnitTests")
@@ -61,6 +57,8 @@ set(GPA_AUTOGEN_PUBLIC_COUNTER_INPUT_FILES_REL_PATH         "Src/AutoGenerated/P
 set(GPA_AUTOGEN_PUBLIC_COUNTER_INPUT_FILES                  "${GPA_ROOT}/${GPA_AUTOGEN_PUBLIC_COUNTER_INPUT_FILES_REL_PATH}")
 set(GPA_SRC_GL_TRIANGLE_REL_PATH                            "Src/Examples/OpenGL/GLTriangle")
 set(GPA_SRC_GL_TRIANGLE                                     "${GPA_ROOT}/${GPA_SRC_GL_TRIANGLE_REL_PATH}")
+set(GPA_SRC_D3D11_TRIANGLE_REL_PATH                         "Src/Examples/DX11/D3D11Triangle")
+set(GPA_SRC_D3D11_TRIANGLE                                  "${GPA_ROOT}/${GPA_SRC_D3D11_TRIANGLE_REL_PATH}")
 
 set(GOOGLETEST_DIR                                          ${COMMON_DIR_LIB}/Ext/GoogleTest)
 
@@ -77,8 +75,6 @@ set(CMAKE_COMMON_SRC_GLOBAL_TSINGLETON                      ${COMMON_DIR_SRC}/TS
 set(CMAKE_COMMON_LIB_GLOBAL_AMD_ADL                         ${COMMON_DIR_LIB}/AMD/ADL/Global-ADL.cmake)
 set(CMAKE_COMMON_LIB_GLOBAL_AMD_OPENCL_NO_LIB               ${COMMON_DIR_LIB}/AMD/APPSDK/Global-OpenCL-NoLib.cmake)
 set(CMAKE_COMMON_LIB_GLOBAL_AMD_OPENCL                      ${COMMON_DIR_LIB}/AMD/APPSDK/Global-OpenCL.cmake)
-set(CMAKE_COMMON_LIB_GLOBAL_AMD_HSA_NO_LIB                  ${COMMON_DIR_LIB}/AMD/HSA/Global-HSAFoundation-NoLib.cmake)
-set(CMAKE_COMMON_LIB_GLOBAL_AMD_HSA                         ${COMMON_DIR_LIB}/AMD/HSA/Global-HSAFoundation.cmake)
 set(CMAKE_COMMON_LIB_GLOBAL_EXT_OPENGL                      ${COMMON_DIR_LIB}/Ext/OpenGL/Global-OpenGL.cmake)
 set(CMAKE_COMMON_LIB_GLOBAL_EXT_VULKAN                      ${COMMON_DIR_LIB}/Ext/Vulkan/Global-Vulkan.cmake)
 set(CMAKE_COMMON_LIB_GLOBAL_EXT_WINDOWS_SDK                 ${COMMON_DIR_LIB}/Ext/Windows-Kits/Global-WindowsSDK.cmake)

CMakeModules/GPA-Android.cmake

@@ -0,0 +1,65 @@
+## Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
+cmake_minimum_required(VERSION 3.5.1)
+
+if (NOT DEFINED ENV{ANDROID_SDK})
+    message(FATAL_ERROR "ANDROID_SDK is not defined")
+endif()
+
+if (NOT DEFINED ENV{ANDROID_NDK})
+    message(FATAL_ERROR "ANDROID_NDK is not defined")
+endif()
+
+if (NOT DEFINED ENV{JAVA_HOME})
+    message(FATAL_ERROR "JAVA_HOME is not defined")
+endif()
+
+# Android variables
+set(ANDROID_NDK_PATH $ENV{ANDROID_NDK})
+set(ANDROID_SDK_PATH $ENV{ANDROID_SDK})
+set(ANDROID_NDK_SHADER_TOOL_PATH ${ANDROID_NDK_PATH}/shader-tools/linux-x86_64)
+set(JAVA_HOME_PATH $ENV{JAVA_HOME})
+
+if (NOT DEFINED ANDROID_PLATFORM)
+    set(ANDROID_PLATFORM 24)
+    message(STATUS "GPA: Using Android platform level ${ANDROID_PLATFORM}")
+endif()
+
+if (NOT DEFINED ANDROID_ABI)
+    set(ANDROID_ABI x86_64)
+    message(STATUS "GPA: Using Android abi ${ANDROID_ABI}")
+endif()
+
+if (NOT DEFINED ANDROID_NATIVE_API_LEVEL)
+    set(ANDROID_NATIVE_API_LEVEL 24)
+    message(STATUS "GPA: Using Android native api level ${ANDROID_NATIVE_API_LEVEL}")
+endif()
+
+if(NOT DEFINED ANDROID_STL)
+    set(ANDROID_STL c++_static)
+    message(STATUS "GPA: Using Android ${ANDROID_STL} C/C++ STL")
+endif()
+
+set(ANDROID_TAGET_PLATFORM_ID ${ANDROID_PLATFORM})
+set(ANDROID_NDK_NATIVE_GLUE_DIR "${ANDROID_NDK_PATH}/sources/android/native_app_glue")
+set(ANDROID_NDK_INC "${ANDROID_NDK_PATH}/sysroot/usr/include")
+set(ANDROID_TARGET_PLATFORM ${ANDROID_SDK_PATH}/platforms/android-${ANDROID_TAGET_PLATFORM_ID})
+set(ANDROID_TARGET_JAR ${ANDROID_TARGET_PLATFORM}/android.jar)
+set(ANDROID_BUILD_TOOLS ${ANDROID_SDK_PATH}/build-tools/24.0.3)
+
+## Build configurations
+set(CMAKE_TOOLCHAIN_FILE ${ANDROID_NDK_PATH}/build/cmake/android.toolchain.cmake)
+set(USE_DEFAULT_COMPILER OFF)
+set(USE_DEFAULT_OUTPUT_DIRECTORY OFF)
+set(GPA_OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Output/Android)
+
+if(${AMDT_INTERNAL_BUILD_FLAG})
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${GPA_OUTPUT_DIR}${AMDTInternalSuffix})
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${GPA_OUTPUT_DIR}${AMDTInternalSuffix})
+else()
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${GPA_OUTPUT_DIR})
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${GPA_OUTPUT_DIR})
+endif()
+
+set(ANDROID_INCLUDE_DIRECTORIES ${ANDROID_NDK_NATIVE_GLUE_DIR}
+                                ${ANDROID_NDK_INC})
+set(ANDROID_LIBS log android)

CMakeModules/GPA-HSA.cmake

@@ -21,10 +21,11 @@ if(${GPA_ALL_OPEN_SOURCE})
 
         set(ADDITIONAL_INCLUDE_DIRECTORIES  ${ADDITIONAL_INCLUDE_DIRECTORIES}
                                             ${VK_INC_DIRS})
-
     else()
-        message("CMake: Vulkan SDK not found")
+        message(STATUS "Vulkan SDK not found")
     endif()
 else()
     include(${CMAKE_COMMON_LIB_GLOBAL_EXT_VULKAN})
 endif()
+
+message(STATUS "Using vulkan headers from ${VK_INC_DIRS}, libraries from ${VK_LIB} and tools from ${VK_TOOLS_DIR}")