Skip to content

Commit e28486b

Browse files
committed
GPA 2.21 release
Change-Id: If3ab213517d7bc213268b7e0e00b2be058cf12ca
1 parent eaedf3c commit e28486b

File tree

349 files changed

+1115
-1228
lines changed

Some content is hidden

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

349 files changed

+1115
-1228
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ bld/
2424
!Common/Lib/**/[Bb]in
2525
[Oo]bj/
2626
[Ll]og/
27+
Doc/public
28+
*.so
29+
*.a
30+
*.pyc
2731

2832
# Visual Studo 2015 cache/options directory
2933
.vs/
@@ -239,4 +243,4 @@ FakesAssemblies/
239243
**/*.DesktopClient/ModelManifest.xml
240244
**/*.Server/GeneratedArtifacts
241245
**/*.Server/ModelManifest.xml
242-
_Pvt_Extensions
246+
_Pvt_Extensions

.gitmodules

Lines changed: 0 additions & 42 deletions
This file was deleted.

BUILD.md

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,47 @@
11
# GPUPerfAPI Build Instructions
22
---
33
## Table of Contents
4+
* [Cloning/Updating Dependent Repositories](#DependentRepos)
45
* [Windows Build Information](#Windows)
56
* [Linux Build Information](#Linux)
67
* [PublicCounterCompiler Tool](#PublicCounterCompiler)
78

9+
<A Name="DependentRepos">
10+
## Cloning/Updating Dependent Repositories
11+
GPUPerfAPI no longer uses git submodules to reference dependent repositories. Instead, you need to follow these instructions in
12+
order to clone/update any dependent repositories.
13+
#### Prerequisites
14+
* This step requires that python be installed on the system. Python can be installed from https://www.python.org/
15+
#### Instructions
16+
* Simply execute the [UpdateCommon.py](Scripts/UpdateCommon.py) python script located in the [Scripts](Scripts) directory:
17+
* __python Scripts/UpdateCommon.py__
18+
This script will clone any dependent repositories that are not present on the system. If any of the dependent repositories are already
19+
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
20+
this script everytime you pull new changes from GPA repository.
21+
822
<A Name="Windows">
923
## Windows Build Information
1024

1125
##### Prerequisites
12-
* Microsoft Visual Studio 2015 Community Edition or higher + Update 1
26+
* Microsoft Visual Studio 2015 Community Edition or higher + Update 3
1327
* Windows 10 SDK Version 10.0.10586.0 from https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk
1428
* You can override the version of the Windows 10 SDK used by modifying Common/Lib/Ext/Windows-Kits/Global-WindowsSDK.props
1529

1630
##### Build Instructions
1731
* Load Build\VS2015\GPUPerfAPI.sln into Visual Studio
1832
* Build the 64-bit and/or 32-bit configuration
19-
* After a successful build, the GPUPerfAPI binaries can be found in __Build\VS2015\\$(Configuration)-$(Platform)__ (for example Build\VS2015\Release-x64)
33+
* After a successful build, the GPUPerfAPI binaries can be found in __GPA\Output\\$(Configuration)\bin__ (for example GPA\Output\Release\bin)
2034

2135
#### Additional Information
2236
* The Visual Studio solution includes a Documentation project that allows you to generate the HTML-based source code documentation using Doxygen. In order
23-
to build that project, you'll need to modify [Documentation.vcxproj](GPUPerfAPI/Build/VS2015/Documentation.vcxproj) and modify the paths to the doxygen executable.
37+
to build that project, you'll need to modify [Documentation.vcxproj](Build/VS2015/Documentation.vcxproj) and modify the paths to the doxygen executable.
2438
* 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
25-
the build number. The version and build numbers can be manually updated by modifying the [GPAVersion.h](GPUPerfAPI/GPUPerfAPI-Common/GPAVersion.h) file.
39+
the build number. The version and build numbers can be manually updated by modifying the [GPAVersion.h](Src/GPUPerfAPI-Common/GPAVersion.h) file.
2640
* Information on building the Internal version:
2741
* To generate the internal version, two environment variables are required to be set prior to building in Visual Studio:
28-
* GDT_BUILD=GDT_INTERNAL
29-
* GDT_BUILD_SUFFIX=-Internal
30-
* The output location of the binaries will be __Build\VS2015\\$(Configuration)-$(Platform)-Internal__ (for example Build\VS2015\Release-x64-Internal)
31-
* Each binary filename will also have a "-Internal" suffix (for example GPUPerfAPIDX11-x64-Internal.dll)
42+
* AMDT_BUILD=AMDT_INTERNAL
43+
* AMDT_BUILD_SUFFIX=-Internal
44+
* Each binary filename will have a "-Internal" suffix (for example GPUPerfAPIDX11-x64-Internal.dll)
3245

3346
<A Name="Linux">
3447
## Linux Build Information
@@ -47,7 +60,7 @@
4760
* __quick__ or __incremental__: performs an incremental build (as opposed to a from-scratch build)
4861
* __buildinternal__: builds the internal versions of GPUPerfAPI
4962
* __hsadir__: overrides the location of the ROCm/HSA header files (by default they are expected to be in /opt/rocm/hsa)
50-
* After a successful build, the GPUPerfAPI binaries can be found in their respective source file directories. For instance, the binaries for the OpenGL version of GPUPerfAPI (libGPUPerfAPIGL.so) can be found in the GPUPerfAPIGL subdirectory.
63+
* After a successful build, the GPUPerfAPI binaries can be found in their respective source file directories. For instance, the binaries for the OpenGL version of GPUPerfAPI (libGPUPerfAPIGL.so) can be found in the Src/GPUPerfAPIGL subdirectory.
5164
* Example build command line (builds the debug versions of the binaries, skipping the HSA library):
5265
* ./build.sh debug skiphsa
5366
* In addition to using the build.sh build script to build all of GPUPerfAPI, you can also build a single API library by executing __make__ in that library's directory. This is useful when making localized changes in a single version of GPUPerfAPI. When using __make__, the following default targets are supported:
@@ -76,8 +89,8 @@
7689
## PublicCounterCompiler Tool
7790

7891
The PublicCounterCompiler Tool is a utility, written in C#, that will generate C++ code to define the public (or derived) counters.
79-
It takes as input text files contained in the [PublicCounterCompilerInputFiles](GPUPerfAPI/PublicCounterCompilerInputFiles) directory and
80-
outputs files in the [GPUPerfAPICounterGenerator](GPUPerfAPI/GPUPerfAPICounterGenerator) and [GPUPerfAPIUnitTests](GPUPerfAPI/GPUPerfAPIUnitTests) directories.
92+
It takes as input text files contained in the [PublicCounterCompilerInputFiles](Src/PublicCounterCompilerInputFiles) directory and
93+
outputs files in the [GPUPerfAPICounterGenerator](Src/GPUPerfAPICounterGenerator) and [GPUPerfAPIUnitTests](Src/GPUPerfAPIUnitTests) directories.
8194

8295
There are three ways to execute the tool:
8396
* With no parameters - it opens the user interface with no fields prepopulated
@@ -91,7 +104,7 @@ There are three ways to execute the tool:
91104
* Param 4: Test output Dir - the directory to generate the test output in (Ex: the path to the GPUPerfAPIUnitTests/counters directory)
92105
* Param 5: Active section label - the label to take the counter names from (ex: dx11gfx6)
93106

94-
See the various PublicCounterDefinitions\*.txt files in the [PublicCounterCompilerInputFiles](GPUPerfAPI/PublicCounterCompilerInputFiles) directory. These contain all the counter definitions.
107+
See the various PublicCounterDefinitions\*.txt files in the [PublicCounterCompilerInputFiles](Src/PublicCounterCompilerInputFiles) directory. These contain all the counter definitions.
95108
Each counter is given a name, a description, a type, an optional usage type, a list of hardware counters required and a formula applied to the values of the hardware counters to calculate the value of the counter.
96109

97110
Counter formulas are expressed in a Reverse Polish Notation and are made up the following elements:
@@ -101,5 +114,5 @@ Counter formulas are expressed in a Reverse Polish Notation and are made up the
101114
* functions: The supported functions are: min, max, sum, and ifnotzero. "max and "sum" have variants that work on multiple items at once (i.e. sum16, sum63, etc.)
102115
* hardware params: The supported hardware params are "num_shader_engines". "num_simds", "su_clock_prim", "num_prim_pipes", and "TS_FREQ"
103116

104-
For more details, see the "EvaluateExpression" function in the [GPAPublicCounters.cpp](GPUPerfAPI/GPUPerfAPICounterGenerator/GPAPublicCounters.cpp) file.
117+
For more details, see the "EvaluateExpression" function in the [GPAPublicCounters.cpp](Src/GPUPerfAPICounterGenerator/GPAPublicCounters.cpp) file.
105118

GPUPerfAPI/Build/Linux/Common.mk renamed to Build/Linux/Common.mk

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ CFLAGS = -std=c++11 $(OPTIMIZE) -fPIC -D_LINUX -Wno-write-strings $(PLATFORM_CFL
1313
# ADDLCFLAGS = -Wall -Wno-unknown-pragmas -Wno-strict-aliasing -Wno-non-virtual-dtor -Werror -msse
1414
PLATFORM_DIR = x64
1515
BUILD_DEF = -DAMDT_BUILD_SUFFIX=
16-
HSA_PLATFORM_DIR = x86_64
17-
HSA_PLATFORM_SUFFIX = 64
1816
GLES_PLATFORM_DIR=Linx64
1917
MAKEFILENAME=makefile
2018
BASE_OBJDIR = obj
@@ -30,16 +28,17 @@ PLATFORM_DEFINES = -DAMDT_PLATFORM_SUFFIX=\"\"
3028
DEBUG_DEFINES = -DAMDT_DEBUG_SUFFIX=\"\"
3129
DEFINES = $(BASE_DEFINES) $(BUILD_DEFINES) $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(ADDL_DEFINES)
3230

33-
GPACG_DIR = $(DEPTH)/GPUPerfAPICounterGenerator
34-
GPACOMMON_DIR = $(DEPTH)/GPUPerfAPI-Common
35-
GPADEVICEINFO_DIR = $(DEPTH)/DeviceInfo
31+
GPASRC_DIR=$(DEPTH)/Src
32+
GPACG_DIR = $(GPASRC_DIR)/GPUPerfAPICounterGenerator
33+
GPACOMMON_DIR = $(GPASRC_DIR)/GPUPerfAPI-Common
34+
GPADEVICEINFO_DIR = $(GPASRC_DIR)/DeviceInfo
3635

3736
COMMON_DIR = $(DEPTH)/../Common
3837
COMMON_SRC = $(COMMON_DIR)/Src
3938
ATI_STREAM_SDK_DIR = $(COMMON_DIR)/Lib/AMD/APPSDK/3-0
4039
HSA_DIR = /opt/rocm/hsa
41-
HSA_LIB_DIR = $(HSA_DIR)/lib/$(HSA_PLATFORM_DIR)
4240
DEVICEINFO_DIR = $(COMMON_SRC)/DeviceInfo
41+
DEVICEINFOINTERNAL_DIR = $(COMMON_SRC)/DeviceInfo-Internal
4342
GPUPERFAPIUTILS_DIR = $(COMMON_SRC)/GPUPerfAPIUtils
4443
ADL_DIR = $(COMMON_DIR)/Lib/AMD/ADL
4544
ADLUTIL_DIR = $(COMMON_DIR)/Src/ADLUtil
@@ -60,7 +59,7 @@ COMMON_LIBS = -lGPUPerfAPI-Common$(TARGET_SUFFIX) -lGPUPerfAPICounterGenerator$(
6059
STANDARD_LIBS = -ldl -lpthread
6160

6261
# Build target overrides
63-
X86_OVERRIDES = "PLATFORM_CFLAG = -m32 -msse2" "PLATFORM_LFLAG = -m32" "PLATFORM_DEFINES = -DX86 -DAMDT_PLATFORM_SUFFIX=\\\"32\\\"" "CODEXL_OUTPUT_DIR = Output_x86" "PLATFORM_DIR = x86" "HSA_PLATFORM_DIR = x86" "HSA_PLATFORM_SUFFIX =" "HSA_PLATFORM_SUFFIX_COMPILER_LIB = 32" "GLES_PLATFORM_DIR = Linx86"
62+
X86_OVERRIDES = "PLATFORM_CFLAG = -m32 -msse2" "PLATFORM_LFLAG = -m32" "PLATFORM_DEFINES = -DX86 -DAMDT_PLATFORM_SUFFIX=\\\"32\\\"" "CODEXL_OUTPUT_DIR = Output_x86" "PLATFORM_DIR = x86" "GLES_PLATFORM_DIR = Linx86"
6463
INTERNAL_OVERRIDES = "BUILD_DEFINES = -DAMDT_INTERNAL -DAMDT_BUILD_SUFFIX=\\\"-Internal\\\"" "INTERNAL_PUBLIC = _Internal"
6564
DEBUG_OVERRIDES = "OPTIMIZE = $(DEBUG_CFLAGS)" "DEBUG_RELEASE = debug" "DEBUG_DEFINES = -DAMDT_DEBUG_SUFFIX=\\\"-d\\\""
6665

GPUPerfAPI/Build/Linux/CommonTargets.mk renamed to Build/Linux/CommonTargets.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ all: default x86 Internal Internalx86 Dbg Dbgx86 DbgInternal DbgInternalx86
4040

4141
BUILD_SRC=$(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
4242

43-
$(OBJ_DIR)/%.o: ../Non-OpenSource/GPUPerfAPICounterGenerator/%.cpp
43+
$(OBJ_DIR)/%.o: ../../../GPA-Internal/Src/GPUPerfAPICounterGenerator/%.cpp
4444
$(BUILD_SRC)
4545

4646
$(OBJ_DIR)/%.o: %.cpp
@@ -64,6 +64,9 @@ $(OBJ_DIR)/%.o: $(AMDTMUTEX_DIR)/%.cpp
6464
$(OBJ_DIR)/%.o: $(DEVICEINFO_DIR)/%.cpp
6565
$(BUILD_SRC)
6666

67+
$(OBJ_DIR)/%.o: $(DEVICEINFOINTERNAL_DIR)/%.cpp
68+
$(BUILD_SRC)
69+
6770
$(OBJ_DIR)/%.o: $(GPUPERFAPIUTILS_DIR)/%.cpp
6871
$(BUILD_SRC)
6972

GPUPerfAPI/Build/Linux/build.sh renamed to Build/Linux/build.sh

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ do
7373
done
7474

7575
LOGFILE=$GPAROOT/Build/Linux/GPUPerfAPI_Build.log
76-
77-
CL=$GPAROOT/GPUPerfAPICL
78-
HSA=$GPAROOT/GPUPerfAPIHSA
79-
GL=$GPAROOT/GPUPerfAPIGL
80-
GLES=$GPAROOT/GPUPerfAPIGLES
81-
COUNTERS=$GPAROOT/GPUPerfAPICounters
82-
COUNTERGENERATOR=$GPAROOT/GPUPerfAPICounterGenerator
83-
GPA_COMMON=$GPAROOT/GPUPerfAPI-Common
84-
GPA_DEVICEINFO=$GPAROOT/DeviceInfo
76+
GPASRC=$GPAROOT/Src
77+
CL=$GPASRC/GPUPerfAPICL
78+
HSA=$GPASRC/GPUPerfAPIHSA
79+
GL=$GPASRC/GPUPerfAPIGL
80+
GLES=$GPASRC/GPUPerfAPIGLES
81+
COUNTERS=$GPASRC/GPUPerfAPICounters
82+
COUNTERGENERATOR=$GPASRC/GPUPerfAPICounterGenerator
83+
GPA_COMMON=$GPASRC/GPUPerfAPI-Common
84+
GPA_DEVICEINFO=$GPASRC/DeviceInfo
8585

8686
GLLIB=libGPUPerfAPIGL$DEBUG_SUFFIX.so
8787
GLESLIB=libGPUPerfAPIGLES$DEBUG_SUFFIX.so
@@ -155,7 +155,7 @@ for SUBDIR in $BUILD_DIRS; do
155155
if !($bIncrementalBuild) ; then
156156
make -C $SUBDIR spotless >> $LOGFILE 2>&1
157157
fi
158-
158+
159159
#make 64 bit
160160
echo "Build ${BASENAME}, 64-bit..." | tee -a $LOGFILE
161161

@@ -199,9 +199,10 @@ done
199199

200200
if $bZip ; then
201201
echo "Generate tarball..." | tee -a $LOGFILE
202+
ZIP_DIR_NAME=${VER_MAJOR}_${VER_MINOR}
202203
cd $BUILD_DIR
203-
mkdir GPUPerfAPI-$VER-lnx
204-
cd GPUPerfAPI-$VER-lnx
204+
mkdir $ZIP_DIR_NAME
205+
cd $ZIP_DIR_NAME
205206
mkdir Bin
206207
mkdir Bin/Linx64
207208
mkdir Bin/Linx86
@@ -212,29 +213,37 @@ if $bZip ; then
212213
cp $CL/$CLLIB32 ./Bin/Linx86/
213214
cp $GL/$GLLIB32 ./Bin/Linx86/
214215
cp $GLES/$GLESLIB32 ./Bin/Linx86/
216+
cp $COUNTERS/$COUNTERSLIB ./Bin/Linx64/
217+
cp $COUNTERS/$COUNTERSLIB32 ./Bin/Linx86/
215218
mkdir Include
216-
cp ../../../GPUPerfAPI-Common/GPUPerfAPI.h ./Include/
217-
cp ../../../GPUPerfAPI-Common/GPUPerfAPIFunctionTypes.h ./Include/
218-
cp ../../../GPUPerfAPI-Common/GPUPerfAPITypes.h ./Include/
219-
cp ../../../doc/GPUPerfAPI-UserGuide.pdf .
219+
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPI.h ./Include/
220+
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPIFunctionTypes.h ./Include/
221+
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPITypes.h ./Include/
222+
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPI-Private.h ./Include/
223+
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPIFunctionTypes-Private.h ./Include/
224+
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPITypes-Private.h ./Include/
225+
cp ../../../Src/GPUPerfAPI-Common/GPAFunctions.h ./Include/
226+
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPI-HSA.h ./Include/
227+
cp ../../../Src/GPUPerfAPI-Common/GPUPerfAPIOS.h ./Include/
228+
cp ../../../Src/GPUPerfAPICounters/GPUPerfAPICounters.h ./Include/
229+
cp ../../../Src/GPUPerfAPICounterGenerator/GPACounterGenerator.h ./Include/
230+
cp ../../../Src/GPUPerfAPICounterGenerator/GPAICounterAccessor.h ./Include/
231+
cp ../../../Src/GPUPerfAPICounterGenerator/GPAICounterScheduler.h ./Include/
232+
cp ../../../Doc/GPUPerfAPI-UserGuide.pdf .
220233
cp ../../../LICENSE .
221-
cp ../../../doc/thirdpartylicenses.txt .
234+
cp ../../../Doc/thirdpartylicenses.txt .
222235
cd ..
223-
tar cvzf GPUPerfAPI.$VER-lnx.tgz GPUPerfAPI-$VER-lnx/
236+
tar cvzf GPUPerfAPI.$VER-lnx.tgz $ZIP_DIR_NAME/
224237

225238
#-----------------------------------------
226239
#copy to bin-Internal folder
227240
#-----------------------------------------
228241
if $bBuildInternal ; then
229-
cd GPUPerfAPI-$VER-lnx
242+
cd $ZIP_DIR_NAME
230243
mkdir Bin-Internal
231244
mkdir Bin-Internal/Linx64
232245
mkdir Bin-Internal/Linx86
233246

234-
# public libs that only appear in the promotion tarball
235-
cp $COUNTERS/$COUNTERSLIB ./Bin/Linx64/
236-
cp $COUNTERS/$COUNTERSLIB32 ./Bin/Linx86/
237-
238247
# internal libs
239248
cp $CL/$CLLIB_INTERNAL ./Bin-Internal/Linx64/
240249
cp $HSA/$HSALIB_INTERNAL ./Bin-Internal/Linx64/
@@ -247,18 +256,8 @@ if $bZip ; then
247256
cp $GLES/$GLESLIB32_INTERNAL ./Bin-Internal/Linx86/
248257
cp $COUNTERS/$COUNTERSLIB32_INTERNAL ./Bin-Internal/Linx86/
249258

250-
cp ../../../GPUPerfAPI-Common/GPUPerfAPI-Private.h ./Include/
251-
cp ../../../GPUPerfAPI-Common/GPUPerfAPIFunctionTypes-Private.h ./Include/
252-
cp ../../../GPUPerfAPI-Common/GPUPerfAPITypes-Private.h ./Include/
253-
cp ../../../GPUPerfAPI-Common/GPAFunctions.h ./Include/
254-
cp ../../../GPUPerfAPI-Common/GPUPerfAPI-HSA.h ./Include/
255-
cp ../../../GPUPerfAPI-Common/GPUPerfAPIOS.h ./Include/
256-
cp ../../../GPUPerfAPICounters/GPUPerfAPICounters.h ./Include/
257-
cp ../../../GPUPerfAPICounterGenerator/GPACounterGenerator.h ./Include/
258-
cp ../../../GPUPerfAPICounterGenerator/GPAICounterAccessor.h ./Include/
259-
cp ../../../GPUPerfAPICounterGenerator/GPAICounterScheduler.h ./Include/
260259
cd ..
261-
tar cvzf GPUPerfAPI.$VER-lnx-Promotion.tgz GPUPerfAPI-$VER-lnx/
260+
tar cvzf GPUPerfAPI.$VER-lnx-Promotion.tgz $ZIP_DIR_NAME/
262261
fi
263262
fi
264263

GPUPerfAPI/Build/VS2015/Documentation.vcxproj renamed to Build/VS2015/Documentation.vcxproj

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,18 @@
2727
</ImportGroup>
2828
<ImportGroup Label="PropertySheets">
2929
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
30+
<Import Project="GPA-Common.props" />
3031
</ImportGroup>
3132
<PropertyGroup Label="UserMacros" />
3233
<PropertyGroup>
3334
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
34-
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
35-
<IntDir>$(Configuration)\</IntDir>
3635
</PropertyGroup>
37-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
38-
<PreBuildEvent>
39-
<Message>
40-
</Message>
41-
<Command>
42-
</Command>
43-
</PreBuildEvent>
44-
</ItemDefinitionGroup>
4536
<ItemGroup>
46-
<CustomBuild Include="../../doc/DoxyfilePublic">
37+
<CustomBuild Include="../../Doc/DoxyfilePublic">
4738
<FileType>Document</FileType>
48-
<Message Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.4/bin/doxygen.exe')">Generating Public Doxygen documentation</Message>
49-
<Command Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.4/bin/doxygen.exe')">"../../../Common/DK/Doxygen/doxygen-1.8.4/bin/doxygen.exe" "%(FullPath)"</Command>
50-
<Outputs Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.4/bin/doxygen.exe')">$(ProjectDir)public\html\index.html;%(Outputs)</Outputs>
39+
<Message Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.11/bin/doxygen.exe')">Generating Public Doxygen documentation</Message>
40+
<Command Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.11/bin/doxygen.exe')">"../../../Common/DK/Doxygen/doxygen-1.8.11/bin/doxygen.exe" "%(FullPath)"</Command>
41+
<Outputs Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.11/bin/doxygen.exe')">../../Doc/public\html\index.html;%(Outputs)</Outputs>
5142
</CustomBuild>
5243
</ItemGroup>
5344
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

GPUPerfAPI/Build/VS2015/Documentation.vcxproj.filters renamed to Build/VS2015/Documentation.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</Filter>
88
</ItemGroup>
99
<ItemGroup>
10-
<CustomBuild Include="../../doc/DoxyfilePublic">
10+
<CustomBuild Include="../../Doc/DoxyfilePublic">
1111
<Filter>Source Files</Filter>
1212
</CustomBuild>
1313
</ItemGroup>

GPUPerfAPI/Build/VS2015/GPA-Common.props renamed to Build/VS2015/GPA-Common.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
2020
</PropertyGroup>
2121
<PropertyGroup Label="UserMacros">
22+
<MyBinDir>$(AMDTOutDir)$(Configuration)-$(Platform)$(AMDT_BUILD_SUFFIX)</MyBinDir>
2223
<AMDTCRT>MT</AMDTCRT>
2324
</PropertyGroup>
2425
<PropertyGroup>
File renamed without changes.

0 commit comments

Comments
 (0)