AI/rocm-systems
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 2038311 by vsytchen@vsytchen-ocl-win10-2 on 2019/11/28 15:39:44

Browse Source 
SWDEV-193973 - Enable Navi21 for mainline builds

	ReviewBoardURL = http://ocltc.amd.com/reviews/r/18326/diff/

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palbedefs#59 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcounters.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldefs.hpp#66 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/paldevice.cpp#178 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palresource.cpp#82 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palsettings.cpp#107 edit
This commit is contained in:
foreman committed 2019-11-28 15:41:22 -05:00
1 parent fc6a848e84
commit 3de904a3f3
4 files changed
+9 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

rocclr/runtime/device/pal/palcounters.cpp
+1 -6
View File
@@ -138,11 +138,7 @@ bool PalCounterReference::finalize() {
}
}
#if !IS_MAINLINE && (PAL_CLIENT_INTERFACE_MAJOR_VERSION >= 543)
static const std::array<PCIndexSelect, 49> blockIdToIndexSelect = {{
#else
static const std::array<PCIndexSelect, 46> blockIdToIndexSelect = {{
#endif
PCIndexSelect::None, // CPF
PCIndexSelect::ShaderEngine, // IA
PCIndexSelect::ShaderEngine, // VGT
@@ -189,11 +185,9 @@ static const std::array<PCIndexSelect, 46> blockIdToIndexSelect = {{
PCIndexSelect::None, // GCR
PCIndexSelect::None, // PH
PCIndexSelect::ShaderArray, // UTCL1
#if !IS_MAINLINE && PAL_CLIENT_INTERFACE_MAJOR_VERSION >= 543
PCIndexSelect::None, // GeDist
PCIndexSelect::ShaderEngine, // GeSe
PCIndexSelect::None, // Df
#endif
}};
static_assert(blockIdToIndexSelect.size() == static_cast<size_t>(Pal::GpuBlock::Count), "size of blockIdToIndexSelect does not match GpuBlock::Count");
@@ -680,6 +674,7 @@ void PerfCounter::convertInfo() {
}
break;
case Pal::GfxIpLevel::GfxIp10_1:
case Pal::GfxIpLevel::GfxIp10_3:
if (info_.blockIndex_ < gfx10BlockIdPal.size()) {
auto p = gfx10BlockIdPal[info_.blockIndex_];
info_.blockIndex_ = std::get<0>(p);