Skip to content

Commit 376cec1

Browse files
PLohrmannAMDPLohrmannAMD
committed
GPA 3.13.1 updates
1 parent bdaa849 commit 376cec1

File tree

87 files changed

+817503
-816391
lines changed

Some content is hidden

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

87 files changed

+817503
-816391
lines changed

‎NOTICES.txt‎

Lines changed: 136 additions & 82 deletions
Large diffs are not rendered by default.

‎README.md‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,12 @@ Prebuilt binaries can be downloaded from the Releases page: https://github.com/G
3131
* Provides access to some raw hardware counters. See [Raw Hardware Counters](#raw-hardware-counters) for more information.
3232

3333
## What's New
34-
### Version 3.13 (04/27/2023)
35-
* Add support for AMD Radeon RX 7000M Series hardware.
36-
* Add support for AMD Radeon RX 7000S Series hardware.
37-
* OpenCL support for AMD Radeon RX 7000 Series hardware has been restored if using Adrenalin 23.3.2 or newer.
38-
* Removed implementation related to supporting software counters. They have not been supported since GPA 3.0.
39-
* Update C++ language standard to C++ 17.
40-
* CMake 3.19 or newer is now required.
41-
* 32-bit Linux builds are no longer supported.
34+
### Version 3.13.1 (06/22/2023)
35+
* Add support for additional AMD Radeon RX 7000 Series hardware.
36+
* Add support for AMD Radeon 700M Series APUs.
37+
* Vulkan and OpenGL are supported on existing drivers; DX12, DX11, and OpenCL will be enabled by an upcoming driver.
4238
* Bug Fixes:
43-
* Fixed a regression that resulted in a crash on certain hardware variants.
44-
* Fix a memory leak in the GpaInterfaceLoader if multiple APIs were loaded.
45-
* Fix a memory leak in GPUPerfAPIUnitTests caused by not closing a context.
46-
* Marked kGpaOpenContextHideSoftwareCountersBit as obsolete.
47-
* Marked kGpaOpenContextHideHardwareCountesrBit as obsolete.
39+
* Fixed performance regression in GPUPerfAPIDX12[-x64].dll
4840

4941
## System Requirements
5042
* An AMD Radeon GPU or APU based on Graphics IP version 8 and newer.

‎ReleaseNotes.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# GPU Performance API Release Notes
22
---
3+
## Version 3.13.1 (06/22/2023)
4+
* Add support for additional AMD Radeon RX 7000 Series hardware.
5+
* Add support for AMD Radeon 700M Series APUs.
6+
* Vulkan and OpenGL are supported on existing drivers; DX12, DX11, and OpenCL will be enabled by an upcoming driver.
7+
* Bug Fixes:
8+
* Fixed performance regression in GPUPerfAPIDX12[-x64].dll
9+
310
## Version 3.13 (04/27/2023)
411
* Add support for AMD Radeon RX 7000M Series hardware.
512
* Add support for AMD Radeon RX 7000S Series hardware.

‎build/cmake_modules/defs.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.19)
44
## Define the GPA version
55
set(GPA_MAJOR_VERSION 3)
66
set(GPA_MINOR_VERSION 13)
7-
set(GPA_UPDATE_VERSION 0)
7+
set(GPA_UPDATE_VERSION 1)
88

99
if(NOT DEFINED GPA_BUILD_NUMBER)
1010
set(GPA_BUILD_NUMBER 0)

‎docs/sphinx/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Copyright (c) 2018-2022 Advanced Micro Devices, Inc. All rights reserved.
1+
## Copyright (c) 2018-2023 Advanced Micro Devices, Inc. All rights reserved.
22
cmake_minimum_required(VERSION 3.5.1)
33

44
set(DEPTH "../")
@@ -25,5 +25,5 @@ target_link_libraries(${GPA_PROJECT_NAME}
2525
GPUPerfAPI-Common)
2626

2727
add_custom_command(TARGET ${GPA_PROJECT_NAME} PRE_BUILD
28-
COMMAND ${SPHINX_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/source ${GPA_OUTPUT_DIR}/docs/
28+
COMMAND ${SPHINX_EXECUTABLE} -M html ${CMAKE_CURRENT_LIST_DIR}/source ${GPA_OUTPUT_DIR}/docs
2929
COMMENT "Generating sphinx documentation..." )

‎docs/sphinx/source/usage.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ for each API
2222

2323
"Vulkan", "| 64-bit Windows: GPUPerfAPIVK-x64.dll
2424
| 32-bit Windows: GPUPerfAPIVK.dll
25-
| 64-bit Linux: libGPUPerfAPIVK.so
25+
| 64-bit Linux: libGPUPerfAPIVK.so"
2626
"DirectX 12", "| 64-bit Windows: GPUPerfAPIDX12-x64.dll
2727
| 32-bit Windows: GPUPerfAPIDX12.dll"
2828
"DirectX 11", "| 64-bit Windows: GPUPerfAPIDX11-x64.dll
2929
| 32-bit Windows: GPUPerfAPIDX11.dll"
3030
"OpenGL", "| 64-bit Windows: GPUPerfAPIGL-x64.dll
3131
| 32-bit Windows: GPUPerfAPIGL.dll
32-
| 64-bit Linux: libGPUPerfAPIGL.so
32+
| 64-bit Linux: libGPUPerfAPIGL.so"
3333
"OpenCL", "| 64-bit Windows: GPUPerfAPICL-x64.dll
3434
| 32-bit Windows: GPUPerfAPICL.dll"
3535

‎scripts/dependencies_map.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
"googletest" : ["external/Lib/Ext/GoogleTest", "542e057c6c5bf45454b43764b881397b71164d62"],
1818
# Src.
1919
"adl_util" : ["external/Src/ADLUtil", "d62c94514326775c83fc129bb89d299c8749ebd1"],
20-
"device_info" : ["external/Src/DeviceInfo", "7f814f15a0896659af005498d9008fd627446ba0"],
20+
"device_info" : ["external/Src/DeviceInfo", "0893fae90b1a0d75780bdafef81b2e4d836ce56b"],
2121
"dynamic_library_module" : ["external/Src/DynamicLibraryModule", "e6451ce26b8509cf724c7cf5d007878791143a58"],
2222
"tsingleton" : ["external/Src/TSingleton", "02e8fa7d98f33cdbd0e1f77d1a8a403a32e35882"],
2323
}
2424

2525
# Name : Source , Destination, version, Copied/Installation location wrt to Script root
2626
downloadWin = {
27-
"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"]
27+
"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"]
2828
}
2929

3030
# Name : Source , Destination, version, Copied/Installation location wrt to Script root

‎scripts/gpa_packaging.py‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/python3
2-
## Copyright (c) 2019-2020 Advanced Micro Devices, Inc. All rights reserved.
2+
## Copyright (c) 2019-2023 Advanced Micro Devices, Inc. All rights reserved.
33
# GPA Packaging script
44

55
import os
@@ -76,9 +76,6 @@ def CreatePackage(self, archive_output_dir, build_artifacts_dir, sphinx_docs_dir
7676
gpa_build_artifacts_dir = self._gpa_build_artifacts_dir
7777
gpa_archive_out_dir = self._gpa_build_artifacts_dir
7878

79-
if sphinx_docs_dir is None:
80-
sphinx_docs_dir = self._gpa_build_artifacts_dir
81-
8279
config_str = "release"
8380
if is_debug == True:
8481
config_str = "debug"
@@ -172,25 +169,31 @@ def CreatePackage(self, archive_output_dir, build_artifacts_dir, sphinx_docs_dir
172169
GpaUtils.WriteFileToArchive(gpa_archive_handle, other_file_abs_path,
173170
other_file_in_archive)
174171

175-
# Write docs
176-
gpa_docs_dir = os.path.normpath(os.path.join(gpa_build_artifacts_dir, sphinx_docs_dir, "html"))
177-
gpa_docs_dir_str = str(gpa_docs_dir)
178-
gpa_docs_dir_info = os.walk(gpa_docs_dir)
172+
if (sphinx_docs_dir is not None) and (sphinx_docs_dir != ""):
173+
# Write docs
174+
gpa_docs_dir = os.path.normpath(os.path.join(gpa_build_artifacts_dir, sphinx_docs_dir, "html"))
175+
gpa_docs_dir_str = str(gpa_docs_dir)
176+
gpa_docs_dir_info = os.walk(gpa_docs_dir)
179177

180-
if sys.platform == "win32":
181-
doc_folder_str = "\\docs"
182-
else:
183-
doc_folder_str = "/docs"
184-
185-
for dirs, sub_dirs, files in gpa_docs_dir_info:
186-
for file in files:
187-
doc_file_abs_path = os.path.join(dirs, file)
188-
doc_file_abs_path = os.path.normpath(doc_file_abs_path)
189-
doc_file_abs_path_str = str(doc_file_abs_path)
190-
doc_file_in_archive = gpa_archive_root_name + doc_folder_str + \
191-
doc_file_abs_path_str.split(gpa_docs_dir_str)[1]
192-
GpaUtils.WriteFileToArchive(gpa_archive_handle, doc_file_abs_path,
193-
doc_file_in_archive)
178+
if sys.platform == "win32":
179+
doc_folder_str = "\\docs"
180+
else:
181+
doc_folder_str = "/docs"
182+
183+
file_count = 0
184+
for dirs, sub_dirs, files in gpa_docs_dir_info:
185+
for file in files:
186+
file_count = file_count + 1
187+
doc_file_abs_path = os.path.join(dirs, file)
188+
doc_file_abs_path = os.path.normpath(doc_file_abs_path)
189+
doc_file_abs_path_str = str(doc_file_abs_path)
190+
doc_file_in_archive = gpa_archive_root_name + doc_folder_str + \
191+
doc_file_abs_path_str.split(gpa_docs_dir_str)[1]
192+
GpaUtils.WriteFileToArchive(gpa_archive_handle, doc_file_abs_path,
193+
doc_file_in_archive)
194+
195+
if file_count == 0:
196+
raise Exception("Failed to find html documentation")
194197

195198
# Returns the gpa version
196199
def GetGpaVersion(self, _build_numberin):

‎source/auto_generated/gpu_perf_api_counter_generator/gpa_hw_counter.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx10.h
77
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx103.h
88
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx103_gfx1031_gfx1032.h
99
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx11.h
10+
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx11_gfx1103.h
1011
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8.h
1112
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8_baffin.h
1213
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8_carrizo.h
@@ -24,6 +25,7 @@ ${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx10.cc
2425
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx103.cc
2526
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx103_gfx1031_gfx1032.cc
2627
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx11.cc
28+
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx11_gfx1103.cc
2729
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8.cc
2830
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8_baffin.cc
2931
${CMAKE_CURRENT_LIST_DIR}/gpa_hw_counter_gfx8_carrizo.cc

0 commit comments

Comments
 (0)