GPA 3.13 updates

GPUOpen-Tools · Apr 27, 2023 · 3fe0d4c · 3fe0d4c
1 parent 73f5217
commit 3fe0d4c
Show file tree

Hide file tree

Showing 519 changed files with 448,395 additions and 499,877 deletions.
diff --git a/BUILD.md b/BUILD.md
@@ -12,7 +12,7 @@ order to clone/update any dependent repositories.
 
 #### Prerequisites
   * Python 3.x, which can be installed from https://www.python.org/.
-  * CMake 3.7.2 or newer
+  * CMake 3.19 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:
@@ -41,7 +41,7 @@ this script everytime you pull new changes from GPA repository.
  * This script also executes cmake to generate all required files to build GPA.
  * If you want to generate all cmake build files without trying to clone/pull dependent repos, you can add "--nofetch" to the [pre_build.py](build/pre_build.py) command line.
  * Additional switches that can be used with the [pre_build.py](build/pre_build.py) script:
-   * `--vs=[2015,2017,2019]`: Specify the Visual Studio version for which to generate projects. Default is 2017.
+   * `--vs=[2015,2017,2019,2022]`: Specify the Visual Studio version for which to generate projects. Default is 2019.
     * `--config=[debug,release]`: Specify the config for which to generate makefiles. Default is both. A specific config can only be specified on Linux. On Windows, both configs are always supported by the generated VS solution and project files.
    * `--platform=[x86,x64]`: Specify the platform for which to generate build files. Default is both.
    * `--clean`: Deletes CMakeBuild directory and regenerates all build files from scratch
@@ -57,10 +57,10 @@ this script everytime you pull new changes from GPA repository.
 ## Windows Build Information
 
 ##### Prerequisites
- * Microsoft Visual Studio 2017
+ * Microsoft Visual Studio 2019
  * 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 external/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
+   * You can override the version of the Windows 10 SDK used by modifying external/Lib/Ext/Windows-Kits/Global-WindowsSDK.cmake
+ * Microsoft .NET 4.6.2 SDK from https://dotnet.microsoft.com/en-us/download/dotnet-framework/thank-you/net462-developer-pack-offline-installer
 
 ##### Build Instructions
  * Load cmake_bld\x64\GPUPerfAPI.sln into Visual Studio to build the 64-bit version of GPA
@@ -75,15 +75,11 @@ this script everytime you pull new changes from GPA repository.
 
 ##### Prerequisites
  * Install the Mesa common development package: sudo apt-get install mesa-common-dev
- * For 32-bit builds, install the multilib packages: sudo apt-get install gcc-multilib g++-multilib
 
 ##### Build Instructions
  * Execute "make" in the cmake_bld/x64/debug to build the 64-bit debug version of GPA
  * Execute "make" in the cmake_bld/x64/release to build the 64-bit release version of GPA
- * Execute "make" in the cmake_bld/x86/debug to build the 32-bit debug version of GPA
- * Execute "make" in the cmake_bld/x86/release to build the 32-bit release version of GPA
  * After a successful build, the GPUPerfAPI binaries can be found in `gpu_performance_api/output/$(Configuration)` (for example gpu_performance_api/output/release)
- * When building the internal version, each binary filename will also have a "-Internal" suffix (for example libGPUPerfAPIGL-Internal.so)
 
 ## PublicCounterCompiler Tool
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,6 +6,10 @@ set(DEPTH "./")
 message(STATUS "Generating project files for GPA....")
 set(GPA_CMAKE_MODULES_DIR   ${CMAKE_CURRENT_SOURCE_DIR}/build/cmake_modules)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 if(NOT DEFINED build)
     set(GPA_BUILD_NUMBER 0)
 else()

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2022 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2016-2023 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -31,23 +31,27 @@ Prebuilt binaries can be downloaded from the Releases page: https://github.com/G
 * Provides access to some raw hardware counters. See [Raw Hardware Counters](#raw-hardware-counters) for more information.
 
 ## What's New
-### Version 3.12 (12/14/22)
-* Add support for AMD Radeon™ RX 7900 XTX and AMD Radeon™ RX 7900 XT GPUs.
-* Add support for compiling with Visual Studio 2022.
-* Reduced binary sizes by an average of 75%.
+### Version 3.13 (04/27/2023)
+* Add support for AMD Radeon RX 7600 series hardware.
+* Add support for AMD Radeon RX 7700 series hardware.
+* OpenCL support for AMD Radeon RX 7000 series hardware has been restored if using Adrenalin 23.3.2 or newer.
+* Removed implementation related to supporting software counters. They have not been supported since GPA 3.0.
+* Update C++ language standard to C++ 17.
+* CMake 3.19 or newer is now required.
+* 32-bit Linux builds are no longer supported.
 * Bug Fixes:
-  * AMD Radeon RX 6800, DX12: HiZ and PreZ counters are now reporting correct values (requires Adrenalin 22.7.1 or newer driver).
-  * AMD Radeon RX 6800: CSThreadgroups is now reporting the correct values (requires Adrenalin 22.7.1 or newer driver).
-  * AMD Radeon RX 6000 Series: PostTessellation counters now only show results in pipelines using tessellation.
-  * AMD Radeon RX 5000 Series: PreTessellation counters now only show results in pipelines using tessellation.
-  * Sample apps: Fix implementation of passes in D3D11Triangle, and improve general error handling.
+  * Fixed a regression that resulted in a crash on certain hardware variants.
+  * Fix a memory leak in the GpaInterfaceLoader if multiple APIs were loaded.
+  * Fix a memory leak in GPUPerfAPIUnitTests caused by not closing a context.
+  * Marked kGpaOpenContextHideSoftwareCountersBit as obsolete.
+  * Marked kGpaOpenContextHideHardwareCountesrBit as obsolete.
 
 ## System Requirements
 * An AMD Radeon GPU or APU based on Graphics IP version 8 and newer.
 * Windows: Radeon Software Adrenalin 2020 Edition 20.11.2 or later (Driver Packaging Version 20.45 or later).
 * Linux: Radeon Software for Linux Revision 20.45 or later.
 * Radeon GPUs or APUs based on Graphics IP version 6 and 7 are no longer supported by GPUPerfAPI. Please use an older version ([3.3](https://github.com/GPUOpen-Tools/gpu_performance_api/releases/tag/v3.3)) with older hardware.
-* Windows 7, 8.1, and 10.
+* Windows 7, 8.1, 10, or 11.
 * Ubuntu (16.04 and later) and CentOS/RHEL (7 and later) distributions.
 
 ## Cloning the Repository
@@ -107,9 +111,6 @@ There are some counters that are returning unexpected results on specific hardwa
 ### Counter Validation Errors in D3D12ColorCube Sample App
 Due to the extensive counter validation now being done in the D3D12ColorCube sample application, and some expected variation in nondeterministic counters across a wide range of systems, the sample app may report errors on some systems. Likewise, some counters are marked as known issues and we are investigating the underlying causes of the inconsistent results.
 
-### Support for OpenCL is not enabled for Radeon 7000 Series GPUs
-This should be resolved in a future release.
-
 ### OpenCL Performance Counter Accuracy For Radeon 6000 Series GPUs
 The following performance counter values may not be accurate for OpenCL applications running on Radeon 6000 Series GPUs:
 * Wavefronts, VALUInsts, SALUInsts, SALUBusy, VALUUtilization: These values should be representative of performance, but may not be 100% accurate.

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,17 +1,28 @@
 # GPU Performance API Release Notes
+---
+## Version 3.13 (04/27/2023)
+* Add support for AMD Radeon RX 7600 series hardware.
+* Add support for AMD Radeon RX 7700 series hardware.
+* OpenCL support for AMD Radeon RX 7000 series hardware has been restored if using Adrenalin 23.3.2 or newer.
+* Removed implementation related to supporting software counters. They have not been supported since GPA 3.0.
+* Update C++ language standard to C++ 17.
+* CMake 3.19 or newer is now required.
+* 32-bit Linux builds are no longer supported.
+* Bug Fixes:
+  * Fixed a regression that resulted in a crash on certain hardware variants.
+  * Fix a memory leak in the GpaInterfaceLoader if multiple APIs were loaded.
+  * Fix a memory leak in GPUPerfAPIUnitTests caused by not closing a context.
+  * Marked kGpaOpenContextHideSoftwareCountersBit as obsolete.
+  * Marked kGpaOpenContextHideHardwareCountesrBit as obsolete.
 
-## Upcoming Release
-  * Renamed kGpaOpenContextHideSoftwareCountesrBit and kGpaOpenContextHideHardwareCountersBit since they are obsolete.
-
-## Version 3.12 (12/14/22)
-  * Add support for AMD Radeon™ RX 7900 XTX and AMD Radeon™ RX 7900 XT GPUs.
+## Version 3.12 (12/14/2022)
+  * Add support for AMD Radeon RX 7000 Series hardware.
   * Add support for compiling with Visual Studio 2022.
-  * Reduced binary sizes by an average of 75%.
+  * Reduced binary sizes by an average of 45%.
   * Bug Fixes:
     * AMD Radeon RX 6800, DX12: HiZ and PreZ counters are now reporting correct values (requires Adrenalin 22.7.1 or newer driver).
     * AMD Radeon RX 6800: CSThreadgroups is now reporting the correct values (requires Adrenalin 22.7.1 or newer driver).
     * AMD Radeon RX 6000 Series: PostTessellation counters now only show results in pipelines using tessellation.
-    * AMD Radeon RX 5000 Series: PreTessellation counters now only show results in pipelines using tessellation.
     * Sample apps: Fix implementation of passes in D3D11Triangle, and improve general error handling.
 
 ## Version 3.11.1 (07/27/22)

diff --git a/build/cmake_modules/build_flags.cmake b/build/cmake_modules/build_flags.cmake
@@ -17,6 +17,7 @@ if(${build-internal})
     set(AMDT_INTERNAL_BUILD_FLAG ON)
 endif()
 
+
 if(${usingscript})
     # Platform Control variable
     if(NOT DEFINED build-32bit)
@@ -86,4 +87,4 @@ endif()
 # Default compiler
 if(NOT DEFINED USE_DEFAULT_COMPILER)
     set(USE_DEFAULT_COMPILER ON)
-endif()
+endif()
diff --git a/build/cmake_modules/defs.cmake b/build/cmake_modules/defs.cmake
@@ -1,17 +1,17 @@
 ## Copyright (c) 2018-2022 Advanced Micro Devices, Inc. All rights reserved.
-cmake_minimum_required(VERSION 3.5.1)
+cmake_minimum_required(VERSION 3.19)
 
 ## Define the GPA version
 set(GPA_MAJOR_VERSION 3)
-set(GPA_MINOR_VERSION 12)
+set(GPA_MINOR_VERSION 13)
 set(GPA_UPDATE_VERSION 0)
 
 if(NOT DEFINED GPA_BUILD_NUMBER)
     set(GPA_BUILD_NUMBER 0)
 endif()
 
 if(NOT DEFINED GPA_ROOT)
-    set(GPA_ROOT ${CMAKE_CURRENT_LIST_DIR}/../..)
+    file(REAL_PATH "${CMAKE_CURRENT_LIST_DIR}/../.." GPA_ROOT)
 endif()
 
 if(NOT DEFINED GPA_OUTPUT_DIR)

diff --git a/build/cmake_modules/utils.cmake b/build/cmake_modules/utils.cmake
@@ -78,8 +78,9 @@ macro(REMOVE_CPP_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")
+        elseif(OPTION STREQUAL "-std=c++17")
+            continue()
+        elseif(OPTION STREQUAL "-Wno-non-virtual-dtor")
             continue()
         endif()
         set(USE_COMPILE_OPTIONS ${USE_COMPILE_OPTIONS} ${OPTION})

diff --git a/docs/doxygen/DoxyfilePublic b/docs/doxygen/DoxyfilePublic
@@ -31,7 +31,7 @@ PROJECT_NAME           = "GPU Perf API"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 3.12
+PROJECT_NUMBER         = 3.13
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

diff --git a/docs/sphinx/source/compute_counter_tables_gfx10.rst b/docs/sphinx/source/compute_counter_tables_gfx10.rst
@@ -1,4 +1,4 @@
-.. Copyright(c) 2018-2022 Advanced Micro Devices, Inc.All rights reserved.
+.. Copyright(c) 2018-2023 Advanced Micro Devices, Inc.All rights reserved.
 .. Compute Performance Counters for RDNA
 
 .. *** Note, this is an auto-generated file. Do not edit. Execute PublicCounterCompiler to rebuild.

diff --git a/docs/sphinx/source/compute_counter_tables_gfx103.rst b/docs/sphinx/source/compute_counter_tables_gfx103.rst
@@ -1,4 +1,4 @@
-.. Copyright(c) 2018-2022 Advanced Micro Devices, Inc.All rights reserved.
+.. Copyright(c) 2018-2023 Advanced Micro Devices, Inc.All rights reserved.
 .. Compute Performance Counters for RDNA2
 
 .. *** Note, this is an auto-generated file. Do not edit. Execute PublicCounterCompiler to rebuild.

diff --git a/docs/sphinx/source/compute_counter_tables_gfx11.rst b/docs/sphinx/source/compute_counter_tables_gfx11.rst
@@ -1,4 +1,4 @@
-.. Copyright(c) 2018-2022 Advanced Micro Devices, Inc.All rights reserved.
+.. Copyright(c) 2018-2023 Advanced Micro Devices, Inc.All rights reserved.
 .. Compute Performance Counters for RDNA3
 
 .. *** Note, this is an auto-generated file. Do not edit. Execute PublicCounterCompiler to rebuild.

diff --git a/docs/sphinx/source/compute_counter_tables_gfx8.rst b/docs/sphinx/source/compute_counter_tables_gfx8.rst
@@ -1,4 +1,4 @@
-.. Copyright(c) 2018-2022 Advanced Micro Devices, Inc.All rights reserved.
+.. Copyright(c) 2018-2023 Advanced Micro Devices, Inc.All rights reserved.
 .. Compute Performance Counters for Graphics IP v8
 
 .. *** Note, this is an auto-generated file. Do not edit. Execute PublicCounterCompiler to rebuild.

diff --git a/docs/sphinx/source/compute_counter_tables_gfx9.rst b/docs/sphinx/source/compute_counter_tables_gfx9.rst
@@ -1,4 +1,4 @@
-.. Copyright(c) 2018-2022 Advanced Micro Devices, Inc.All rights reserved.
+.. Copyright(c) 2018-2023 Advanced Micro Devices, Inc.All rights reserved.
 .. Compute Performance Counters for Vega
 
 .. *** Note, this is an auto-generated file. Do not edit. Execute PublicCounterCompiler to rebuild.

diff --git a/docs/sphinx/source/conf.py b/docs/sphinx/source/conf.py
@@ -61,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'3.12'
+version = u'3.13'
 # The full version, including alpha/beta/rc tags.
-release = u'3.12'
+release = u'3.13'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/sphinx/source/graphics_counter_tables_gfx10.rst b/docs/sphinx/source/graphics_counter_tables_gfx10.rst
@@ -1,4 +1,4 @@
-.. Copyright(c) 2018-2022 Advanced Micro Devices, Inc.All rights reserved.
+.. Copyright(c) 2018-2023 Advanced Micro Devices, Inc.All rights reserved.
 .. Graphics Performance Counters for RDNA
 
 .. *** Note, this is an auto-generated file. Do not edit. Execute PublicCounterCompiler to rebuild.

diff --git a/docs/sphinx/source/graphics_counter_tables_gfx103.rst b/docs/sphinx/source/graphics_counter_tables_gfx103.rst
@@ -1,4 +1,4 @@
-.. Copyright(c) 2018-2022 Advanced Micro Devices, Inc.All rights reserved.
+.. Copyright(c) 2018-2023 Advanced Micro Devices, Inc.All rights reserved.
 .. Graphics Performance Counters for RDNA2
 
 .. *** Note, this is an auto-generated file. Do not edit. Execute PublicCounterCompiler to rebuild.

diff --git a/docs/sphinx/source/graphics_counter_tables_gfx11.rst b/docs/sphinx/source/graphics_counter_tables_gfx11.rst
@@ -1,4 +1,4 @@
-.. Copyright(c) 2018-2022 Advanced Micro Devices, Inc.All rights reserved.
+.. Copyright(c) 2018-2023 Advanced Micro Devices, Inc.All rights reserved.
 .. Graphics Performance Counters for RDNA3
 
 .. *** Note, this is an auto-generated file. Do not edit. Execute PublicCounterCompiler to rebuild.

diff --git a/docs/sphinx/source/graphics_counter_tables_gfx8.rst b/docs/sphinx/source/graphics_counter_tables_gfx8.rst
@@ -1,4 +1,4 @@
-.. Copyright(c) 2018-2022 Advanced Micro Devices, Inc.All rights reserved.
+.. Copyright(c) 2018-2023 Advanced Micro Devices, Inc.All rights reserved.
 .. Graphics Performance Counters for Graphics IP v8
 
 .. *** Note, this is an auto-generated file. Do not edit. Execute PublicCounterCompiler to rebuild.

diff --git a/docs/sphinx/source/graphics_counter_tables_gfx9.rst b/docs/sphinx/source/graphics_counter_tables_gfx9.rst
@@ -1,4 +1,4 @@
-.. Copyright(c) 2018-2022 Advanced Micro Devices, Inc.All rights reserved.
+.. Copyright(c) 2018-2023 Advanced Micro Devices, Inc.All rights reserved.
 .. Graphics Performance Counters for Vega
 
 .. *** Note, this is an auto-generated file. Do not edit. Execute PublicCounterCompiler to rebuild.

diff --git a/docs/sphinx/source/usage.rst b/docs/sphinx/source/usage.rst
@@ -1,4 +1,4 @@
-.. Copyright (c) 2018-2021 Advanced Micro Devices, Inc. All rights reserved.
+.. Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved.
 .. GPU Performance API Usage
 
 .. highlight:: c++
@@ -23,15 +23,13 @@ for each API
     "Vulkan", "| 64-bit Windows: GPUPerfAPIVK-x64.dll
     | 32-bit Windows: GPUPerfAPIVK.dll
     | 64-bit Linux: libGPUPerfAPIVK.so
-    | 32-bit Linux: libGPUPerfAPIVK32.so"
     "DirectX 12", "| 64-bit Windows: GPUPerfAPIDX12-x64.dll
     | 32-bit Windows: GPUPerfAPIDX12.dll"
     "DirectX 11", "| 64-bit Windows: GPUPerfAPIDX11-x64.dll
     | 32-bit Windows: GPUPerfAPIDX11.dll"
     "OpenGL", "| 64-bit Windows: GPUPerfAPIGL-x64.dll
     | 32-bit Windows: GPUPerfAPIGL.dll
     | 64-bit Linux: libGPUPerfAPIGL.so
-    | 32-bit Linux: libGPUPerfAPIGL32.so"
     "OpenCL", "| 64-bit Windows: GPUPerfAPICL-x64.dll
     | 32-bit Windows: GPUPerfAPICL.dll"
 

diff --git a/include/gpu_performance_api/gpu_perf_api_counters.h b/include/gpu_performance_api/gpu_perf_api_counters.h
@@ -299,6 +299,8 @@ typedef GpaStatus (*GpaCounterLibGetCounterNamePtrType)(const GpaCounterContext,
 /// @param [out] gpa_counter_index The address which will hold the index upon successful execution.
 ///
 /// @return The GPA result status of the operation. kGpaStatusOk is returned if the operation is successful.
+/// @retval kGpaStatusErrorNullPointer if the gpa_counter_info or gpa_counter_index is null, or if the gpa_counter_info
+///         indicates that it is a derived counter, but the derived counter name is null.
 GPU_PERF_API_COUNTERS_DECL GpaStatus GpaCounterLibGetCounterIndex(const GpaCounterContext gpa_virtual_context,
                                                                   const GpaCounterParam*  gpa_counter_info,
                                                                   GpaUInt32*              gpa_counter_index);