GPA 3.1 release

Author: chesik-amd

.gitignore

@@ -76,6 +76,7 @@ artifacts/
 *.pidb
 *.svclog
 *.scc
+*.dll
 
 # Chutzpah Test files
 _Chutzpah*

BUILD.md

@@ -22,17 +22,18 @@ present on the system, this script will instead do a "git pull" on those reposit
 this script everytime you pull new changes from GPA repository.
  * 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 files will need to be updated:
+   * 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)
-     * Linux-specific: [Common.mk](GPA/Build/Linux/Common.mk)
-     * Windows-specific: Common/Lib/Ext/Global-Vulkan.props
+   * By default the build will expect the Vulkan SDK to be found in a directory pointed to by the `VULKAN_SDK` environment variable. This environment variable is automatically set by the Windows SDK installer, but you may need to set it manually after running the Linux SDK installer. The Linux SDK includes a script called `setup-env.sh` to aid in setting this environment variable:
+     * `source ~/VulkanSDK/1.0.68.0/setup-env.sh` (adjust path as necessary)
 
 ## Windows Build Information
 
 ##### Prerequisites
  * Microsoft Visual Studio 2015 Community Edition or higher + Update 3
  * Windows 10 SDK Version 10.0.10586.0 from https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk
    * You can override the version of the Windows 10 SDK used by modifying Common/Lib/Ext/Windows-Kits/Global-WindowsSDK.props
+ * Microsoft .NET 4.6.2 SDK from https://www.microsoft.com/en-us/download/details.aspx?id=53321
 
 ##### Build Instructions
  * Load Build\VS2015\GPUPerfAPI.sln into Visual Studio
@@ -73,6 +74,7 @@ this script everytime you pull new changes from GPA repository.
    * `hsadir`: overrides the location of the ROCm/HSA header files (by default they are expected to be in /opt/rocm/hsa)
    * `gtestlibdir`: overrides the location of the GoogleTest libraries (by default they are expected to be in Common/Lib/Ext/GoogleTest/1-7/lib/gcc5/x64. There is also a gcc4.x-compatible version in Common/Lib/Ext/GoogleTest/1-7/lib/x64 for use when building on a system with gcc 4.x)
    * `gtestlibdir32`: overrides the location of the 32-bit GoogleTest libraries (by default they are expected to be in Common/Lib/Ext/GoogleTest/1-7/lib/gcc5/x86. There is also a gcc4.x-compatible version in Common/Lib/Ext/GoogleTest/1-7/lib/x86 for use when building on a system with gcc 4.x)
+   * `vksdkdir`: overrides the location of the Vulkan SDK. If not specified, the build will use a `VULKAN_SDK` environment variable to determine where to look for the Vulkan SDK.
  * After a successful build, the GPUPerfAPI binaries can be found in Output/bin.
  * Example build command line (builds the debug versions of the binaries, skipping the HSA library):
    * ./build.sh debug skiphsa

Build/Linux/Common.mk

@@ -56,8 +56,9 @@ GL_DIR = $(COMMON_LIB_EXT)/OpenGL
 GTEST_DIR = $(COMMON_LIB_EXT)/GoogleTest/1-7
 GTEST_LIBS = $(GTEST_DIR)/lib/gcc5/x64/libgtest.a
 GTEST_LIBS32 = $(GTEST_DIR)/lib/gcc5/x86/libgtest.a
-VK_SDK_DIR = $(COMMON_LIB_EXT)/Vulkan/VulkanSDK/1.0.49.0/x86_64
+VK_SDK_DIR = $(VULKAN_SDK)
 VK_INCLUDE_DIR = $(VK_SDK_DIR)/include
+VK_LIB_DIR = $(VK_SDK_DIR)/lib
 AMD_VK_EXT_DIR = $(COMMON_SRC)/AmdVkExt
 
 # Lib paths

Build/Linux/build.sh

@@ -4,9 +4,6 @@ set -u
 #define path
 GPAROOT=`dirname $(readlink -f "$0")`/../..
 
-# clean up old folders
-rm -rf $GPAROOT/Output/*
-
 # Command line args
 
 # Generate internal build
@@ -32,8 +29,11 @@ DEBUG_SUFFIX=
 # HSA directory override
 HSA_DIR_OVERRIDE=
 
-# Vulkan include directory override
-VK_INC_DIR_OVERRIDE=
+# Vulkan SDK directory override
+VK_SDK_DIR_OVERRIDE=
+
+# VUlkan SDK Override path
+VULKAN_SDK_OVERRIDE=
 
 # API-specific build control
 bBuildOpenGL=true
@@ -78,9 +78,10 @@ do
    elif [ "$1" = "hsadir" ]; then
       shift
       HSA_DIR_OVERRIDE="HSA_DIR=$1"
-   elif [ "$1" = "vkincdir" ]; then
+   elif [ "$1" = "vksdkdir" ]; then
       shift
-      VK_INC_DIR_OVERRIDE="VK_INCLUDE_DIR=$1"
+      VK_SDK_DIR_OVERRIDE="VK_SDK_DIR=$1"
+      VULKAN_SDK_OVERRIDE="$1"
    elif [ "$1" = "skipopengl" ]; then
       bBuildOpenGL=false
    elif [ "$1" = "skipvulkan" ]; then
@@ -117,6 +118,8 @@ CL=$GPASRC/GPUPerfAPICL
 HSA=$GPASRC/GPUPerfAPIHSA
 GL=$GPASRC/GPUPerfAPIGL
 VK=$GPASRC/GPUPerfAPIVk
+VKCOLORCUBE=$GPASRC/Examples/Vulkan/VkColorCube
+
 COUNTERS=$GPASRC/GPUPerfAPICounters
 COUNTERGENERATOR=$GPASRC/GPUPerfAPICounterGenerator
 GPA_COMMON=$GPASRC/GPUPerfAPI-Common
@@ -179,6 +182,15 @@ VER_MINOR=$(grep -E "#define GPA_MINOR_VERSION\s*[0-9]+" $VERSION_NUMBER_FILE |
 VER_MAJOR_MINOR=$VER_MAJOR.$VER_MINOR
 VER=$VER_MAJOR_MINOR.$BUILD
 
+CURRENT_VERSION_H_FILE_PERMISSIONS=$(stat --format %a $VERSION_NUMBER_FILE)
+chmod 777 "$VERSION_NUMBER_FILE"
+old=$(grep -E "#define GPA_BUILD_NUMBER [0-9]+" $VERSION_NUMBER_FILE)
+new="#define GPA_BUILD_NUMBER $BUILD"
+echo "old = $old"
+echo "new = $new"
+sed -i "s/$old/$new/g" "$VERSION_NUMBER_FILE"
+chmod $CURRENT_VERSION_H_FILE_PERMISSIONS "$VERSION_NUMBER_FILE"
+
 CPU_COUNT=`cat /proc/cpuinfo | grep processor | wc -l`
 
 BUILD_DIRS="$GPUPERFAPI $GPA_COMMON $GPA_DEVICEINFO $COUNTERGENERATOR $COUNTERS"
@@ -188,6 +200,16 @@ if $bBuildOpenGL ; then
 fi
 
 if $bBuildVK ; then
+   if ([ ! -z "$VULKAN_SDK_OVERRIDE" ]) ; then
+      echo "Using VULKAN_SDK Override: $VULKAN_SDK_OVERRIDE"
+      VULKAN_SDK="$VULKAN_SDK_OVERRIDE"
+   elif ([ -v VULKAN_SDK ]) && ([ -e "${VULKAN_SDK}/lib/libvulkan.so" ]) && ([ -e "${VULKAN_SDK}/include/vulkan/vulkan.h" ]) ; then
+      echo "Using VULKAN_SDK Env Var: $VULKAN_SDK"
+   else
+      VULKAN_SDK="${GPAROOT}/../Common/Lib/Ext/Vulkan/Linux/"
+      echo "Using local VULKAN_SDK: ${VULKAN_SDK}"
+   fi
+
    BUILD_DIRS="$BUILD_DIRS $VK"
 fi
 
@@ -196,50 +218,60 @@ if $bBuildOpenCL ; then
 fi
 
 if $bBuildHSA ; then
-   BUILD_DIRS="$BUILD_DIRS $HSA"
+    BUILD_DIRS="$BUILD_DIRS $HSA"
+fi
+
+if $bBuildVK ; then
+    BUILD_DIRS="$BUILD_DIRS $VKCOLORCUBE"
 fi
 
 if $bBuildTests ; then
    BUILD_DIRS="$BUILD_DIRS $UNITTESTS"
 fi
 
+#delete old build
+if ! ($bIncrementalBuild) ; then
+   # clean up old folders
+   rm -rf $GPAROOT/Output/*
+fi
+
 for SUBDIR in $BUILD_DIRS; do
    BASENAME=`basename $SUBDIR`
 
    #delete old build
-   if !($bIncrementalBuild) ; then
+   if ! ($bIncrementalBuild) ; then
       make -C $SUBDIR spotless >> $LOGFILE 2>&1
    fi
 
    #make 64 bit
    echo "Build ${BASENAME}, 64-bit..." | tee -a $LOGFILE
 
-   if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_INC_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET} >> $LOGFILE 2>&1; then
+   if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_SDK_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET} >> $LOGFILE 2>&1; then
       echo "Failed to build ${BASENAME}, 64 bit"
       exit 1
    fi
 
    #make 64 bit Internal
    if $bBuildInternal ; then
-      if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_INC_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}Internal  >> $LOGFILE 2>&1; then
+      if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_SDK_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}Internal  >> $LOGFILE 2>&1; then
          echo "Failed to build ${BASENAME}, 64 bit, Internal"
          exit 1
       fi
    fi
 
    if $b32bitbuild; then
-      if [ "$SUBDIR" != "$HSA" ]; then
+      if ([ "$SUBDIR" != "$HSA" ]  && [ "$SUBDIR" != "$VKCOLORCUBE" ]); then
          #make 32 bit
          echo "Build ${BASENAME}, 32-bit..." | tee -a $LOGFILE
 
-         if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_INC_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE32 "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}x86 >> $LOGFILE 2>&1; then
+         if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_SDK_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE32 "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}x86 >> $LOGFILE 2>&1; then
             echo "Failed to build ${BASENAME}, 32 bit"
             exit 1
          fi
 
          #make 32 bit Internal
          if $bBuildInternal ; then
-            if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_INC_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE32 "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}Internalx86  >> $LOGFILE 2>&1; then
+            if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE $VK_SDK_DIR_OVERRIDE $GTEST_LIB_DIR_OVERRIDE32 "$ADDITIONAL_COMPILER_DEFINES_OVERRIDE" ${MAKE_TARGET}Internalx86  >> $LOGFILE 2>&1; then
                echo "Failed to build ${BASENAME}, 32 bit, Internal"
                exit 1
             fi
@@ -324,6 +356,22 @@ if $bZip ; then
       cd ..
       tar cvzf GPUPerfAPI.$VER-lnx-Promotion.tgz $ZIP_DIR_NAME/
    fi
+
+   #---------------------------------------------------
+   # Copy Vk samples
+   #---------------------------------------------------
+   echo "Generate Samples tarball..." | tee -a $LOGFILE
+   ZIP_DIR_NAME=Samples
+   cd $GPAOUTPUT
+   mkdir -p $ZIP_DIR_NAME
+   cd $ZIP_DIR_NAME
+   mkdir -p Bin
+   mkdir -p Bin/Linx64
+   cp $GPAOUTPUT_BIN/libGPUPerfAPIVK.so ./Bin/Linx64/
+   cp $GPAOUTPUT_BIN/VkColorCube ./Bin/Linx64/
+   cp $GPAOUTPUT_BIN/*.spv ./Bin/Linx64/
+   cd ..
+   tar cvzf GPUPerfAPISamples.$VER-lnx.tgz $ZIP_DIR_NAME/
 fi
 
 if [ -z ${LD_LIBRARY_PATH+x} ]; then

Build/VS2015/D3D12ColorCube.vcxproj

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Src\Examples\DX12\D3D12ColorCube\CubeSample.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Src\Examples\DX12\D3D12ColorCube\Shaders.hlsl" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Src\Examples\DX12\D3D12ColorCube\CubeSample.cpp" />
+    <ClCompile Include="..\..\Src\Examples\DX12\Sample.cpp" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{1B136D41-DEA0-48D8-8E9B-E0DEE84D6DA6}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>D3D12ColorCube</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\GPA\Build\VS2015\GPA-Common.props" />
+  </ImportGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <AdditionalDependencies>dxgi.lib;d3d12.lib;D3DCompiler.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <PostBuildEvent>
+      <Command>XCOPY /E /Y $(ProjectDir)..\..\Src\Examples\DX12\D3D12ColorCube\*.hlsl $(AMDTOutputDir)$(Configuration)\bin\</Command>
+    </PostBuildEvent>
+    <ClCompile>
+      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">USE_DEBUG_GPA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

Build/VS2015/D3D12ColorCube.vcxproj.filters

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Shaders">
+      <UniqueIdentifier>{44431555-5ad5-4160-af84-3d5faea6448d}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Src\Examples\DX12\D3D12ColorCube\CubeSample.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\Src\Examples\DX12\D3D12ColorCube\Shaders.hlsl">
+      <Filter>Shaders</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Src\Examples\DX12\Sample.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Src\Examples\DX12\D3D12ColorCube\CubeSample.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>

Build/VS2015/GPA-Vulkan.props

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets" />
+  <PropertyGroup Label="UserMacros">
+    <VULKAN_SDK Condition="Exists('$(VK_SDK_PATH)')">$(VK_SDK_PATH)</VULKAN_SDK>
+    <VULKAN_SDK Condition="!Exists('$(VK_SDK_PATH)')">$(CommonDir)Lib\Ext\Vulkan\Windows\</VULKAN_SDK>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(VULKAN_SDK)\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="VULKAN_SDK">
+      <Value>$(VULKAN_SDK)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>

Build/VS2015/GPA-VulkanDemo.props

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="..\..\..\GPA\Build\VS2015\GPA-Common.props" />
+    <Import Project="GPA-Vulkan.props" />
+  </ImportGroup>
+  <ItemDefinitionGroup >
+    <Link>
+      <AdditionalDependencies>vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories Condition="'$(Platform)'=='Win32'">$(VULKAN_SDK)\Lib32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories Condition="'$(Platform)'=='x64'">$(VULKAN_SDK)\Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup />
+</Project>

Build/VS2015/GPAFunctionExports.def

@@ -44,4 +44,6 @@ EXPORTS
     GPA_GetSampleResult
     GPA_GetStatusAsStr
     GPA_GetDeviceAndRevisionId
-    GPA_GetDeviceName
+    GPA_GetDeviceName
+    GPA_GetSampleId
+    GPA_GetVersion

Build/VS2015/GPUPerfAPI-Common.vcxproj

@@ -22,7 +22,6 @@
     <ClInclude Include="..\..\..\Common\Src\DeviceInfo\DeviceInfo.h" />
     <ClInclude Include="..\..\..\Common\Src\DeviceInfo\DeviceInfoUtils.h" />
     <ClInclude Include="..\..\..\Common\Src\DynamicLibraryModule\DynamicLibraryModule.h" />
-    <ClInclude Include="..\..\..\Common\Src\GPUPerfAPIUtils\GPUPerfAPIRegistry.h" />
     <ClInclude Include="..\..\Src\GPUPerfAPI-Common\Adapter.h" />
     <ClInclude Include="..\..\Src\GPUPerfAPI-Common\APIRTModuleLoader.h" />
     <ClInclude Include="..\..\Src\GPUPerfAPI-Common\CircularBuffer.h" />