GPA 3.4 release

Author: chesik-amd

.gitignore

@@ -33,6 +33,7 @@ CMakeBuild*/
 
 # Visual Studo 2015 cache/options directory
 .vs/
+.vscode/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

BUILD.md

@@ -12,7 +12,7 @@ order to clone/update any dependent repositories.
 
 #### Prerequisites
   * Python, which can be installed from https://www.python.org/. Either Python 2.7 or 3.x should work.
-  * CMake 3.5.1 or newer
+  * CMake 3.7.2 or newer
     * For Windows, this can be downloaded from https://cmake.org/download/
     * For Linux, this can be installed using: sudo apt-get install cmake
   * To build the documentation:
@@ -30,8 +30,8 @@ order to clone/update any dependent repositories.
  * This script will clone any dependent repositories that are not present on the system. If any of the dependent repositories are already
 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 an earlier GPA release, 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.
+ * 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.
    * 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)
@@ -96,7 +96,7 @@ this script everytime you pull new changes from GPA repository.
 
 The PublicCounterCompiler Tool is a utility, written in C#, that will generate C++ code to define the public (or derived) counters.
 It takes as input text files contained in the [PublicCounterCompilerInputFiles](Src/PublicCounterCompilerInputFiles) directory and
-outputs files in the [GPUPerfAPICounterGenerator](Src/GPUPerfAPICounterGenerator), [GPUPerfAPIUnitTests](Src/GPUPerfAPIUnitTests)
+outputs files in the [GPUPerfAPICounterGenerator](Src/AutoGenerated/GPUPerfAPICounterGenerator), [GPUPerfAPIUnitTests](Src/AutoGenerated/GPUPerfAPIUnitTests)
 and [docs](docs) directories.
 
 There are three ways to execute the tool:

CMakeModules/Common.cmake

@@ -49,5 +49,5 @@ if(NOT WIN32)
     set(CMAKE_CXX_COMPILER g++)
     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)
+    add_compile_options(-Wno-unknown-pragmas -Wno-strict-aliasing -Wno-non-virtual-dtor -Wno-unused-value -msse -fvisibility=hidden)
 endif()

CMakeModules/CommonDefs.cmake

@@ -21,6 +21,8 @@ set(GPA_SRC_COMMON_REL_PATH                                 "Src/GPUPerfAPI-Comm
 set(GPA_SRC_COMMON                                          "${GPA_ROOT}/${GPA_SRC_COMMON_REL_PATH}")
 set(GPA_SRC_COUNTER_GENERATOR_REL_PATH                      "Src/GPUPerfAPICounterGenerator")
 set(GPA_SRC_COUNTER_GENERATOR                               "${GPA_ROOT}/${GPA_SRC_COUNTER_GENERATOR_REL_PATH}")
+set(GPA_AUTOGEN_SRC_COUNTER_GENERATOR_REL_PATH              "Src/AutoGenerated/GPUPerfAPICounterGenerator")
+set(GPA_AUTOGEN_SRC_COUNTER_GENERATOR                       "${GPA_ROOT}/${GPA_AUTOGEN_SRC_COUNTER_GENERATOR_REL_PATH}")
 set(GPA_SRC_COUNTERS_REL_PATH                               "Src/GPUPerfAPICounters")
 set(GPA_SRC_COUNTERS                                        "${GPA_ROOT}/${GPA_SRC_COUNTERS_REL_PATH}")
 set(GPA_SRC_GL_REL_PATH                                     "Src/GPUPerfAPIGL")
@@ -41,6 +43,8 @@ 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")
+set(GPA_AUTOGEN_SRC_TESTS                                   "${GPA_ROOT}/${GPA_AUTOGEN_SRC_TESTS_REL_PATH}")
 set(GPA_SRC_PUBLIC_COUNTER_COMPILER_REL_PATH                "Src/PublicCounterCompiler")
 set(GPA_SRC_PUBLIC_COUNTER_COMPILER                         "${GPA_ROOT}/${GPA_SRC_PUBLIC_COUNTER_COMPILER_REL_PATH}")
 set(GPA_SRC_PUBLIC_COUNTER_INPUT_FILES_REL_PATH             "Src/PublicCounterCompilerInputFiles")
@@ -53,6 +57,10 @@ set(GPA_SPHINX_DOCS_REL_PATH                                "docs")
 set(GPA_SPHINX_DOCS                                         "${GPA_ROOT}/${GPA_SPHINX_DOCS_REL_PATH}")
 set(GPA_SRC_GOOGLE_TEST_REL_PATH                            "Src/GoogleTest")
 set(GPA_SRC_GOOGLE_TEST                                     "${GPA_ROOT}/${GPA_SRC_GOOGLE_TEST_REL_PATH}")
+set(GPA_AUTOGEN_PUBLIC_COUNTER_INPUT_FILES_REL_PATH         "Src/AutoGenerated/PublicCounterCompilerInputFiles")
+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(GOOGLETEST_DIR                                          ${COMMON_DIR_LIB}/Ext/GoogleTest)
 

CMakeModules/CommonMacros.cmake

@@ -57,4 +57,21 @@ endif()
 ## Macro to exclude a target from the default build process
 macro(REMOVE_TARGET_FROM_BUILD TARGET_NAME)
     set_property(TARGET ${ARGV0} PROPERTY ${EXCLUDE_FROM_BUILD} ON)
+endmacro()
+
+## Macro to remove C++ options for C builds
+macro(REMOVE_CPP_COMPILE_OPTIONS)
+    get_property(NATIVE_C_BUILD_OPTIONS DIRECTORY PROPERTY COMPILE_OPTIONS)
+    set(USE_COMPILE_OPTIONS "")
+
+    foreach(OPTION IN ITEMS ${NATIVE_C_BUILD_OPTIONS})
+        if(OPTION STREQUAL "-std=c++11")
+            continue()
+        endif()
+        if(OPTION STREQUAL "-Wno-non-virtual-dtor")
+            continue()
+        endif()
+        set(USE_COMPILE_OPTIONS ${USE_COMPILE_OPTIONS} ${OPTION})
+    endforeach()
+    set_property(DIRECTORY PROPERTY COMPILE_OPTIONS ${USE_COMPILE_OPTIONS})
 endmacro()

CMakeModules/GPA-Vulkan.cmake

@@ -1,35 +1,30 @@
-## Copyright (c) 2018 Advanced Micro Devices, Inc. All rights reserved.
-cmake_minimum_required(VERSION 3.5.1)
+## Copyright (c) 2018-2019 Advanced Micro Devices, Inc. All rights reserved.
+cmake_minimum_required(VERSION 3.7.2)
 
 if(${GPA_ALL_OPEN_SOURCE})
-    if(DEFINED ENV{VULKAN_SDK})
-        set(VULKAN_SDK $ENV{VULKAN_SDK})
-        if(WIN32)
-            set(ADDITIONAL_INCLUDE_DIRECTORIES ${ADDITIONAL_INCLUDE_DIRECTORIES}
-                                           ${VULKAN_SDK}/Include)
-        else()
-            set(ADDITIONAL_INCLUDE_DIRECTORIES ${ADDITIONAL_INCLUDE_DIRECTORIES}
-                                   ${VULKAN_SDK}/include)
-        endif()
-
-        set(ADDITIONAL_DEFINTIONS ${ADDITIONAL_DEFINTIONS}
-                          -DVULKAN_SDK="${VULKAN_SDK}")
-
+    find_package(Vulkan REQUIRED)
+    if(${Vulkan_FOUND})
+        set(VK_INC_DIRS ${Vulkan_INCLUDE_DIRS})
+        set(VK_LIB ${Vulkan_LIBRARIES})
         if(WIN32)
             if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-                set(ADDITIONAL_LINK_DIRECTORIES ${ADDITIONAL_LINK_DIRECTORIES}
-                                                ${VULKAN_SDK}/Lib)
+                find_path(VK_TOOLS_DIR NAMES glslangValidator.exe PATHS "$ENV{VULKAN_SDK}/Bin")
             else()
-                set(ADDITIONAL_LINK_DIRECTORIES ${ADDITIONAL_LINK_DIRECTORIES}
-                                                ${VULKAN_SDK}/Lib32)
+                find_path(VK_TOOLS_DIR NAMES glslangValidator.exe PATHS "$ENV{VULKAN_SDK}/Bin32")
             endif()
         else()
-            set(ADDITIONAL_LINK_DIRECTORIES ${ADDITIONAL_LINK_DIRECTORIES}
-                                            ${VULKAN_SDK}/lib)
+            find_path(VK_TOOLS_DIR NAMES glslangValidator PATHS "$ENV{VULKAN_SDK}/bin")
         endif()
+
+        set(ADDITIONAL_DEFINTIONS ${ADDITIONAL_DEFINTIONS}
+                                  -DVK_INC_DIRS="${VK_INC_DIRS}")
+
+        set(ADDITIONAL_INCLUDE_DIRECTORIES  ${ADDITIONAL_INCLUDE_DIRECTORIES}
+                                            ${VK_INC_DIRS})
+
     else()
         message("CMake: Vulkan SDK not found")
     endif()
 else()
     include(${CMAKE_COMMON_LIB_GLOBAL_EXT_VULKAN})
-endif()
+endif()

CMakeModules/Targets.cmake

@@ -73,6 +73,12 @@ if(CMAKE_SIZEOF_VOID_P EQUAL 8)
     add_subdirectory(${GPA_SRC_VK_COLOR_CUBE} ${CMAKE_BINARY_DIR}/${GPA_SRC_VK_COLOR_CUBE_REL_PATH})
 endif()
 
+if(WIN32)
+    add_subdirectory(${GPA_SRC_GL_TRIANGLE} ${CMAKE_BINARY_DIR}/${GPA_SRC_GL_TRIANGLE_REL_PATH})
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    add_subdirectory(${GPA_SRC_GL_TRIANGLE} ${CMAKE_BINARY_DIR}/${GPA_SRC_GL_TRIANGLE_REL_PATH})
+endif()
+
 if(NOT ${skiptests})
     # Build GoogleTest libs
     add_subdirectory(${GPA_SRC_GOOGLE_TEST} ${CMAKE_BINARY_DIR}/${GPA_SRC_GOOGLE_TEST_REL_PATH})