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

Commit

Permalink
GPA-related udpates
Browse files Browse the repository at this point in the history
1) Pull GPA as part of FetchDependencies
2) Remove GPA headers included in CodeXL repo
3) Move to GPA 2.3

Change-Id: I618c26ec34c2bcd70fb13299baaf33dcb3e34378
  • Loading branch information
chesik-amd committed Jun 28, 2017
1 parent 8a413e0 commit 33d258e
Show file tree
Hide file tree
Showing 21 changed files with 10 additions and 1,315 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -303,5 +303,8 @@ Common/Lib/AMD/RCP/jqPlot
Common/Lib/AMD/RCP/CXLActivityLogger
Common/Lib/AMD/RCP/include

# GPA
Common/Lib/AMD/GPUPerfAPI/2_23

# RGA
Common/Lib/AMD/RGA
2 changes: 1 addition & 1 deletion CodeXL/Components/GpuProfiling/AMDTGpuProfiling/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ GPUProf_env.Append( CPPPATH = [
GPUProf_env['CXL_common_dir'] + '/Src/AMDTMutex',
GPUProf_env['CXL_common_dir'] + '/Lib/Ext/utf8cpp/source',
GPUProf_env['CXL_common_dir'] + '/Lib/AMD/RCP/include',
GPUProf_env['CXL_common_dir'] + '/Lib/AMD/GPUPerfAPI/2_22/Include',
GPUProf_env['CXL_common_dir'] + '/Lib/AMD/GPUPerfAPI/2_23/Include',
GPUProf_env['CXL_commonproj_dir'],
GPUProf_env['CXL_common_dir'] + '/../CodeXL',
GPUProf_env['CXL_common_dir'] + '/../CodeXL/Components',
Expand Down
6 changes: 4 additions & 2 deletions CodeXL/Scripts/FetchDependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@
"https://github.com/GPUOpen-Tools/RGA/releases/download/1.1.0.0/rga-windows-x86-1.1.zip" : "../../Common/Lib/AMD/RGA/x86",
"https://github.com/GPUOpen-Tools/RGA/releases/download/1.1.0.0/rga-windows-x64-1.1.zip" : "../../Common/Lib/AMD/RGA/x64",
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RadeonComputeProfiler.2017-06-26-v5.1.6451.zip" : "../../Common/Lib/AMD/RCP",
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RCPProfileDataParser.2017-06-26-v5.1.6451.zip" : "../../Common/Lib/AMD/RCP"
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RCPProfileDataParser.2017-06-26-v5.1.6451.zip" : "../../Common/Lib/AMD/RCP",
"https://github.com/GPUOpen-Tools/GPA/releases/download/v2.23/GPUPerfAPI-2.23.2382.0.zip" : "../../Common/Lib/AMD/GPUPerfAPI"
}
downloadMappingLin = {
"https://github.com/GPUOpen-Tools/RGA/releases/download/1.1.0.0/rga-linux-1.1.tgz" : "../../Common/Lib/AMD/RGA",
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RadeonComputeProfiler-v5.1.6396.tgz" : "../../Common/Lib/AMD/RCP",
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RCPProfileDataParser-v5.1.6396.tgz" : "../../Common/Lib/AMD/RCP"
"https://github.com/GPUOpen-Tools/RCP/releases/download/v5.1/RCPProfileDataParser-v5.1.6396.tgz" : "../../Common/Lib/AMD/RCP",
"https://github.com/GPUOpen-Tools/GPA/releases/download/v2.23/GPUPerfAPI.2.23.1973-lnx.tgz" : "../../Common/Lib/AMD/GPUPerfAPI"
}

# to allow the script to be run from anywhere - not just the cwd - store the absolute path to the script file
Expand Down
Binary file not shown.
32 changes: 0 additions & 32 deletions Common/Lib/AMD/GPUPerfAPI/2_22/Include/GPACounterGenerator.h

This file was deleted.

81 changes: 0 additions & 81 deletions Common/Lib/AMD/GPUPerfAPI/2_22/Include/GPAFunctions.h

This file was deleted.

106 changes: 0 additions & 106 deletions Common/Lib/AMD/GPUPerfAPI/2_22/Include/GPAICounterAccessor.h

This file was deleted.

102 changes: 0 additions & 102 deletions Common/Lib/AMD/GPUPerfAPI/2_22/Include/GPAICounterScheduler.h

This file was deleted.

Loading

0 comments on commit 33d258e

Please sign in to comment.