Skip to content

Commit 49d4232

Browse files
chesik-amdchesik-amd
committed
GPA 3.2 release
1 parent 849a16e commit 49d4232

File tree

194 files changed

+210643
-203510
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+210643
-203510
lines changed

‎BUILD.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,21 @@ this script everytime you pull new changes from GPA repository.
3030
## Windows Build Information
3131

3232
##### Prerequisites
33-
* Microsoft Visual Studio 2015 Community Edition or higher + Update 3
33+
* Microsoft Visual Studio 2015 Community Edition or higher + Update 3 or Microsoft Visual Studio 2017
3434
* Windows 10 SDK Version 10.0.10586.0 from https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk
3535
* You can override the version of the Windows 10 SDK used by modifying Common/Lib/Ext/Windows-Kits/Global-WindowsSDK.props
3636
* Microsoft .NET 4.6.2 SDK from https://www.microsoft.com/en-us/download/details.aspx?id=53321
3737

3838
##### Build Instructions
39-
* Load Build\VS2015\GPUPerfAPI.sln into Visual Studio
39+
* Load Build\VS2015\GPUPerfAPI.sln into Visual Studio 2015
40+
* If you are using VS2017, you should load Build\VS2017\GPUPerfAPI.sln instead
4041
* Build the 64-bit and/or 32-bit configuration
4142
* After a successful build, the GPUPerfAPI binaries can be found in `GPA\Output\$(Configuration)\bin` (for example GPA\Output\Release\bin)
4243

4344
#### Additional Information
4445
* The Visual Studio solution includes a Documentation project that allows you to generate the HTML-based source code documentation using Doxygen. In order
45-
to build that project, you'll need to modify [Documentation.vcxproj](Build/VS2015/Documentation.vcxproj) and modify the paths to the doxygen executable.
46+
to build that project, you'll need to modify [Build/VS2015/Documentation.vcxproj](Build/VS2015/Documentation.vcxproj) or [Build/VS2017/Documentation.vcxproj](Build/VS2017/Documentation.vcxproj)
47+
to update the paths to the doxygen executable.
4648
* The Windows projects each include a .rc file that embeds the VERSIONINFO resource into the final binary. Internally within AMD, a Jenkins build system will dynamically update
4749
the build number. The version and build numbers can be manually updated by modifying the [GPAVersion.h](Src/GPUPerfAPI-Common/GPAVersion.h) file.
4850
* Information on building the Internal version:

‎Build/VS2015/GPUPerfAPI-Common.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\CircularBuffer.h" />
2828
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPACommandList.h" />
2929
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPACommonDefs.h" />
30+
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAContextCounterMediator.h" />
3031
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAImplementor.h" />
3132
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAPass.h" />
3233
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPASample.h" />
@@ -61,6 +62,7 @@
6162
<ClCompile Include="..\..\..\Common\Src\DynamicLibraryModule\DynamicLibraryModule.cpp" />
6263
<ClCompile Include="..\..\Src\GPUPerfAPI-Common\GPACommandList.cpp" />
6364
<ClCompile Include="..\..\Src\GPUPerfAPI-Common\GPAContext.cpp" />
65+
<ClCompile Include="..\..\Src\GPUPerfAPI-Common\GPAContextCounterMediator.cpp" />
6466
<ClCompile Include="..\..\Src\GPUPerfAPI-Common\GPACustomHWValidationManager.cpp" />
6567
<ClCompile Include="..\..\Src\GPUPerfAPI-Common\Adapter.cpp" />
6668
<ClCompile Include="..\..\Src\GPUPerfAPI-Common\GPAHWInfo.cpp" />

‎Build/VS2015/GPUPerfAPI-Common.vcxproj.filters

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
<ClCompile Include="..\..\Src\GPUPerfAPI-Common\Logging.cpp">
5656
<Filter>Source Files</Filter>
5757
</ClCompile>
58+
<ClCompile Include="..\..\Src\GPUPerfAPI-Common\GPAContextCounterMediator.cpp">
59+
<Filter>Source Files</Filter>
60+
</ClCompile>
5861
</ItemGroup>
5962
<ItemGroup>
6063
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\Adapter.h">
@@ -165,6 +168,9 @@
165168
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAInterfaceLoader.h">
166169
<Filter>Public Header Files</Filter>
167170
</ClInclude>
171+
<ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAContextCounterMediator.h">
172+
<Filter>Header Files</Filter>
173+
</ClInclude>
168174
</ItemGroup>
169175
<ItemGroup>
170176
<Filter Include="Source Files">

‎Build/VS2017/D3D12ColorCube.vcxproj

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<ItemGroup>
22+
<ClInclude Include="..\..\Src\Examples\DX12\D3D12ColorCube\CubeSample.h" />
23+
</ItemGroup>
24+
<ItemGroup>
25+
<None Include="..\..\Src\Examples\DX12\D3D12ColorCube\Shaders.hlsl" />
26+
</ItemGroup>
27+
<ItemGroup>
28+
<ClCompile Include="..\..\Src\Examples\DX12\D3D12ColorCube\CubeSample.cpp" />
29+
<ClCompile Include="..\..\Src\Examples\DX12\Sample.cpp" />
30+
</ItemGroup>
31+
<PropertyGroup Label="Globals">
32+
<VCProjectVersion>15.0</VCProjectVersion>
33+
<ProjectGuid>{1B136D41-DEA0-48D8-8E9B-E0DEE84D6DA6}</ProjectGuid>
34+
<Keyword>Win32Proj</Keyword>
35+
<RootNamespace>D3D12ColorCube</RootNamespace>
36+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
37+
</PropertyGroup>
38+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
39+
<PropertyGroup Label="Configuration">
40+
<ConfigurationType>Application</ConfigurationType>
41+
<PlatformToolset>v141</PlatformToolset>
42+
<CharacterSet>Unicode</CharacterSet>
43+
</PropertyGroup>
44+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
45+
<ImportGroup Label="ExtensionSettings">
46+
</ImportGroup>
47+
<ImportGroup Label="Shared">
48+
</ImportGroup>
49+
<ImportGroup Label="PropertySheets">
50+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
51+
<Import Project="..\..\..\GPA\Build\VS2017\GPA-Common.props" />
52+
</ImportGroup>
53+
<ItemDefinitionGroup>
54+
<Link>
55+
<SubSystem>Windows</SubSystem>
56+
<AdditionalDependencies>dxgi.lib;d3d12.lib;D3DCompiler.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
57+
</Link>
58+
<PostBuildEvent>
59+
<Command>XCOPY /E /Y $(ProjectDir)..\..\Src\Examples\DX12\D3D12ColorCube\*.hlsl $(AMDTOutputDir)$(Configuration)\bin\</Command>
60+
</PostBuildEvent>
61+
<ClCompile>
62+
<PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">USE_DEBUG_GPA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
63+
</ClCompile>
64+
</ItemDefinitionGroup>
65+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
66+
<ImportGroup Label="ExtensionTargets">
67+
</ImportGroup>
68+
</Project>

‎Build/VS2017/D3D12ColorCube.vcxproj.filters

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
<Filter Include="Shaders">
17+
<UniqueIdentifier>{44431555-5ad5-4160-af84-3d5faea6448d}</UniqueIdentifier>
18+
</Filter>
19+
</ItemGroup>
20+
<ItemGroup>
21+
<ClInclude Include="..\..\Src\Examples\DX12\D3D12ColorCube\CubeSample.h">
22+
<Filter>Header Files</Filter>
23+
</ClInclude>
24+
</ItemGroup>
25+
<ItemGroup>
26+
<None Include="..\..\Src\Examples\DX12\D3D12ColorCube\Shaders.hlsl">
27+
<Filter>Shaders</Filter>
28+
</None>
29+
</ItemGroup>
30+
<ItemGroup>
31+
<ClCompile Include="..\..\Src\Examples\DX12\Sample.cpp">
32+
<Filter>Source Files</Filter>
33+
</ClCompile>
34+
<ClCompile Include="..\..\Src\Examples\DX12\D3D12ColorCube\CubeSample.cpp">
35+
<Filter>Source Files</Filter>
36+
</ClCompile>
37+
</ItemGroup>
38+
</Project>

‎Build/VS2017/Documentation.vcxproj

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<PropertyGroup Label="Globals">
14+
<ProjectGuid>{A6C305E6-C182-4227-BD2D-D5C5489669F0}</ProjectGuid>
15+
<RootNamespace>Documentation</RootNamespace>
16+
<ProjectName>Documentation</ProjectName>
17+
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
18+
</PropertyGroup>
19+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
20+
<PropertyGroup Label="Configuration">
21+
<ConfigurationType>Utility</ConfigurationType>
22+
<CharacterSet>MultiByte</CharacterSet>
23+
<PlatformToolset>v141</PlatformToolset>
24+
</PropertyGroup>
25+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
26+
<ImportGroup Label="ExtensionSettings">
27+
</ImportGroup>
28+
<ImportGroup Label="PropertySheets">
29+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
30+
<Import Project="GPA-Common.props" />
31+
</ImportGroup>
32+
<PropertyGroup Label="UserMacros" />
33+
<PropertyGroup>
34+
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
35+
</PropertyGroup>
36+
<ItemDefinitionGroup>
37+
<PreBuildEvent>
38+
<Command>if not exist ..\..\Output\docs\doxygen mkdir ..\..\Output\docs\doxygen</Command>
39+
</PreBuildEvent>
40+
</ItemDefinitionGroup>
41+
<ItemGroup>
42+
<CustomBuild Include="..\..\docs\doxygen\DoxyfilePublic">
43+
<FileType>Document</FileType>
44+
<Message Condition="exists('c:\Program Files\doxygen\bin\doxygen.exe')">Generating Doxygen documentation</Message>
45+
<Command Condition="exists('C:\Program Files\doxygen\bin\doxygen.exe')">"c:\Program Files\doxygen\bin\doxygen.exe" "%(FullPath)"</Command>
46+
<Outputs Condition="exists('c:\Program Files\doxygen\bin\doxygen.exe')">...\..\Output\docs\doxygen\html\index.html;%(Outputs)</Outputs>
47+
</CustomBuild>
48+
</ItemGroup>
49+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
50+
<ImportGroup Label="ExtensionTargets">
51+
</ImportGroup>
52+
</Project>

‎Build/VS2017/Documentation.vcxproj.filters

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
</ItemGroup>
9+
<ItemGroup>
10+
<CustomBuild Include="..\..\docs\doxygen\DoxyfilePublic">
11+
<Filter>Source Files</Filter>
12+
</CustomBuild>
13+
</ItemGroup>
14+
</Project>

‎Build/VS2017/GPA-API-DLL.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
5+
</PropertyGroup>
6+
<ItemDefinitionGroup>
7+
<Link>
8+
<ModuleDefinitionFile>$(GPUPerfAPIBaseDir)Build\VS2017\GPAFunctionExports.def</ModuleDefinitionFile>
9+
</Link>
10+
</ItemDefinitionGroup>
11+
</Project>

‎Build/VS2017/GPA-Common.props

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ImportGroup Label="PropertySheets">
4+
<Import Project="GPA-Properties.props" />
5+
<Import Project="..\..\..\Common\Src\Vsprops\Global-Common.props" />
6+
<Import Project="..\..\..\Common\Src\DeviceInfo\Global-DeviceInfo.props" />
7+
<Import Project="..\..\..\Common\Lib\Ext\Windows-Kits\Global-WindowsSDK.props" />
8+
<Import Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Project="..\..\..\Common\Lib\AMD\HSA\Global-HSAFoundation-NoLib.props" />
9+
<Import Project="..\..\..\Common\Lib\AMD\APPSDK\Global-OpenCL-NoLib.props" />
10+
<Import Project="..\..\..\Common\Lib\Ext\OpenGL\Global-OpenGL.props" />
11+
<Import Project="..\..\..\Common\Src\ADLUtil\Global-ADLUtil.props" />
12+
<Import Project="..\..\..\Common\Src\AmdDxExt\Global-AmdDxExt.props" />
13+
<Import Project="..\..\..\Common\Src\DynamicLibraryModule\Global-DynamicLibraryModule.props" />
14+
<Import Project="..\..\..\Common\Src\AmdVkExt\Global-AmdVkExt.props" />
15+
</ImportGroup>
16+
<PropertyGroup Label="Globals">
17+
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
18+
</PropertyGroup>
19+
<PropertyGroup Label="UserMacros">
20+
<MyBinDir>$(AMDTOutDir)$(Configuration)-$(Platform)$(AMDT_BUILD_SUFFIX)</MyBinDir>
21+
<AMDTCRT>MT</AMDTCRT>
22+
</PropertyGroup>
23+
<PropertyGroup>
24+
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
25+
</PropertyGroup>
26+
<ItemDefinitionGroup>
27+
<ClCompile>
28+
<PreprocessorDefinitions>NOMINMAX;USE_POINTER_SINGLETON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
29+
<PreprocessorDefinitions Condition="$([System.Convert]::ToBoolean($(IsDebug)))">USE_DEBUG_GPA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
30+
<WholeProgramOptimization>false</WholeProgramOptimization>
31+
<RuntimeLibrary Condition="$([System.Convert]::ToBoolean($(IsDebug)))">MultiThreadedDebug</RuntimeLibrary>
32+
<RuntimeLibrary Condition="$([System.Convert]::ToBoolean($(IsRelease)))">MultiThreaded</RuntimeLibrary>
33+
</ClCompile>
34+
<Link>
35+
<OutputFile>$(OutDir)$(AMDTProjectName).exe</OutputFile>
36+
</Link>
37+
</ItemDefinitionGroup>
38+
<ItemGroup>
39+
<BuildMacro Include="MyBinDir">
40+
<Value>$(MyBinDir)</Value>
41+
</BuildMacro>
42+
<BuildMacro Include="AMDTCRT">
43+
<Value>$(AMDTCRT)</Value>
44+
</BuildMacro>
45+
</ItemGroup>
46+
</Project>

‎Build/VS2017/GPA-DLL.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
5+
</PropertyGroup>
6+
<ItemDefinitionGroup>
7+
<Link>
8+
<OutputFile>$(OutDir)$(AMDTProjectName).dll</OutputFile>
9+
</Link>
10+
</ItemDefinitionGroup>
11+
</Project>

0 commit comments

Comments
 (0)