GPA 2.23 release

Author: chesik-amd

.gitignore

@@ -11,6 +11,7 @@
 *.userprefs
 
 # Build results
+[Oo]utput/
 [Dd]ebug/
 !Common/Lib/**/[Dd]ebug
 [Dd]ebugPublic/
@@ -244,3 +245,10 @@ FakesAssemblies/
 **/*.Server/GeneratedArtifacts
 **/*.Server/ModelManifest.xml
 _Pvt_Extensions
+
+# Linux unit test output
+Build/Linux/GPUPerfAPIUnitTests*.xml
+Src/GPUPerfAPIUnitTests/GPUPerfAPIUnitTests
+Src/GPUPerfAPIUnitTests/GPUPerfAPIUnitTests32
+Src/GPUPerfAPIUnitTests/GPUPerfAPIUnitTests-Internal
+Src/GPUPerfAPIUnitTests/GPUPerfAPIUnitTests32-Internal

BUILD.md

@@ -15,7 +15,7 @@ order to clone/update any dependent repositories.
 
 #### Instructions
  * Simply execute the [UpdateCommon.py](Scripts/UpdateCommon.py) python script located in the [Scripts](Scripts) directory:
-   * __python Scripts/UpdateCommon.py__
+   * `python Scripts/UpdateCommon.py`
 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.
@@ -30,7 +30,7 @@ this script everytime you pull new changes from GPA repository.
 ##### Build Instructions
  * Load Build\VS2015\GPUPerfAPI.sln into Visual Studio
  * Build the 64-bit and/or 32-bit configuration
- * After a successful build, the GPUPerfAPI binaries can be found in __GPA\Output\\$(Configuration)\bin__ (for example GPA\Output\Release\bin)
+ * After a successful build, the GPUPerfAPI binaries can be found in `GPA\Output\\$(Configuration)\bin` (for example GPA\Output\Release\bin)
 
 #### Additional Information
  * The Visual Studio solution includes a Documentation project that allows you to generate the HTML-based source code documentation using Doxygen. In order
@@ -47,31 +47,33 @@ this script everytime you pull new changes from GPA repository.
 
 ##### Build Instructions
  * cd into the Build\Linux directory
- * Execute __./build.sh__
+ * Execute `./build.sh`
    * By default this performs a from-scratch build of the release versions of GPUPerfAPI, both 32-bit and 64-bit binaries.
  * The following arguments can be passed to build.sh to alter the build:
-   * __debug__: performs a debug build
-   * __skip32bitbuild__: skips building the 32-bit binaries
-   * __skipopengl__: skips building the OpenGL version of GPUPerfAPI
-   * __skipopengles__: skips building the OpenGLES version of GPUPerfAPI
-   * __skipopencl__: skips building the OpenCL version of GPUPerfAPI
-   * __skiphsa__: skips building the ROCm/HSA version of GPUPerfAPI
-   * __quick__ or __incremental__: performs an incremental build (as opposed to a from-scratch build)
-   * __buildinternal__: builds the internal versions of GPUPerfAPI
-   * __hsadir__: overrides the location of the ROCm/HSA header files (by default they are expected to be in /opt/rocm/hsa)
+   * `debug`: performs a debug build
+   * `skip32buildbuild`: skips building the 32-bit binaries
+   * `skipopengl`: skips building the OpenGL version of GPUPerfAPI
+   * `skipopengles`: skips building the OpenGLES version of GPUPerfAPI
+   * `skipopencl`: skips building the OpenCL version of GPUPerfAPI
+   * `skiphsa`: skips building the ROCm/HSA version of GPUPerfAPI
+   * `quick` or `incremental`: performs an incremental build (as opposed to a from-scratch build)
+   * `buildinternal`: builds the internal versions of GPUPerfAPI
+   * `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)
  * 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.
  * Example build command line (builds the debug versions of the binaries, skipping the HSA library):
    * ./build.sh debug skiphsa
- * 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:
-   * __\<default\>__: makes the 64-bit release version
-   * __x86__: makes the 32-bit release version
-   * __Dbg__: makes the 64-bit debug version
-   * __Dbgx86__: makes the 32-bit debug version
-   * __Internal__: makes the 64-bit release Internal version
-   * __Internalx86__: makes the 32-bit release Internal version
-   * __DbgInternal__: makes the 64-bit debug Internal version
-   * __DbgInternalx86__: makes the 32-bit debug Internal version
- * __Make__ is supported in the following directories (those marked with (*) are required to be built before the others, as they produce static libraries used by the others):
+ * 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:
+   * `\<default\>`: makes the 64-bit release version
+   * `x86`: makes the 32-bit release version
+   * `Dbg`: makes the 64-bit debug version
+   * `Dbgx86`: makes the 32-bit debug version
+   * `Internal`: makes the 64-bit release Internal version
+   * `Internalx86`: makes the 32-bit release Internal version
+   * `DbgInternal`: makes the 64-bit debug Internal version
+   * `DbgInternalx86`: makes the 32-bit debug Internal version
+ * `Make` is supported in the following directories (those marked with (*) are required to be built before the others, as they produce static libraries used by the others):
    * DeviceInfo (*)
    * GPUPerfAPI-Common (*)
    * GPUPerfAPICounterGenerator (*)
@@ -80,7 +82,7 @@ this script everytime you pull new changes from GPA repository.
    * GPUPerfAPIGL
    * GPUPerfAPIGLES
    * GPUPerfAPIHSA
- * When using __make__ to build the ROCM/HSA version of GPUPerfAPI, by default the HSA headers are expected to be in /opt/rocm/hsa. You can override this by specifying "HSA_DIR=<dir>" on the make command line:
+ * When using `make` to build the ROCM/HSA version of GPUPerfAPI, by default the HSA headers are expected to be in /opt/rocm/hsa. You can override this by specifying "HSA_DIR=<dir>" on the make command line:
    * Example: make Dbg HSA_DIR=/home/user/hsa_dir
  * When building the internal version, each binary filename will also have a "-Internal" suffix (for example libGPUPerfAPIGL-Internal.so)
 

Build/Linux/Common.mk

@@ -23,15 +23,17 @@ OBJ_DIR = $(BASE_OBJDIR)/$(DEBUG_RELEASE)$(INTERNAL_PUBLIC)/$(PLATFORM_DIR)
 # Build defines
 BASE_DEFINES = -D_LINUX -DUSE_POINTER_SINGLETON
 ADDL_DEFINES =
+ADDITIONAL_COMPILER_DEFINES_FROM_BUILD_SCRIPT =
 BUILD_DEFINES = -DAMDT_PUBLIC -DAMDT_BUILD_SUFFIX=\"\"
 PLATFORM_DEFINES = -DAMDT_PLATFORM_SUFFIX=\"\"
 DEBUG_DEFINES = -DAMDT_DEBUG_SUFFIX=\"\"
-DEFINES = $(BASE_DEFINES) $(BUILD_DEFINES) $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(ADDL_DEFINES)
+DEFINES = $(BASE_DEFINES) $(BUILD_DEFINES) $(PLATFORM_DEFINES) $(DEBUG_DEFINES) $(ADDL_DEFINES) $(ADDITIONAL_COMPILER_DEFINES_FROM_BUILD_SCRIPT)
 
 GPASRC_DIR=$(DEPTH)/Src
 GPACG_DIR = $(GPASRC_DIR)/GPUPerfAPICounterGenerator
 GPACOMMON_DIR = $(GPASRC_DIR)/GPUPerfAPI-Common
 GPADEVICEINFO_DIR = $(GPASRC_DIR)/DeviceInfo
+GPACOUNTERS_DIR = $(GPASRC_DIR)/GPUPerfAPICounters
 
 COMMON_DIR = $(DEPTH)/../Common
 COMMON_SRC = $(COMMON_DIR)/Src
@@ -43,14 +45,17 @@ GPUPERFAPIUTILS_DIR = $(COMMON_SRC)/GPUPerfAPIUtils
 ADL_DIR = $(COMMON_DIR)/Lib/AMD/ADL
 ADLUTIL_DIR = $(COMMON_DIR)/Src/ADLUtil
 AMDTMUTEX_DIR = $(COMMON_DIR)/Src/AMDTMutex
-BOOST = $(COMMON_DIR)/Lib/Ext/Boost/boost_1_59_0
 TSINGLETON_DIR = $(COMMON_SRC)/TSingleton
 DYNAMICLIBRARYMODULE_DIR = $(COMMON_SRC)/DynamicLibraryModule
-GTEST_DIR = $(COMMON_DIR)/Lib/Ext/GoogleTest/1-7
-GL_DIR = $(COMMON_DIR)/Lib/Ext/OpenGL
-GLES_DIR = $(COMMON_DIR)/Lib/Ext/OpenGLES
-GLEW_DIR = $(COMMON_DIR)/Lib/Ext/glew/1.9.0
+COMMON_LIB_EXT=$(COMMON_DIR)/Lib/Ext
+GTEST_DIR = $(COMMON_LIB_EXT)/GoogleTest/1-7
+GL_DIR = $(COMMON_LIB_EXT)/OpenGL
+GLES_DIR = $(COMMON_LIB_EXT)/OpenGLES
+GLEW_DIR = $(COMMON_LIB_EXT)/glew/1.9.0
 GLES_LIB_DIR = -L$(GLES_DIR)/Lib/$(GLES_PLATFORM_DIR)
+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
 
 # Lib paths
 COMMON_LIB_PATHS = -L$(GPACOMMON_DIR) -L$(GPACG_DIR)
@@ -59,7 +64,7 @@ COMMON_LIBS = -lGPUPerfAPI-Common$(TARGET_SUFFIX) -lGPUPerfAPICounterGenerator$(
 STANDARD_LIBS = -ldl -lpthread
 
 # Build target overrides
-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"
+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" "GTEST_LIBS = $(GTEST_LIBS32)"
 INTERNAL_OVERRIDES = "BUILD_DEFINES = -DAMDT_INTERNAL -DAMDT_BUILD_SUFFIX=\\\"-Internal\\\"" "INTERNAL_PUBLIC = _Internal"
 DEBUG_OVERRIDES = "OPTIMIZE = $(DEBUG_CFLAGS)" "DEBUG_RELEASE = debug" "DEBUG_DEFINES = -DAMDT_DEBUG_SUFFIX=\\\"-d\\\""
 

Build/Linux/CommonTargets.mk

@@ -2,13 +2,19 @@ default: $(TARGET) $(TARGETSO) $(TARGETLIB)
 
 # build targets
 $(TARGET) : makedir $(OBJS)
+	$(PRE_BUILD_ACTION)
 	$(CC) $(LINKFLAGS_EXE) $(PLATFORM_LFLAG) $(OBJS) $(LIBPATH) $(LIBS) -o $(TARGET) $(STATIC_LIBS)
+	$(POST_BUILD_ACTION)
 
 $(TARGETLIB) : makedir $(LIB_OBJS)
+	$(PRE_BUILD_ACTION)
 	ar rcs $(TARGETLIB) $(LIB_OBJS)
+	$(POST_BUILD_ACTION)
 
 $(TARGETSO) : makedir $(SO_OBJS)
+	$(PRE_BUILD_ACTION)
 	$(CC) $(LINKFLAGS_SO) $(PLATFORM_LFLAG) $(SO_OBJS) $(LIBPATH) $(LIBS) -o $(TARGETSO) $(STATIC_LIBS)
+	$(POST_BUILD_ACTION)
 
 x86:
 	$(MAKE) -f $(MAKEFILENAME) $(BUILD_X86_OVERRIDES)

Build/Linux/build.sh

@@ -34,9 +34,21 @@ bBuildOpenGLES=true
 bBuildOpenCL=true
 bBuildHSA=true
 
+# Tests build control
+bBuildTests=true
+
 REL_ROOT=
 BUILD=0
 
+# GoogleTest Lib directory override
+GTEST_LIB_DIR_OVERRIDE=
+
+# GoogleTest 32-bit Lib directory override
+GTEST_LIB_DIR_OVERRIDE32=
+
+# Additional compiler defines override
+ADDITIONAL_COMPILER_DEFINES_OVERRIDE="ADDITIONAL_COMPILER_DEFINES_FROM_BUILD_SCRIPT="
+
 # Set build flag
 while [ "$*" != "" ]
 do
@@ -64,10 +76,21 @@ do
       bBuildOpenCL=false
    elif [ "$1" = "skiphsa" ]; then
       bBuildHSA=false
+   elif [ "$1" = "skiptests" ]; then
+      bBuildTests=false
    elif [ "$1" = "incremental" ]; then
       bIncrementalBuild=true
    elif [ "$1" = "quick" ]; then
       bIncrementalBuild=true
+   elif [ "$1" = "gtestlibdir" ]; then
+      shift
+      GTEST_LIB_DIR_OVERRIDE="GTEST_LIBS=$1/libgtest.a"
+   elif [ "$1" = "gtestlibdir32" ]; then
+      shift
+      GTEST_LIB_DIR_OVERRIDE32="GTEST_LIBS32=$1/libgtest.a"
+   elif [ "$1" = "additionaldefines" ]; then
+      shift
+      ADDITIONAL_COMPILER_DEFINES_OVERRIDE="ADDITIONAL_COMPILER_DEFINES_FROM_BUILD_SCRIPT=$1"
    fi
    shift
 done
@@ -82,6 +105,7 @@ COUNTERS=$GPASRC/GPUPerfAPICounters
 COUNTERGENERATOR=$GPASRC/GPUPerfAPICounterGenerator
 GPA_COMMON=$GPASRC/GPUPerfAPI-Common
 GPA_DEVICEINFO=$GPASRC/DeviceInfo
+UNITTESTS=$GPASRC/GPUPerfAPIUnitTests
 
 GLLIB=libGPUPerfAPIGL$DEBUG_SUFFIX.so
 GLESLIB=libGPUPerfAPIGLES$DEBUG_SUFFIX.so
@@ -117,6 +141,11 @@ COUNTERGENERATORLIB32_INTERNAL=libGPUPerfAPICounterGenerator32$DEBUG_SUFFIX-Inte
 GPA_COMMONLIB32_INTERNAL=libGPUPerfAPI-Common32$DEBUG_SUFFIX-Internal.a
 GPA_DEVICEINFOLIB32_INTERNAL=libDeviceInfo32$DEBUG_SUFFIX-Internal.a
 
+UNITTEST=GPUPerfAPIUnitTests$DEBUG_SUFFIX
+UNITTEST32=GPUPerfAPIUnitTests32$DEBUG_SUFFIX
+UNITTEST_INTERNAL=GPUPerfAPIUnitTests$DEBUG_SUFFIX-Internal
+UNITTEST32_INTERNAL=GPUPerfAPIUnitTests32$DEBUG_SUFFIX-Internal
+
 BUILD_DIR_BASE=$GPAROOT/Build
 BUILD_DIR=$BUILD_DIR_BASE/Linux
 
@@ -148,6 +177,10 @@ if $bBuildHSA ; then
    BUILD_DIRS="$BUILD_DIRS $HSA"
 fi
 
+if $bBuildTests ; then
+   BUILD_DIRS="$BUILD_DIRS $UNITTESTS"
+fi
+
 for SUBDIR in $BUILD_DIRS; do
    BASENAME=`basename $SUBDIR`
 
@@ -159,14 +192,14 @@ for SUBDIR in $BUILD_DIRS; do
    #make 64 bit
    echo "Build ${BASENAME}, 64-bit..." | tee -a $LOGFILE
 
-   if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE ${MAKE_TARGET} >> $LOGFILE 2>&1; then
+   if ! make -C $SUBDIR -j$CPU_COUNT $HSA_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 ${MAKE_TARGET}Internal  >> $LOGFILE 2>&1; then
+      if ! make -C $SUBDIR -j$CPU_COUNT $HSA_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
@@ -177,14 +210,14 @@ for SUBDIR in $BUILD_DIRS; do
          #make 32 bit
          echo "Build ${BASENAME}, 32-bit..." | tee -a $LOGFILE
 
-         if ! make -C $SUBDIR -j$CPU_COUNT $HSA_DIR_OVERRIDE ${MAKE_TARGET}x86 >> $LOGFILE 2>&1; then
+         if ! make -C $SUBDIR -j$CPU_COUNT $HSA_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 ${MAKE_TARGET}Internalx86  >> $LOGFILE 2>&1; then
+            if ! make -C $SUBDIR -j$CPU_COUNT $HSA_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
@@ -261,4 +294,20 @@ if $bZip ; then
    fi
 fi
 
+if $bBuildTests ; then
+   LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$UNITTESTS $UNITTESTS/$UNITTEST --gtest_output=xml:$UNITTEST.xml
+
+   if $b32bitbuild ; then
+      LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$UNITTESTS $UNITTESTS/$UNITTEST32 --gtest_output=xml:$UNITTEST32.xml
+   fi
+
+   if $bBuildInternal ; then
+      LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$UNITTESTS $UNITTESTS/$UNITTEST_INTERNAL --gtest_output=xml:$UNITTEST_INTERNAL.xml
+
+      if $b32bitbuild ; then
+         LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$UNITTESTS $UNITTESTS/$UNITTEST32_INTERNAL --gtest_output=xml:$UNITTEST32_INTERNAL.xml
+      fi
+   fi
+fi
+
 echo "Build Complete" | tee -a $LOGFILE

Build/VS2015/Documentation.vcxproj

@@ -36,9 +36,9 @@
   <ItemGroup>
     <CustomBuild Include="../../Doc/DoxyfilePublic">
       <FileType>Document</FileType>
-      <Message Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.11/bin/doxygen.exe')">Generating Public Doxygen documentation</Message>
-      <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>
-      <Outputs Condition="exists('../../../Common/DK/doxygen/doxygen-1.8.11/bin/doxygen.exe')">../../Doc/public\html\index.html;%(Outputs)</Outputs>
+      <Message Condition="exists('c:\Program Files\doxygen\bin\doxygen.exe')">Generating Public Doxygen documentation</Message>
+      <Command Condition="exists('C:\Program Files\doxygen\bin\doxygen.exe')">"c:\Program Files\doxygen\bin\doxygen.exe" "%(FullPath)"</Command>
+      <Outputs Condition="exists('c:\Program Files\doxygen\bin\doxygen.exe')">../../Doc/public\html\index.html;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Build/VS2015/GPA-Properties.props

@@ -11,8 +11,11 @@
     </PropertyGroup>
     <ItemDefinitionGroup>
         <ClCompile>
-            <AdditionalIncludeDirectories>$(GPUPerfAPIBaseDir)Src\GPUPerfAPI-Common\</AdditionalIncludeDirectories>
+            <AdditionalIncludeDirectories>$(GPUPerfAPIBaseDir)Src\GPUPerfAPI-Common\;$(GPUPerfAPIBaseDir)Src\GPUPerfAPICounterGenerator;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
         </ClCompile>
+        <ResourceCompile>
+            <AdditionalIncludeDirectories>$(GPUPerfAPIBaseDir)Src\GPUPerfAPI-Common\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+        </ResourceCompile>
     </ItemDefinitionGroup>
     <ItemGroup>
         <BuildMacro Include="BaseDir">

Build/VS2015/GPUPerfAPI-Common.vcxproj

@@ -26,6 +26,7 @@
     <ClInclude Include="..\..\Src\GPUPerfAPI-Common\Adapter.h" />
     <ClInclude Include="..\..\Src\GPUPerfAPI-Common\APIRTModuleLoader.h" />
     <ClInclude Include="..\..\Src\GPUPerfAPI-Common\CircularBuffer.h" />
+    <ClInclude Include="..\..\Src\GPUPerfAPI-Common\DXGetAMDDeviceInfo.h" />
     <ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAContextState.h" />
     <ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPACounterDataRequestManager.h" />
     <ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPACustomHWValidationManager.h" />
@@ -49,7 +50,9 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\Common\Src\ADLUtil\ADLUtil.cpp" />
     <ClCompile Include="..\..\..\Common\Src\AMDTMutex\AMDTMutex.cpp" />
-    <ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\Common\Src\DeviceInfo-Internal\DeviceInfoInternal.cpp" />
+    <ClCompile Condition="'$(SolutionName)'=='GPUPerfAPI-Full'" Include="..\..\..\Common\Src\DeviceInfo-Internal\DeviceInfoInternal.cpp">
+      <ExcludedFromBuild Condition="'$(AMDT_BUILD)'!='AMDT_INTERNAL'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\Common\Src\DeviceInfo\DeviceInfoUtils.cpp" />
     <ClCompile Include="..\..\..\Common\Src\DynamicLibraryModule\DynamicLibraryModule.cpp" />
     <ClCompile Include="..\..\..\Common\Src\GPUPerfAPIUtils\GPUPerfAPIRegistry.cpp" />

Build/VS2015/GPUPerfAPI-Common.vcxproj.filters

@@ -94,6 +94,9 @@
     <ClInclude Include="..\..\Src\GPUPerfAPI-Common\GPAVersion.h">
       <Filter>Source Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\Src\GPUPerfAPI-Common\DXGetAMDDeviceInfo.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Src\GPUPerfAPI-Common\GPAContextState.cpp">