Skip to content
This repository was archived by the owner on Apr 30, 2020. It is now read-only.

Commit 33d258e

Browse files
committed
GPA-related udpates
1) Pull GPA as part of FetchDependencies 2) Remove GPA headers included in CodeXL repo 3) Move to GPA 2.3 Change-Id: I618c26ec34c2bcd70fb13299baaf33dcb3e34378
1 parent 8a413e0 commit 33d258e

21 files changed

+10
-1315
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,5 +303,8 @@ Common/Lib/AMD/RCP/jqPlot
303303
Common/Lib/AMD/RCP/CXLActivityLogger
304304
Common/Lib/AMD/RCP/include
305305

306+
# GPA
307+
Common/Lib/AMD/GPUPerfAPI/2_23
308+
306309
# RGA
307310
Common/Lib/AMD/RGA

CodeXL/Components/GpuProfiling/AMDTGpuProfiling/SConscript

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ GPUProf_env.Append( CPPPATH = [
4343
GPUProf_env['CXL_common_dir'] + '/Src/AMDTMutex',
4444
GPUProf_env['CXL_common_dir'] + '/Lib/Ext/utf8cpp/source',
4545
GPUProf_env['CXL_common_dir'] + '/Lib/AMD/RCP/include',
46-
GPUProf_env['CXL_common_dir'] + '/Lib/AMD/GPUPerfAPI/2_22/Include',
46+
GPUProf_env['CXL_common_dir'] + '/Lib/AMD/GPUPerfAPI/2_23/Include',
4747
GPUProf_env['CXL_commonproj_dir'],
4848
GPUProf_env['CXL_common_dir'] + '/../CodeXL',
4949
GPUProf_env['CXL_common_dir'] + '/../CodeXL/Components',

CodeXL/Scripts/FetchDependencies.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@
2020
"https://github.com/GPUOpen-Tools/RGA/releases/download/1.1.0.0/rga-windows-x86-1.1.zip" : "../../Common/Lib/AMD/RGA/x86",
2121
"https://github.com/GPUOpen-Tools/RGA/releases/download/1.1.0.0/rga-windows-x64-1.1.zip" : "../../Common/Lib/AMD/RGA/x64",
2222
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RadeonComputeProfiler.2017-06-26-v5.1.6451.zip" : "../../Common/Lib/AMD/RCP",
23-
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RCPProfileDataParser.2017-06-26-v5.1.6451.zip" : "../../Common/Lib/AMD/RCP"
23+
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RCPProfileDataParser.2017-06-26-v5.1.6451.zip" : "../../Common/Lib/AMD/RCP",
24+
"https://github.com/GPUOpen-Tools/GPA/releases/download/v2.23/GPUPerfAPI-2.23.2382.0.zip" : "../../Common/Lib/AMD/GPUPerfAPI"
2425
}
2526
downloadMappingLin = {
2627
"https://github.com/GPUOpen-Tools/RGA/releases/download/1.1.0.0/rga-linux-1.1.tgz" : "../../Common/Lib/AMD/RGA",
2728
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RadeonComputeProfiler-v5.1.6396.tgz" : "../../Common/Lib/AMD/RCP",
28-
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RCPProfileDataParser-v5.1.6396.tgz" : "../../Common/Lib/AMD/RCP"
29+
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RCPProfileDataParser-v5.1.6396.tgz" : "../../Common/Lib/AMD/RCP",
30+
"https://github.com/GPUOpen-Tools/GPA/releases/download/v2.23/GPUPerfAPI.2.23.1973-lnx.tgz" : "../../Common/Lib/AMD/GPUPerfAPI"
2931
}
3032

3133
# to allow the script to be run from anywhere - not just the cwd - store the absolute path to the script file
Binary file not shown.

Common/Lib/AMD/GPUPerfAPI/2_22/Include/GPACounterGenerator.h

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

Common/Lib/AMD/GPUPerfAPI/2_22/Include/GPAFunctions.h

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

Common/Lib/AMD/GPUPerfAPI/2_22/Include/GPAICounterAccessor.h

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

Common/Lib/AMD/GPUPerfAPI/2_22/Include/GPAICounterScheduler.h

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

0 commit comments

Comments
 (0)