GPA 3.13.1 updates

GPUOpen-Tools · Jun 22, 2023 · 376cec1 · 376cec1
1 parent bdaa849
commit 376cec1
Show file tree

Hide file tree

Showing 87 changed files with 817,503 additions and 816,391 deletions.
diff --git a/NOTICES.txt b/NOTICES.txt
diff --git a/README.md b/README.md
@@ -31,20 +31,12 @@ 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.13 (04/27/2023)
-* Add support for AMD Radeon RX 7000M Series hardware.
-* Add support for AMD Radeon RX 7000S 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.
+### Version 3.13.1 (06/22/2023)
+* Add support for additional AMD Radeon RX 7000 Series hardware.
+* Add support for AMD Radeon 700M Series APUs.
+  * Vulkan and OpenGL are supported on existing drivers; DX12, DX11, and OpenCL will be enabled by an upcoming driver.
 * 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.
+  * Fixed performance regression in GPUPerfAPIDX12[-x64].dll
 
 ## System Requirements
 * An AMD Radeon GPU or APU based on Graphics IP version 8 and newer.

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,5 +1,12 @@
 # GPU Performance API Release Notes
 ---
+## Version 3.13.1 (06/22/2023)
+* Add support for additional AMD Radeon RX 7000 Series hardware.
+* Add support for AMD Radeon 700M Series APUs.
+  * Vulkan and OpenGL are supported on existing drivers; DX12, DX11, and OpenCL will be enabled by an upcoming driver.
+* Bug Fixes:
+  * Fixed performance regression in GPUPerfAPIDX12[-x64].dll
+
 ## Version 3.13 (04/27/2023)
 * Add support for AMD Radeon RX 7000M Series hardware.
 * Add support for AMD Radeon RX 7000S Series hardware.

diff --git a/build/cmake_modules/defs.cmake b/build/cmake_modules/defs.cmake
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.19)
 ## Define the GPA version
 set(GPA_MAJOR_VERSION 3)
 set(GPA_MINOR_VERSION 13)
-set(GPA_UPDATE_VERSION 0)
+set(GPA_UPDATE_VERSION 1)
 
 if(NOT DEFINED GPA_BUILD_NUMBER)
     set(GPA_BUILD_NUMBER 0)

diff --git a/docs/sphinx/CMakeLists.txt b/docs/sphinx/CMakeLists.txt
@@ -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.
 cmake_minimum_required(VERSION 3.5.1)
 
 set(DEPTH "../")
@@ -25,5 +25,5 @@ target_link_libraries(${GPA_PROJECT_NAME}
                       GPUPerfAPI-Common)
 
 add_custom_command(TARGET ${GPA_PROJECT_NAME} PRE_BUILD
-                   COMMAND ${SPHINX_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/source ${GPA_OUTPUT_DIR}/docs/
+                   COMMAND ${SPHINX_EXECUTABLE} -M html ${CMAKE_CURRENT_LIST_DIR}/source ${GPA_OUTPUT_DIR}/docs
                    COMMENT "Generating sphinx documentation..." )
diff --git a/docs/sphinx/source/usage.rst b/docs/sphinx/source/usage.rst
@@ -22,14 +22,14 @@ for each API
 
     "Vulkan", "| 64-bit Windows: GPUPerfAPIVK-x64.dll
     | 32-bit Windows: GPUPerfAPIVK.dll
-    | 64-bit Linux: libGPUPerfAPIVK.so
+    | 64-bit Linux: libGPUPerfAPIVK.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
+    | 64-bit Linux: libGPUPerfAPIGL.so"
     "OpenCL", "| 64-bit Windows: GPUPerfAPICL-x64.dll
     | 32-bit Windows: GPUPerfAPICL.dll"
 

diff --git a/scripts/dependencies_map.py b/scripts/dependencies_map.py
@@ -17,14 +17,14 @@
     "googletest"       : ["external/Lib/Ext/GoogleTest",        "542e057c6c5bf45454b43764b881397b71164d62"],
 # Src.
     "adl_util"                 : ["external/Src/ADLUtil",               "d62c94514326775c83fc129bb89d299c8749ebd1"],
-    "device_info"              : ["external/Src/DeviceInfo",            "7f814f15a0896659af005498d9008fd627446ba0"],
+    "device_info"              : ["external/Src/DeviceInfo",            "0893fae90b1a0d75780bdafef81b2e4d836ce56b"],
     "dynamic_library_module"   : ["external/Src/DynamicLibraryModule",  "e6451ce26b8509cf724c7cf5d007878791143a58"],
     "tsingleton"               : ["external/Src/TSingleton",            "02e8fa7d98f33cdbd0e1f77d1a8a403a32e35882"],
 }
 
 # Name : Source , Destination, version, Copied/Installation location wrt to Script root
 downloadWin = {
-    "GPADX11GetDeviceInfo" : [ "https://github.com/GPUOpen-Tools/gpu_performance_api/releases/download/v3.10/GPUPerfAPI-3.10.0.77.zip" , "default", "3_10", "external/Lib/AMD/GPUPerfAPI"]
+    "GPADX11GetDeviceInfo" : [ "https://github.com/GPUOpen-Tools/gpu_performance_api/releases/download/v3.13/GPUPerfAPI-3.13.0.28.zip" , "default", "3_13", "external/Lib/AMD/GPUPerfAPI"]
 }
 
 # Name : Source , Destination, version, Copied/Installation location wrt to Script root

diff --git a/scripts/gpa_packaging.py b/scripts/gpa_packaging.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python3
-## Copyright (c) 2019-2020 Advanced Micro Devices, Inc. All rights reserved.
+## Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved.
 # GPA Packaging script
 
 import os
@@ -76,9 +76,6 @@ def CreatePackage(self, archive_output_dir, build_artifacts_dir, sphinx_docs_dir
         gpa_build_artifacts_dir = self._gpa_build_artifacts_dir
         gpa_archive_out_dir = self._gpa_build_artifacts_dir
 
-        if sphinx_docs_dir is None:
-            sphinx_docs_dir = self._gpa_build_artifacts_dir
-
         config_str = "release"
         if is_debug == True:
             config_str = "debug"
@@ -172,25 +169,31 @@ def CreatePackage(self, archive_output_dir, build_artifacts_dir, sphinx_docs_dir
                 GpaUtils.WriteFileToArchive(gpa_archive_handle, other_file_abs_path,
                                                                 other_file_in_archive)
 
-            # Write docs
-            gpa_docs_dir = os.path.normpath(os.path.join(gpa_build_artifacts_dir, sphinx_docs_dir, "html"))
-            gpa_docs_dir_str = str(gpa_docs_dir)
-            gpa_docs_dir_info = os.walk(gpa_docs_dir)
+            if (sphinx_docs_dir is not None) and (sphinx_docs_dir != ""):
+                # Write docs
+                gpa_docs_dir = os.path.normpath(os.path.join(gpa_build_artifacts_dir, sphinx_docs_dir, "html"))
+                gpa_docs_dir_str = str(gpa_docs_dir)
+                gpa_docs_dir_info = os.walk(gpa_docs_dir)
 
-            if sys.platform == "win32":
-                doc_folder_str = "\\docs"
-            else:
-                doc_folder_str = "/docs"
-
-            for dirs, sub_dirs, files in gpa_docs_dir_info:
-                for file in files:
-                    doc_file_abs_path = os.path.join(dirs, file)
-                    doc_file_abs_path = os.path.normpath(doc_file_abs_path)
-                    doc_file_abs_path_str = str(doc_file_abs_path)
-                    doc_file_in_archive = gpa_archive_root_name + doc_folder_str + \
-                                            doc_file_abs_path_str.split(gpa_docs_dir_str)[1]
-                    GpaUtils.WriteFileToArchive(gpa_archive_handle, doc_file_abs_path,
-                                                                    doc_file_in_archive)
+                if sys.platform == "win32":
+                    doc_folder_str = "\\docs"
+                else:
+                    doc_folder_str = "/docs"
+
+                file_count = 0
+                for dirs, sub_dirs, files in gpa_docs_dir_info:
+                    for file in files:
+                        file_count = file_count + 1
+                        doc_file_abs_path = os.path.join(dirs, file)
+                        doc_file_abs_path = os.path.normpath(doc_file_abs_path)
+                        doc_file_abs_path_str = str(doc_file_abs_path)
+                        doc_file_in_archive = gpa_archive_root_name + doc_folder_str + \
+                                                doc_file_abs_path_str.split(gpa_docs_dir_str)[1]
+                        GpaUtils.WriteFileToArchive(gpa_archive_handle, doc_file_abs_path,
+                                                                        doc_file_in_archive)
+
+                if file_count == 0:
+                    raise Exception("Failed to find html documentation")
 
     # Returns the gpa version
     def GetGpaVersion(self, _build_numberin):

diff --git a/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter.cmake b/source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter.cmake
@@ -7,6 +7,7 @@ ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx10.h
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx103.h
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx103_gfx1031_gfx1032.h
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx11.h
+${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx11_gfx1103.h
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8.h
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8_baffin.h
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8_carrizo.h
@@ -24,6 +25,7 @@ ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx10.cc
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx103.cc
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx103_gfx1031_gfx1032.cc
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx11.cc
+${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx11_gfx1103.cc
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8.cc
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8_baffin.cc
 ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8_carrizo.cc