From 4ca6ca35b69eeb81e248b35d7263a9247eedd344 Mon Sep 17 00:00:00 2001 From: foreman Date: Tue, 8 Oct 2019 18:38:10 -0400 Subject: [PATCH] P4 to Git Change 2010251 by vsytchen@vsytchen-remote-ocl-win10 on 2019/10/08 18:30:23 SWDEV-193973 - Update perfcounter info to accomodate PAL interface changes Gfx103 added perf counters for three new blocks - GeDist, GeSe and Df 1. Update the blockIdToIndexSelect array to reflect these changes. ReviewBoardURL = http://ocltc.amd.com/reviews/r/18063/diff/ Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palcounters.cpp#25 edit [ROCm/clr commit: 5fc50068538a56638344a7050576bcaf023e0563] --- projects/clr/rocclr/runtime/device/pal/palcounters.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/projects/clr/rocclr/runtime/device/pal/palcounters.cpp b/projects/clr/rocclr/runtime/device/pal/palcounters.cpp index 7897e1bec3..807480062d 100644 --- a/projects/clr/rocclr/runtime/device/pal/palcounters.cpp +++ b/projects/clr/rocclr/runtime/device/pal/palcounters.cpp @@ -138,7 +138,11 @@ bool PalCounterReference::finalize() { } } +#if !IS_MAINLINE && (PAL_CLIENT_INTERFACE_MAJOR_VERSION >= 543) +static const std::array blockIdToIndexSelect = {{ +#else static const std::array blockIdToIndexSelect = {{ +#endif PCIndexSelect::None, // CPF PCIndexSelect::ShaderEngine, // IA PCIndexSelect::ShaderEngine, // VGT @@ -185,6 +189,11 @@ static const std::array 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(Pal::GpuBlock::Count), "size of blockIdToIndexSelect does not match GpuBlock::Count");